wow/ouroloot: core.lua comparison

comparison core.lua @ 61:99ab21f0755f

Fix major breakage in attendance snapshotting.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Thu, 19 Apr 2012 00:52:37 +0000
parents	59718ec80610
children	d5fe3482db67

comparison

equal deleted inserted replaced

-:45d2b153c2df
+:99ab21f0755f
 local nametag, addon = ...
 --[==[
 g_loot's numeric indices are loot entries (including titles, separators,
 etc); its named indices are:
-- forum			saved text from forum markup window, default nil
+- forum         saved text from forum markup window, default nil
-- attend		saved text from raid attendence window, default nil
+- attend        saved text from raid attendence window, default nil
-- printed.FOO	last loot index formatted into text window FOO, default 0
+- printed.FOO   last loot index formatted into text window FOO, default 0
-- raiders		accumulating raid roster data as we see raid members; indexed
+- raiders       accumulating raid roster data as we see raid members; indexed
 by player name with subtable fields:
--    class		capitalized English codename ("WARRIOR", "DEATHKNIGHT", etc)
+-    class      capitalized English codename ("WARRIOR", "DEATHKNIGHT", etc)
--    subgroup	1-8
+-    subgroup   1-8
--    race		English codename ("BloodElf", etc)
+-    race       English codename ("BloodElf", etc)
--    sex		1 = unknown/error, 2 = male, 3 = female
+-    sex        1 = unknown/error, 2 = male, 3 = female
--    level		can be 0 if player was offline at the time
+-    level      can be 0 if player was offline at the time
--    guild		guild name, or missing if unguilded
+-    guild      guild name, or missing if unguilded
--    online		1 = online, 2 = offline, 3 = no longer in raid
+-    online     1 = online, 2 = offline, 3 = no longer in raid
 [both of these next two fields use time_t values:]
--    join		time player joined the raid (or first time we've seen them)
+-    join       time player joined the raid (or first time we've seen them)
--    leave		time player left the raid (or time we've left the raid)
+-    leave      time player left the raid (or time we've left the raid, if
+'online' is not 3)
 Common g_loot entry indices:
-- kind			time/boss/loot
+- kind          time/boss/loot
-- hour			0-23, on the *physical instance server*, not the realm server
+- hour          0-23, on the *physical instance server*, not the realm server
-- minute		0-59, ditto
+- minute        0-59, ditto
-- stamp			time_t on the local computer
+- stamp         time_t on the local computer
-- cols			graphical display data; cleared when logging out
+- cols          graphical display data; cleared when logging out
 Time specific g_loot indices:
-- startday		table with month/day/year/text fields from makedate()
+- startday      table with month/day/year/text fields from makedate()
 text is always "dd Month yyyy"
 Boss specific g_loot indices:
-- bossname		name of boss/encounter;
+- bossname      name of boss/encounter;
 may be changed if "snarky boss names" option is enabled
-- reason		wipe/kill ("pull" does not generate an entry)
+- reason        wipe/kill ("pull" does not generate an entry)
-- instance		name of instance, including size and difficulty
+- instance      name of instance, including size and difficulty
-- maxsize		5/10/25, presumably also 15 and 40 could show up; can be
+- maxsize       max raid size: 5/10/25, presumably also 15 and 40 could show
-0 if we're outside an instance and the player inside has
+up; can be 0 if we're outside an instance and the player
-an older version
+inside has an older version
-- duration		in seconds; may be missing (only present if local)
+- duration      in seconds; may be missing (only present if local)
-- raidersnap	copy of g_loot.raiders at the time of the boss event
+- raidersnap    copy of g_loot.raiders at the time of the boss event
 Loot specific g_loot indices:
-- person		recipient
+- person        recipient
-- person_class	class of recipient if available; may be missing;
+- person_class  class of recipient if available; may be missing;
 will be classID-style (e.g., DEATHKNIGHT)
-- itemname		not including square brackets
+- itemname      not including square brackets
-- id			itemID as number
+- id            itemID as number
-- itemlink		full clickable link
+- itemlink      full clickable link
-- itexture		icon path (e.g., Interface\Icons\INV_Misc_Rune_01)
+- itexture      icon path (e.g., Interface\Icons\INV_Misc_Rune_01)
-- quality		ITEM_QUALITY_* number
+- quality       ITEM_QUALITY_* number
-- disposition	offspec/gvault/shard; missing otherwise; can be set from
+- disposition   offspec/gvault/shard; missing otherwise; can be set from
 the extratext field
-- count			e.g., "x3"; missing otherwise; can be set/removed from
+- count         e.g., "x3"; missing otherwise; can be set/removed from
 extratext; triggers only for a stack of items, not "the boss
 dropped double axes today"
-- is_heroic		true if item is heroic; missing otherwise
+- is_heroic     true if item is heroic; missing otherwise
-- cache_miss	if GetItemInfo failed; SHOULD be missing (changes other fields)
+- cache_miss    if GetItemInfo failed; SHOULD be missing (changes other fields)
-- bcast_from	if rebroadcast from another player; missing otherwise
+- bcast_from    if rebroadcast from another player; missing otherwise
-- extratext		text in Note column, including disposition and rebroadcasting
+- extratext     text in Note column, including disposition and rebroadcasting
-- extratext_byhand	true if text edited by player directly; missing otherwise
+- extratext_byhand    true if text edited by player directly; missing otherwise
 Functions arranged like this, with these lables (for jumping to).  As a
 rule, member functions with UpperCamelCase names are called directly by
 user-facing code, ones with lowercase names are "one step removed", and
 -- (e.g., 87), due to the tagging system versus subversion file revs.  This
 -- is good, as local dev code will never trigger a false positive update
 -- warning for other users.  The downside is that additional decimal places
 -- in the Version field for bugfixes (e.g., "2.16.4.1") imposes a high-water
 -- mark, as subsequent shorter strings ("2.16.5", "2.17") will never be larger.
+-- Will need to redo this so it's not quite so dumb.
 do
 	local r = 0
 	for d in addon.revision:gmatch("%d+") do
 		r = 1000*r + d
 	end
 	end
 end
 -- Returns an instance name or abbreviation, followed by the raid size
 local function instance_tag()
+	-- possibly redo this with the new GetRaidDifficulty function
 	local name, typeof, diffcode, diffstr, _, perbossheroic, isdynamic = GetInstanceInfo()
 	local t, r
 	name = addon.instance_abbrev[name] or name
 	if typeof == "none" then return name, MAX_RAID_MEMBERS end
 	-- diffstr is "5 Player", "10 Player (Heroic)", etc.  ugh.
 			for name,r in pairs(OuroLootSV.raiders) do
 				r.subgroup = 0
 			end
 			stored_datarev = 16
 		end
+		if stored_datarev == 16 then
+			self:Print("Transitioning saved data format to 17..."); dirty = true
+			for i,e in ipairs(OuroLootSV) do
+				if e.kind == 'boss' then -- brown paper bag bugs
+					e.raidersnap = e.raidersnap or {}
+					e.maxsize = e.maxsize or 0
+				end
+			end
+			stored_datarev = 17
+		end
 		if dirty then self:Print("Saved data has been massaged into shape.") end
 	end
 	_init(self)
 	self.dprint('flow', "version strings:", revision_large, self.status_text)
 				local r = g_loot.raiders[name]
 				-- We grab a bunch of return values here, but only pay attention to
 				-- them under specific circumstances.
 				local grri_name, connected, subgroup, level, class, _
 				grri_name, _, subgroup, level, _, class, connected = GetRaidRosterInfo(i)
-				assert(name==grri_name, "UnitName =/= grri_name of same raidindex")
+				if name ~= grri_name then
+					error("UnitName ("..tostring(name)..") =/= grri_name ("..
+					      tostring(grri_name)..") of same raidindex ("..i..")")
+				end
 				r.subgroup = subgroup
 				if r.needinfo and UnitIsVisible(unit) then
 					r.needinfo = nil
 					r.class    = class    --select(2,UnitClass(unit))
 					r.race     = select(2,UnitRace(unit))
 	local function maybe_trash_kill_entry()
 		-- this is set on various boss interactions, so we've got a kill/wipe
 		-- entry already
 		if addon.latest_instance then return end
 		addon.latest_instance = instance_tag()
+		local ss, max = addon:snapshot_raid()
 		addon:_mark_boss_kill (addon._addLootEntry{
-			kind='boss',reason='kill',bossname=[[trash]],instance=addon.latest_instance,duration=0
+			kind='boss', reason='kill', bossname=[[trash]],
+			instance=addon.latest_instance, duration=0,
+			raidersnap=ss, maxsize=max
 		})
 	end
 	-- Recent loot cache
 	local candidates = {}
 		_G.OL = self
 		_G.Oloot = g_loot
 	end
 end
+-- Raid roster snapshots
+do
+	function addon:snapshot_raid (only_inraid_p)
+		local ss = CopyTable(g_loot.raiders)
+		local instance,maxsize = instance_tag()
+		if only_inraid_p then
+			for name,info in next, ss do
+				if info.online == 3 then
+					ss[name] = nil
+				end
+			end
+		end
+		return ss, maxsize, instance, time()
+	end
+end
 -- Tie-in with Deadly Boss Mods (or other such addons)
 do
 	local candidates = {}
 	local location
 	local function fixup_durations (cache)
 					kind		= 'boss',
 					bossname	= bossname,
 					reason		= reason,
 					instance	= intag,
 					duration	= duration,      -- deliberately may be nil
-					raidersnap	= CopyTable(g_loot.raiders),
+					raidersnap	= self:snapshot_raid(),
 					maxsize		= maxsize,
 				}
 				tinsert(candidates,c)
 			end
 			break

Mercurial > wow > ouroloot

comparison core.lua @ 61:99ab21f0755f