brues/pfUI
1
2
Fork 0
mirror of https://github.com/brues-code/pfUI.git synced 2026-10-26 05:50:50 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

loot: use new cmatch for pattern matching

Browse Source
This commit is contained in:
shagu
2018-12-02 14:47:04 +01:00
parent aa30d5871e
commit 98ecb6db09
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/loot.lua
+2 -3
View File
@@ -21,7 +21,6 @@ pfUI:RegisterModule("loot", function ()
["PF_BANKLOOTER"] = {T["Set Banker"],"bankLooter"}, ["PF_BANKLOOTER"] = {T["Set Banker"],"bankLooter"},
["PF_DISENCHANTLOOTER"] = {T["Set Disenchanter"],"disenchantLooter"}, ["PF_DISENCHANTLOOTER"] = {T["Set Disenchanter"],"disenchantLooter"},
} }
pfUI.loot.rollCapture = SanitizePattern(RANDOM_ROLL_RESULT)
pfUI.loot.me = (UnitName("player")) pfUI.loot.me = (UnitName("player"))
pfUI.loot.index_to_name = {} pfUI.loot.index_to_name = {}
pfUI.loot.name_to_index = {} pfUI.loot.name_to_index = {}
@@ -656,7 +655,7 @@ pfUI:RegisterModule("loot", function ()
if event == "CHAT_MSG_SYSTEM" then if event == "CHAT_MSG_SYSTEM" then
-- random rolling, check for our own roll -- random rolling, check for our own roll
if pfUI.loot.randomRolling ~= nil then if pfUI.loot.randomRolling ~= nil then
local _, _, who, roll, from, to = string.find(arg1, pfUI.loot.rollCapture) local who, roll, from, to = cmatch(arg1, RANDOM_ROLL_RESULT)
if (who) and who == pfUI.loot.me then if (who) and who == pfUI.loot.me then
local winner = tonumber(roll) local winner = tonumber(roll)
GiveMasterLoot(pfUI.loot.selectedSlot, pfUI.loot.randoms[winner]) GiveMasterLoot(pfUI.loot.selectedSlot, pfUI.loot.randoms[winner])
@@ -665,7 +664,7 @@ pfUI:RegisterModule("loot", function ()
end end
-- collecting rolls from raid, discard duplicates and 'cheating' -- collecting rolls from raid, discard duplicates and 'cheating'
if pfUI.loot.monitorRolling ~= nil then if pfUI.loot.monitorRolling ~= nil then
local _, _, who, roll, from, to = string.find(arg1, pfUI.loot.rollCapture) local who, roll, from, to = cmatch(arg1, RANDOM_ROLL_RESULT)
if (who) and not pfUI.loot.rollers[who] then if (who) and not pfUI.loot.rollers[who] then
if tonumber(from)==1 and tonumber(to)==100 then if tonumber(from)==1 and tonumber(to)==100 then
if pfUI.loot.name_to_index[who] ~= nil then if pfUI.loot.name_to_index[who] ~= nil then