Mercurial > wow > wowdb-profiler
changeset 337:48f7f671fc77 WoD
Moved two constant tables to Constants.lua and restructured a pair of them to be a single table. Replaced UnitManaMax with UnitPowerMax (other was deprecated).
| author | MMOSimca <MMOSimca@gmail.com> |
|---|---|
| date | Fri, 05 Sep 2014 01:50:04 -0400 |
| parents | cba0e57a71b7 |
| children | 9b683a560ed3 |
| files | Constants.lua Main.lua |
| diffstat | 2 files changed, 61 insertions(+), 66 deletions(-) [+] |
line wrap: on
line diff
--- a/Constants.lua Fri Sep 05 01:20:44 2014 -0400 +++ b/Constants.lua Fri Sep 05 01:50:04 2014 -0400 @@ -15,6 +15,58 @@ ----------------------------------------------------------------------- -- Game Data Constants. ----------------------------------------------------------------------- +private.FACTION_NAMES = { -- Only used for private.REP_BUFFS + CENARION_CIRCLE = _G.GetFactionInfoByID(609), + HONOR_HOLD = _G.GetFactionInfoByID(946), + THE_SHATAR = _G.GetFactionInfoByID(935), + THRALLMAR = _G.GetFactionInfoByID(947), +} + +private.REP_BUFFS = { + [_G.GetSpellInfo(30754)] = { -- CENARION FAVOR + faction = FACTION_NAMES.CENARION_CIRCLE, + modifier = 0.25, + }, + [_G.GetSpellInfo(24705)] = { -- GRIM VISAGE + modifier = 0.1, + }, + [_G.GetSpellInfo(32098)] = { -- HONOR HOLD FAVOR + faction = FACTION_NAMES.HONOR_HOLD, + modifier = 0.25, + }, + [_G.GetSpellInfo(39913)] = { -- NAZGRELS FERVOR + faction = FACTION_NAMES.THRALLMAR, + modifier = 0.1, + }, + [_G.GetSpellInfo(39953)] = { -- SONG OF BATTLE + faction = FACTION_NAMES.THE_SHATAR, + modifier = 0.1, + }, + [_G.GetSpellInfo(61849)] = { -- SPIRIT OF SHARING + modifier = 0.1, + }, + [_G.GetSpellInfo(32096)] = { -- THRALLMARS FAVOR + faction = FACTION_NAMES.THRALLMAR, + modifier = 0.25, + }, + [_G.GetSpellInfo(39911)] = { -- TROLLBANES COMMAND + faction = FACTION_NAMES.HONOR_HOLD, + modifier = 0.1, + }, + [_G.GetSpellInfo(95987)] = { -- UNBURDENED + modifier = 0.1, + }, + [_G.GetSpellInfo(100951)] = { -- WOW 8TH ANNIVERSARY + modifier = 0.08, + }, + [_G.GetSpellInfo(132700)] = { -- WOW 9TH ANNIVERSARY + modifier = 0.09, + }, + [_G.GetSpellInfo(150986)] = { -- WOW 10TH ANNIVERSARY + modifier = 0.1, + } +} + private.LOOT_SPELL_ID_TO_ITEM_ID_MAP = { [142397] = 98134, -- Heroic Cache of Treasures [142901] = 98546, -- Bulging Heroic Cache of Treasures
--- a/Main.lua Fri Sep 05 01:20:44 2014 -0400 +++ b/Main.lua Fri Sep 05 01:50:04 2014 -0400 @@ -48,6 +48,7 @@ local PLAYER_NAME = _G.UnitName("player") local PLAYER_RACE = _G.select(2, _G.UnitRace("player")) +-- Ignoring NPC casts of the following spells local CHI_WAVE_SPELL_ID = 132464 local DISGUISE_SPELL_ID = 121308 @@ -1118,7 +1119,7 @@ level_data.max_health = level_data.max_health or _G.UnitHealthMax("target") if not level_data.power then - local max_power = _G.UnitManaMax("target") + local max_power = _G.UnitPowerMax("target") if max_power > 0 then local power_type = _G.UnitPowerType("target") @@ -1279,7 +1280,7 @@ local currency_texture = CurrencyLinkToTexture(item_link) if currency_texture and currency_texture ~= "" then Debug("%s: %s X %d", event_name, currency_texture, quantity) - -- workaround for Patch 5.4.0 bug with Flexible raid Siege of Orgrimmar bosses and Valor Points + -- Workaround for Patch 5.4.0 bug with Flexible raid Siege of Orgrimmar bosses and Valor Points if quantity > 1000 and currency_texture == "pvecurrency-valor" then quantity = math.floor(quantity / 100) end @@ -1574,70 +1575,12 @@ end end + local DIPLOMACY_SPELL_ID = 20599 local MR_POP_RANK1_SPELL_ID = 78634 local MR_POP_RANK2_SPELL_ID = 78635 - - local REP_BUFFS = { - [_G.GetSpellInfo(30754)] = "CENARION_FAVOR", - [_G.GetSpellInfo(24705)] = "GRIM_VISAGE", - [_G.GetSpellInfo(32098)] = "HONOR_HOLD_FAVOR", - [_G.GetSpellInfo(39913)] = "NAZGRELS_FERVOR", - [_G.GetSpellInfo(39953)] = "SONG_OF_BATTLE", - [_G.GetSpellInfo(61849)] = "SPIRIT_OF_SHARING", - [_G.GetSpellInfo(32096)] = "THRALLMARS_FAVOR", - [_G.GetSpellInfo(39911)] = "TROLLBANES_COMMAND", - [_G.GetSpellInfo(95987)] = "UNBURDENED", - [_G.GetSpellInfo(100951)] = "WOW_ANNIVERSARY", - } - - - local FACTION_NAMES = { - CENARION_CIRCLE = _G.GetFactionInfoByID(609), - HONOR_HOLD = _G.GetFactionInfoByID(946), - THE_SHATAR = _G.GetFactionInfoByID(935), - THRALLMAR = _G.GetFactionInfoByID(947), - } - - - local MODIFIERS = { - CENARION_FAVOR = { - faction = FACTION_NAMES.CENARION_CIRCLE, - modifier = 0.25, - }, - GRIM_VISAGE = { - modifier = 0.1, - }, - HONOR_HOLD_FAVOR = { - faction = FACTION_NAMES.HONOR_HOLD, - modifier = 0.25, - }, - NAZGRELS_FERVOR = { - faction = FACTION_NAMES.THRALLMAR, - modifier = 0.1, - }, - SONG_OF_BATTLE = { - faction = FACTION_NAMES.THE_SHATAR, - modifier = 0.1, - }, - SPIRIT_OF_SHARING = { - modifier = 0.1, - }, - THRALLMARS_FAVOR = { - faction = FACTION_NAMES.THRALLMAR, - modifier = 0.25, - }, - TROLLBANES_COMMAND = { - faction = FACTION_NAMES.HONOR_HOLD, - modifier = 0.1, - }, - UNBURDENED = { - modifier = 0.1, - }, - WOW_ANNIVERSARY = { - modifier = 0.08, - } - } + local FACTION_NAMES = private.FACTION_NAMES + local REP_BUFFS = private.REP_BUFFS function WDP:COMBAT_TEXT_UPDATE(event_name, message_type, faction_name, amount) @@ -1671,12 +1614,12 @@ modifier = modifier + 0.05 end - for buff_name, buff_label in pairs(REP_BUFFS) do + for buff_name, rep_data_table in pairs(REP_BUFFS) do if _G.UnitBuff("player", buff_name) then - local modded_faction = MODIFIERS[buff_label].faction + local modded_faction = rep_data_table.faction if not modded_faction or faction_name == modded_faction then - modifier = modifier + MODIFIERS[buff_label].modifier + modifier = modifier + rep_data_table.modifier end end end