diff --git a/prices.lua b/prices.lua index ebc14d4..e256bc1 100644 --- a/prices.lua +++ b/prices.lua @@ -1,4 +1,33 @@ local prices = { + + ----------------- + --- Kara40 --- + ----------------- + + [55078] = {0,"T3.5"}; --Ley-attuned Chocker + [55084] = {200,"T3.5"}; --Torn Wings of Midnight + [55081] = {0,"T3.5"}; --Manadrenched Feather Slippers + [55079] = {300,"T3.5"}; --Ravenkeeper's Frenzied Embrace + [55082] = {100,"T3.5"}; --Idol of Laceration + [55083] = {300,"T3.5"}; --Crown of the Wildpack + + [55091] = {200,"T3.5"}; --Loop of Infused Renewal + [41403] = {0,"T3.5"}; --Enchanted Amethyst + [55507] = {250,"T3.5"}; --Choker of Terminal Arcanum + + [55483] = {150,"T3.5"}; --Ethereal Boots of Conquest + [55484] = {150,"T3.5"}; --Ethereal Boots of Ascendancy + [55485] = {150,"T3.5"}; --Shifting Mantle of Conquest + [55486] = {150,"T3.5"}; --Shifting Mantle of Ascendancy + [55487] = {150,"T3.5"}; --Fractured Crown of Conquest + [55488] = {150,"T3.5"}; --Fractured Crown of Ascendancy + [55489] = {150,"T3.5"}; --Brutal Leggings of Conquest + [55490] = {150,"T3.5"}; --Brutal Leggings of Ascendancy + [55491] = {150,"T3.5"}; --Nathrezim Armor of Treachery + [55492] = {150,"T3.5"}; --Nathrezim Armor of Deceit + + [55579] = {0,"T3.5"}; --Hearth of Mephistroth + ----------------- --- Naxxramas --- ----------------- @@ -784,10 +813,11 @@ 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,["T2.5"]=1,["T2"]=1, ["T1.5"]=1,["T1"]=1}, - ["T2"] = {["T3"]=1, ["T2.5"]=1, ["T2"]=1, ["T1.5"]=1,["T1"]=1}, - ["T1"] = {["T3"]=1,["T2.5"]=1,["T2"]=1,["T1.5"]=1,["T1"]=1} + ["T3.5"] = {["T3.5"]=1, ["T3"]=1, ["T2.5"]=1, ["T2"]=1, ["T1.5"]=1, ["T1"]=1}, + ["T3"] = {["T3.5"]=1, ["T3"]=1, ["T2.5"]=1, ["T2"]=1, ["T1.5"]=1, ["T1"]=1}, + ["T2.5"] = {["T3.5"]=1, ["T3"]=1, ["T2.5"]=1, ["T2"]=1, ["T1.5"]=1, ["T1"]=1}, + ["T2"] = {["T3.5"]=1, ["T3"]=1, ["T2.5"]=1, ["T2"]=1, ["T1.5"]=1, ["T1"]=1}, + ["T1"] = {["T3.5"]=1, ["T3"]=1, ["T2.5"]=1, ["T2"]=1, ["T1.5"]=1, ["T1"]=1} } local function get_adjusted_price(price,tier,progress) if not progress_scaling[progress] then return price end diff --git a/shootyepgp.lua b/shootyepgp.lua index f181754..d84604f 100644 --- a/shootyepgp.lua +++ b/shootyepgp.lua @@ -331,7 +331,7 @@ function sepgp:buildMenu() sepgp:shareSettings(true) end end, - validate = { ["T3"]=L["4.Naxxramas"], ["T2.5"]=L["3.Temple of Ahn\'Qiraj"], ["T2"]=L["2.Blackwing Lair"], ["T1"]=L["1.Molten Core"]}, + validate = { ["T3.5"] = L["Tower of Karazhan"], ["T3"]=L["4.Naxxramas"], ["T2.5"]=L["3.Temple of Ahn\'Qiraj"], ["T2"]=L["2.Blackwing Lair"], ["T1"]=L["1.Molten Core"]}, } options.args["report_channel"] = { type = "text", @@ -2260,13 +2260,51 @@ function sepgp:make_escable(framename,operation) end 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 raidZones = {[L["Molten Core"]]="T1",[L["Onyxia\'s Lair"]]="T1.5",[L["Blackwing Lair"]]="T2",[L["Ahn\'Qiraj"]]="T2.5",[L["Naxxramas"]]="T3",[L["Tower of Karazhan"]]="T3.5"} +-- Updated zone_multipliers table with added "T3.5" columns and a new row for raid progress "T3.5": 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.5"] = { + ["T3.5"] = 1, + ["T3"] = 0.8, + ["T2.5"] = 0.65, + ["T2"] = 0.5, + ["T1.5"] = 0.3, + ["T1"] = 0.3 + }, + ["T3"] = { + ["T3.5"] = 1, + ["T3"] = 1, + ["T2.5"] = 0.75, + ["T2"] = 0.5, + ["T1.5"] = 0.25, + ["T1"] = 0.25 + }, + ["T2.5"] = { + ["T3.5"] = 1, + ["T3"] = 1, + ["T2.5"] = 1, + ["T2"] = 0.7, + ["T1.5"] = 0.4, + ["T1"] = 0.4 + }, + ["T2"] = { + ["T3.5"] = 1, + ["T3"] = 1, + ["T2.5"] = 1, + ["T2"] = 1, + ["T1.5"] = 0.5, + ["T1"] = 0.5 + }, + ["T1"] = { + ["T3.5"] = 1, + ["T3"] = 1, + ["T2.5"] = 1, + ["T2"] = 1, + ["T1.5"] = 1, + ["T1"] = 1 + } } + function sepgp:suggestedAwardEP() local currentTier, zoneEN, zoneLoc, checkTier, multiplier local inInstance, instanceType = IsInInstance() diff --git a/shootyepgp.toc b/shootyepgp.toc index f99552f..c191504 100644 --- a/shootyepgp.toc +++ b/shootyepgp.toc @@ -7,7 +7,7 @@ ## X-Website: https://github.com/cinecom/shootyepgp/ ## X-Category: Guild ## X-Credits: shooty, Qcat(zhCN) -## Version: 3.86 +## Version: 10.1 ## X-Alpha: ## OptionalDeps: Ace2 ## SavedVariables: sepgp_saychannel, sepgp_groupbyclass, sepgp_groupbyarmor, sepgp_groupbyrole, sepgp_raidonly, sepgp_dbver, sepgp_debug, sepgp_fubar