wow/ouroloot: core.lua comparison

comparison core.lua @ 142:375059a11c1d 2.21.0

Updates for WoD. - Basic WoD changes (TOC bump, LE_* constants, etc) - The instance_abbrev table is now indexed by InstanceMapID values; the old method is still supported for transition. - Some initial placeholder values for WoD until we actually start seeing them.

author	Farmbuyer of US-Kilrogg <farmbuyer@gmail.com>
date	Thu, 13 Nov 2014 22:12:33 -0500
parents	c176359e7265
children	543fcf15add7

comparison

equal deleted inserted replaced

-:13d81d7faa0a
+:375059a11c1d
 otherwise
 - itemname      not including square brackets
 - id            itemID as number
 - itemlink      full clickable link
 - itexture      icon path (e.g., Interface\Icons\INV_Misc_Rune_01)
-- quality       ITEM_QUALITY_* number
+- quality       [LE_]ITEM_QUALITY_* number
 - unique        an almost-certainly-unique string, content meaningless
 - disposition   offspec/gvault/shard; missing otherwise; can be set from
 the extratext field
 - count         e.g., "x3"; missing otherwise; can be set/removed from
 extratext; triggers only for a stack of items, not "the boss
 	-- don't use NUM_ITEM_QUALITIES as the upper loop bound unless we expect
 	-- heirlooms to show up
 	thresholds		= {}
 	for i = 0,6 do
-		thresholds[i] = _G.ITEM_QUALITY_COLORS[i].hex .. _G["ITEM_QUALITY"..i.."_DESC"] .. "|r"
+		thresholds[i] = _G.ITEM_QUALITY_COLORS[i].hex .. _G['ITEM_QUALITY'..i..'_DESC'] .. '|r'
 	end
 	_G.setfenv (1, _G)
 end
 		print("Collecting hyperlink object <",tostring(ud),">")
 	end
 	--@end-debug@
 	-- TEXT will automatically be surrounded by brackets
-	-- COLOR can be ITEM_QUALITY_* or a formatting string ("|cff...")
+	-- COLOR can be LE_ITEM_QUALITY_* or a formatting string ("|cff...")
 	-- FUNC can be "MethodName", "tab_title", or a function
 	--
 	-- Returns an opaque token and a matching number.  Calling tostring() on
 	-- the token will yield a formatted clickable string that can be displayed
 	-- in local chat.  Clicking a tab_title hyperlink opens the GUI to that
 		[9] = "40",
 	}
 	function instance_tag()
 		-- Return values of GetInstanceInfo changed considerably, now much
 		-- more useful and consistent.
-		local name, typeof, diffcode, _, raidsize = GetInstanceInfo()
+		local name, typeof, diffcode, _, raidsize, _, _, mapid, currsize = GetInstanceInfo()
 		local t
-		name = addon.instance_abbrev[name] or name
+		name = addon.instance_abbrev[mapid] or addon.instance_abbrev[name] or name
 		if typeof == nil or typeof == "none" or diffcode == 0 or diffcode == nil then
 			-- either outdoors or in a scenario (revisit those maybe)
 			return name, MAX_RAID_MEMBERS
 		end
 		t = codemap[diffcode] or ("?"..diffcode.."?")
 	-- 2  bar
 end
 end
 ]]
 do
+	local AnimTimerFrame = CreateFrame('Frame',nil,nil) -- FIXME transition hack
 	local caches = {}
 	local cleanup_group = AnimTimerFrame:CreateAnimationGroup()
 	local time, next = time, next
 	local new, del = flib.new, flib.del
 	cleanup_group:SetLooping("REPEAT")
 	self.callbacks = LibStub("CallbackHandler-1.0"):New(self)
 	--function self.callbacks:OnUsed (target_aka_self, eventname)  end
 	--function self.callbacks:OnUnused (target_aka_self, eventname)  end
 	if _G.OuroLootOptsDB == nil then
