From bc91839370d3b183d6b9a3cd7a6e266512d3ab98 Mon Sep 17 00:00:00 2001
From: Road-block <dridzt.addons@hotmail.com>
Date: Tue, 30 Oct 2018 17:20:33 +0200
Subject: [PATCH] fix standings and bid sorters for fractional PR add a couple
 more keywords to member bid detection add support for pfUI-addonskins

---
 bids.lua       |  8 ++++----
 shootyepgp.lua | 10 ++++++----
 shootyepgp.toc |  2 +-
 standings.lua  |  8 ++++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bids.lua b/bids.lua
index 9fa06c0..8a8a84b 100644
--- a/bids.lua
+++ b/bids.lua
@@ -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
diff --git a/shootyepgp.lua b/shootyepgp.lua
index a44c7c7..0e295f8 100644
--- a/shootyepgp.lua
+++ b/shootyepgp.lua
@@ -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
diff --git a/shootyepgp.toc b/shootyepgp.toc
index a7c23e3..5a85510 100644
--- a/shootyepgp.toc
+++ b/shootyepgp.toc
@@ -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
diff --git a/standings.lua b/standings.lua
index 4045144..05ff6d7 100644
--- a/standings.lua
+++ b/standings.lua
@@ -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