wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 75:a034bfa8982b

Handle recording of loot from specific sources.

author	James D. Callahan III <jcallahan@curse.com>
date	Tue, 21 Aug 2012 15:29:15 -0500
parents	06daf4cb1cf9
children	5c42e26ae1fc

comparison

equal deleted inserted replaced

-:06daf4cb1cf9
+:a034bfa8982b
 end
 end
 end -- do-block
-local function GenericLootUpdate(data_type, top_field)
+local GenericLootUpdate
-local entry = DBEntry(data_type, action_data.identifier)
+do
+local function LootTable(entry, loot_type, loot_count, top_field)
-if not entry then
+if top_field then
-return
+entry[top_field] = entry[top_field] or {}
-end
+entry[top_field][loot_count] = (entry[top_field][loot_count] or 0) + 1
-local loot_type = action_data.label or "drops"
+entry[top_field][loot_type] = entry[top_field][loot_type] or {}
-local loot_count = ("%s_count"):format(loot_type)
+return entry[top_field][loot_type]
-local loot_data
+end
-if top_field then
-entry[top_field] = entry[top_field] or {}
-entry[top_field][loot_count] = (entry[top_field][loot_count] or 0) + 1
-entry[top_field][loot_type] = entry[top_field][loot_type] or {}
-loot_data = entry[top_field][loot_type]
-else
 entry[loot_count] = (entry[loot_count] or 0) + 1
 entry[loot_type] = entry[loot_type] or {}
-loot_data = entry[loot_type]
+return entry[loot_type]
 end
-for index = 1, #action_data.loot_list do
+function GenericLootUpdate(data_type, top_field)
-table.insert(loot_data, action_data.loot_list[index])
+local loot_type = action_data.label or "drops"
-end
+local loot_count = ("%s_count"):format(loot_type)
-end
+for source_id, loot_data in pairs(action_data.loot_sources) do
+local entry = DBEntry(data_type, source_id)
+if entry then
+local loot_table = LootTable(entry, loot_type, loot_count, top_field)
+UpdateDBEntryLocation(data_type, source_id)
+for item_id, quantity in pairs(loot_data) do
+table.insert(loot_table, ("%d:%d"):format(item_id, quantity))
+end
+end
+end
+-- TODO: Remove this when GetLootSourceInfo() has values for money
+local entry = DBEntry(data_type, action_data.identifier)
+if not entry then
+return
+end
+local loot_table = LootTable(entry, loot_type, loot_count, top_field)
+for index = 1, #action_data.loot_list do
+table.insert(loot_table, action_data.loot_list[index])
+end
+end
+end -- do-block
 -----------------------------------------------------------------------
 -- Methods.
 -----------------------------------------------------------------------
 function WDP:OnInitialize()
 end
 end
 end