-		local vclick = self.format_hypertext ([[click here]], ITEM_QUALITY_UNCOMMON, 'help')
+		local vclick = self.format_hypertext ([[click here]], LE_ITEM_QUALITY_UNCOMMON, 'help')
 		self:ScheduleTimer(function(s)
 			for id in pairs(self.default_itemfilter) do
 				opts.itemfilter[id] = true
 			end
 			for id in pairs(self.default_itemvault) do
 	--
 	-- Everything dealing with a prefix hyperlink is my fault.
 	--
 	-- CFPrint added instead of the usual Print testing of the first arg for
 	-- frame-ness, which would slow down all printing and only rarely be useful.
-	--
-	-- There is no ITEM_QUALITY_LEGENDARY constant.  Sigh.
 	do
 		local AC = LibStub("AceConsole-3.0")
 		function addon.chatprefix (code, arg)
 			local f = ''   -- empty -> BuildMainDisplay(empty) -> main tab
 			if code == "GoToLootLine" then
 				f = code
 			--elseif .....
 			end
-			local ret, num = self.format_hypertext ("Ouro Loot", --[[legendary]]5, f)
+			local ret, num = self.format_hypertext ("Ouro Loot",
+				LE_ITEM_QUALITY_LEGENDARY, f)
 			if code == "GoToLootLine" then
 				self.lootjumps[num] = arg
 			end
 			return ret, num
 		end
 	end
 	while opts.keybinding do
 		if InCombatLockdown() then
 			local reload = self.format_hypertext ([[the options tab]],
-				ITEM_QUALITY_UNCOMMON, 'opt')
+				LE_ITEM_QUALITY_UNCOMMON, 'opt')
 			self:Print("Cannot create '%s' as a keybinding while in combat!",
 				opts.keybinding_text)
 			self:Print("The rest of the addon will continue to work, but you will need to reload out of combat to get the keybinding.  Either type /reload or use the button on %s in the lower right.",
 				tostring(reload))
 			break
 tag string stored as 'unique' in loot entries and used as keys in history.
 Item IDs are always of numeric type.
 'Activate', enabled_p, rebroadcast_p, threshold
 The two boolean predicates are self-explanatory.  The threshold is an
-ITEM_QUALITY_* constant integer.
+LE_ITEM_QUALITY_* constant integer.
 'Deactivate', raiderdata
 After all system events have been unregistered.  Argument is a holder of
 	the current g_loot.raiders table (in 'raidersnap').
 		local iname, ilink, iquality = GetItemInfo(itemid)
 		local cache_miss
 		if (not iname) or (not itexture) then
 			cache_miss = true
 			iname, ilink, iquality, itexture =
-				UNKNOWN..': '..itemid, 'item:6948', ITEM_QUALITY_COMMON, [[Interface\ICONS\INV_Misc_QuestionMark]]
+				UNKNOWN..': '..itemid, 'item:6948', LE_ITEM_QUALITY_COMMON, [[Interface\ICONS\INV_Misc_QuestionMark]]
 		end
 		self.dprint('loot',">>"..prefix, "R:", recipient, "U:", unique, "I:",
 			itemid, "C:", count, "frm:", from, "ex:", extratext, "q:", iquality)
 		itemid = tonumber(ilink:match("item:(%d+)") or 0)
 -- that would result in a pile of teensy functions, most of which would
 -- never be called.  Too much overhead.  (2.0:  Most of these removed now
 -- that GUI is in place.)
 do
 	local green_help_link = addon.format_hypertext ([[Click here]],
-		ITEM_QUALITY_UNCOMMON, 'help')
+		LE_ITEM_QUALITY_UNCOMMON, 'help')
 	function addon:OnSlash (txt) --, editbox)
 		txt = strtrim(txt:lower())
 		local cmd, arg = ""
 		do
 			local s,e = txt:find("^%a+")
 		self:broadcast('revcheck',version_large)
 	else
 		self.dprint('comm', "ours is older, (possibly) yammering")
 		if newer_warning then
-			local pop = addon.format_hypertext ([[click here]], ITEM_QUALITY_UNCOMMON,
+			local pop = addon.format_hypertext ([[click here]], LE_ITEM_QUALITY_UNCOMMON,
 				function()
 					-- Sadly, this is not generated by the packager, so hardcode it
 					-- for now.  The 'data' field is handled differently for onshow
 					-- than for other callbacks.
 					StaticPopup_Show("OUROL_URL",
 						--[[text_arg1=]]nil, --[[text_arg2=]]nil,
 						--[[data=]][[http://www.curse.com/addons/wow/ouroloot]])
 				end)
-			local ping = addon.format_hypertext ([[click here]], ITEM_QUALITY_UNCOMMON, 'DoPing')
+			local ping = addon.format_hypertext ([[click here]], LE_ITEM_QUALITY_UNCOMMON, 'DoPing')
 			self:Print(newer_warning, tostring(pop), tostring(ping))
 			newer_warning = nil
 		end
 	end
 end

Mercurial > wow > ouroloot

comparison core.lua @ 142:375059a11c1d 2.21.0