wow/wowdb-profiler: Main.lua comparison

comparison Main.lua @ 151:e2331b00a1cf 1.0.15

Added some debugging prints (turned off). Removed defaulting to NPC if no target_type - simply ignore the loot. Removed setting target_type to NPC every time a target's location is updated. Ensure the unit name on the tooltip matches the spell's target name. Bumped DB version to 10.

author	James D. Callahan III <jcallahan@curse.com>
date	Wed, 03 Oct 2012 17:27:10 -0500
parents	11f242b0b170
children	d29109b5aaea

comparison

equal deleted inserted replaced

-:11f242b0b170
+:e2331b00a1cf
 -----------------------------------------------------------------------
 -- Local constants.
 -----------------------------------------------------------------------
-local DB_VERSION = 9
+local DB_VERSION = 10
+local DEBUGGING = false
 local DATABASE_DEFAULTS = {
 char = {},
 global = {
 items = {},
 }
 -----------------------------------------------------------------------
 -- Helper Functions.
 -----------------------------------------------------------------------
+local function Debug(...)
+if not DEBUGGING then
+return
+end
+_G.print(...)
+end
 local ActualCopperCost
 do
 local BARTERING_SPELL_ID = 83964
 local STANDING_DISCOUNTS = {
 local power_type = _G.UnitPowerType("target")
 encounter_data[npc_level].power = ("%s:%d"):format(POWER_TYPE_NAMES[_G.tostring(power_type)] or power_type, max_power)
 end
 end
 name_to_id_map[_G.UnitName("target")] = unit_idnum
-current_action.target_type = AF.NPC
 current_action.identifier = unit_idnum
 return npc, unit_idnum
 end
 end -- do-block
 -- Prevent opening the same loot window multiple times from recording data multiple times.
 local loot_guid_registry = {}
 function WDP:LOOT_CLOSED(event_name)
+Debug(event_name)
 current_loot = nil
 table.wipe(current_action)
 end
 function WDP:LOOT_OPENED(event_name)
 if current_loot then
 return
 end
-current_action.target_type = current_action.target_type or AF.NPC
+Debug(event_name)
+if not current_action.target_type then
+Debug("No target type.")
+return
+else
+Debug(("current_action.target_type: %s"):format(private.ACTION_TYPE_NAMES[current_action.target_type]))
+end
 local verify_func = LOOT_VERIFY_FUNCS[current_action.target_type]
 local update_func = LOOT_UPDATE_FUNCS[current_action.target_type]
 if not verify_func or not update_func then
 if not loot_guid_registry[source_guid] then
 local loot_quantity = loot_info[loot_index + 1]
 local source_type, source_id = ParseGUID(source_guid)
 -- TODO: Remove debugging
---                        local source_key = ("%s:%d"):format(private.UNIT_TYPE_NAMES[source_type + 1], source_id)
+local source_key = ("%s:%d"):format(private.UNIT_TYPE_NAMES[source_type + 1], source_id)
---                        print(("GUID: %s - Type:ID: %s - Amount: %d"):format(loot_info[loot_index], source_key, loot_quantity))
+Debug(("GUID: %s - Type:ID: %s - Amount: %d"):format(loot_info[loot_index], source_key, loot_quantity))
 local item_id = ItemLinkToID(_G.GetLootSlotLink(loot_slot))
 current_loot.sources[source_guid] = current_loot.sources[source_guid] or {}
 current_loot.sources[source_guid][item_id] = current_loot.sources[source_guid][item_id] or 0 + loot_quantity
 guids_used[source_guid] = true
 function WDP:PLAYER_TARGET_CHANGED(event_name)
 if not PlayerTarget() then
 return
 end
+Debug(event_name)
+current_action.target_type = AF.NPC
 self:UpdateTargetLocation()
 end
 do
 if private.tracked_line or unit_id ~= "player" then
 return
 end
 local spell_label = private.SPELL_LABELS_BY_NAME[spell_name]
+Debug(event_name, unit_id, spell_name, spell_rank, target_name, spell_line)
 if not spell_label then
 return
 end
 table.wipe(current_action)
 local item_name, item_link = _G.GameTooltip:GetItem()
 local unit_name, unit_id = _G.GameTooltip:GetUnit()
+Debug(("Item name: '%s', Unit name: '%s'"):format(tostring(item_name), tostring(unit_name)))
 if not unit_name and _G.UnitName("target") == target_name then
 unit_name = target_name
 unit_id = "target"
 end
 if not private.NON_LOOT_SPELL_LABELS[spell_label] then
 current_action.loot_label = spell_label:lower()
 end
-if unit_name and not item_name then
+if unit_name and unit_name == target_name and not item_name then
+Debug("Unit name is same as target_name")
 if bit.band(spell_flags, AF.NPC) == AF.NPC then
 if not unit_id or unit_name ~= target_name then
 return
 end
 current_action.target_type = AF.NPC
 current_action.identifier = ItemLinkToID(select(2, _G.GetItemInfo(target_name)))
 end
 elseif not item_name and not unit_name then
 if bit.band(spell_flags, AF.OBJECT) == AF.OBJECT then
 if target_name == "" then
+Debug("Didn't set current_action.target_type")
 return
 end
 current_action.object_name = target_name
 current_action.target_type = AF.OBJECT
+Debug(("Set current_action.target_type to %s"):format(private.ACTION_TYPE_NAMES[current_action.target_type]))
 elseif bit.band(spell_flags, AF.ZONE) == AF.ZONE then
 current_action.target_type = AF.ZONE
 end
 end
 private.tracked_line = spell_line
 function WDP:UNIT_SPELLCAST_SUCCEEDED(event_name, unit_id, spell_name, spell_rank, spell_line, spell_id)
 if unit_id ~= "player" then
 return
 end
 private.tracked_line = nil
+Debug(event_name)
 if spell_name:match("^Harvest.+") then
 reputation_npc_id = current_target_id
 private.harvesting = true
 end
 function WDP:HandleSpellFailure(event_name, unit_id, spell_name, spell_rank, spell_line, spell_id)
 if unit_id ~= "player" then
 return
 end
+Debug(event_name)
 if private.tracked_line == spell_line then
 private.tracked_line = nil
 end
 table.wipe(current_action)

Mercurial > wow > wowdb-profiler

comparison Main.lua @ 151:e2331b00a1cf 1.0.15