wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 387:b4a0a56ab3ae

Assorted code cleanup and reorganization as preparation for new data collection methods.

author	MMOSimca <MMOSimca@gmail.com>
date	Tue, 16 Dec 2014 20:46:14 -0500
parents	bc1b8234c659
children	1c6098b69ec9

comparison

equal deleted inserted replaced

-:bc1b8234c659
+:b4a0a56ab3ae
 local item_process_timer_handle
 local faction_standings = {}
 local forge_spell_ids = {}
 local languages_known = {}
 local boss_loot_toasting = {}
+local container_loot_toasting
+local loot_toast_container_id
+local raid_boss_id
 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
 local loot_table = LootTable(entry, loot_type, top_field)
 if not source_list[source_id] then
 if top_field then
 entry[top_field][loot_count] = (entry[top_field][loot_count] or 0) + 1
-elseif not private.container_loot_toasting then
+elseif not container_loot_toasting then
 entry[loot_count] = (entry[loot_count] or 0) + 1
 end
 source_list[source_id] = true
 end
 UpdateDBEntryLocation(data_type, source_id)
 killed_boss_id_timer_handle:Cancel()
 killed_boss_id_timer_handle = nil
 end
 table.wipe(boss_loot_toasting)
-private.raid_boss_id = nil
+raid_boss_id = nil
 end
 local function ClearLootToastContainerID()
 if loot_toast_container_timer_handle then
 loot_toast_container_timer_handle:Cancel()
 loot_toast_container_timer_handle = nil
 end
-private.container_loot_toasting = false
+container_loot_toasting = false
-private.loot_toast_container_id = nil
+loot_toast_container_id = nil
 end
 local function ClearLootToastData()
 if loot_toast_data_timer_handle then
 table.wipe(loot_toast_data)
 end
 end
-local function ClearTimeBasedLootData()
+local function ClearChatLootData()
-Debug("ClearTimeBasedLootData: Ending salvage loot timer.")
+Debug("ClearChatLootData: Ending chat-based loot timer.")
 if chat_loot_timer_handle then
 chat_loot_timer_handle:Cancel()
 chat_loot_timer_handle = nil
 end
 function WDP:SHOW_LOOT_TOAST(event_name, loot_type, item_link, quantity, spec_ID, sex_ID, is_personal, loot_source)
 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_id = private.raid_boss_id
 -- Need information on the most recent args, so using this complete debug statement for now
 Debug("%s: loot_type: %s, item_link: %s, quantity: %s, spec_ID: %s, sex_ID: %s, is_personal: %s, loot_source: %s", event_name, loot_type, item_link, quantity, spec_ID, sex_ID, is_personal, loot_source)
 -- Handle Garrison cache specially
 Debug("%s: When handling the Garrison cache, the top level loot data was missing for objectID %d.", event_name, last_garrison_cache_object_id)
 end
 else
 Debug("%s: Currency texture is nil, from currency link %s", event_name, item_link)
 end
-elseif npc_id then
+elseif raid_boss_id then
 -- Slightly messy hack to workaround duplicate world bosses
 local upper_limit = 0
-if DUPLICATE_WORLD_BOSS_IDS[npc_id] then
+if DUPLICATE_WORLD_BOSS_IDS[raid_boss_id] then
-upper_limit = #DUPLICATE_WORLD_BOSS_IDS[npc_id]
+upper_limit = #DUPLICATE_WORLD_BOSS_IDS[raid_boss_id]
 end
 for i = 0, upper_limit do
-local temp_npc_id = npc_id
+local temp_npc_id = raid_boss_id
 if i > 0 then
-temp_npc_id = DUPLICATE_WORLD_BOSS_IDS[npc_id][i]
+temp_npc_id = DUPLICATE_WORLD_BOSS_IDS[raid_boss_id][i]
 end
 local npc = NPCEntry(temp_npc_id)
 if npc then
 local loot_label = "drops"
 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
+elseif loot_toast_container_id then
 InitializeCurrentLoot()
 -- Fake the loot characteristics to match that of an actual container item
-current_loot.identifier = container_id
+current_loot.identifier = loot_toast_container_id
 current_loot.label = "contains"
 current_loot.target_type = AF.ITEM
-current_loot.sources[container_id] = current_loot.sources[container_id] or {}
+current_loot.sources[loot_toast_container_id] = current_loot.sources[loot_toast_container_id] or {}
 if loot_type == "item" then
 local item_id = ItemLinkToID(item_link)
 if item_id then
 Debug("%s: %s X %d (%d)", event_name, item_link, quantity, item_id)
 RecordItemData(item_id, item_link, true)
-current_loot.sources[container_id][item_id] = (current_loot.sources[container_id][item_id] or 0) + quantity
+current_loot.sources[loot_toast_container_id][item_id] = (current_loot.sources[loot_toast_container_id][item_id] or 0) + quantity
 else
 Debug("%s: ItemID is nil, from item link %s", event_name, item_link)
 current_loot = nil
 return
 end
 elseif loot_type == "money" then
 Debug("%s: money X %d", event_name, quantity)
-current_loot.sources[container_id]["money"] = (current_loot.sources[container_id]["money"] or 0) + quantity
+current_loot.sources[loot_toast_container_id]["money"] = (current_loot.sources[loot_toast_container_id]["money"] or 0) + quantity
 elseif loot_type == "currency" then
 local currency_texture = CurrencyLinkToTexture(item_link)
 if currency_texture and currency_texture ~= "" then
 Debug("%s: %s X %d", event_name, currency_texture, quantity)
 local currency_token = ("currency:%s"):format(currency_texture)
