wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 317:8a2e619cced5

Loot and merchant currency fixes.

author	James D. Callahan III <jcallahan@curse.com>
date	Sun, 15 Sep 2013 19:01:58 -0500
parents	564deda095ec
children	4f2d5a082b6d

comparison

equal deleted inserted replaced

-:9fe19fd62142
+:8a2e619cced5
 local in_instance
 local item_process_timer_handle
 local faction_standings = {}
 local forge_spell_ids = {}
 local languages_known = {}
+local boss_loot_toasting = {}
 local loot_toast_container_timer_handle
 local loot_toast_data
 local loot_toast_data_timer_handle
 local name_to_id_map = {}
 local killed_boss_id_timer_handle
 return math.floor(copper_cost / modifier)
 end
 end -- do-block
+-- constant for duplicate boss data; a dirty hack to get around world bosses that cannot be identified individually and cannot be linked on wowdb because they are not in a raid
+local DUPLICATE_WORLD_BOSS_IDS = {
+[71952] = { 71953, 71954, 71955, },
+}
 -- Called on a timer
 local function ClearKilledNPC()
 killed_npc_id = nil
 end
 local function ClearKilledBossID()
 if killed_boss_id_timer_handle then
 WDP:CancelTimer(killed_boss_id_timer_handle)
 end
-private.boss_loot_toasting = false
+table.wipe(boss_loot_toasting)
 private.raid_finder_boss_id = nil
 private.world_boss_id = nil
 killed_boss_id_timer_handle = nil
 end
 if not loot_type or (loot_type ~= "item" and loot_type ~= "money" and loot_type ~= "currency") then
 Debug("%s: loot_type is %s. Item link is %s, and quantity is %d.", event_name, loot_type, item_link, quantity)
 return
 end
 local container_id = private.loot_toast_container_id
