From c7435c4b0a2b7c247c9f8c6abbdb3ab739c74301 Mon Sep 17 00:00:00 2001 From: Road-block Date: Sun, 18 Feb 2018 02:58:26 +0200 Subject: [PATCH] Add a missing item to AQ40 Fix a price scaling issue for AQ40 when on T2 multiplier --- prices.lua | 11 ++++++----- shootyepgp.lua | 16 ++++++++++++---- shootyepgp.toc | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/prices.lua b/prices.lua index 8ba821e..6a889d9 100644 --- a/prices.lua +++ b/prices.lua @@ -365,6 +365,7 @@ local prices = { [21701] = {88,"T2.5"}; --Cloak of the Concentrated Hatred [21702] = {4,"T2.5"}; --Amulet of Foul Warding [21703] = {24,"T2.5"}; --Hammer of Ji'zhi + [21704] = {68,"T2.5"}; --Boots of the Redeemed Prophecy [21705] = {12,"T2.5"}; --Boots of the Fallen Prophet [21706] = {28,"T2.5"}; --Boots of the Unwavering Will [21707] = {48,"T2.5"}; --Ring of Swarming Thought @@ -769,10 +770,10 @@ sepgp.gp_prices = prices ["T3"] = 9 }]] local progress_scaling = { - ["T3"] = {["T3"]=1,["T2.5"]=1,["T2"]=1,["T1.5"]=1,["T1"]=1}, - ["T2.5"] = {["T3"]=1.5,["T2.5"]=1.5,["T2"]=2,["T1.5"]=2,["T1"]=2}, - ["T2"] = {["T3"]=1.5,["T2.5"]=1.5,["T2"]=3,["T1.5"]=3,["T1"]=3}, - ["T1"] = {["T3"]=4.5,["T2.5"]=4.5,["T2"]=4.5,["T1.5"]=6,["T1"]=9} + ["T3"] = {["T3"]=1, ["T2.5"]=1, ["T2"]=1, ["T1.5"]=1,["T1"]=1}, + ["T2.5"] = {["T3"]=1.5,["T2.5"]=1.5,["T2"]=2, ["T1.5"]=2,["T1"]=2}, + ["T2"] = {["T3"]=2, ["T2.5"]=2, ["T2"]=3, ["T1.5"]=3,["T1"]=3}, + ["T1"] = {["T3"]=4.5,["T2.5"]=4.5,["T2"]=4.5,["T1.5"]=6,["T1"]=9} } local function get_adjusted_price(price,tier,progress) if not progress_scaling[progress] then return price end @@ -813,4 +814,4 @@ function sepgp_prices:GetPrice(item,progress) end -- GLOBALS: sepgp_saychannel,sepgp_groupbyclass,sepgp_groupbyarmor,sepgp_groupbyrole,sepgp_raidonly,sepgp_decay,sepgp_reservechannel,sepgp_main,sepgp_progress,sepgp_discount,sepgp_log,sepgp_dbver,sepgp_looted --- GLOBALS: sepgp,sepgp_prices,sepgp_standings,sepgp_bids,sepgp_loot,sepgp_reserves,sepgp_alts,sepgp_logs \ No newline at end of file +-- GLOBALS: sepgp,sepgp_prices,sepgp_standings,sepgp_bids,sepgp_loot,sepgp_reserves,sepgp_alts,sepgp_logs diff --git a/shootyepgp.lua b/shootyepgp.lua index aafd714..b085e82 100644 --- a/shootyepgp.lua +++ b/shootyepgp.lua @@ -104,6 +104,14 @@ local admincmd, membercmd = {type = "group", handler = sepgp, args = { sepgp_standings:Toggle() end, }, + restart = { + type = "execute", + name = L["Restart"], + desc = L["Restart shootyepgp if having startup problems."], + func = function() + sepgp:OnEnable() + end, + }, }} --[[{ type = "execute", @@ -1972,10 +1980,10 @@ end local raidZones = {[L["Molten Core"]]="T1",[L["Onyxia\'s Lair"]]="T1.5",[L["Blackwing Lair"]]="T2",[L["Ahn\'Qiraj"]]="T2.5",[L["Naxxramas"]]="T3"} local zone_multipliers = { - ["T3"] = {["T3"]=1,["T2.5"]=0.75,["T2"]=0.5,["T1.5"]=0.25,["T1"]=0.25}, - ["T2.5"] = {["T3"]=1,["T2.5"]=1,["T2"]=0.7,["T1.5"]=0.4,["T1"]=0.4}, - ["T2"] = {["T3"]=1,["T2.5"]=1,["T2"]=1,["T1.5"]=0.5,["T1"]=0.5}, - ["T1"] = {["T3"]=1,["T2.5"]=1,["T2"]=1,["T1.5"]=1,["T1"]=1} + ["T3"] = {["T3"]=1,["T2.5"]=0.75,["T2"]=0.5,["T1.5"]=0.25,["T1"]=0.25}, + ["T2.5"] = {["T3"]=1,["T2.5"]=1, ["T2"]=0.7,["T1.5"]=0.4, ["T1"]=0.4}, + ["T2"] = {["T3"]=1,["T2.5"]=1, ["T2"]=1, ["T1.5"]=0.5, ["T1"]=0.5}, + ["T1"] = {["T3"]=1,["T2.5"]=1, ["T2"]=1, ["T1.5"]=1, ["T1"]=1} } function sepgp:suggestedAwardEP() local currentTier, zoneEN, zoneLoc, checkTier, multiplier diff --git a/shootyepgp.toc b/shootyepgp.toc index 3792877..566320f 100644 --- a/shootyepgp.toc +++ b/shootyepgp.toc @@ -8,7 +8,7 @@ ## X-Category: Guild ## X-Credits: shooty, Qcat(zhCN) ## Version: 3.41 -## X-Alpha: +## X-Alpha: 3.42 ## 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_reservechannel, sepgp_progress, sepgp_discount, sepgp_altspool, sepgp_altpercent