fix standings and bid sorters for fractional PR

add a couple more keywords to member bid detection
add support for pfUI-addonskins
This commit is contained in:
Road-block
2018-10-30 17:20:33 +02:00
parent b75443b4b4
commit bc91839370
4 changed files with 15 additions and 13 deletions
+4 -4
View File
@@ -125,9 +125,9 @@ local pr_sorter_bids = function(a,b)
local b_over = b[3]-sepgp_minep >= 0
if a_over and b_over or (not a_over and not b_over) then
if a[5] ~= b[5] then
return a[5] > b[5]
return tonumber(a[5]) > tonumber(b[5])
else
return a[3] > b[3]
return tonumber(a[3]) > tonumber(b[3])
end
elseif a_over and (not b_over) then
return true
@@ -136,9 +136,9 @@ local pr_sorter_bids = function(a,b)
end
else
if a[5] ~= b[5] then
return a[5] > b[5]
return tonumber(a[5]) > tonumber(b[5])
else
return a[3] > b[3]
return tonumber(a[3]) > tonumber(b[3])
end
end
end
+6 -4
View File
@@ -535,8 +535,10 @@ function sepgp:AceEvent_FullyInitialized() -- SYNTHETIC EVENT, later than PLAYER
end
-- if pfUI loaded, skin the extra tooltip
if (pfUI) and pfUI.api and pfUI.api.CreateBackdrop and pfUI_config and pfUI_config.tooltip and pfUI_config.tooltip.alpha then
pfUI.api.CreateBackdrop(sepgp.extratip,nil,nil,tonumber(pfUI_config.tooltip.alpha))
if not IsAddOnLoaded("pfUI-addonskins") then
if (pfUI) and pfUI.api and pfUI.api.CreateBackdrop and pfUI_config and pfUI_config.tooltip and pfUI_config.tooltip.alpha then
pfUI.api.CreateBackdrop(sepgp.extratip,nil,nil,tonumber(pfUI_config.tooltip.alpha))
end
end
-- hook GiveMasterLoot to catch loot assign to members too far for chat parsing
self:SecureHook("GiveMasterLoot")
@@ -1771,8 +1773,8 @@ function sepgp:captureLootCall(text, sender)
end
local lootBid = {}
lootBid.ms = {"(%+)",".+(%+).*",".*(%+).+",".*(%+).*","(ms)"}
lootBid.os = {"(%-)",".+(%-).*",".*(%-).+",".*(%-).*","(os)"}
lootBid.ms = {"(%+)",".+(%+).*",".*(%+).+",".*(%+).*","(ms)","(need)"}
lootBid.os = {"(%-)",".+(%-).*",".*(%-).+",".*(%-).*","(os)","(greed)"}
function sepgp:captureBid(text, sender)
if not (running_bid) then return end
if not (IsRaidLeader() or self:lootMaster()) then return end
+1 -1
View File
@@ -8,7 +8,7 @@
## X-Category: Guild
## X-Credits: shooty, Qcat(zhCN)
## Version: 3.50.5
## X-Alpha:
## X-Alpha: 3.60
## OptionalDeps: Ace2
## SavedVariables: sepgp_saychannel, sepgp_groupbyclass, sepgp_groupbyarmor, sepgp_groupbyrole, sepgp_raidonly, sepgp_dbver, sepgp_debug
## SavedVariablesPerCharacter: sepgp_main, sepgp_log, sepgp_looted, sepgp_decay, sepgp_minep, sepgp_reservechannel, sepgp_progress, sepgp_discount, sepgp_altspool, sepgp_altpercent
+4 -4
View File
@@ -348,9 +348,9 @@ local pr_sorter_standings = function(a,b)
local b_over = b[4]-sepgp_minep >= 0
if a_over and b_over or (not a_over and not b_over) then
if a[6] ~= b[6] then
return a[6] > b[6]
return tonumber(a[6]) > tonumber(b[6])
else
return a[4] > b[4]
return tonumber(a[4]) > tonumber(b[4])
end
elseif a_over and (not b_over) then
return true
@@ -359,9 +359,9 @@ local pr_sorter_standings = function(a,b)
end
else
if a[6] ~= b[6] then
return a[6] > b[6]
return tonumber(a[6]) > tonumber(b[6])
else
return a[4] > b[4]
return tonumber(a[4]) > tonumber(b[4])
end
end
end