-local npc = NPCEntry(private.raid_finder_boss_id or private.world_boss_id)
+local npc_id = private.raid_finder_boss_id or private.world_boss_id
-if npc then
+if npc_id then
-local loot_label = "drops"
+-- slightly messy hack to workaround duplicate world bosses
-local encounter_data = npc:EncounterData(InstanceDifficultyToken())
+local upper_limit = 0
-encounter_data[loot_label] = encounter_data[loot_label] or {}
+if DUPLICATE_WORLD_BOSS_IDS[npc_id] then
-encounter_data.loot_counts = encounter_data.loot_counts or {}
+upper_limit = #DUPLICATE_WORLD_BOSS_IDS[npc_id]
+end
-if loot_type == "item" then
+for i = 0, upper_limit do
-local item_id = ItemLinkToID(item_link)
+local temp_npc_id = npc_id
-if item_id then
-Debug("%s: %s X %d (%d)", event_name, item_link, quantity, item_id)
+if i > 0 then
-table.insert(encounter_data[loot_label], ("%d:%d"):format(item_id, quantity))
+temp_npc_id = DUPLICATE_WORLD_BOSS_IDS[npc_id][i]
-else
+end
-Debug("%s: ItemID is nil, from item link %s", event_name, item_link)
-return
+local npc = NPCEntry(temp_npc_id)
-end
+if npc then
-elseif loot_type == "money" then
+local loot_label = "drops"
-Debug("%s: money X %d", event_name, quantity)
+local encounter_data = npc:EncounterData(InstanceDifficultyToken())
-table.insert(encounter_data[loot_label], ("money:%d"):format(quantity))
+encounter_data[loot_label] = encounter_data[loot_label] or {}
-elseif loot_type == "currency" then
+encounter_data.loot_counts = encounter_data.loot_counts or {}
-local currency_texture = CurrencyLinkToTexture(item_link)
-if currency_texture and currency_texture ~= "" then
+if loot_type == "item" then
-Debug("%s: %s X %d", event_name, currency_texture, quantity)
+local item_id = ItemLinkToID(item_link)
-table.insert(encounter_data[loot_label], ("currency:%d:%s"):format(quantity, currency_texture))
+if item_id then
-else
+Debug("%s: %s X %d (%d)", event_name, item_link, quantity, item_id)
-Debug("%s: Currency texture is nil, from currency link %s", event_name, item_link)
+table.insert(encounter_data[loot_label], ("%d:%d"):format(item_id, quantity))
-return
+else
-end
+Debug("%s: ItemID is nil, from item link %s", event_name, item_link)
-end
+return
+end
-if not private.boss_loot_toasting then
+elseif loot_type == "money" then
-encounter_data.loot_counts[loot_label] = (encounter_data.loot_counts[loot_label] or 0) + 1
+Debug("%s: money X %d", event_name, quantity)
-end
+table.insert(encounter_data[loot_label], ("money:%d"):format(quantity))
+elseif loot_type == "currency" then
-private.boss_loot_toasting = true -- Do not count further loots until timer expires or another boss is killed
+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
+if quantity > 1000 and currency_texture == "pvecurrency-valor" then
+quantity = math.floor(quantity / 100)
+end
+table.insert(encounter_data[loot_label], ("currency:%d:%s"):format(quantity, currency_texture))
+else
+Debug("%s: Currency texture is nil, from currency link %s", event_name, item_link)
+return
+end
+end
+if not boss_loot_toasting[temp_npc_id] then
+encounter_data.loot_counts[loot_label] = (encounter_data.loot_counts[loot_label] or 0) + 1
+boss_loot_toasting[temp_npc_id] = true -- Do not count further loots until timer expires or another boss is killed
+end
+end
+end
 elseif container_id then
 InitializeCurrentLoot()
 -- Fake the loot characteristics to match that of an actual container item
 current_loot.identifier = container_id
 if not previous_combat_event.party_damage then
 --Debug("%s: %s was killed by %s (not group member or pet).", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN) -- broken in Patch 5.4
 table.wipe(previous_combat_event)
 ClearKilledNPC()
 else
 --Debug("%s: %s was killed by %s.", sub_event, dest_name or _G.UNKNOWN, killer_name or _G.UNKNOWN) -- broken in Patch 5.4
 end
 killed_npc_id = unit_idnum
 WDP:ScheduleTimer(ClearKilledNPC, 0.1)
 end,
 }
 -- Keeping this around in case Blizzard makes the two points diverge at some point.
 --                    price_string = ("%s:%s:%s:%s"):format(price_string, battleground_rating, personal_rating, required_season_amount or 0)
 price_string = ("%s:%s:%s"):format(price_string, personal_rating, required_season_amount or 0)
 for cost_index = 1, item_count do