-function WDP:CHAT_MSG_LOOT(event, message)
+function WDP:CHAT_MSG_LOOT(event_name, message)
 if action_data.spell_label ~= "EXTRACT_GAS" then
 return
 end
 local item_link, quantity = deformat(message, _G.LOOT_ITEM_PUSHED_SELF_MULTIPLE)
 local LOOT_UPDATE_FUNCS = {
 [AF.ITEM] = function()
 GenericLootUpdate("items")
 end,
 [AF.NPC] = function()
+local difficulty_token = InstanceDifficultyToken()
+local loot_type = action_data.label or "drops"
+for source_id, loot_data in pairs(action_data.loot_sources) do
+local npc = NPCEntry(source_id)
+if npc then
+local encounter_data = npc.encounter_data[difficulty_token]
+encounter_data.loot_counts = encounter_data.loot_counts or {}
+encounter_data.loot_counts[loot_type] = (encounter_data.loot_counts[loot_type] or 0) + 1
+encounter_data[loot_type] = encounter_data[loot_type] or {}
+for item_id, quantity in pairs(loot_data) do
+table.insert(encounter_data[loot_type], ("%d:%d"):format(item_id, quantity))
+end
+end
+end
+-- TODO: Remove this when GetLootSourceInfo() has values for money
 local npc = NPCEntry(action_data.identifier)
 if not npc then
 return
 end
-local encounter_data = npc.encounter_data[InstanceDifficultyToken()]
+local encounter_data = npc.encounter_data[difficulty_token]
-local loot_type = action_data.label or "drops"
 encounter_data.loot_counts = encounter_data.loot_counts or {}
 encounter_data.loot_counts[loot_type] = (encounter_data.loot_counts[loot_type] or 0) + 1
 encounter_data[loot_type] = encounter_data[loot_type] or {}
 for index = 1, #action_data.loot_list do
 end
 if _G.type(verify_func) == "function" and not verify_func() then
 return
 end
-local loot_registry = {}
 action_data.loot_list = {}
+action_data.loot_sources = {}
 action_data.looting = true
 for loot_slot = 1, _G.GetNumLootItems() do
 local icon_texture, item_text, quantity, quality, locked = _G.GetLootSlotInfo(loot_slot)
 local slot_type = _G.GetLootSlotType(loot_slot)
+local sources = {
-if slot_type == _G.LOOT_SLOT_ITEM then
+_G.GetLootSourceInfo(loot_slot)
-local item_id = ItemLinkToID(_G.GetLootSlotLink(loot_slot))
+}
-loot_registry[item_id] = (loot_registry[item_id]) or 0 + quantity
-elseif slot_type == _G.LOOT_SLOT_MONEY then
+-- TODO: Remove debugging
-table.insert(action_data.loot_list, ("money:%d"):format(_toCopper(item_text)))
+--            print(("Loot slot %d: Source count: %d"):format(loot_slot, floor((#sources / 2) + 0.5)))
-elseif slot_type == _G.LOOT_SLOT_CURRENCY then
-table.insert(action_data.loot_list, ("currency:%d:%s"):format(quantity, icon_texture:match("[^\\]+$"):lower()))
+-- Odd index is GUID, even is count.
-end
+for source_index = 1, #sources, 2 do
-end
+local source_type, source_id = ParseGUID(sources[source_index])
+local source_count = sources[source_index + 1]
-for item_id, quantity in pairs(loot_registry) do
+local source_key = ("%s:%d"):format(private.UNIT_TYPE_NAMES[source_type + 1], source_id)
-table.insert(action_data.loot_list, ("%d:%d"):format(item_id, quantity))
+-- TODO: Remove debugging
+--                print(("GUID: %s - Type:ID: %s - Amount: %d"):format(sources[source_index], source_key, source_count))
+-- Items return the player as the source, so we need to replace the nil ID with the item's ID (disenchant, milling, etc)
+if not source_id then
+source_id = action_data.identifier
+end
+action_data.loot_sources[source_id] = action_data.loot_sources[source_id] or {}
+if slot_type == _G.LOOT_SLOT_ITEM then
+local item_id = ItemLinkToID(_G.GetLootSlotLink(loot_slot))
+action_data.loot_sources[source_id][item_id] = action_data.loot_sources[source_id][item_id] or 0 + source_count
+elseif slot_type == _G.LOOT_SLOT_MONEY then
+table.insert(action_data.loot_list, ("money:%d"):format(_toCopper(item_text)))
+elseif slot_type == _G.LOOT_SLOT_CURRENCY then
+table.insert(action_data.loot_list, ("currency:%d:%s"):format(quantity, icon_texture:match("[^\\]+$"):lower()))
+end
+end
 end
 update_func()
 end
 end -- do-block
 if bit.band(spell_flags, AF.OBJECT) == AF.OBJECT then
 if target_name == "" then
 return
 end
-local identifier = ("%s:%s"):format(spell_label, target_name)
-UpdateDBEntryLocation("objects", identifier)
 action_data.type = AF.OBJECT
-action_data.identifier = identifier
 elseif bit.band(spell_flags, AF.ZONE) == AF.ZONE then
 local identifier = ("%s:%s"):format(spell_label, _G["GameTooltipTextLeft1"]:GetText() or "NONE") -- Possible fishing pool name.
 action_data.zone_data = UpdateDBEntryLocation("zones", identifier)
 action_data.type = AF.ZONE
 action_data.identifier = identifier

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 75:a034bfa8982b