-current_loot.sources[container_id][currency_token] = (current_loot.sources[container_id][currency_token] or 0) + quantity
+current_loot.sources[loot_toast_container_id][currency_token] = (current_loot.sources[loot_toast_container_id][currency_token] or 0) + quantity
 else
 Debug("%s: Currency texture is nil, from currency link %s", event_name, item_link)
 current_loot = nil
 return
 end
 end
 GenericLootUpdate("items")
 current_loot = nil
-private.container_loot_toasting = true -- Do not count further loots until timer expires or another container is opened
+container_loot_toasting = true -- Do not count further loots until timer expires or another container is opened
 else
 Debug("%s: NPC and Container are nil, storing loot toast data for 5 seconds.", event_name)
 loot_toast_data = loot_toast_data or {}
 loot_toast_data[#loot_toast_data + 1] = { loot_type, item_link, quantity }
 if container_id and (container_id == BAG_OF_SALVAGE_ITEM_ID or container_id == CRATE_OF_SALVAGE_ITEM_ID or container_id == BIG_CRATE_OF_SALVAGE_ITEM_ID) then
 Debug("CHAT_MSG_LOOT: AF.ITEM %d (%d)", item_id, quantity)
 current_loot.sources[container_id] = current_loot.sources[container_id] or {}
 current_loot.sources[container_id][item_id] = (current_loot.sources[container_id][item_id] or 0) + quantity
 else -- If not, cancel the timer and wipe the loot table early
-Debug("CHAT_MSG_LOOT: We would have assigned the wrong loot to salvage crates!")
+Debug("CHAT_MSG_LOOT: We would have assigned the wrong loot!")
-ClearTimeBasedLootData()
+ClearChatLootData()
 end
 end,
 [AF.NPC] = function(item_id, quantity)
 Debug("CHAT_MSG_LOOT: AF.NPC %d (%d)", item_id, quantity)
 end,
 current_loot = nil
 end,
 }
-function WDP:CHAT_MSG_LOOT(event_name, message)
+function WDP:CHAT_MSG_CURRENCY(event_name, message)
 local category
 local item_link, quantity = deformat(message, _G.LOOT_ITEM_PUSHED_SELF_MULTIPLE)
 if not item_link then
 quantity, item_link = 1, deformat(message, _G.LOOT_ITEM_PUSHED_SELF)
 return true
 end
 function WDP:LOOT_OPENED(event_name)
+if chat_loot_timer_handle then
+ClearChatLootData()
+end
 if current_loot then
 current_loot = nil
 Debug("%s: Previous loot did not process in time for this event. Attempting to extrapolate current_action from loot data.", event_name)
 if not ExtrapolatedCurrentActionFromLootData(event_name) then
 function WDP:SPELL_CONFIRMATION_PROMPT(event_name, spell_id, confirm_type, text, duration, currency_id_cost)
 if private.RAID_BOSS_BONUS_SPELL_ID_TO_NPC_ID_MAP[spell_id] then
 ClearKilledBossID()
 ClearLootToastContainerID()
-private.raid_boss_id = private.RAID_BOSS_BONUS_SPELL_ID_TO_NPC_ID_MAP[spell_id]
+raid_boss_id = private.RAID_BOSS_BONUS_SPELL_ID_TO_NPC_ID_MAP[spell_id]
 else
 Debug("%s: Spell ID %d is not a known raid boss 'Bonus' spell.", event_name, spell_id)
 return
 end
 -- Assign existing loot data to boss if it exists
 if loot_toast_data then
-local npc_id = private.raid_boss_id
+local npc_id = raid_boss_id
 -- Slightly messy hack to workaround duplicate world bosses
 local upper_limit = 0
 if DUPLICATE_WORLD_BOSS_IDS[npc_id] then
 upper_limit = #DUPLICATE_WORLD_BOSS_IDS[npc_id]
 if private.LOOT_TOAST_CONTAINER_SPELL_ID_TO_ITEM_ID_MAP[spell_id] then
 ClearKilledBossID()
 ClearLootToastContainerID()
 ClearLootToastData()
-private.loot_toast_container_id = private.LOOT_TOAST_CONTAINER_SPELL_ID_TO_ITEM_ID_MAP[spell_id]
+loot_toast_container_id = private.LOOT_TOAST_CONTAINER_SPELL_ID_TO_ITEM_ID_MAP[spell_id]
 loot_toast_container_timer_handle = C_Timer.NewTimer(1, ClearLootToastContainerID) -- we need to assign a handle here to cancel it later
 return
 end
 -- For Crates of Salvage (and potentially other items based on spell casts in the future which need manual handling)
 if private.DELAYED_CONTAINER_SPELL_ID_TO_ITEM_ID_MAP[spell_id] then
 -- Set up timer
 Debug("%s: Beginning Salvage loot timer for spellID %d", event_name, spell_id)
-chat_loot_timer_handle = C_Timer.NewTimer(1, ClearTimeBasedLootData)
+chat_loot_timer_handle = C_Timer.NewTimer(1, ClearChatLootData)
 -- Standard item handling setup
 table.wipe(current_action)
 current_loot = nil
 current_action.target_type = AF.ITEM

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 387:b4a0a56ab3ae