--- (after some testing, the DB/Parser doesn't even support currency_ids -at all-, so vendor data submitted with the correct format will ironically be destroyed. that's why I removed the code here for currency_ids)
+-- the third return (Blizz calls "currency_link") of GetMerchantItemCostItem only returns item links as of Patch 5.3.0
--- the third return ("currency_link") of GetMerchantItemCostItem is broken as of Patch 5.4.0
+local icon_texture, amount_required, item_link = _G.GetMerchantItemCostItem(item_index, cost_index)
-local currency_texture, amount_required = _G.GetMerchantItemCostItem(item_index, cost_index)
+local currency_identifier = item_link and ItemLinkToID(item_link) or nil
-if currency_texture then
+if (not currency_identifier or currency_identifier < 1) and icon_texture then
-currency_list[#currency_list + 1] = ("(%s:%s)"):format(amount_required, currency_texture:match("[^\\]+$"):lower())
+currency_identifier = icon_texture:match("[^\\]+$"):lower()
+end
+if currency_identifier then
+currency_list[#currency_list + 1] = ("(%s:%s)"):format(amount_required, currency_identifier)
 end
 end
 for currency_index = 1, #currency_list do
 price_string = ("%s:%s"):format(price_string, currency_list[currency_index])
 return
 end
 -- assign existing loot data to boss if it exists
 if loot_toast_data then
-local npc = NPCEntry(private.raid_finder_boss_id or private.world_boss_id)
+local npc_id = private.raid_finder_boss_id or private.world_boss_id
-if npc then
+-- slightly messy hack to workaround duplicate world bosses
--- create needed npc fields if required
+local upper_limit = 0
-local loot_label = "drops"
+if DUPLICATE_WORLD_BOSS_IDS[npc_id] then
-local encounter_data = npc:EncounterData(InstanceDifficultyToken())
+upper_limit = #DUPLICATE_WORLD_BOSS_IDS[npc_id]
-encounter_data[loot_label] = encounter_data[loot_label] or {}
+end
-encounter_data.loot_counts = encounter_data.loot_counts or {}
-encounter_data.loot_counts[loot_label] = (encounter_data.loot_counts[loot_label] or 0) + 1
+for i = 0, upper_limit do
+local temp_npc_id = npc_id
-for index = 1, #loot_toast_data do
-local data = loot_toast_data[index]
+if i > 0 then
-local loot_type = data[1]
+temp_npc_id = DUPLICATE_WORLD_BOSS_IDS[npc_id][i]
-local hyperlink = data[2]
+end
-local quantity = data[3]
+local npc = NPCEntry(temp_npc_id)
-if loot_type == "item" then
+if npc then
-local item_id = ItemLinkToID(hyperlink)
+-- create needed npc fields if required
-Debug("%s: Assigned stored item loot data - %s - %d:%d", event_name, hyperlink, item_id, quantity)
+local loot_label = "drops"
-table.insert(encounter_data[loot_label], ("%d:%d"):format(item_id, quantity))
+local encounter_data = npc:EncounterData(InstanceDifficultyToken())
-elseif loot_type == "money" then
+encounter_data[loot_label] = encounter_data[loot_label] or {}
-Debug("%s: Assigned stored money loot data - money:%d", event_name, quantity)
+encounter_data.loot_counts = encounter_data.loot_counts or {}
-table.insert(encounter_data[loot_label], ("money:%d"):format(quantity))
-elseif loot_type == "currency" then
+for index = 1, #loot_toast_data do
-local currency_texture = CurrencyLinkToTexture(hyperlink)
+local data = loot_toast_data[index]
-Debug("%s: Assigned stored currency loot data - %s - currency:%d:%s", event_name, hyperlink, currency_texture, quantity)
+local loot_type = data[1]
-table.insert(encounter_data[loot_label], ("currency:%d:%s"):format(quantity, currency_texture))
+local hyperlink = data[2]
+local quantity = data[3]
+if loot_type == "item" then
+local item_id = ItemLinkToID(hyperlink)
+Debug("%s: Assigned stored item loot data - %s - %d:%d", event_name, hyperlink, item_id, quantity)
+table.insert(encounter_data[loot_label], ("%d:%d"):format(item_id, quantity))
+elseif loot_type == "money" then
+Debug("%s: Assigned stored money loot data - money:%d", event_name, quantity)
+table.insert(encounter_data[loot_label], ("money:%d"):format(quantity))
+elseif loot_type == "currency" then
+local currency_texture = CurrencyLinkToTexture(hyperlink)
+Debug("%s: Assigned stored currency loot data - %s - currency:%d:%s", event_name, hyperlink, currency_texture, quantity)
+-- 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
+table.insert(encounter_data[loot_label], ("currency:%d:%s"):format(quantity, currency_texture))
+end
 end
-end
-private.boss_loot_toasting = true
+if not boss_loot_toasting[temp_npc_id] then
-else
+encounter_data.loot_counts[loot_label] = (encounter_data.loot_counts[loot_label] or 0) + 1
-Debug("%s: NPC is nil, but we have stored loot data...", event_name)
+boss_loot_toasting[temp_npc_id] = true -- Do not count further loots until timer expires or another boss is killed
+end
+else
+Debug("%s: NPC is nil, but we have stored loot data...", event_name)
+end
 end
 end
 ClearLootToastData()

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 317:8a2e619cced5