Deadly Boss Mods

r7279 (nbluewiz): # fix SPELL_BUILDING_DAMAGE in pvp mod.

nbluewiz — Sat, 04 Feb 2012 06:29:46 GMT

Author: nbluewiz
Date: Sat Feb 04 07:29:46 CET 2012
Revision: 7279

Log:

# fix SPELL_BUILDING_DAMAGE in pvp mod.

Updated

trunk/DBM-PvP/Battlegrounds/IsleOfConquest.lua

Action: modified

Old revision: 7278

Old date: 2012-02-04 04:11:04 UTC

@@ -152,22 +152,22 @@
 	end
 end
 
-function IsleOfConquest:SPELL_BUILDING_DAMAGE(args)
-	if args == nil or args.destName == nil or args.destGUID == nil or args.amount == nil or not bgzone then
+function IsleOfConquest:SPELL_BUILDING_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId, spellName, spellSchool, amount)
+	if sourceGUID == nil or destName == nil or destGUID == nil or amount == nil or not bgzone then
 		return
 	end
-	local guid = args.destGUID
+	local guid = destGUID
 	if gateHP[guid] == nil then -- first hit
 		gateHP[guid] = 600000 -- initial gate health: 600000
 		if	self.Options.ShowGatesHealth then
 			if not DBM.BossHealth:IsShown() then
 				DBM.BossHealth:Show(L.GatesHealthFrame)
 			end
-			DBM.BossHealth:AddBoss(function() return gateHP[guid]/6000	end, args.destName)
+			DBM.BossHealth:AddBoss(function() return gateHP[guid]/6000	end, destName)
 		end
 	end
-	if gateHP[guid] > args.amount then
-		gateHP[guid] = gateHP[guid] - args.amount
+	if gateHP[guid] > amount then
+		gateHP[guid] = gateHP[guid] - amount
 	else
 		gateHP[guid] = 0
 	end

r7278 (Omega): increase residue count some, because it's good to know how many are down for rolling off his back too.

Omega — Sat, 04 Feb 2012 04:11:04 GMT

Author: Omega
Date: Sat Feb 04 05:11:04 CET 2012
Revision: 7278

Log:

increase residue count some, because it's good to know how many are down for rolling off his back too.
Also scan dest damage too. make it as accurate as possible. count should always be right and fastest possible now.

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7277

Old date: 2012-02-04 03:47:39 UTC

@@ -181,7 +181,7 @@
 		oozeGUIDS[args.sourceGUID] = true
 		residueCount = residueCount + 1
 		warnResidue:Cancel()
-		if residueCount > 4 and residueCount < 13 then -- announce 9 stacks (ready to eat blood!), sometimes it can be missing 2~3 stacks, announce to 12 stacks.
+		if residueCount > 4 and residueCount < 16 then -- announce 9 stacks (ready to eat blood!), sometimes it can be missing 2~3 stacks, announce to 15 stacks.
 			warnResidue:Schedule(2, residueCount)
 		end
 	end
@@ -190,15 +190,22 @@
 --Damage event that indicates an ooze is taking damage
 --we check its GUID to see if it's a resurrected ooze and if so remove it from table.
 function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags)
-	if oozeGUIDS[sourceGUID] and self:GetCIDFromGUID(sourceGUID) == 53889 then--It is an ooze that died earlier. We check source instead of dest, cause then we detect all oozes once they attack someone, vs only oozes that get attacked (and missing untanked oozes)
+	if oozeGUIDS[sourceGUID] and self:GetCIDFromGUID(sourceGUID) == 53889 then--It is an ooze that died earlier. We check source damage since this will detect untanked oozes.
 		oozeGUIDS[sourceGUID] = nil --Remove it
 		residueCount = residueCount - 1 --Reduce count
 		warnResidue:Cancel()
-		if residueCount > 4 and residueCount < 13 then -- announce new count.
+		if residueCount > 4 and residueCount < 16 then -- announce new count.
 			warnResidue:Schedule(2, residueCount)
 		end
+	elseif oozeGUIDS[destGUID] and self:GetCIDFromGUID(destGUID) == 53889 then--It is an ooze that died earlier. We check destination damage to detect oozes faster if they take damage before they do damage.
+		oozeGUIDS[destGUID] = nil --Remove it
+		residueCount = residueCount - 1 --Reduce count
+		warnResidue:Cancel()
+		if residueCount > 4 and residueCount < 16 then -- announce new count.
+			warnResidue:Schedule(2, residueCount)
 	end
 end
+end
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 mod.SWING_MISSED = mod.SPELL_DAMAGE
 mod.SWING_DAMAGE = mod.SPELL_DAMAGE

r7277 (nbluewiz): more fixes

nbluewiz — Sat, 04 Feb 2012 03:47:39 GMT

Author: nbluewiz
Date: Sat Feb 04 04:47:39 CET 2012
Revision: 7277

Log:

more fixes

Updated

trunk/DBM-BlackwingDescent/Nefarian.lua

Action: modified

Old revision: 7276

Old date: 2012-02-04 02:55:13 UTC

@@ -27,6 +27,7 @@
 	"SPELL_DAMAGE",
 	"SPELL_MISSED",
 	"SWING_DAMAGE",
+	"SWING_MISSED",
 	"CHAT_MSG_MONSTER_YELL",
 	"RAID_BOSS_EMOTE",
 	"UNIT_DIED"
@@ -279,7 +280,7 @@
 	if (spellId == 81007 or spellId == 94085 or spellId == 94086 or spellId == 94087) and destGUID == UnitGUID("player") and GetTime() - spamShadowblaze > 5 then
 		specWarnShadowblaze:Show()
 		spamShadowblaze = GetTime()
-	elseif not spellID == 50288 and self:GetCIDFromGUID(destGUID) == 41918 and bit.band(sourceFlags, COMBATLOG_OBJECT_TYPE_PLAYER) ~= 0 and self:IsInCombat() then--Any spell damage except for starfall
+	elseif spellID ~= 50288 and self:GetCIDFromGUID(destGUID) == 41918 and bit.band(sourceFlags, COMBATLOG_OBJECT_TYPE_PLAYER) ~= 0 and self:IsInCombat() then--Any spell damage except for starfall
 		if sourceGUID ~= UnitGUID("player") then
 			if self.Options.TankArrow then
 				DBM.Arrow:ShowRunTo(sourceName, 0, 0)
@@ -298,6 +299,7 @@
 		end
 	end
 end
+mod.SWING_MISSED = mod.SWING_DAMAGE
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.YellPhase2 or msg:find(L.YellPhase2) then

r7276 (nbluewiz): fix more unchanged.

nbluewiz — Sat, 04 Feb 2012 02:55:13 GMT

Author: nbluewiz
Date: Sat Feb 04 03:55:13 CET 2012
Revision: 7276

Log:

fix more unchanged.

Updated

trunk/DBM-ThroneFourWinds/AlAkir.lua

Updated

trunk/DBM-ThroneFourWinds/Conclave.lua

trunk/DBM-ThroneFourWinds/AlAkir.lua

Action: modified

Old revision: 7275

Old date: 2012-02-04 02:19:20 UTC

@@ -178,7 +178,7 @@
 end
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
-function mod:SPELL_PERIODIC_DAMAGE(args)
+function mod:SPELL_PERIODIC_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
 	if (spellId == 91020 or spellId == 93258 or spellId == 93259 or spellId == 93260) and GetTime() - spamIce >= 4 and destGUID == UnitGUID("player") then
 		specWarnIceStorm:Show()
 		spamIce = GetTime()

trunk/DBM-ThroneFourWinds/Conclave.lua

Action: modified

Old revision: 7275

Old date: 2012-02-04 02:19:20 UTC

@@ -137,7 +137,7 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
 	if (spellId == 86111 or spellId == 93129 or spellId == 93130 or spellId == 93131) and destGUID == UnitGUID("player") and GetTime() - iceSpam >= 3 then
 		iceSpam = GetTime()
 		specWarnIcePatch:Show()

r7275 (Omega): Dummy commit (well not completely useless, adding blue to credits) Note to Blue, old content mods, i'll start from bottom you start from top ;)

Omega — Sat, 04 Feb 2012 02:19:20 GMT

Author: Omega
Date: Sat Feb 04 03:19:20 CET 2012
Revision: 7275

Log:

Dummy commit (well not completely useless, adding blue to credits)

Note to Blue, old content mods, i'll start from bottom you start from top ;)

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7274

Old date: 2012-02-04 02:13:40 UTC

@@ -22,6 +22,7 @@
 --    * Arta
 --    * Omegal @ US-Whisperwind (continuing mod support for 3.2+)
 --    * Tennberg (a lot of fixes in the enGB/enUS localization)
+--    * nbluewiz (a lot of fixes in the koKR localization as well as boss mod work)
 --
 --
 -- The code of this addon is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 License. (see license.txt)

r7274 (nbluewiz): hopefully fixed all stuff.

nbluewiz — Sat, 04 Feb 2012 02:13:40 GMT

Author: nbluewiz
Date: Sat Feb 04 03:13:40 CET 2012
Revision: 7274

Log:

hopefully fixed all stuff.

Updated

trunk/DBM-BlackwingDescent/Magmaw.lua

Updated

trunk/DBM-ThroneFourWinds/AlAkir.lua

Updated

trunk/DBM-WorldEvents/Holidays/Omen.lua

trunk/DBM-BlackwingDescent/Magmaw.lua

Action: modified

Old revision: 7273

Old date: 2012-02-04 02:10:27 UTC

@@ -119,7 +119,7 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
 	if (spellId == 92128 or spellId == 92196 or spellId == 92197 or spellId == 92198) and destGUID == UnitGUID("player") and GetTime() - ignitionSpam >= 4 then
 		specWarnIgnition:Show()
 		ignitionSpam = GetTime()

trunk/DBM-ThroneFourWinds/AlAkir.lua

Action: modified

Old revision: 7273

Old date: 2012-02-04 02:10:27 UTC

@@ -18,6 +18,7 @@
 	"SPELL_DAMAGE",
 	"SPELL_MISSED",
 	"SPELL_PERIODIC_DAMAGE",
+	"SPELL_PERIODIC_MISSED",
 	"UNIT_SPELLCAST_SUCCEEDED"
 )
 
@@ -175,7 +176,6 @@
 		spamCloud = GetTime()
 	end
 end
-
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:SPELL_PERIODIC_DAMAGE(args)
@@ -184,6 +184,7 @@
 		spamIce = GetTime()
 	end
 end
+mod.SPELL_PERIODIC_MISSED = mod.SPELL_PERIODIC_DAMAGE
 
 function mod:UNIT_SPELLCAST_SUCCEEDED(uId, spellName)
 	if uId ~= "boss1" then return end--Anti spam to ignore all other args

trunk/DBM-WorldEvents/Holidays/Omen.lua

Action: modified

Old revision: 7273

Old date: 2012-02-04 02:10:27 UTC

@@ -11,7 +11,7 @@
 mod:RegisterEvents(
 	"SPELL_CAST_SUCCESS",
 	"SPELL_PERIODIC_DAMAGE",
-	"SPELL_PERIODIC_MISS"
+	"SPELL_PERIODIC_MISSED"
 )
 
 local warnCleave				= mod:NewSpellAnnounce(104903, 2)
@@ -45,5 +45,5 @@
 			antiSpam = GetTime()
 		end
 	end
-	mod.SPELL_PERIODIC_MISS = mod.SPELL_PERIODIC_DAMAGE
+	mod.SPELL_PERIODIC_MISSED = mod.SPELL_PERIODIC_DAMAGE
 end

r7273 (Omega): Blackwing touch

Omega — Sat, 04 Feb 2012 02:10:27 GMT

Author: Omega
Date: Sat Feb 04 03:10:27 CET 2012
Revision: 7273

Log:

Blackwing touch

Updated

trunk/DBM-BlackwingDescent/BWDTrash.lua

Updated

trunk/DBM-BlackwingDescent/Nefarian.lua

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

trunk/DBM-BlackwingDescent/BWDTrash.lua

Action: modified

Old revision: 7272

Old date: 2012-02-04 02:06:20 UTC

@@ -64,24 +64,15 @@
 	end
 end
 
---does this consume too much cpu?--
 function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags)
 	if self:GetCIDFromGUID(destGUID) == 42362 and not InCombatLockdown() then
 		timerChargeCD:Start(21.5)
 	end
 end
-
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
+mod.SWING_DAMAGE = mod.SPELL_DAMAGE
+mod.SWING_MISSED = mod.SPELL_DAMAGE
 
-function mod:SWING_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags)
-	if self:GetCIDFromGUID(destGUID) == 42362 and not InCombatLockdown() then
-		timerChargeCD:Start(21.5)
-	end
-end
-
-mod.SWING_MISSED = mod.SWING_DAMAGE
---does this consume too much cpu?--
-
 function mod:UNIT_DIED(args)
 	local cid = self:GetCIDFromGUID(args.destGUID)
 	if cid == 42362 then

trunk/DBM-BlackwingDescent/Nefarian.lua

Action: modified

Old revision: 7272

Old date: 2012-02-04 02:06:20 UTC

@@ -25,6 +25,7 @@
 	"SPELL_AURA_REMOVED",
 	"SPELL_CAST_SUCCESS",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"SWING_DAMAGE",
 	"CHAT_MSG_MONSTER_YELL",
 	"RAID_BOSS_EMOTE",
@@ -286,6 +287,7 @@
 		end
 	end
 end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:SWING_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags)
 	if self:GetCIDFromGUID(destGUID) == 41918 and bit.band(sourceFlags, COMBATLOG_OBJECT_TYPE_PLAYER) ~= 0 and self:IsInCombat() then

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7272

Old date: 2012-02-04 02:06:20 UTC

@@ -189,7 +189,7 @@
 
 --Damage event that indicates an ooze is taking damage
 --we check its GUID to see if it's a resurrected ooze and if so remove it from table.
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag)
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags)
 	if oozeGUIDS[sourceGUID] and self:GetCIDFromGUID(sourceGUID) == 53889 then--It is an ooze that died earlier. We check source instead of dest, cause then we detect all oozes once they attack someone, vs only oozes that get attacked (and missing untanked oozes)
 		oozeGUIDS[sourceGUID] = nil --Remove it
 		residueCount = residueCount - 1 --Reduce count

r7272 (nbluewiz): oops, missed.

nbluewiz — Sat, 04 Feb 2012 02:06:20 GMT

Author: nbluewiz
Date: Sat Feb 04 03:06:20 CET 2012
Revision: 7272

Log:

oops, missed.

Updated

trunk/DBM-BlackwingDescent/BWDTrash.lua

Action: modified

Old revision: 7271

Old date: 2012-02-04 02:02:16 UTC

@@ -73,7 +73,7 @@
 
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
-function mod:SWING_DAMAGE(args)
+function mod:SWING_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags)
 	if self:GetCIDFromGUID(destGUID) == 42362 and not InCombatLockdown() then
 		timerChargeCD:Start(21.5)
 	end

r7271 (nbluewiz): Blackwing Descent

nbluewiz — Sat, 04 Feb 2012 02:02:16 GMT

Author: nbluewiz
Date: Sat Feb 04 03:02:16 CET 2012
Revision: 7271

Log:

Blackwing Descent

Updated

trunk/DBM-BlackwingDescent/BWDTrash.lua

Updated

trunk/DBM-BlackwingDescent/DarkIronGolemCouncil.lua

Updated

trunk/DBM-BlackwingDescent/Magmaw.lua

Updated

trunk/DBM-BlackwingDescent/Nefarian.lua

trunk/DBM-BlackwingDescent/BWDTrash.lua

Action: modified

Old revision: 7270

Old date: 2012-02-04 01:54:44 UTC

@@ -65,8 +65,8 @@
 end
 
 --does this consume too much cpu?--
-function mod:SPELL_DAMAGE(args)
-	if args:GetDestCreatureID() == 42362 and not InCombatLockdown() then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags)
+	if self:GetCIDFromGUID(destGUID) == 42362 and not InCombatLockdown() then
 		timerChargeCD:Start(21.5)
 	end
 end
@@ -74,7 +74,7 @@
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:SWING_DAMAGE(args)
-	if args:GetDestCreatureID() == 42362 and not InCombatLockdown() then
+	if self:GetCIDFromGUID(destGUID) == 42362 and not InCombatLockdown() then
 		timerChargeCD:Start(21.5)
 	end
 end

trunk/DBM-BlackwingDescent/DarkIronGolemCouncil.lua

Action: modified

Old revision: 7270

Old date: 2012-02-04 01:54:44 UTC

@@ -19,7 +19,8 @@
 	"SPELL_CAST_START",
 	"SPELL_CAST_SUCCESS",
 	"SPELL_INTERRUPT",
-	"SPELL_DAMAGE"
+	"SPELL_DAMAGE",
+	"SPELL_MISSED"
 )
 
 --Magmatron
@@ -401,8 +402,9 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(79710, 91540, 91541, 91542) then--An interrupt failed (or wasn't cast)
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 79710 or spellId == 91540 or spellId == 91541 or spellId == 91542) then--An interrupt failed (or wasn't cast)
 		timerArcaneLockout:Cancel()--Cancel bar just in case one was started by a late SPELL_INTERRUPT event that showed in combat log while cast went off anyways.
 	end
 end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
\ No newline at end of file

trunk/DBM-BlackwingDescent/Magmaw.lua

Action: modified

Old revision: 7270

Old date: 2012-02-04 01:54:44 UTC

@@ -18,6 +18,7 @@
 	"SPELL_CAST_SUCCESS",
 	"SPELL_SUMMON",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"CHAT_MSG_MONSTER_YELL",
 	"RAID_BOSS_EMOTE",
 	"UNIT_HEALTH",
@@ -119,11 +120,12 @@
 end
 
 function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(92128, 92196, 92197, 92198) and args:IsPlayer() and GetTime() - ignitionSpam >= 4 then
+	if (spellId == 92128 or spellId == 92196 or spellId == 92197 or spellId == 92198) and destGUID == UnitGUID("player") and GetTime() - ignitionSpam >= 4 then
 		specWarnIgnition:Show()
 		ignitionSpam = GetTime()
 	end
 end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 -- heroic phase 2
 function mod:CHAT_MSG_MONSTER_YELL(msg)

trunk/DBM-BlackwingDescent/Nefarian.lua

Action: modified

Old revision: 7270

Old date: 2012-02-04 01:54:44 UTC

@@ -274,24 +274,24 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsPlayer() and args:IsSpellID(81007, 94085, 94086, 94087) and GetTime() - spamShadowblaze > 5 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 81007 or spellId == 94085 or spellId == 94086 or spellId == 94087) and destGUID == UnitGUID("player") and GetTime() - spamShadowblaze > 5 then
 		specWarnShadowblaze:Show()
 		spamShadowblaze = GetTime()
-	elseif args:GetDestCreatureID() == 41918 and args:IsSrcTypePlayer() and not args:IsSpellID(50288) and self:IsInCombat() then--Any spell damage except for starfall
-		if args.sourceName ~= UnitName("player") then
+	elseif not spellID == 50288 and self:GetCIDFromGUID(destGUID) == 41918 and bit.band(sourceFlags, COMBATLOG_OBJECT_TYPE_PLAYER) ~= 0 and self:IsInCombat() then--Any spell damage except for starfall
+		if sourceGUID ~= UnitGUID("player") then
 			if self.Options.TankArrow then
-				DBM.Arrow:ShowRunTo(args.sourceName, 0, 0)
+				DBM.Arrow:ShowRunTo(sourceName, 0, 0)
 			end
 		end
 	end
 end
 
-function mod:SWING_DAMAGE(args)
-	if args:GetDestCreatureID() == 41918 and args:IsSrcTypePlayer() and self:IsInCombat() then
-		if args.sourceName ~= UnitName("player") then
+function mod:SWING_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags)
+	if self:GetCIDFromGUID(destGUID) == 41918 and bit.band(sourceFlags, COMBATLOG_OBJECT_TYPE_PLAYER) ~= 0 and self:IsInCombat() then
+		if sourceGUID ~= UnitGUID("player") then
 			if self.Options.TankArrow then
-				DBM.Arrow:ShowRunTo(args.sourceName, 0, 0)
+				DBM.Arrow:ShowRunTo(sourceName, 0, 0)
 			end
 		end
 	end

r7270 (Omega): match up blue's change for uniformity on 5 man mods

Omega — Sat, 04 Feb 2012 01:54:44 GMT

Author: Omega
Date: Sat Feb 04 02:54:44 CET 2012
Revision: 7270

Log:

match up blue's change for uniformity on 5 man mods

Updated

trunk/DBM-Party-Cataclysm/HallsOfOrigination/TempleGuardianAnhuur.lua

Updated

trunk/DBM-Party-Cataclysm/HourOfTwilight/Benedictus.lua

Updated

trunk/DBM-Party-Cataclysm/LostCityOfTheTolvir/HighProphetBarim.lua

Updated

trunk/DBM-Party-Cataclysm/ShadowFangKeep/Springvale.lua

Updated

trunk/DBM-Party-Cataclysm/TheStonecore/Slabhide.lua

Updated

trunk/DBM-Party-Cataclysm/WorldBosses/JulakDoom.lua

Updated

trunk/DBM-Party-Cataclysm/ZulAman/Daakara.lua

Updated

trunk/DBM-Party-Cataclysm/ZulAman/Malacrass5.lua

Updated

trunk/DBM-Party-Cataclysm/ZulGurub/Mandokir.lua

Updated

trunk/DBM-Party-Cataclysm/ZulGurub/Venoxis.lua

Updated

trunk/DBM-WorldEvents/Holidays/ApothecaryTrio.lua

Updated

trunk/DBM-WorldEvents/Holidays/Omen.lua

trunk/DBM-Party-Cataclysm/HallsOfOrigination/TempleGuardianAnhuur.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -48,8 +48,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if (spellId == 75117 or spellId == 94951) and GetTime() - spamLight > 5 and destName == UnitName("player") then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 75117 or spellId == 94951) and GetTime() - spamLight > 5 and destGUID == UnitGUID("player") then
 		specWarnLight:Show()
 	end
 end

trunk/DBM-Party-Cataclysm/HourOfTwilight/Benedictus.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -71,11 +71,11 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if spellId == 103653 and destName == UnitName("player") and GetTime() - spamDamage > 5 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if spellId == 103653 and destGUID == UnitGUID("player") and GetTime() - spamDamage > 5 then
 		specwarnPurified:Show()
 		spamDamage = GetTime()
-	elseif spellId == 103775 and destName == UnitName("player") and GetTime() - spamDamage > 5 then
+	elseif spellId == 103775 and destGUID == UnitGUID("player") and GetTime() - spamDamage > 5 then
 		specwarnTwilight:Show()
 		spamDamage = GetTime()
 	end

trunk/DBM-Party-Cataclysm/LostCityOfTheTolvir/HighProphetBarim.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -72,8 +72,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if (spellId == 81942 or spellId == 90040) and destName == UnitName("player") and GetTime() - spamSIS > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 81942 or spellId == 90040) and destGUID == UnitGUID("player") and GetTime() - spamSIS > 3 then
 		spamSIS = GetTime()
 		specWarnHeavenFury:Show()
 	end

trunk/DBM-Party-Cataclysm/ShadowFangKeep/Springvale.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -58,8 +58,8 @@
 
 do 
 	local lastdesecration = 0
-	function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-		if spellId == 94370 and destName == UnitName("player") and GetTime() - lastdesecration > 4 then
+	function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+		if spellId == 94370 and destGUID == UnitGUID("player") and GetTime() - lastdesecration > 4 then
 			specWarnDesecration:Show()
 			lastdesecration = GetTime()
 		end

trunk/DBM-Party-Cataclysm/TheStonecore/Slabhide.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -52,8 +52,8 @@
 	self:ScheduleMethod(12.5-delay, "airphase")
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if (spellId == 80800 or spellId == 80801 or spellId == 92657 or spellId == 92658) and destName == UnitName("player") and GetTime() - spamEruption > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 80800 or spellId == 80801 or spellId == 92657 or spellId == 92658) and destGUID == UnitGUID("player") and GetTime() - spamEruption > 3 then
 		specWarnEruption:Show()
 		spamEruption = GetTime()
 	end

trunk/DBM-Party-Cataclysm/WorldBosses/JulakDoom.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -77,8 +77,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if spellId == 93612 and destName == UnitName("player") and GetTime() - lastBreath > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if spellId == 93612 and destGUID == UnitGUID("player") and GetTime() - lastBreath > 3 then
 		specWarnBreath:Show()
 		lastBreath = GetTime()
 	end

trunk/DBM-Party-Cataclysm/ZulAman/Daakara.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -128,8 +128,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if spellId == 97682 and destName == UnitName("player") and GetTime() - lastburn > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if spellId == 97682 and destGUID == UnitGUID("player") and GetTime() - lastburn > 3 then
 		specWarnBurn:Show()
 		lastburn = GetTime()
 	end

trunk/DBM-Party-Cataclysm/ZulAman/Malacrass5.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -13,7 +13,8 @@
 	"SPELL_CAST_START",
 	"SPELL_CAST_SUCCESS",
 	"SPELL_AURA_APPLIED",
-	"SPELL_PERIODIC_DAMAGE"
+	"SPELL_PERIODIC_DAMAGE",
+	"SPELL_PERIODIC_MISSED"
 )
 
 --Warriors and warlocks can too but only with right spec/pet. So they are not in the defaults.
@@ -104,16 +105,17 @@
 
 do 
 	local lastSIS = 0--Last S.I.S. (Stand in shit)
-	function mod:SPELL_PERIODIC_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-		if spellId == 43429 and destName == UnitName("player") and GetTime() - lastSIS > 3 then	--Paladin (Consecration)
+	function mod:SPELL_PERIODIC_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+		if spellId == 43429 and destGUID == UnitGUID("player") and GetTime() - lastSIS > 3 then	--Paladin (Consecration)
 			specWarnConsecration:Show()
 			lastSIS = GetTime()
-		elseif spellId == 43440 and destName == UnitName("player") and GetTime() - lastSIS > 3 then	--Warlock(Rain of Fire)
+		elseif spellId == 43440 and destGUID == UnitGUID("player") and GetTime() - lastSIS > 3 then	--Warlock(Rain of Fire)
 			specWarnRainofFire:Show()
 			lastSIS = GetTime()
-		elseif spellId == 61603 and destName == UnitName("player") and GetTime() - lastSIS > 3 then	--Death Knight(Death and Decay)
+		elseif spellId == 61603 and destGUID == UnitGUID("player") and GetTime() - lastSIS > 3 then	--Death Knight(Death and Decay)
 			specWarnDeathNDecay:Show()
 			lastSIS = GetTime()
 		end
 	end
+	mod.SPELL_PERIODIC_MISSED = mod.SPELL_PERIODIC_DAMAGE
 end
\ No newline at end of file

trunk/DBM-Party-Cataclysm/ZulGurub/Mandokir.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -92,7 +92,7 @@
 	end
 end
 
-function mod:SPELL_HEAL(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+function mod:SPELL_HEAL(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
 	if spellId == 96724 then
 		specWarnOhgan:Show()
 		ohganGUID = destGUID

trunk/DBM-Party-Cataclysm/ZulGurub/Venoxis.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -11,7 +11,8 @@
 
 mod:RegisterEventsInCombat(
 	"SPELL_CAST_START",
-	"SPELL_DAMAGE"
+	"SPELL_DAMAGE",
+	"SPELL_MISSED"
 )
 
 mod:RegisterEvents(
@@ -110,12 +111,13 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if spellId == 97338 and GetTime() - spamEffusion >= 3 and destName == UnitName("player") then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if spellId == 97338 and GetTime() - spamEffusion >= 3 and destGUID == UnitGUID("player") then
 		specWarnEffusion:Show()
 		spamEffusion = GetTime()
-	elseif spellId == 97089 and GetTime() - spamPool >= 3 and destName == UnitName("player") then
+	elseif spellId == 97089 and GetTime() - spamPool >= 3 and destGUID == UnitGUID("player") then
 		specWarnPoolAcridTears:Show()
 		spamPool = GetTime()
 	end
-end
\ No newline at end of file
+end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE

trunk/DBM-WorldEvents/Holidays/ApothecaryTrio.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -33,11 +33,11 @@
 
 do 
 	local lastspill = 0
-	function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-		if spellId == 68927 and destName == UnitName("player") and GetTime() - lastspill > 2 then
+	function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+		if spellId == 68927 and destGUID == UnitGUID("player") and GetTime() - lastspill > 2 then
 			specWarnPerfumeSpill:Show()
 			lastspill = GetTime()
-		elseif spellId == 68934 and destName == UnitName("player") and GetTime() - lastspill > 2 then
+		elseif spellId == 68934 and destGUID == UnitGUID("player") and GetTime() - lastspill > 2 then
 			specWarnCologneSpill:Show()
 			lastspill = GetTime()
 		end

trunk/DBM-WorldEvents/Holidays/Omen.lua

Action: modified

Old revision: 7269

Old date: 2012-02-04 01:49:05 UTC

@@ -39,8 +39,8 @@
 
 do 
 	local antiSpam = 0
-	function mod:SPELL_PERIODIC_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-		if spellId == 26540 and destName == UnitName("player") and GetTime() - antiSpam > 3 then
+	function mod:SPELL_PERIODIC_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+		if spellId == 26540 and destGUID == UnitGUID("player") and GetTime() - antiSpam > 3 then
 			specWarnStarfall:Show()
 			antiSpam = GetTime()
 		end

r7269 (Omega): Throne

Omega — Sat, 04 Feb 2012 01:49:05 GMT

Author: Omega
Date: Sat Feb 04 02:49:05 CET 2012
Revision: 7269

Log:

Throne

Updated

trunk/DBM-ThroneFourWinds/AlAkir.lua

Updated

trunk/DBM-ThroneFourWinds/Conclave.lua

trunk/DBM-ThroneFourWinds/AlAkir.lua

Action: modified

Old revision: 7268

Old date: 2012-02-04 01:42:06 UTC

@@ -165,12 +165,12 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(88858, 93286, 93287, 93288) and GetTime() - lastWindburst > 5 then--Phase 3 wind burst, does not use cast success :(
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 88858 or spellId == 93286 or spellId == 93287 or spellId == 93288) and GetTime() - lastWindburst > 5 then--Phase 3 wind burst, does not use cast success :(
 		warnWindBurst:Show()
 		timerWindBurstCD:Start(20)
 		lastWindburst = GetTime()
-	elseif args:IsSpellID(89588, 93299, 93298, 93297) and GetTime() - spamCloud >= 4 and args:IsPlayer() then
+	elseif (spellId == 89588 or spellId == 93299 or spellId == 93298 or spellId == 93297) and GetTime() - spamCloud >= 4 and destGUID == UnitGUID("player") then
 		specWarnCloud:Show()
 		spamCloud = GetTime()
 	end
@@ -179,7 +179,7 @@
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:SPELL_PERIODIC_DAMAGE(args)
-	if args:IsSpellID(91020, 93258, 93259, 93260) and GetTime() - spamIce >= 4 and args:IsPlayer() then
+	if (spellId == 91020 or spellId == 93258 or spellId == 93259 or spellId == 93260) and GetTime() - spamIce >= 4 and destGUID == UnitGUID("player") then
 		specWarnIceStorm:Show()
 		spamIce = GetTime()
 	end

trunk/DBM-ThroneFourWinds/Conclave.lua

Action: modified

Old revision: 7268

Old date: 2012-02-04 01:42:06 UTC

@@ -20,6 +20,7 @@
 	"SPELL_AURA_APPLIED_DOSE",
 	"SPELL_AURA_REMOVED",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"SPELL_CAST_START",
 	"SPELL_CAST_SUCCESS",
 	"UNIT_POWER",
@@ -118,7 +119,6 @@
 		end
 	end
 end
-
 mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
 
 function mod:SPELL_AURA_REMOVED(args)
@@ -138,11 +138,12 @@
 end
 
 function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(86111, 93129, 93130, 93131) and args:IsPlayer() and GetTime() - iceSpam >= 3 then
+	if (spellId == 86111 or spellId == 93129 or spellId == 93130 or spellId == 93131) and destGUID == UnitGUID("player") and GetTime() - iceSpam >= 3 then
 		iceSpam = GetTime()
 		specWarnIcePatch:Show()
 	end
 end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:SPELL_CAST_START(args)
 	if args:IsSpellID(86205) then

r7268 (Omega): All 5 man mods and world event mods

Omega — Sat, 04 Feb 2012 01:42:06 GMT

Author: Omega
Date: Sat Feb 04 02:42:06 CET 2012
Revision: 7268

Log:

All 5 man mods and world event mods

Updated

trunk/DBM-Party-Cataclysm/EndTime/Jaina.lua

Updated

trunk/DBM-Party-Cataclysm/HallsOfOrigination/TempleGuardianAnhuur.lua

Updated

trunk/DBM-Party-Cataclysm/HourOfTwilight/Benedictus.lua

Updated

trunk/DBM-Party-Cataclysm/LostCityOfTheTolvir/HighProphetBarim.lua

Updated

trunk/DBM-Party-Cataclysm/ShadowFangKeep/Springvale.lua

Updated

trunk/DBM-Party-Cataclysm/TheStonecore/Slabhide.lua

Updated

trunk/DBM-Party-Cataclysm/WorldBosses/JulakDoom.lua

Updated

trunk/DBM-Party-Cataclysm/ZulAman/Daakara.lua

Updated

trunk/DBM-Party-Cataclysm/ZulAman/Malacrass5.lua

Updated

trunk/DBM-Party-Cataclysm/ZulGurub/Mandokir.lua

Updated

trunk/DBM-Party-Cataclysm/ZulGurub/Venoxis.lua

Updated

trunk/DBM-WorldEvents/Holidays/ApothecaryTrio.lua

Updated

trunk/DBM-WorldEvents/Holidays/Omen.lua

trunk/DBM-Party-Cataclysm/EndTime/Jaina.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -39,8 +39,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(101980) then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 101980 then
 		timerFlarecoreDetonate:Cancel()
 	end
 end
\ No newline at end of file

trunk/DBM-Party-Cataclysm/HallsOfOrigination/TempleGuardianAnhuur.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -48,8 +48,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(75117, 94951) and GetTime() - spamLight > 5 and args:IsPlayer() then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if (spellId == 75117 or spellId == 94951) and GetTime() - spamLight > 5 and destName == UnitName("player") then
 		specWarnLight:Show()
 	end
 end

trunk/DBM-Party-Cataclysm/HourOfTwilight/Benedictus.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -12,6 +12,7 @@
 	"SPELL_CAST_SUCCESS",
 	"SPELL_AURA_APPLIED",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"UNIT_HEALTH"
 )
 
@@ -70,15 +71,16 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(103653) and args:IsPlayer() and GetTime() - spamDamage > 5 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 103653 and destName == UnitName("player") and GetTime() - spamDamage > 5 then
 		specwarnPurified:Show()
 		spamDamage = GetTime()
-	elseif args:IsSpellID(103775) and args:IsPlayer() and GetTime() - spamDamage > 5 then
+	elseif spellId == 103775 and destName == UnitName("player") and GetTime() - spamDamage > 5 then
 		specwarnTwilight:Show()
 		spamDamage = GetTime()
 	end
 end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:UNIT_HEALTH(uId)
 	if self:GetUnitCreatureId(uId) == 54938 then

trunk/DBM-Party-Cataclysm/LostCityOfTheTolvir/HighProphetBarim.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -12,6 +12,7 @@
 	"SPELL_AURA_APPLIED",
 	"SPELL_AURA_REMOVED",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"UNIT_DIED"
 )
 
@@ -30,12 +31,10 @@
 
 mod:AddBoolOption("BossHealthAdds")
 
-local spamHeavenFury = 0
-local spamGround = 0
+local spamSIS = 0
 
 function mod:OnCombatStart(delay)
-	spamHeavenFury = 0
-	spamGround = 0
+	spamSIS = 0
 	if mod.Options.BossHealthAdds then
 		DBM.BossHealth:AddBoss(48906, L.BlazeHeavens)
 	end
@@ -50,8 +49,8 @@
 		timerLashings:Start(args.destName)
 	elseif args:IsSpellID(82320) and args.destName == L.name then
 		warnRepentance:Show()
-		spamGround = GetTime()
-		if mod.Options.BossHealthAdds then
+		spamSIS = GetTime()
+		if self.Options.BossHealthAdds then
 			DBM.BossHealth:AddBoss(43927, L.HarbringerDarkness)
 			DBM.BossHealth:RemoveBoss(48906)
 		end
@@ -59,8 +58,8 @@
 		warnSoulSever:Show(args.destName)
 		timerSoulSever:Start(args.destName)
 		timerSoulSeverCD:Start()
-	elseif args:IsSpellID(88814, 90010) and args:IsPlayer() and GetTime() - spamGround > 5 then
-		spamGround = GetTime()
+	elseif args:IsSpellID(88814, 90010) and args:IsPlayer() and GetTime() - spamSIS > 5.5 then
+		spamSIS = GetTime()
 		specWarnHallowedGround:Show()
 	end
 end
@@ -73,9 +72,9 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(81942, 90040) and args:IsPlayer() and GetTime() - spamHeavenFury > 5 then
-		spamHeavenFury = GetTime()
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if (spellId == 81942 or spellId == 90040) and destName == UnitName("player") and GetTime() - spamSIS > 3 then
+		spamSIS = GetTime()
 		specWarnHeavenFury:Show()
 	end
 end

trunk/DBM-Party-Cataclysm/ShadowFangKeep/Springvale.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -58,8 +58,8 @@
 
 do 
 	local lastdesecration = 0
-	function mod:SPELL_DAMAGE(args)
-		if args:IsSpellID(94370) and args:IsPlayer() and GetTime() - lastdesecration > 4 then		-- Desecration
+	function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+		if spellId == 94370 and destName == UnitName("player") and GetTime() - lastdesecration > 4 then
 			specWarnDesecration:Show()
 			lastdesecration = GetTime()
 		end

trunk/DBM-Party-Cataclysm/TheStonecore/Slabhide.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -52,8 +52,8 @@
 	self:ScheduleMethod(12.5-delay, "airphase")
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(80800, 80801, 92657, 92658) and args:IsPlayer() and GetTime() - spamEruption > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if (spellId == 80800 or spellId == 80801 or spellId == 92657 or spellId == 92658) and destName == UnitName("player") and GetTime() - spamEruption > 3 then
 		specWarnEruption:Show()
 		spamEruption = GetTime()
 	end

trunk/DBM-Party-Cataclysm/WorldBosses/JulakDoom.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -77,12 +77,10 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(93612) and args:IsPlayer() and GetTime() - lastBreath > 3 then
-		if args:IsPlayer() and GetTime() - lastBreath > 3  then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 93612 and destName == UnitName("player") and GetTime() - lastBreath > 3 then
 			specWarnBreath:Show()
 			lastBreath = GetTime()
 		end
 	end
-end
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
\ No newline at end of file

trunk/DBM-Party-Cataclysm/ZulAman/Daakara.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -128,11 +128,10 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(97682) and args:IsPlayer() and GetTime() - lastburn > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 97682 and destName == UnitName("player") and GetTime() - lastburn > 3 then
 		specWarnBurn:Show()
 		lastburn = GetTime()
 	end
 end
-
 mod.SPELL_MISSED = mod.SPELL_DAMAGE

trunk/DBM-Party-Cataclysm/ZulAman/Malacrass5.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -104,14 +104,14 @@
 
 do 
 	local lastSIS = 0--Last S.I.S. (Stand in shit)
-	function mod:SPELL_PERIODIC_DAMAGE(args)
-		if args:IsSpellID(43429) and args:IsPlayer() and GetTime() - lastSIS > 3 then	--Paladin (Consecration)
+	function mod:SPELL_PERIODIC_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+		if spellId == 43429 and destName == UnitName("player") and GetTime() - lastSIS > 3 then	--Paladin (Consecration)
 			specWarnConsecration:Show()
 			lastSIS = GetTime()
-		elseif args:IsSpellID(43440) and args:IsPlayer() and GetTime() - lastSIS > 3 then	--Warlock(Rain of Fire)
+		elseif spellId == 43440 and destName == UnitName("player") and GetTime() - lastSIS > 3 then	--Warlock(Rain of Fire)
 			specWarnRainofFire:Show()
 			lastSIS = GetTime()
-		elseif args:IsSpellID(61603) and args:IsPlayer() and GetTime() - lastSIS > 3 then	--Death Knight(Death and Decay)
+		elseif spellId == 61603 and destName == UnitName("player") and GetTime() - lastSIS > 3 then	--Death Knight(Death and Decay)
 			specWarnDeathNDecay:Show()
 			lastSIS = GetTime()
 		end

trunk/DBM-Party-Cataclysm/ZulGurub/Mandokir.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -92,10 +92,10 @@
 	end
 end
 
-function mod:SPELL_HEAL(args)
-	if args:IsSpellID(96724) then
+function mod:SPELL_HEAL(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 96724 then
 		specWarnOhgan:Show()
-		ohganGUID = args.destGUID
+		ohganGUID = destGUID
 	end
 end

trunk/DBM-Party-Cataclysm/ZulGurub/Venoxis.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -110,11 +110,11 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(97338) and GetTime() - spamEffusion >= 3 and args:IsPlayer() then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 97338 and GetTime() - spamEffusion >= 3 and destName == UnitName("player") then
 		specWarnEffusion:Show()
 		spamEffusion = GetTime()
-	elseif args:IsSpellID(97089) and GetTime() - spamPool >= 3 and args:IsPlayer() then
+	elseif spellId == 97089 and GetTime() - spamPool >= 3 and destName == UnitName("player") then
 		specWarnPoolAcridTears:Show()
 		spamPool = GetTime()
 	end

trunk/DBM-WorldEvents/Holidays/ApothecaryTrio.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -9,6 +9,7 @@
 mod:RegisterEvents(
 	"SPELL_CAST_START",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"CHAT_MSG_MONSTER_SAY"
 )
 
@@ -32,15 +33,16 @@
 
 do 
 	local lastspill = 0
-	function mod:SPELL_DAMAGE(args)
-		if args:IsSpellID(68927) and args:IsPlayer() and GetTime() - lastspill > 2 then
+	function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+		if spellId == 68927 and destName == UnitName("player") and GetTime() - lastspill > 2 then
 			specWarnPerfumeSpill:Show()
 			lastspill = GetTime()
-		elseif args:IsSpellID(68934) and args:IsPlayer() and GetTime() - lastspill > 2 then
+		elseif spellId == 68934 and destName == UnitName("player") and GetTime() - lastspill > 2 then
 			specWarnCologneSpill:Show()
 			lastspill = GetTime()
 		end
 	end
+	mod.SPELL_MISSED = mod.SPELL_DAMAGE
 end
 
 function mod:CHAT_MSG_MONSTER_SAY(msg)

trunk/DBM-WorldEvents/Holidays/Omen.lua

Action: modified

Old revision: 7267

Old date: 2012-02-04 01:41:39 UTC

@@ -39,8 +39,8 @@
 
 do 
 	local antiSpam = 0
-	function mod:SPELL_PERIODIC_DAMAGE(args)
-		if args:IsSpellID(26540) and args:IsPlayer() and GetTime() - antiSpam > 3 then
+	function mod:SPELL_PERIODIC_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+		if spellId == 26540 and destName == UnitName("player") and GetTime() - antiSpam > 3 then
 			specWarnStarfall:Show()
 			antiSpam = GetTime()
 		end

r7267 (nbluewiz): # Better to use UnitGUID as player identify. (because can cause error for some player use their nicknames as boss names. like Baleroc, Ragnaros, Blackhorn...)

nbluewiz — Sat, 04 Feb 2012 01:41:39 GMT

Author: nbluewiz
Date: Sat Feb 04 02:41:39 CET 2012
Revision: 7267

Log:

# Better to use UnitGUID as player identify. (because can cause error for some player use their nicknames as boss names. like Baleroc, Ragnaros, Blackhorn...)

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/DSTrash.lua

Updated

trunk/DBM-DragonSoul/Morchok.lua

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Updated

trunk/DBM-Firelands/Baleroc.lua

Updated

trunk/DBM-Firelands/Bethtilac.lua

Updated

trunk/DBM-Firelands/FirelandsTrash.lua

Updated

trunk/DBM-Firelands/Ragnaros.lua

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7266

Old date: 2012-02-04 01:29:21 UTC

@@ -248,11 +248,11 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if (spellId == 108076 or spellId == 109222 or spellId == 109223 or spellId == 109224) and destName == UnitName("player") and GetTime() - lastFlames > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 108076 or spellId == 109222 or spellId == 109223 or spellId == 109224) and destGUID == UnitGUID("player") and GetTime() - lastFlames > 3 then
 		specWarnTwilightFlames:Show()
 		lastFlames = GetTime()
-	elseif spellId == 110095 and destName == UnitName("player") and GetTime() - lastFlames > 3 then
+	elseif spellId == 110095 and destGUID == UnitGUID("player") and GetTime() - lastFlames > 3  then
 		specWarnDeckFire:Show()
 		lastFlames = GetTime()
 	end

trunk/DBM-DragonSoul/DSTrash.lua

Action: modified

Old revision: 7266

Old date: 2012-02-04 01:29:21 UTC

@@ -61,8 +61,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if spellId == 105579 and destName == UnitName("player") and GetTime() - antiSpam >= 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if spellID == 105579 and destGUID == UnitGUID("player") and GetTime() - antiSpam >= 3 then
 		specWarnFlames:Show()
 		antiSpam = GetTime()
 	end

trunk/DBM-DragonSoul/Morchok.lua

Action: modified

Old revision: 7266

Old date: 2012-02-04 01:29:21 UTC

@@ -16,8 +16,7 @@
 	"SPELL_CAST_START",
 	"SPELL_SUMMON",
 	"SPELL_CAST_SUCCESS",
-	"SPELL_DAMAGE",
-	"SPELL_MISSED"
+	"SPELL_DAMAGE"
 )
 
 local warnCrushArmor	= mod:NewStackAnnounce(103687, 3, nil, mod:IsTank() or mod:IsHealer())
@@ -191,10 +190,9 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if (spellId == 103785 or spellId == 108570 or spellId == 110287 or spellId == 110288) and destName == UnitName("player") and GetTime() - spamBlood > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 103785 or spellId == 108570 or spellId == 110287 or spellId == 110288) and destGUID == UnitGUID("player") and GetTime() - spamBlood > 3 then
 		specwarnBlood:Show()
 		spamBlood = GetTime()
 	end
 end
-mod.SPELL_MISSED = mod.SPELL_DAMAGE

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7266

Old date: 2012-02-04 01:29:21 UTC

@@ -83,7 +83,7 @@
 	local plasmaTargets = {}
 	local healed = {}
 	
-	function mod:SPELL_HEAL(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, amount, overheal, absorbed)
+	function mod:SPELL_HEAL(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId, spellName, spellSchool, amount, overheal, absorbed)
 		if plasmaTargets[destGUID] then
 			healed[destGUID] = healed[destGUID] + (args.absorbed or 0)
 		end

trunk/DBM-Firelands/Baleroc.lua

Action: modified

Old revision: 7266

Old date: 2012-02-04 01:29:21 UTC

@@ -205,7 +205,7 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
 	if spellId == 99353 then--Decimation Strike
 		strikeCount = strikeCount + 1
 		warnStrike:Show(spellName, strikeCount)

trunk/DBM-Firelands/Bethtilac.lua

Action: modified

Old revision: 7266

Old date: 2012-02-04 01:29:21 UTC

@@ -138,8 +138,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if (spellId == 99278 or spellId == 101133) and destName == UnitName("player") and GetTime() - lastPoison > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 99278 or spellId == 101133) and destGUID == UnitGUID("player") and GetTime() - lastPoison > 3 then
 		specWarnVolatilePoison:Show()
 		lastPoison = GetTime()
 	end

trunk/DBM-Firelands/FirelandsTrash.lua

Action: modified

Old revision: 7266

Old date: 2012-02-04 01:29:21 UTC

@@ -120,8 +120,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if spellId == 99510 and destName == UnitName("player") and GetTime() - antiSpam >= 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if spellId == 99510 and destGUID == UnitGUID("player") and GetTime() - antiSpam >= 3 then
 		specWarnLava:Show()
 		antiSpam = GetTime()
 	end

trunk/DBM-Firelands/Ragnaros.lua

Action: modified

Old revision: 7266

Old date: 2012-02-04 01:29:21 UTC

@@ -533,23 +533,23 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if (spellId == 98518 or spellId == 100252 or spellId == 100253 or spellId == 100254) and not elementalsGUID[args.sourceGUID] then--Molten Inferno. elementals cast this on spawn.
-		elementalsGUID[args.sourceGUID] = true--Add unit GUID's to ignore
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 98518 or spellId == 100252 or spellId == 100253 or spellId == 100254) and not elementalsGUID[sourceGUID] then--Molten Inferno. elementals cast this on spawn.
+		elementalsGUID[sourceGUID] = true--Add unit GUID's to ignore
 		elementalsSpawned = elementalsSpawned + 1--Add up the total elementals
-	elseif (spellId == 98175 or spellId == 100106 or spellId == 100107 or spellId == 100108) and not magmaTrapGUID[args.sourceGUID] then--Magma Trap Eruption. We use it to count traps that have been set off
-		magmaTrapGUID[args.sourceGUID] = true--Add unit GUID's to ignore
+	elseif (spellId == 98175 or spellId == 100106 or spellId == 100107 or spellId == 100108) and not magmaTrapGUID[sourceGUID] then--Magma Trap Eruption. We use it to count traps that have been set off
+		magmaTrapGUID[sourceGUID] = true--Add unit GUID's to ignore
 		magmaTrapSpawned = magmaTrapSpawned - 1--Add up total traps
 		if magmaTrapSpawned == 0 and self.Options.InfoHealthFrame and not seedsActive then--All traps are gone hide the health frame.
 			DBM.InfoFrame:Hide()
 		end
-	elseif (spellId == 98870 or spellId == 100122 or spellId == 100123 or spellId == 100124) and destName == UnitName("player") and GetTime() - standingInFireSpam >= 3 then
+	elseif (spellId == 98870 or spellId == 100122 or spellId == 100123 or spellId == 100124) and destGUID == UnitGUID("player") and GetTime() - standingInFireSpam >= 3 then
 		specWarnScorchedGround:Show()
 		standingInFireSpam = GetTime()
-	elseif (spellId == 99144 or spellId == 100303 or spellId == 100304 or spellId == 100305) and destName == UnitName("player") and GetTime() - standingInFireSpam >= 3 then
+	elseif (spellId == 99144 or spellId == 100303 or spellId == 100304 or spellId == 100305) and destGUID == UnitGUID("player") and GetTime() - standingInFireSpam >= 3 then
 		specWarnBlazingHeatMV:Show()
 		standingInFireSpam = GetTime()
-	elseif (spellId == 100941 or spellId == 100998) and destName == UnitName("player") and GetTime() - standingInFireSpam >= 3 and not UnitBuff("player", GetSpellInfo(100713)) then
+	elseif (spellId == 100941 or spellId == 100998) and destGUID == UnitGUID("player") and GetTime() - standingInFireSpam >= 3 and not UnitBuff("player", GetSpellInfo(100713)) then
 		specWarnDreadFlame:Show()
 		standingInFireSpam = GetTime()
 	elseif (spellId == 98981 or spellId == 100289 or spellId == 100290 or spellId == 100291) and GetTime() - lavaBoltSpam >= 3 then

r7266 (nbluewiz): Baradin Hold and Bastion of Twilight

nbluewiz — Sat, 04 Feb 2012 01:29:21 GMT

Author: nbluewiz
Date: Sat Feb 04 02:29:21 CET 2012
Revision: 7266

Log:

Baradin Hold and Bastion of Twilight

Updated

trunk/DBM-BaradinHold/Argaloth.lua

Updated

trunk/DBM-BaradinHold/Occuthar.lua

Updated

trunk/DBM-BastionTwilight/BoTTrash.lua

Updated

trunk/DBM-BastionTwilight/Chogall.lua

Updated

trunk/DBM-BastionTwilight/Sinestra.lua

Updated

trunk/DBM-BastionTwilight/ValionaTheralion.lua

trunk/DBM-BaradinHold/Argaloth.lua

Action: modified

Old revision: 7265

Old date: 2012-02-04 01:21:17 UTC

@@ -15,6 +15,7 @@
 	"SPELL_AURA_REMOVED",
 	"SPELL_CAST_START",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"UNIT_HEALTH"
 )
 
@@ -112,12 +113,13 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(89000, 95177) and GetTime() - lastFlames > 3 and args:IsPlayer() then -- Flames on ground from Firestorm
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 89000 or spellId == 95177) and destGUID == UnitGUID("player") and GetTime() - lastFlames > 3 then -- Flames on ground from Firestorm
 		specWarnFirestorm:Show()
 		lastFlames = GetTime()
 	end
 end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:UNIT_HEALTH(uId)
 	if self:GetUnitCreatureId(uId) == 47120 then

trunk/DBM-BaradinHold/Occuthar.lua

Action: modified

Old revision: 7265

Old date: 2012-02-04 01:21:17 UTC

@@ -12,6 +12,8 @@
 	"SPELL_CAST_START",
 	"SPELL_CAST_SUCCESS",
 	"SPELL_DAMAGE",
+	"SPELL_PERIODIC_DAMAGE",
+	"RANGE_DAMAGE",
 	"SWING_DAMAGE"
 )
 
@@ -60,17 +62,26 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(97212) and args:IsPlayer() and GetTime() - spamFire > 4 then--Is this even right one? 96883, 101004 are ones that do a lot of damage?
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId, spellName, spellSchool, amount, overkill)
+	if spellId == 97212 and destGUID == UnitGUID("player") and GetTime() - spamFire > 4 then--Is this even right one? 96883, 101004 are ones that do a lot of damage?
 		specWarnFocusedFire:Show()
 		spamFire = GetTime()
-	elseif args:GetDestCreatureID() == 52363 and (args.overkill or 0) > 0 then--Hack cause occuthar doesn't die in combat log since 4.2. SO we look for a killing blow that has overkill.
+	elseif self:GetCIDFromGUID(destGUID) == 52363 and (overkill or 0) > 0 then--Hack cause occuthar doesn't die in combat log since 4.2. SO we look for a killing blow that has overkill.
 		DBM:EndCombat(self)
 	end
 end
+mod.RANGE_DAMAGE = mod.SPELL_DAMAGE
+mod.SPELL_PERIODIC_DAMAGE = mod.SPELL_DAMAGE
 
-function mod:SWING_DAMAGE(args)
-	if args:GetDestCreatureID() == 52363 and (args.overkill or 0) > 0 then--Hack cause occuthar doesn't die in combat log since 4.2. SO we look for a killing blow that has overkill.
+function mod:SPELL_MISSED(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if spellId == 97212 and destGUID == UnitGUID("player") and GetTime() - spamFire > 4 then--Is this even right one? 96883, 101004 are ones that do a lot of damage?
+		specWarnFocusedFire:Show()
+		spamFire = GetTime()
+	end
+end
+
+function mod:SWING_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, amount, overkill)
+	if self:GetCIDFromGUID(destGUID) == 52363 and (overkill or 0) > 0 then--Hack cause occuthar doesn't die in combat log since 4.2. SO we look for a killing blow that has overkill.
 		DBM:EndCombat(self)
 	end
 end
\ No newline at end of file

trunk/DBM-BastionTwilight/BoTTrash.lua

Action: modified

Old revision: 7265

Old date: 2012-02-04 01:21:17 UTC

@@ -9,7 +9,8 @@
 	"SPELL_AURA_APPLIED",
 	"SPELL_AURA_REMOVED",
 	"SPELL_CAST_START",
-	"SPELL_DAMAGE"
+	"SPELL_DAMAGE",
+	"SPELL_MISSED"
 )
 
 local warnVolcanicWrath		= mod:NewSpellAnnounce(87903, 4)--This is nasty volcano aoe that's channeled that will wipe raid on trash if not interrupted.
@@ -89,10 +90,11 @@
 
 do 
 	local lastFlamestrike = 0
-	function mod:SPELL_DAMAGE(args)
-		if args:IsSpellID(93383, 93362) and args:IsPlayer() and GetTime() - lastFlamestrike > 3 then
+	function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+		if (spellId == 93383 or spellId == 93362) and destGUID == UnitGUID("player") and GetTime() - lastFlamestrike > 3 then
 			specWarnFlameStrike:Show()
 			lastFlamestrike = GetTime()
 		end
 	end
+	mod.SPELL_MISSED = mod.SPELL_DAMAGE
 end
\ No newline at end of file

trunk/DBM-BastionTwilight/Chogall.lua

Action: modified

Old revision: 7265

Old date: 2012-02-04 01:21:17 UTC

@@ -19,6 +19,7 @@
 	"SPELL_CAST_START",
 	"SPELL_CAST_SUCCESS",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"UNIT_HEALTH",
 	"UNIT_AURA",
 	"UNIT_DIED"
@@ -284,12 +285,13 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(81538, 93212, 93213, 93214) and args:IsPlayer() and GetTime() - blazeSpam >= 4 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 81538 or spellId == 93212 or spellId == 93213 or spellId == 93214) and destGUID == UnitGUID("player") and GetTime() - blazeSpam >= 4 then
 		specWarnBlaze:Show()
 		blazeSpam = GetTime()
 	end
 end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:UNIT_HEALTH(uId)
 	if self:GetUnitCreatureId(uId) == 43324 then

trunk/DBM-BastionTwilight/Sinestra.lua

Action: modified

Old revision: 7265

Old date: 2012-02-04 01:21:17 UTC

@@ -19,6 +19,7 @@
 	"SPELL_AURA_REMOVED",
 	"CHAT_MSG_MONSTER_YELL",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"UNIT_DIED"
 )
 
@@ -261,12 +262,13 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(92954, 92959) and not orbWarned then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId)
+	if (spellId == 92954 or spellId == 92959) and not orbWarned then
 		orbWarned = true
 		showOrbWarning("damage")
 	end
 end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.YellDragon or msg:find(L.YellDragon) then

trunk/DBM-BastionTwilight/ValionaTheralion.lua

Action: modified

Old revision: 7265

Old date: 2012-02-04 01:21:17 UTC

@@ -105,9 +105,9 @@
 		return math.max(1, math.floor(healed / maxAbsorb * 100))
 	end
 	
-	function mod:SPELL_HEAL(args)
-		if args.destGUID == BlackoutTarget then
-			healed = healed + (args.absorbed or 0)
+	function mod:SPELL_HEAL(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, spellId, spellName, spellSchool, amount, overheal, absorbed)
+		if destGUID == BlackoutTarget then
+			healed = healed + (absorbed or 0)
 		end
 	end	
 	mod.SPELL_PERIODIC_HEAL = mod.SPELL_HEAL
@@ -346,13 +346,11 @@
 end
 
 function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(86505, 92907, 92908, 92909) then
-		if args:IsPlayer() and GetTime() - lastFab > 3  then
+	if (spellId == 86505 or spellId == 92907 or spellId == 92908 or spellId == 92909) and destGUID == UnitGUID("player") and GetTime() - lastFab > 3 then
 			specWarnFabulousFlames:Show()
 			lastFab = GetTime()
 		end
 	end
-end
 mod.SPELL_MISSED = mod.SPELL_DAMAGE--Absorbs still show as spell missed, such as PWS, but with this you'll still get a special warning to GTFO, instead of dbm waiting til your shield breaks and you take a second tick :)
 
 function mod:RAID_BOSS_EMOTE(msg)

r7265 (Omega): Firelands

Omega — Sat, 04 Feb 2012 01:21:17 GMT

Author: Omega
Date: Sat Feb 04 02:21:17 CET 2012
Revision: 7265

Log:

Firelands

Updated

trunk/DBM-Firelands/Baleroc.lua

Updated

trunk/DBM-Firelands/Bethtilac.lua

Updated

trunk/DBM-Firelands/FirelandsTrash.lua

Updated

trunk/DBM-Firelands/Ragnaros.lua

trunk/DBM-Firelands/Baleroc.lua

Action: modified

Old revision: 7264

Old date: 2012-02-04 01:09:43 UTC

@@ -205,8 +205,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(99353) then--Decimation Strike
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 99353 then--Decimation Strike
 		strikeCount = strikeCount + 1
 		warnStrike:Show(spellName, strikeCount)
 		if strikeCount == 5 and self:IsDifficulty("normal25", "heroic25") or strikeCount == 2 and self:IsDifficulty("normal10", "heroic10") then return end--Don't do anything if it's 6th/3rd strike
@@ -230,7 +230,7 @@
 			end
 		end
 		lastStrike = GetTime()--Update last strike timing to this one after function fires.
-	elseif args:IsSpellID(99351, 101000, 101001, 101002) then--Inferno Strike
+	elseif spellId == 99351 or spellId == 101000 or spellId == 101001 or spellId == 101002 then--Inferno Strike
 		strikeCount = strikeCount + 1
 		warnStrike:Show(spellName, strikeCount)
 		if strikeCount == 7 then return end--Don't do anything if it's 6th/3rd strike

trunk/DBM-Firelands/Bethtilac.lua

Action: modified

Old revision: 7264

Old date: 2012-02-04 01:09:43 UTC

@@ -16,7 +16,6 @@
 	"SPELL_DAMAGE",
 	"SPELL_MISSED",
 	"RAID_BOSS_EMOTE"
---	"UNIT_DIED"
 )
 
 local warnSmolderingDevastation		= mod:NewCountAnnounce(99052, 4)--Use count announce, cast time is pretty obvious from the bar, but it's useful to keep track how many of these have been cast.
@@ -139,14 +138,12 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(99278, 101133) and args:IsPlayer() and GetTime() - lastPoison > 3 then
-		if args:IsPlayer() and GetTime() - lastPoison > 3  then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if (spellId == 99278 or spellId == 101133) and destName == UnitName("player") and GetTime() - lastPoison > 3 then
 			specWarnVolatilePoison:Show()
 			lastPoison = GetTime()
 		end
 	end
-end
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:RAID_BOSS_EMOTE(msg)

trunk/DBM-Firelands/FirelandsTrash.lua

Action: modified

Old revision: 7264

Old date: 2012-02-04 01:09:43 UTC

@@ -120,8 +120,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(99510) and args:IsPlayer() and GetTime() - antiSpam >= 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 99510 and destName == UnitName("player") and GetTime() - antiSpam >= 3 then
 		specWarnLava:Show()
 		antiSpam = GetTime()
 	end
@@ -151,7 +151,7 @@
 end
 
 function mod:ZONE_CHANGED_NEW_AREA()
-	if surgers > 0 then--You probably wiped on trash and don't need the range finder to get stuck open.
+	if surgers ~= 0 then--You probably wiped on trash and don't need the range finder to get stuck open.
 		surgers = 0--Reset the surgers.
 		table.wipe(surgerGUIDs)--Also wipe GUID table
 		if self.Options.TrashRangeFrame then

trunk/DBM-Firelands/Ragnaros.lua

Action: modified

Old revision: 7264

Old date: 2012-02-04 01:09:43 UTC

@@ -533,26 +533,26 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(98518, 100252, 100253, 100254) and not elementalsGUID[args.sourceGUID] then--Molten Inferno. elementals cast this on spawn.
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if (spellId == 98518 or spellId == 100252 or spellId == 100253 or spellId == 100254) and not elementalsGUID[args.sourceGUID] then--Molten Inferno. elementals cast this on spawn.
 		elementalsGUID[args.sourceGUID] = true--Add unit GUID's to ignore
 		elementalsSpawned = elementalsSpawned + 1--Add up the total elementals
-	elseif args:IsSpellID(98175, 100106, 100107, 100108) and not magmaTrapGUID[args.sourceGUID] then--Magma Trap Eruption. We use it to count traps that have been set off
+	elseif (spellId == 98175 or spellId == 100106 or spellId == 100107 or spellId == 100108) and not magmaTrapGUID[args.sourceGUID] then--Magma Trap Eruption. We use it to count traps that have been set off
 		magmaTrapGUID[args.sourceGUID] = true--Add unit GUID's to ignore
 		magmaTrapSpawned = magmaTrapSpawned - 1--Add up total traps
 		if magmaTrapSpawned == 0 and self.Options.InfoHealthFrame and not seedsActive then--All traps are gone hide the health frame.
 			DBM.InfoFrame:Hide()
 		end
-	elseif args:IsSpellID(98870, 100122, 100123, 100124) and args:IsPlayer() and GetTime() - standingInFireSpam >= 3 then
+	elseif (spellId == 98870 or spellId == 100122 or spellId == 100123 or spellId == 100124) and destName == UnitName("player") and GetTime() - standingInFireSpam >= 3 then
 		specWarnScorchedGround:Show()
 		standingInFireSpam = GetTime()
-	elseif args:IsSpellID(99144, 100303, 100304, 100305) and args:IsPlayer() and GetTime() - standingInFireSpam >= 3 then
+	elseif (spellId == 99144 or spellId == 100303 or spellId == 100304 or spellId == 100305) and destName == UnitName("player") and GetTime() - standingInFireSpam >= 3 then
 		specWarnBlazingHeatMV:Show()
 		standingInFireSpam = GetTime()
-	elseif args:IsSpellID(100941, 100998) and args:IsPlayer() and GetTime() - standingInFireSpam >= 3 and not UnitBuff("player", GetSpellInfo(100713)) then
+	elseif (spellId == 100941 or spellId == 100998) and destName == UnitName("player") and GetTime() - standingInFireSpam >= 3 and not UnitBuff("player", GetSpellInfo(100713)) then
 		specWarnDreadFlame:Show()
 		standingInFireSpam = GetTime()
-	elseif args:IsSpellID(98981, 100289, 100290, 100291) and GetTime() - lavaBoltSpam >= 3 then
+	elseif (spellId == 98981 or spellId == 100289 or spellId == 100290 or spellId == 100291) and GetTime() - lavaBoltSpam >= 3 then
 		timerLavaBoltCD:Start()
 		lavaBoltSpam = GetTime()
 	end

r7264 (Omega): actually pretty up blackhorn a little, no reason for the extra nesting

Omega — Sat, 04 Feb 2012 01:09:43 GMT

Author: Omega
Date: Sat Feb 04 02:09:43 CET 2012
Revision: 7264

Log:

actually pretty up blackhorn a little, no reason for the extra nesting

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7263

Old date: 2012-02-04 01:06:45 UTC

@@ -249,18 +249,14 @@
 end
 
 function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
-	if spellId == 108076 or spellId == 109222 or spellId == 109223 or spellId == 109224 then
-		if destName == UnitName("player") and GetTime() - lastFlames > 3  then
+	if (spellId == 108076 or spellId == 109222 or spellId == 109223 or spellId == 109224) and destName == UnitName("player") and GetTime() - lastFlames > 3 then
 			specWarnTwilightFlames:Show()
 			lastFlames = GetTime()
-		end
-	elseif spellId == 110095 then
-		if destName == UnitName("player") and GetTime() - lastFlames > 3  then
+	elseif spellId == 110095 and destName == UnitName("player") and GetTime() - lastFlames > 3 then
 			specWarnDeckFire:Show()
 			lastFlames = GetTime()
 		end
 	end
-end
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:RAID_BOSS_EMOTE(msg)

r7263 (Omega): Think this should cover the DS mod conversions. to make sure the alpha is at least functional there, gonna work on rest of raids now.

Omega — Sat, 04 Feb 2012 01:06:45 GMT

Author: Omega
Date: Sat Feb 04 02:06:45 CET 2012
Revision: 7263

Log:

Think this should cover the DS mod conversions. to make sure the alpha is at least functional there, gonna work on rest of raids now.

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/DSTrash.lua

Updated

trunk/DBM-DragonSoul/Morchok.lua

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7262

Old date: 2012-02-04 00:38:38 UTC

@@ -248,14 +248,14 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(108076, 109222, 109223, 109224) then
-		if args:IsPlayer() and GetTime() - lastFlames > 3  then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 108076 or spellId == 109222 or spellId == 109223 or spellId == 109224 then
+		if destName == UnitName("player") and GetTime() - lastFlames > 3  then
 			specWarnTwilightFlames:Show()
 			lastFlames = GetTime()
 		end
-	elseif args:IsSpellID(110095) then
-		if args:IsPlayer() and GetTime() - lastFlames > 3  then
+	elseif spellId == 110095 then
+		if destName == UnitName("player") and GetTime() - lastFlames > 3  then
 			specWarnDeckFire:Show()
 			lastFlames = GetTime()
 		end

trunk/DBM-DragonSoul/DSTrash.lua

Action: modified

Old revision: 7262

Old date: 2012-02-04 00:38:38 UTC

@@ -61,8 +61,8 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(105579) and args:IsPlayer() and GetTime() - antiSpam >= 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if spellId == 105579 and destName == UnitName("player") and GetTime() - antiSpam >= 3 then
 		specWarnFlames:Show()
 		antiSpam = GetTime()
 	end

trunk/DBM-DragonSoul/Morchok.lua

Action: modified

Old revision: 7262

Old date: 2012-02-04 00:38:38 UTC

@@ -16,7 +16,8 @@
 	"SPELL_CAST_START",
 	"SPELL_SUMMON",
 	"SPELL_CAST_SUCCESS",
-	"SPELL_DAMAGE"
+	"SPELL_DAMAGE",
+	"SPELL_MISSED"
 )
 
 local warnCrushArmor	= mod:NewStackAnnounce(103687, 3, nil, mod:IsTank() or mod:IsHealer())
@@ -190,9 +191,10 @@
 	end
 end
 
-function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(103785, 108570, 110287, 110288) and args:IsPlayer() and GetTime() - spamBlood > 3 then
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag, spellId)
+	if (spellId == 103785 or spellId == 108570 or spellId == 110287 or spellId == 110288) and destName == UnitName("player") and GetTime() - spamBlood > 3 then
 		specwarnBlood:Show()
 		spamBlood = GetTime()
 	end
 end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE

r7262 (nbluewiz): # Core : Fix broken args (like: spellid) for recent changes. And no reason to build args table for noArgTableEvents? Changed it, too.

nbluewiz — Sat, 04 Feb 2012 00:38:38 GMT

Author: nbluewiz
Date: Sat Feb 04 01:38:38 CET 2012
Revision: 7262

Log:

# Core : Fix broken args (like: spellid) for recent changes. And no reason to build args table for noArgTableEvents? Changed it, too.

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7261

Old date: 2012-02-04 00:09:21 UTC

@@ -407,8 +407,7 @@
 		-- this prevents work-around with mods that used to have their own event handler to prevent this overhead
 		if noArgTableEvents[event] then
 			handleEvent(nil, event, sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, ...)
-		end
-		
+		else
 		twipe(args)
 		args.timestamp = timestamp
 		args.event = event
@@ -422,6 +421,7 @@
 		args.destRaidFlags = destRaidFlags
 		-- taken from Blizzard_CombatLog.lua
 		if event:sub(0, 6) == "SPELL_" then
+				args.spellId, args.spellName, args.spellSchool = select(1, ...)
 			if event == "SPELL_INTERRUPT" then
 				args.extraSpellId, args.extraSpellName, args.extraSpellSchool = select(4, ...)
 			elseif event == "SPELL_EXTRA_ATTACKS" then
@@ -478,6 +478,7 @@
 		end
 		return handleEvent(nil, event, args)
 	end
+	end
 	mainFrame:SetScript("OnEvent", handleEvent)
 end

r7261 (nbluewiz): # Rhyolith : Countdown 1 not works, so removed it.

nbluewiz — Sat, 04 Feb 2012 00:09:21 GMT

Author: nbluewiz
Date: Sat Feb 04 01:09:21 CET 2012
Revision: 7261

Log:

# Rhyolith : Countdown 1 not works, so removed it.

Updated

trunk/DBM-Firelands/Rhyolith.lua

Action: modified

Old revision: 7260

Old date: 2012-02-03 23:37:20 UTC

@@ -79,7 +79,6 @@
 			StompCountown:Start(7)
 			timerFlameStomp:Start(7)
 		else--Else, he uses it right away
-			StompCountown:Start(1)
 			timerFlameStomp:Start(1)
 		end
 	end

r7260 (tandanu): oozeGUIDS[sourceGUID] = true -- Remove it ...

tandanu — Fri, 03 Feb 2012 23:37:20 GMT

Author: tandanu
Date: Sat Feb 04 00:37:20 CET 2012
Revision: 7260

Log:

oozeGUIDS[sourceGUID] = true -- Remove it

...

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7259

Old date: 2012-02-03 23:31:10 UTC

@@ -191,7 +191,7 @@
 --we check its GUID to see if it's a resurrected ooze and if so remove it from table.
 function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag)
 	if oozeGUIDS[sourceGUID] and self:GetCIDFromGUID(sourceGUID) == 53889 then--It is an ooze that died earlier. We check source instead of dest, cause then we detect all oozes once they attack someone, vs only oozes that get attacked (and missing untanked oozes)
-		oozeGUIDS[sourceGUID] = true --Remove it
+		oozeGUIDS[sourceGUID] = nil --Remove it
 		residueCount = residueCount - 1 --Reduce count
 		warnResidue:Cancel()
 		if residueCount > 4 and residueCount < 13 then -- announce new count.

r7259 (tandanu): Implement fast event processing for high volume events (like SPELL_DAMAGE), these new events will no longer be using the DBM args table but the raw event arguments

tandanu — Fri, 03 Feb 2012 23:31:10 GMT

Author: tandanu
Date: Sat Feb 04 00:31:10 CET 2012
Revision: 7259

Log:

Implement fast event processing for high volume events (like SPELL_DAMAGE), these new events will no longer be using the DBM args table but the raw event arguments
All events that are changed can be found in DBM-Core.lua (see diff)

The reason for this change is that old boss mods didn't really need these events, so performance issues with these high volume events were no issue. However, a lot of newer mods make use of these events for some hacks. The usual approach for the few mods which actually needed these events was to build a new CLEU event handler to bypass DBM event processing. This was reasonable as long as there were like 2 or 3 mods that did this. But nowadays there are like 3 oder 4 mods in each package that require these high volume events...

Note that this change is incompatible with old mods. All mods that were using these events will require updating. See DragonSoul/SpineDeathwing for an example.

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7258

Old date: 2012-02-03 21:35:06 UTC

@@ -135,6 +135,8 @@
 	AlwaysShowSpeedKillTimer = true,
 	DisableCinematics = false,
 --	HelpMessageShown = false,
+	MoviesSeen = {},
+	MovieFilters = {},
 }
 
 DBM.Bars = DBT:New()
@@ -168,8 +170,8 @@
 local checkWipe
 local fireEvent
 local _, class = UnitClass("player")
-local LastZoneText
-local LastZoneMapID
+local LastZoneText = ""
+local LastZoneMapID = -1
 local savedDifficulty
 local queuedBattlefield = {}
 
@@ -344,7 +346,7 @@
 	local function handleEvent(self, event, ...)
 		if not registeredEvents[event] or DBM.Options and not DBM.Options.Enabled then return end
 		for i, v in ipairs(registeredEvents[event]) do
-			if type(v[event]) == "function" and (not v.zones or checkEntry(v.zones, LastZoneText) or checkEntry(v.zones, LastZoneMapID)) and (not v.Options or v.Options.Enabled) then
+			if type(v[event]) == "function" and (not v.zones or v.zones[LastZoneText] or v.zones[LastZoneMapID]) and (not v.Options or v.Options.Enabled) then
 				v[event](v, ...)
 			end
 		end
@@ -382,8 +384,31 @@
 	end
 	
 
+	local noArgTableEvents = {
+		SWING_DAMAGE = true,
+		SWING_MISSED = true,
+		SPELL_DAMAGE = true,
+		SPELL_MISSED = true,
+		RANGE_DAMAGE = true,
+		RANGE_MISSED = true,
+		SPELL_HEAL = true,
+		SPELL_ENERGIZE = true,
+		SPELL_PERIODIC_MISSED = true,
+		SPELL_PERIODIC_DAMAGE = true,
+		SPELL_PERIODIC_DRAIN = true,
+		SPELL_PERIODIC_LEECH = true,
+		SPELL_PERIODIC_ENERGIZE = true,
+		SPELL_DRAIN = true,
+		SPELL_LEECH = true
+	}
 	function DBM:COMBAT_LOG_EVENT_UNFILTERED(timestamp, event, hideCaster, sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, ...)
 		if not registeredEvents[event] then return end
+		-- process some high volume events without building the whole table which is somewhat faster
+		-- this prevents work-around with mods that used to have their own event handler to prevent this overhead
+		if noArgTableEvents[event] then
+			handleEvent(nil, event, sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, ...)
+		end
+		
 		twipe(args)
 		args.timestamp = timestamp
 		args.event = event
@@ -396,55 +421,8 @@
 		args.destFlags = destFlags
 		args.destRaidFlags = destRaidFlags
 		-- taken from Blizzard_CombatLog.lua
-		if event == "SWING_DAMAGE" then
-			args.amount, args.overkill, args.school, args.resisted, args.blocked, args.absorbed, args.critical, args.glancing, args.crushing = select(1, ...)
-		elseif event == "SWING_MISSED" then
-			args.spellName = ACTION_SWING
-			args.missType = select(1, ...)
-		elseif event:sub(1, 5) == "RANGE" then
-			args.spellId, args.spellName, args.spellSchool = select(1, ...)
-			if event == "RANGE_DAMAGE" then
-				args.amount, args.overkill, args.school, args.resisted, args.blocked, args.absorbed, args.critical, args.glancing, args.crushing = select(4, ...)
-			elseif event == "RANGE_MISSED" then
-				args.missType = select(4, ...)
-			end
-		elseif event:sub(1, 5) == "SPELL" then
-			args.spellId, args.spellName, args.spellSchool = select(1, ...)
-			if event == "SPELL_DAMAGE" or event == "SPELL_BUILDING_DAMAGE" then -- SPELL_BUILDING_DAMAGE args guessed
-				args.amount, args.overkill, args.school, args.resisted, args.blocked, args.absorbed, args.critical, args.glancing, args.crushing = select(4, ...)
-			elseif event == "SPELL_MISSED" then
-				args.missType, args.amountMissed = select(4, ...)
-			elseif event == "SPELL_HEAL" then
-				args.amount, args.overheal, args.absorbed, args.critical = select(4, ...)
-				args.school = args.spellSchool
-			elseif event == "SPELL_ENERGIZE" then
-				args.valueType = 2
-				args.amount, args.powerType = select(4, ...)
-			elseif event:sub(1, 14) == "SPELL_PERIODIC" then
-				if event == "SPELL_PERIODIC_MISSED" then
-					args.missType = select(4, ...)
-				elseif event == "SPELL_PERIODIC_DAMAGE" then
-					args.amount, args.overkill, args.school, args.resisted, args.blocked, args.absorbed, args.critical, args.glancing, args.crushing = select(4, ...)
-				elseif event == "SPELL_PERIODIC_HEAL" then
-					args.amount, args.overheal, args.absorbed, args.critical = select(4, ...)
-					args.school = args.spellSchool
-				elseif event == "SPELL_PERIODIC_DRAIN" then
-					args.amount, args.powerType, args.extraAmount = select(4, ...)
-					args.valueType = 2
-				elseif event == "SPELL_PERIODIC_LEECH" then
-					args.amount, args.powerType, args.extraAmount = select(4, ...)
-					args.valueType = 2
-				elseif event == "SPELL_PERIODIC_ENERGIZE" then
-					args.amount, args.powerType = select(4, ...)
-					args.valueType = 2
-				end
-			elseif event == "SPELL_DRAIN" then
-				args.amount, args.powerType, args.extraAmount = select(4, ...)
-				args.valueType = 2
-			elseif event == "SPELL_LEECH" then
-				args.amount, args.powerType, args.extraAmount = select(4, ...)
-				args.valueType = 2
-			elseif event == "SPELL_INTERRUPT" then
+		if event:sub(0, 6) == "SPELL_" then
+			if event == "SPELL_INTERRUPT" then
 				args.extraSpellId, args.extraSpellName, args.extraSpellSchool = select(4, ...)
 			elseif event == "SPELL_EXTRA_ATTACKS" then
 				args.amount = select(4, ...)
@@ -672,7 +650,7 @@
 		
 		-- execute OnUpdate handlers of all modules
 		for i, v in pairs(updateFunctions) do
-			if i.Options.Enabled and (not i.zones or checkEntry(i.zones, LastZoneText) or checkEntry(i.zones, LastZoneMapID)) then
+			if i.Options.Enabled and (not i.zones or i.zones[LastZoneText] or i.zones[LastZoneMapID]) then
 				i.elapsed = (i.elapsed or 0) + elapsed
 				if i.elapsed >= (i.updateInterval or 0) then
 					v(i, i.elapsed)
@@ -1574,8 +1552,8 @@
 		if WorldMapFrame:IsVisible() and not IsInInstance() then --World map is open and we're not in an instance, (such as flying from zone to zone doing archaeology)
 			local C, Z = GetCurrentMapContinent(), GetCurrentMapZone()--Save current map settings.
 			SetMapToCurrentZone()--Force to right zone
-			LastZoneMapID = GetCurrentMapAreaID() --Set accurate zone area id into cache
-			LastZoneText = GetRealZoneText() --Do same with zone name.
+			LastZoneMapID = GetCurrentMapAreaID() or -1 --Set accurate zone area id into cache
+			LastZoneText = GetRealZoneText() or "" --Do same with zone name.
 			local C2, Z2 = GetCurrentMapContinent(), GetCurrentMapZone()--Get right info after we set map to right place.
 			if C2 ~= C or Z2 ~= Z then
 				SetMapZoom(C, Z)--Restore old map settings if they differed to what they were prior to forcing mapchange and user has map open.
@@ -1699,7 +1677,7 @@
 		delay = tonumber(delay or 0) or 0
 		mod = DBM:GetModByName(mod or "")
 		revision = tonumber(revision or 0) or 0
-		if mod and delay and (not mod.zones or #mod.zones == 0 or checkEntry(mod.zones, LastZoneText) or checkEntry(mod.zones, LastZoneMapID)) and (not mod.minSyncRevision or revision >= mod.minSyncRevision) then
+		if mod and delay and (not mod.zones or mod.zones[LastZoneText] or mod.zones[LastZoneMapID]) and (not mod.minSyncRevision or revision >= mod.minSyncRevision) then
 			DBM:StartCombat(mod, delay + lag, true)
 		end
 	end
@@ -3027,6 +3005,35 @@
 end
 
 
+-------------------
+--  Movie Filter --
+-------------------
+MovieFrame:HookScript("OnEvent", function(self, event, id)
+	if event == "PLAY_MOVIE" and id then
+		if DBM.Options.MovieFilters[id] == "Block" or DBM.Options.MovieFilters[id] == "OnlyFirst" and DBM.Options.MoviesSeen[id] then
+			MovieFrame_OnMovieFinished(self)
+		end
+	end
+end)
+
+function DBM:MovieFilter(mod, ...)
+	local i = 1
+	while i <= select("#", ...) do
+		local id, name, default = select(i, ...)
+		if type(default) == "string" then
+			-- id, name, defaultSetting
+			i = i + 3
+		else
+			-- id, name
+			i = i + 2
+			default = nil
+		end
+		mod:AddBoolOption(tostring(id), default == "Block", "BlockMovies")
+		-- mod:AddButton
+	end
+end
+
+
 --------------------------
 --  Boss Mod Prototype  --
 --------------------------
@@ -3106,19 +3113,22 @@
 
 function bossModPrototype:SetZone(...)
 	if select("#", ...) == 0 then
-		if self.addon and self.addon.zone and #self.addon.zone > 0 and self.addon.zoneId and #self.addon.zoneId > 0 then
 			self.zones = {}
+		if self.addon and self.addon.zone then
 			for i, v in ipairs(self.addon.zone) do
-				self.zones[#self.zones + 1] = v
+				self.zones[v] = true
 			end
+		end
+		if self.addon and self.addon.zoneId then
 			for i, v in ipairs(self.addon.zoneId) do
-				self.zones[#self.zones + 1] = v
+				self.zones[v] = true
 			end
-		else
-			self.zones = self.addon and (self.addon.zone and #self.addon.zone > 0 and self.addon.zone or self.addon.zoneId and #self.addon.zoneId > 0 and self.addon.zoneId) or {}
 		end
 	elseif select(1, ...) ~= DBM_DISABLE_ZONE_DETECTION then
-		self.zones = {...}
+		self.zones = {}
+		for i = 1, select("#", ...) do
+			self.zones[select(i, ...)] = true
+		end
 	else -- disable zone detection
 		self.zones = nil
 	end
@@ -4553,7 +4563,7 @@
 	end
 	self.combatInfo = info
 	if not self.zones then return end
-	for i, v in ipairs(self.zones) do
+	for v in pairs(self.zones) do
 		combatInfo[v] = combatInfo[v] or {}
 		table.insert(combatInfo[v], info)
 	end

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7258

Old date: 2012-02-03 21:35:06 UTC

@@ -17,6 +17,10 @@
 	"SPELL_AURA_REMOVED",
 	"SPELL_HEAL",
 	"SPELL_PERIODIC_HEAL",
+	"SPELL_DAMAGE",
+	"SPELL_MISSED",
+	"SWING_DAMAGE",
+	"SWING_MISSED",
 	"RAID_BOSS_EMOTE",
 	"UNIT_DIED"
 )
@@ -50,8 +54,6 @@
 mod:AddBoolOption("ShowShieldInfo", false)--on 25 man this is quite frankly a spammy nightmare, especially on heroic. off by default since it's really only sensible in 10 man. Besides I may be adding an alternate frame option for "grip damage needed"
 
 
-local eventFrame = CreateFrame("Frame") -- frame for high-volume CLEU events that we don't want to pipe through DBM-Core
-
 local gripTargets = {}
 local gripIcon = 6
 local corruptionActive = {}
@@ -81,9 +83,9 @@
 	local plasmaTargets = {}
 	local healed = {}
 	
-	function mod:SPELL_HEAL(args)
-		if plasmaTargets[args.destGUID] then
-			healed[args.destGUID] = healed[args.destGUID] + (args.absorbed or 0)
+	function mod:SPELL_HEAL(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlags, amount, overheal, absorbed)
+		if plasmaTargets[destGUID] then
+			healed[destGUID] = healed[destGUID] + (args.absorbed or 0)
 		end
 	end
 	mod.SPELL_PERIODIC_HEAL = mod.SPELL_HEAL
@@ -122,7 +124,6 @@
 end
 
 function mod:OnCombatStart(delay)
-	eventFrame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	if self:IsDifficulty("lfr25") then
 		warnSealArmor = mod:NewCastAnnounce(105847, 4, 34.5)
 	else
@@ -139,7 +140,6 @@
 end
 
 function mod:OnCombatEnd()
-	eventFrame:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	if self.Options.InfoFrame then
 		DBM.InfoFrame:Hide()
 	end
@@ -188,10 +188,10 @@
 end
 
 --Damage event that indicates an ooze is taking damage
---we check it's GUID to see if it's a ressurected ooze and if so remove it from table.
-function mod:SPELL_DAMAGE(hideCaster, sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag)
-	if tonumber(sourceGUID:sub(7, 10), 16) == 53889 and oozeGUIDS[sourceGUID] then--It is an ooze that died earlier. We check source instead of dest, cause then we detect all oozes once they attack someone, vs only oozes that get attacked (and missing untanked oozes)
-		oozeGUIDS[sourceGUID] = false--Remove it
+--we check its GUID to see if it's a resurrected ooze and if so remove it from table.
+function mod:SPELL_DAMAGE(sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag)
+	if oozeGUIDS[sourceGUID] and self:GetCIDFromGUID(sourceGUID) == 53889 then--It is an ooze that died earlier. We check source instead of dest, cause then we detect all oozes once they attack someone, vs only oozes that get attacked (and missing untanked oozes)
+		oozeGUIDS[sourceGUID] = true --Remove it
 		residueCount = residueCount - 1--Reduce count
 		warnResidue:Cancel()
 		if residueCount > 4 and residueCount < 13 then -- announce new count.
@@ -203,13 +203,7 @@
 mod.SWING_MISSED = mod.SPELL_DAMAGE
 mod.SWING_DAMAGE = mod.SPELL_DAMAGE
 
-eventFrame:SetScript("OnEvent", function(self, event, timestamp, combatLogEvent, ...)
-	if event == "COMBAT_LOG_EVENT_UNFILTERED" and mod[combatLogEvent] then
-		mod[combatLogEvent](mod, ...)
-	end
-end)
 
-
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(105248) then
 		--Need to check raw logs later to see if these have sourceGUIDs.

r7258 (tandanu): add SWING/SPELL_DAMAGE/MISSED based ooze tracking

tandanu — Fri, 03 Feb 2012 21:35:06 GMT

Author: tandanu
Date: Fri Feb 03 22:35:06 CET 2012
Revision: 7258

Log:

add SWING/SPELL_DAMAGE/MISSED based ooze tracking

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7257

Old date: 2012-02-03 21:21:16 UTC

@@ -49,6 +49,9 @@
 mod:AddBoolOption("SetIconOnGrip", true)
 mod:AddBoolOption("ShowShieldInfo", false)--on 25 man this is quite frankly a spammy nightmare, especially on heroic. off by default since it's really only sensible in 10 man. Besides I may be adding an alternate frame option for "grip damage needed"
 
+
+local eventFrame = CreateFrame("Frame") -- frame for high-volume CLEU events that we don't want to pipe through DBM-Core
+
 local gripTargets = {}
 local gripIcon = 6
 local corruptionActive = {}
@@ -119,6 +122,7 @@
 end
 
 function mod:OnCombatStart(delay)
+	eventFrame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	if self:IsDifficulty("lfr25") then
 		warnSealArmor = mod:NewCastAnnounce(105847, 4, 34.5)
 	else
@@ -135,6 +139,7 @@
 end
 
 function mod:OnCombatEnd()
+	eventFrame:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	if self.Options.InfoFrame then
 		DBM.InfoFrame:Hide()
 	end
@@ -184,9 +189,9 @@
 
 --Damage event that indicates an ooze is taking damage
 --we check it's GUID to see if it's a ressurected ooze and if so remove it from table.
-function mod:SPELL_DAMAGE(args)
-	if args:GetSrcCreatureID() == 53889 and oozeGUIDS[args.sourceGUID] then--It is an ooze that died earlier. We check source instead of dest, cause then we detect all oozes once they attack someone, vs only oozes that get attacked (and missing untanked oozes)
-		oozeGUIDS[args.sourceGUID] = false--Remove it
+function mod:SPELL_DAMAGE(hideCaster, sourceGUID, sourceName, sourceFlags, sourceRaidFlags, destGUID, destName, destFlags, destRaidFlag)
+	if tonumber(sourceGUID:sub(7, 10), 16) == 53889 and oozeGUIDS[sourceGUID] then--It is an ooze that died earlier. We check source instead of dest, cause then we detect all oozes once they attack someone, vs only oozes that get attacked (and missing untanked oozes)
+		oozeGUIDS[sourceGUID] = false--Remove it
 		residueCount = residueCount - 1--Reduce count
 		warnResidue:Cancel()
 		if residueCount > 4 and residueCount < 13 then -- announce new count.
@@ -198,6 +203,13 @@
 mod.SWING_MISSED = mod.SPELL_DAMAGE
 mod.SWING_DAMAGE = mod.SPELL_DAMAGE
 
+eventFrame:SetScript("OnEvent", function(self, event, timestamp, combatLogEvent, ...)
+	if event == "COMBAT_LOG_EVENT_UNFILTERED" and mod[combatLogEvent] then
+		mod[combatLogEvent](mod, ...)
+	end
+end)
+
+
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(105248) then
 		--Need to check raw logs later to see if these have sourceGUIDs.
@@ -288,4 +300,4 @@
 	elseif cid == 56341 or cid == 56575 then
 		timerSealArmor:Cancel()
 	end
-end
\ No newline at end of file
+end

r7257 (Omega): refine it more.

Omega — Fri, 03 Feb 2012 21:21:16 GMT

Author: Omega
Date: Fri Feb 03 22:21:16 CET 2012
Revision: 7257

Log:

refine it more.

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7256

Old date: 2012-02-03 21:13:21 UTC

@@ -185,7 +185,7 @@
 --Damage event that indicates an ooze is taking damage
 --we check it's GUID to see if it's a ressurected ooze and if so remove it from table.
 function mod:SPELL_DAMAGE(args)
-	if oozeGUIDS[args.sourceGUID] then--It is an ooze that died earlier
+	if args:GetSrcCreatureID() == 53889 and oozeGUIDS[args.sourceGUID] then--It is an ooze that died earlier. We check source instead of dest, cause then we detect all oozes once they attack someone, vs only oozes that get attacked (and missing untanked oozes)
 		oozeGUIDS[args.sourceGUID] = false--Remove it
 		residueCount = residueCount - 1--Reduce count
 		warnResidue:Cancel()
@@ -200,6 +200,9 @@
 
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(105248) then
+		--Need to check raw logs later to see if these have sourceGUIDs.
+		--if so remove em from table to reduce table size
+		--although it own't break anything not removing em.
 		residueCount = residueCount - 1
 		warnAbsorbedBlood:Cancel()--Just a little anti spam
 		warnAbsorbedBlood:Schedule(1.25, args.destName, args.amount or 1)

r7256 (Omega): Work in progress, remove respawned oozes from residue count

Omega — Fri, 03 Feb 2012 21:13:21 GMT

Author: Omega
Date: Fri Feb 03 22:13:21 CET 2012
Revision: 7256

Log:

Work in progress, remove respawned oozes from residue count

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7255

Old date: 2012-02-03 15:18:40 UTC

@@ -53,6 +53,7 @@
 local gripIcon = 6
 local corruptionActive = {}
 local residueCount = 0
+local oozeGUIDS = {}
 
 local function checkTendrils()
 	if not UnitDebuff("player", GetSpellInfo(109454)) and not UnitIsDeadOrGhost("player") then
@@ -125,6 +126,7 @@
 	end
 	table.wipe(gripTargets)
 	table.wipe(corruptionActive)
+	table.wipe(oozeGUIDS)
 	if self.Options.ShowShieldInfo then
 		clearPlasmaVariables()
 	end
@@ -170,7 +172,8 @@
 end
 
 function mod:SPELL_CAST_SUCCESS(args)
-	if args:IsSpellID(105219, 109371, 109372, 109373) then
+	if args:IsSpellID(105219, 109371, 109372, 109373) and not oozeGUIDS[args.sourceGUID] then
+		oozeGUIDS[args.sourceGUID] = true
 		residueCount = residueCount + 1
 		warnResidue:Cancel()
 		if residueCount > 4 and residueCount < 13 then -- announce 9 stacks (ready to eat blood!), sometimes it can be missing 2~3 stacks, announce to 12 stacks.
@@ -179,6 +182,22 @@
 	end
 end
 
+--Damage event that indicates an ooze is taking damage
+--we check it's GUID to see if it's a ressurected ooze and if so remove it from table.
+function mod:SPELL_DAMAGE(args)
+	if oozeGUIDS[args.sourceGUID] then--It is an ooze that died earlier
+		oozeGUIDS[args.sourceGUID] = false--Remove it
+		residueCount = residueCount - 1--Reduce count
+		warnResidue:Cancel()
+		if residueCount > 4 and residueCount < 13 then -- announce new count.
+			warnResidue:Schedule(2, residueCount)
+		end
+	end
+end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
+mod.SWING_MISSED = mod.SPELL_DAMAGE
+mod.SWING_DAMAGE = mod.SPELL_DAMAGE
+
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(105248) then
 		residueCount = residueCount - 1

r7255 (Omega): also, it's 7sec based on many logs.

Omega — Fri, 03 Feb 2012 15:18:40 GMT

Author: Omega
Date: Fri Feb 03 16:18:40 CET 2012
Revision: 7255

Log:

also, it's 7sec based on many logs.

Updated

trunk/DBM-Firelands/Rhyolith.lua

Action: modified

Old revision: 7254

Old date: 2012-02-03 15:16:27 UTC

@@ -76,8 +76,8 @@
 		if timerFlameStomp:GetTime() > 0 then--This only happens if it was still on CD going into phase
 			StompCountown:Cancel()
 			timerFlameStomp:Cancel()
-			StompCountown:Start(6)
-			timerFlameStomp:Start(6)
+			StompCountown:Start(7)
+			timerFlameStomp:Start(7)
 		else--Else, he uses it right away
 			StompCountown:Start(1)
 			timerFlameStomp:Start(1)

r7254 (Omega): Rhyolith update, phase 2 doesn't need a yell anymore.

Omega — Fri, 03 Feb 2012 15:16:27 GMT

Author: Omega
Date: Fri Feb 03 16:16:27 CET 2012
Revision: 7254

Log:

Rhyolith update, phase 2 doesn't need a yell anymore.

Updated

trunk/DBM-Firelands/Rhyolith.lua

Updated

trunk/DBM-Firelands/Shannox.lua

Updated

trunk/DBM-Firelands/localization.cn.lua

Updated

trunk/DBM-Firelands/localization.de.lua

Updated

trunk/DBM-Firelands/localization.en.lua

Updated

trunk/DBM-Firelands/localization.es.lua

Updated

trunk/DBM-Firelands/localization.fr.lua

Updated

trunk/DBM-Firelands/localization.kr.lua

Updated

trunk/DBM-Firelands/localization.pt.lua

Updated

trunk/DBM-Firelands/localization.ru.lua

Updated

trunk/DBM-Firelands/localization.tw.lua

trunk/DBM-Firelands/Rhyolith.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -13,11 +13,11 @@
 mod:RegisterCombat("combat")
 
 mod:RegisterEventsInCombat(
+	"SPELL_AURA_APPLIED",
 	"SPELL_AURA_APPLIED_DOSE",
 	"SPELL_CAST_START",
 	"SPELL_CAST_SUCCESS",
 	"SPELL_SUMMON",
-	"CHAT_MSG_MONSTER_YELL",
 	"UNIT_HEALTH"
 )
 
@@ -45,7 +45,7 @@
 local StompCountown			= mod:NewCountdown(30.5, 97282, false)
 
 local spamAdds = 0
-local phase = 1
+local phase2Started = false
 local spamMoltenArmor = 0
 local sparkCount = 0
 local fragmentCount = 0
@@ -63,12 +63,28 @@
 	end
 	spamAdds = 0
 	spamMoltenArmor = 0
-	phase = 1
+	phase2Started = false
 	sparkCount = 0
 	fragmentCount = 1--Fight starts out 1 cycle in so only 1 more spawns before pattern reset.
 	prewarnedPhase2 = false
 end
 
+function mod:SPELL_AURA_APPLIED(args)
+	if args:IsSpellID(99846) and not phase2Started then
+		phase2Started = true
+		warnPhase2:Show()
+		if timerFlameStomp:GetTime() > 0 then--This only happens if it was still on CD going into phase
+			StompCountown:Cancel()
+			timerFlameStomp:Cancel()
+			StompCountown:Start(6)
+			timerFlameStomp:Start(6)
+		else--Else, he uses it right away
+			StompCountown:Start(1)
+			timerFlameStomp:Start(1)
+		end
+	end
+end
+
 function mod:SPELL_AURA_APPLIED_DOSE(args)
 	if args:IsSpellID(98255, 101157, 101158, 101159) and self:GetCIDFromGUID(args.destGUID) == 52558 and args.amount > 10 and GetTime() - spamMoltenArmor > 5 then
 		warnMoltenArmor:Show(args.destName, args.amount)
@@ -82,7 +98,7 @@
 	elseif args:IsSpellID(97282, 100411, 100968, 100969) then
 		warnFlameStomp:Show()
 		specWarnFlameStomp:Show()
-		if phase == 1 then
+		if not phase2Started then
 			timerFlameStomp:Start()
 			StompCountown:Start(30.5)
 		else--13sec cd in phase 2
@@ -125,17 +141,6 @@
 	end
 end
 
-function mod:CHAT_MSG_MONSTER_YELL(msg)
-	if msg == L.yellPhase2 or msg:find(L.yellPhase2) then
-		StompCountown:Cancel()
-		timerFlameStomp:Cancel()
-		StompCountown:Start(6)
-		timerFlameStomp:Start(6)
-		warnPhase2:Show()
-		phase = 2
-	end
-end
-
 function mod:UNIT_HEALTH(uId)
 	if self:GetUnitCreatureId(uId) == 52558 then
 		local h = UnitHealth(uId) / UnitHealthMax(uId) * 100

trunk/DBM-Firelands/Shannox.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -111,10 +111,12 @@
 	end
 end
 
+--This fails if you're already incombat before pulling boss, my transcriptor bugged and didn't log it so I don't know why, because the boss still engaged, registered event, and detected kill fine.
+--I can only speculate that somehow he wasn't boss1 but maybe 2-4? Will be hard to reproduce since it's not customary to purposely pull shannox with trash.
 function mod:TrapHandler(SpellID, isTank)
 	trapScansDone = trapScansDone + 1
 	if UnitExists("boss1target") then--Better way to check if target exists and prevent nil errors at same time, without stopping scans from starting still. so even if target is nil, we stil do more checks instead of just blowing off a trap warning.
-		local targetname = UnitName("boss1target")
+		local targetname = self:GetBossTarget(53691)
 		if UnitDetailedThreatSituation("boss1target", "boss1") and not isTank then--He's targeting his highest threat target.
 			if trapScansDone < 12 then--Make sure no infinite loop.
 				self:ScheduleMethod(0.05, "TrapHandler", SpellID)--Check multiple times to be sure it's not on something other then tank.

trunk/DBM-Firelands/localization.cn.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -39,7 +39,6 @@
 })
 
 L:SetMiscLocalization({
-	yellPhase2			= "我已经沉睡了无数的时光，现在却被这些血肉生灵所扰……你们将燃烧殆尽！"
 })
 
 ---------------

trunk/DBM-Firelands/localization.de.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -35,7 +35,6 @@
 })
 
 L:SetMiscLocalization({
-	yellPhase2			= "Äonen habe ich ungestört durchgeschlafen… jetzt das… Fleischlinge, Ihr werdet BRENNEN!"
 })
 
 ---------------

trunk/DBM-Firelands/localization.en.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -34,7 +34,6 @@
 })
 
 L:SetMiscLocalization({
-	yellPhase2			= "Eons I have slept undisturbed... Now this... Creatures of flesh, now you will BURN!"
 })
 
 ---------------

trunk/DBM-Firelands/localization.es.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -35,7 +35,6 @@
 })
 
 L:SetMiscLocalization({
-	yellPhase2			= "He dormido durante eones sin ser molestado... Y ahora... Seres de carne, ¡ARDERÉIS!"
 })
 
 ---------------

trunk/DBM-Firelands/localization.fr.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -34,7 +34,6 @@
 })
 
 L:SetMiscLocalization({
-	yellPhase2			= "Je dors en paix depuis des éons… Et maintenant ça… Créatures de chair, vous allez BRÛLER !"
 })
 
 ---------------

trunk/DBM-Firelands/localization.kr.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -35,7 +35,6 @@
 })
 
 L:SetMiscLocalization({
-	yellPhase2			= "긴 세월 내 잠을 방해한 이가 없었건만... 그래... 이 살덩어리들아. 네놈들을 불태워 주마!"
 })
 
 ---------------

trunk/DBM-Firelands/localization.pt.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -42,7 +42,6 @@
 })
 
 L:SetMiscLocalization({
-	yellPhase2			= "Eons I have slept undisturbed... Now this... Creatures of flesh, now you will BURN!"
 })
 
 ---------------

trunk/DBM-Firelands/localization.ru.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -35,7 +35,6 @@
 })
 
 L:SetMiscLocalization({
-	yellPhase2			= "Целую вечность я спокойно спал… Маленькие кусочки мяса… Вы СГОРИТЕ!"
 })
 
 ---------------

trunk/DBM-Firelands/localization.tw.lua

Action: modified

Old revision: 7253

Old date: 2012-02-03 10:37:07 UTC

@@ -35,7 +35,6 @@
 })
 
 L:SetMiscLocalization({
-	yellPhase2			= "數萬年來我平靜地睡著...現在居然這樣...血肉之軀，你們給我燒吧!"
 })
 
 ---------------

r7253 (oscarucb): ensure DBM-Arrow calls SetMapToCurrentZone at least once nested zone maps like in DS can confuse the existing heuristic

oscarucb — Fri, 03 Feb 2012 10:37:07 GMT

Author: oscarucb
Date: Fri Feb 03 11:37:07 CET 2012
Revision: 7253

Log:

ensure DBM-Arrow calls SetMapToCurrentZone at least once
nested zone maps like in DS can confuse the existing heuristic

Updated

trunk/DBM-Core/DBM-Arrow.lua

Action: modified

Old revision: 7252

Old date: 2012-02-01 18:37:58 UTC

@@ -197,6 +197,7 @@
 ----------------------
 local function show(runAway, x, y, distance, time)
 	local player
+	SetMapToCurrentZone()
 	if type(x) == "string" then
 		player, hideDistance, hideTime = x, y, hideDistance
 	end

r7252 (ebmor): deDE update (Omen)

ebmor — Wed, 01 Feb 2012 18:37:58 GMT

Author: ebmor
Date: Wed Feb 01 19:37:58 CET 2012
Revision: 7252

Log:

deDE update (Omen)

Updated

trunk/DBM-WorldEvents/localization.de.lua

Action: modified

Old revision: 7251

Old date: 2012-02-01 14:33:22 UTC

@@ -1,6 +1,15 @@
 if GetLocale() ~= "deDE" then return end
 local L
 
+------------
+--  Omen  --
+------------
+L = DBM:GetModLocalization("Omen")
+
+L:SetGeneralLocalization({
+	name = "Omen"
+})
+
 -----------------------
 --  Apothecary Trio  --
 -----------------------

r7251 (arta): Dont shot statistics on PvP pages

arta — Wed, 01 Feb 2012 14:33:22 GMT

Author: arta
Date: Wed Feb 01 15:33:22 CET 2012
Revision: 7251

Log:

Dont shot statistics on PvP pages

Updated

trunk/DBM-GUI/DBM-GUI.lua

Action: modified

Old revision: 7250

Old date: 2012-02-01 01:05:47 UTC

@@ -1981,6 +1981,8 @@
 		if not panel then 
 			error("Panel is nil", 2)
 		end
+		if addon.modId == "DBM-PvP" then return	end -- no need to create a stats page for PvP modules
+
 		local ptext = panel:CreateText(L.BossModLoaded:format(subtab and addon.subTabs[subtab] or addon.name), nil, nil, GameFontNormal)
 		ptext:SetPoint('TOPLEFT', panel.frame, "TOPLEFT", 10, -10)

r7250 (nbluewiz): # Rhyolith : Reset Stomp timer on phase 2 start.

nbluewiz — Wed, 01 Feb 2012 01:05:47 GMT

Author: nbluewiz
Date: Wed Feb 01 02:05:47 CET 2012
Revision: 7250

Log:

# Rhyolith : Reset Stomp timer on phase 2 start.

Updated

trunk/DBM-Firelands/Rhyolith.lua

Action: modified

Old revision: 7249

Old date: 2012-01-31 17:46:20 UTC

@@ -127,6 +127,10 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.yellPhase2 or msg:find(L.yellPhase2) then
+		StompCountown:Cancel()
+		timerFlameStomp:Cancel()
+		StompCountown:Start(6)
+		timerFlameStomp:Start(6)
 		warnPhase2:Show()
 		phase = 2
 	end

r7249 (Snamor): esES update

Snamor — Tue, 31 Jan 2012 17:46:20 GMT

Author: Snamor
Date: Tue Jan 31 18:46:20 CET 2012
Revision: 7249

Log:

esES update

Updated

trunk/DBM-WorldEvents/DBM-WorldEvents.toc

Updated

trunk/DBM-WorldEvents/localization.es.lua

trunk/DBM-WorldEvents/DBM-WorldEvents.toc

Action: modified

Old revision: 7248

Old date: 2012-01-31 12:14:23 UTC

@@ -19,7 +19,7 @@
 ## X-DBM-Mod-SubCategories-koKR: 연간 이벤트,다크문 축제
 ## X-DBM-Mod-SubCategories-zhTW: 節慶,暗月馬戲團
 ## X-DBM-Mod-SubCategories-zhCN: Holidays,Darkmoon Faire
-## X-DBM-Mod-SubCategories-esES: Holidays,Darkmoon Faire
+## X-DBM-Mod-SubCategories-esES: Fiestas,Feria de la Luna Negra
 ## X-DBM-Mod-SubCategories-esMX: Holidays,Darkmoon Faire
 ## X-DBM-Mod-SubCategories-ptBR: Holidays,Darkmoon Faire
 ## X-DBM-Mod-Name: World Events

trunk/DBM-WorldEvents/localization.es.lua

Action: modified

Old revision: 7248

Old date: 2012-01-31 12:14:23 UTC

@@ -2,6 +2,15 @@
 
 local L
 
+------------
+--  Omen  --
+------------
+L = DBM:GetModLocalization("Omen")
+
+L:SetGeneralLocalization({
+	name = "Omen"
+})
+
 -----------------------
 --  Apothecary Trio  --
 -----------------------

r7248 (ultrashining): zhTW update

ultrashining — Tue, 31 Jan 2012 12:14:23 GMT

Author: ultrashining
Date: Tue Jan 31 13:14:23 CET 2012
Revision: 7248

Log:

zhTW update

Updated

trunk/DBM-WorldEvents/localization.tw.lua

Action: modified

Old revision: 7247

Old date: 2012-01-31 08:13:49 UTC

@@ -2,6 +2,15 @@
 
 local L
 
+------------
+--  Omen  --
+------------
+L = DBM:GetModLocalization("Omen")
+
+L:SetGeneralLocalization({
+	name = "年獸"
+})
+
 -----------------------
 --  Apothecary Trio  --
 -----------------------

r7247 (nbluewiz): koKR update

nbluewiz — Tue, 31 Jan 2012 08:13:49 GMT

Author: nbluewiz
Date: Tue Jan 31 09:13:49 CET 2012
Revision: 7247

Log:

koKR update

Updated

trunk/DBM-WorldEvents/localization.kr.lua

Action: modified

Old revision: 7246

Old date: 2012-01-31 08:10:41 UTC

@@ -2,6 +2,15 @@
 
 local L
 
+------------
+--  Omen  --
+------------
+L = DBM:GetModLocalization("Omen")
+
+L:SetGeneralLocalization({
+	name = "오멘"
+})
+
 -----------------------
 --  Apothecary Trio  --
 -----------------------

r7246 (nbluewiz): # Yorsahj : revert Purples spec warn spell id.

nbluewiz — Tue, 31 Jan 2012 08:10:41 GMT

Author: nbluewiz
Date: Tue Jan 31 09:10:41 CET 2012
Revision: 7246

Log:

# Yorsahj : revert Purples spec warn spell id.

Updated

trunk/DBM-DragonSoul/Yorsahj.lua

Action: modified

Old revision: 7245

Old date: 2012-01-31 04:03:41 UTC

@@ -28,7 +28,7 @@
 local specWarnOozes			= mod:NewSpecialWarningSpell("ej3978")
 local specWarnVoidBolt		= mod:NewSpecialWarningStack(108383, mod:IsTank(), 3)
 local specWarnManaVoid		= mod:NewSpecialWarningSpell(105530, mod:IsManaUser())
-local specWarnPurple		= mod:NewSpecialWarningSpell(105171, mod:IsTank() or mod:IsHealer())
+local specWarnPurple		= mod:NewSpecialWarningSpell(104896, mod:IsTank() or mod:IsHealer())
 
 local timerOozesCD			= mod:NewNextTimer(90, "ej3978")
 local timerOozesActive		= mod:NewTimer(7, "timerOozesActive", 16372) -- varies (7.0~8.5)

r7245 (Omega): Long overdo, i meant to do this sooner. Use EJ for fragments and sparks on rhyolith to shorten the announce/bar text (spellids have "summon" in them, too much text)

Omega — Tue, 31 Jan 2012 04:03:41 GMT

Author: Omega
Date: Tue Jan 31 05:03:41 CET 2012
Revision: 7245

Log:

Long overdo, i meant to do this sooner. Use EJ for fragments and sparks on rhyolith to shorten the announce/bar text (spellids have "summon" in them, too much text)
Change ragnaros adds to new generic and reduce locals.

Updated

trunk/DBM-Firelands/Ragnaros.lua

Updated

trunk/DBM-Firelands/Rhyolith.lua

Updated

trunk/DBM-Firelands/localization.cn.lua

Updated

trunk/DBM-Firelands/localization.de.lua

Updated

trunk/DBM-Firelands/localization.en.lua

Updated

trunk/DBM-Firelands/localization.es.lua

Updated

trunk/DBM-Firelands/localization.fr.lua

Updated

trunk/DBM-Firelands/localization.kr.lua

Updated

trunk/DBM-Firelands/localization.pt.lua

Updated

trunk/DBM-Firelands/localization.ru.lua

Updated

trunk/DBM-Firelands/localization.tw.lua

trunk/DBM-Firelands/Ragnaros.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -40,7 +40,7 @@
 local warnMoltenSeed		= mod:NewSpellAnnounce(98520, 4)--Phase 2 only ability
 mod:AddBoolOption("warnSeedsLand", false, "announce")
 local warnSplittingBlow		= mod:NewAnnounce("warnSplittingBlow", 3, 100877)
-local warnSonsLeft			= mod:NewAnnounce("WarnRemainingAdds", 2, 99014)
+local warnSonsLeft			= mod:NewAddsLeftAnnounce("ej2637", 2, 99014)
 local warnEngulfingFlame	= mod:NewAnnounce("warnEngulfingFlame", 4, 99171)
 local warnPhase3Soon		= mod:NewPrePhaseAnnounce(3, 3)
 local warnBlazingHeat		= mod:NewTargetAnnounce(100460, 4)--Second transition adds ability.

trunk/DBM-Firelands/Rhyolith.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -25,8 +25,8 @@
 local warnFlameStomp		= mod:NewSpellAnnounce(97282, 3, nil, mod:IsMelee())--According to journal only hits players within 20 yards of him, so melee by default?
 local warnMoltenArmor		= mod:NewStackAnnounce(98255, 4, nil, mod:IsTank() or mod:IsHealer())	-- Would this be nice if we could show this in the infoFrame? (changed defaults to tanks/healers, if you aren't either it doesn't concern you unless you find shit to stand in)
 local warnDrinkMagma		= mod:NewSpellAnnounce(98034, 4)	-- if you "kite" him to close to magma
-local warnFragments			= mod:NewSpellAnnounce(98136, 2)
-local warnShard				= mod:NewCountAnnounce(98552, 3)
+local warnFragments			= mod:NewSpellAnnounce("ej2531", 2, 98136)
+local warnShard				= mod:NewCountAnnounce("ej2532", 3, 98552)
 local warnMagmaFlow			= mod:NewSpellAnnounce(97225, 4)
 local warnPhase2Soon		= mod:NewPrePhaseAnnounce(2, 2)
 local warnPhase2			= mod:NewPhaseAnnounce(2, 3)
@@ -34,8 +34,8 @@
 local specWarnMagmaFlow		= mod:NewSpecialWarningSpell(97225, nil, nil, nil, true)
 local specWarnFlameStomp	= mod:NewSpecialWarningSpell(97282, false)
 
-local timerSparkCD			= mod:NewNextCountTimer(22.5, 98552)
-local timerFragmentCD		= mod:NewNextTimer(22.5, 98136)
+local timerFragmentCD		= mod:NewNextTimer(22.5, "ej2531", nil, nil, nil, 98136)
+local timerSparkCD			= mod:NewNextCountTimer(22.5, "ej2532", nil, nil, nil, 98552)
 local timerHeatedVolcano	= mod:NewNextTimer(25.5, 98493)
 local timerFlameStomp		= mod:NewNextTimer(30.5, 97282)
 local timerSuperheated		= mod:NewNextTimer(10, 101305)		--Add the 10 second party in later at some point if i remember to actually log it better

trunk/DBM-Firelands/localization.cn.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -165,7 +165,6 @@
 L:SetWarningLocalization({
 	warnSplittingBlow		= "%s在%s",--Spellname in Location
 	warnEngulfingFlame		= "%s在%s",--Spellname in Location
-	WarnRemainingAdds		= "剩余%d个烈焰之子",
 	warnEmpoweredSulf		= "%s - 5秒后施放"--The spell has a 5 second channel, but tooltip doesn't reflect it so cannot auto localize
 })
 
@@ -178,7 +177,6 @@
 	warnSplittingBlow			= "警报：$spell:100877的位置",
 	warnEngulfingFlame			= "警报：$spell:99171",
 	WarnEngulfingFlameHeroic	= "警报：英雄模式下$spell:99171的位置",
-	WarnRemainingAdds			= "警报：烈焰之子剩余数量",
 	warnSeedsLand				= "警报与计时条：$spell:98520落地，而非施法警报",
 	warnEmpoweredSulf			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast:format(100997, GetSpellInfo(100997)),
 	timerRageRagnaros			= DBM_CORE_AUTO_TIMER_OPTIONS.cast:format(101109, GetSpellInfo(101109)),

trunk/DBM-Firelands/localization.de.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -162,7 +162,6 @@
 	warnRageRagnarosSoon	= "%s auf %s in 5 Sekunden",--Spellname on targetname
 	warnSplittingBlow		= "%s im %s",--Spellname in Location
 	warnEngulfingFlame		= "%s im %s",--Spellname in Location
-	WarnRemainingAdds		= "%d Söhne der Flamme verbleiben",
 	warnEmpoweredSulf		= "%s in 5 Sekunden"
 })
 
@@ -176,7 +175,6 @@
 	warnSplittingBlow			= "Zeige Warnungen für Position des $spell:100877",
 	warnEngulfingFlame			= "Zeige Warnungen für Position der $spell:99171",
 	WarnEngulfingFlameHeroic	= "Zeige Warnungen für Position der $spell:99171 auf Heroisch",
-	WarnRemainingAdds			= "Verkünde die Anzahl der verbleibenden Söhne der Flamme",
 	warnSeedsLand				= "Zeige Warnung/Timer für Landung der $spell:98520\n(anstatt Erzeugung)",
 	warnEmpoweredSulf			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast:format(100997, GetSpellInfo(100997)),
 	timerRageRagnaros			= DBM_CORE_AUTO_TIMER_OPTIONS.cast:format(101109, GetSpellInfo(101109)),

trunk/DBM-Firelands/localization.en.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -161,7 +161,6 @@
 	warnRageRagnarosSoon	= "%s on %s in 5 sec",--Spellname on targetname
 	warnSplittingBlow		= "%s in %s",--Spellname in Location
 	warnEngulfingFlame		= "%s in %s",--Spellname in Location
-	WarnRemainingAdds		= "%d Sons of Flame remaining",
 	warnEmpoweredSulf		= "%s in 5 sec"--The spell has a 5 second channel, but tooltip doesn't reflect it so cannot auto localize
 })
 
@@ -175,7 +174,6 @@
 	warnSplittingBlow			= "Show location warnings for $spell:100877",
 	warnEngulfingFlame			= "Show location warnings for $spell:99171",
 	WarnEngulfingFlameHeroic	= "Show location warnings for $spell:99171 on heroic",
-	WarnRemainingAdds			= "Show warning for how many Sons of Flame remain",
 	warnSeedsLand				= "Show warning/timer for $spell:98520 landing instead of seed casts.",
 	warnEmpoweredSulf			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast:format(100997, GetSpellInfo(100997)),
 	timerRageRagnaros			= DBM_CORE_AUTO_TIMER_OPTIONS.cast:format(101109, GetSpellInfo(101109)),

trunk/DBM-Firelands/localization.es.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -162,7 +162,6 @@
 	warnRageRagnarosSoon	= "%s en %s en 5 seg",
 	warnSplittingBlow		= "%s en %s",
 	warnEngulfingFlame		= "%s en %s",
-	WarnRemainingAdds		= "%d Hijos de la Llama restantes",
 	warnEmpoweredSulf		= "%s en 5 seg"
 })
 
@@ -176,7 +175,6 @@
 	warnSplittingBlow	= "Mostrar aviso para $spell:100877",
 	warnEngulfingFlame	= "Mostrar aviso para $spell:99171",
 	WarnEngulfingFlameHeroic	= "Mostrar avisos de localización para $spell:99171 en heroico",
-	WarnRemainingAdds	= "Mostrar aviso para el número de Hijos de la Llama restantes",
 	warnSeedsLand		= "Mostrar aviso/tiempo para el aterrizaje de $spell:98520 en lugar de los casteos.",
 	warnEmpoweredSulf			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast:format(100997, GetSpellInfo(100997)),
 	timerRageRagnaros			= DBM_CORE_AUTO_TIMER_OPTIONS.cast:format(101109, GetSpellInfo(101109)),

trunk/DBM-Firelands/localization.fr.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -161,7 +161,6 @@
 	warnRageRagnarosSoon	= "%s sur %s dans 5 sec.",--Spellname on targetname
 	warnSplittingBlow		= "%s %s",--Spellname in Location
 	warnEngulfingFlame		= "%s %s",--Spellname in Location
-	WarnRemainingAdds		= "%d Fils des flammes restants",
 	warnAggro				= "Vous avez l'aggro d'un Elémentaire du magma",
 	warnNoAggro				= "Vous n'avez pas l'aggro d'un Elémentaire du magma",
 	warnEmpoweredSulf		= "%s dans 5 sec."--The spell has a 5 second channel, but tooltip doesn't reflect it so cannot auto localize
@@ -177,7 +176,6 @@
 	warnSplittingBlow			= "Alerte concernant $spell:100877",
 	warnEngulfingFlame			= "Alerte de position concernant $spell:99171",
 	WarnEngulfingFlameHeroic	= "Alerte de position concernant $spell:99171 en héroïque",
-	WarnRemainingAdds			= "Alerte indiquant le nombre de Fils des flammes restants",
 	warnSeedsLand				= "Alerte/Délai concernant l'impact de $spell:98520 au lieu des incant. de graînes",
 	ElementalAggroWarn			= "Alerte indiquant si vous avez ou non l'aggro d'un Elém. du magma",
 	warnEmpoweredSulf			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast:format(100997, GetSpellInfo(100997)),

trunk/DBM-Firelands/localization.kr.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -162,7 +162,6 @@
 	warnRageRagnarosSoon	= "5초 후 %s : %s",
 	warnSplittingBlow		= "%s (%s)",
 	warnEngulfingFlame		= "%s (%s)",
-	WarnRemainingAdds		= "남은 피조물: %d",
 	warnEmpoweredSulf		= "5초 후 %s"
 })
 
@@ -176,7 +175,6 @@
 	warnSplittingBlow			= "$spell:100877 위치 알림 보기",
 	warnEngulfingFlame			= "$spell:99171 알림 보기",
 	WarnEngulfingFlameHeroic	= "영웅 난이도에서 $spell:99171 위치 알림 보기",
-	WarnRemainingAdds			= "사잇단계에서 남은 화염의 피조물 알림 보기",
 	warnSeedsLand				= "$spell:98520 주문이 시전될 때가 아니라 착지되는 시간에 맞는 알림/바 보기",
 	warnEmpoweredSulf			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast:format(100997, GetSpellInfo(100997)),
 	timerRageRagnaros			= DBM_CORE_AUTO_TIMER_OPTIONS.cast:format(101109, GetSpellInfo(101109)),

trunk/DBM-Firelands/localization.pt.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -169,7 +169,6 @@
 	warnRageRagnarosSoon	= "%s em %s em 5 seg",--Spellname on targetname
 	warnSplittingBlow		= "%s em %s",--Spellname in Location
 	warnEngulfingFlame		= "%s em %s",--Spellname in Location
-	WarnRemainingAdds		= "%d Filhos das Chamas restantes",
 	warnEmpoweredSulf		= "%s em 5 seg"--The spell has a 5 second channel, but tooltip doesn't reflect it so cannot auto localize
 })
 
@@ -183,7 +182,6 @@
 	warnSplittingBlow			= "Exibir avisos para local de $spell:100877",
 	warnEngulfingFlame			= "Exibir avisos para local de $spell:99171",
 	WarnEngulfingFlameHeroic	= "Exibir avisos para local de $spell:99171 (modo heróico)",
-	WarnRemainingAdds			= "Exibir aviso sobre quantos Filhos das Chamas restam",
 	warnSeedsLand				= "Exibir aviso/cronógrafo para queda de $spell:98520 ao invés do lançamento",
 	warnEmpoweredSulf			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast:format(100997, GetSpellInfo(100997)),
 	timerRageRagnaros			= DBM_CORE_AUTO_TIMER_OPTIONS.cast:format(101109, GetSpellInfo(101109)),

trunk/DBM-Firelands/localization.ru.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -162,7 +162,6 @@
 	warnRageRagnarosSoon	= "%s на %s через 5 секунд",--Spellname on targetname
 	warnSplittingBlow		= "%s %s",--Spellname in Location
 	warnEngulfingFlame		= "%s %s",--Spellname in Location
-	WarnRemainingAdds		= "Осталось элементалей: %d",
 	warnEmpoweredSulf		= "%s черещ 5 секунд"--The spell has a 5 second channel, but tooltip doesn't reflect it so cannot auto localize
 })
 
@@ -176,7 +175,6 @@
 	warnSplittingBlow			= "Предупреждение для $spell:100877",
 	warnEngulfingFlame			= "Предупреждение для $spell:99171",
 	WarnEngulfingFlameHeroic	= "Предупреждение о появлении $spell:99171 (в героическом режиме)",
-	WarnRemainingAdds			= "Показывать количество оставшихся элементалей",
 	warnSeedsLand				= "Отсчитывать время до появления $spell:98520, а не до их появления в воздухе",
 	warnEmpoweredSulf			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast:format(100997, GetSpellInfo(100997)),
 	timerRageRagnaros			= DBM_CORE_AUTO_TIMER_OPTIONS.cast:format(101109, GetSpellInfo(101109)),

trunk/DBM-Firelands/localization.tw.lua

Action: modified

Old revision: 7244

Old date: 2012-01-31 03:44:17 UTC

@@ -162,7 +162,6 @@
 	warnRageRagnarosSoon	= "%s在%s在5秒後",
 	warnSplittingBlow		= "%s在%s",
 	warnEngulfingFlame		= "%s在%s",
-	WarnRemainingAdds		= "剩下%d個烈焰之子",
 	warnAggro				= "你為熔岩煉獄的目標!",
 	warnNoAggro				= "你沒有熔岩煉獄的仇恨",
 	warnEmpoweredSulf		= "%s在5秒後施放"
@@ -178,7 +177,6 @@
 	warnSplittingBlow			= "為$spell:100877的位置顯示警告",
 	warnEngulfingFlame			= "為$spell:99171的位置顯示警告",
 	WarnEngulfingFlameHeroic	= "為$spell:99171的位置顯示警告(英雄模式)",
-	WarnRemainingAdds			= "為剩餘的烈焰之子顯示警告",
 	warnSeedsLand				= "為$spell:98520落地而非熔岩晶粒施放顯示警告/計時器",
 	warnEmpoweredSulf			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast:format(100997, GetSpellInfo(100997)),
 	timerRageRagnaros			= DBM_CORE_AUTO_TIMER_OPTIONS.cast:format(101109, GetSpellInfo(101109)),

r7244 (Omega): might work better if i actually load it

Omega — Tue, 31 Jan 2012 03:44:17 GMT

Author: Omega
Date: Tue Jan 31 04:44:17 CET 2012
Revision: 7244

Log:

might work better if i actually load it

Updated

trunk/DBM-WorldEvents/DBM-WorldEvents.toc

Action: modified

Old revision: 7243

Old date: 2012-01-31 03:38:07 UTC

@@ -41,6 +41,7 @@
 localization.es.lua
 localization.cn.lua
 localization.pt.lua
+Holidays\Omen.lua
 Holidays\ApothecaryTrio.lua
 Holidays\Ahune.lua
 Holidays\CorenDirebrew.lua

r7243 (Omega): Omen boss, just cause.

Omega — Tue, 31 Jan 2012 03:38:07 GMT

Author: Omega
Date: Tue Jan 31 04:38:07 CET 2012
Revision: 7243

Log:

Omen boss, just cause.

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-DragonSoul/Yorsahj.lua

Updated

trunk/DBM-WorldEvents/Holidays/Greench.lua

Added

trunk/DBM-WorldEvents/Holidays/Omen.lua

Updated

trunk/DBM-WorldEvents/localization.en.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7242

Old date: 2012-01-31 02:42:26 UTC

@@ -1516,7 +1516,7 @@
 					break
 				end
 			end
-		elseif (cId == 55003 or cId == 54499) and not DBM:GetModByName("Greench") then--The Abominable Greench (Winter Veil world boss)
+		elseif (cId == 55003 or cId == 54499 or cId == 15467 or cId == 15466) and not DBM:GetModByName("Greench") then--The Abominable Greench & his helpers (Winter Veil world boss), Omen & his minions (Lunar Festival world boss)
 			for i, v in ipairs(DBM.AddOns) do
 				if v.modId == "DBM-WorldEvents" then
 					DBM:LoadMod(v)
@@ -1546,7 +1546,7 @@
 					break
 				end
 			end
-		elseif (cId == 55003 or cId == 54499) and not DBM:GetModByName("Greench") then--The Abominable Greench & his helpers (Winter Veil world boss)
+		elseif (cId == 55003 or cId == 54499 or cId == 15467 or cId == 15466) and not DBM:GetModByName("Greench") then--The Abominable Greench & his helpers (Winter Veil world boss), Omen & his minions (Lunar Festival world boss)
 			for i, v in ipairs(DBM.AddOns) do
 				if v.modId == "DBM-WorldEvents" then
 					DBM:LoadMod(v)

trunk/DBM-DragonSoul/Yorsahj.lua

Action: modified

Old revision: 7242

Old date: 2012-01-31 02:42:26 UTC

@@ -134,7 +134,7 @@
 		if #oozesHitTable == expectedOozes then
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
-		specWarnPurple:Show()
+		specWarnPurple:Show()--We warn here to make sure everyone is topped off and things like healing rain are not on ground.
 	elseif args:IsSpellID(105027) and args:GetDestCreatureID() == 55312 then--Blue
 		table.insert(oozesHitTable, L.Blue)
 		if #oozesHitTable == expectedOozes then

trunk/DBM-WorldEvents/Holidays/Greench.lua

Action: modified

Old revision: 7242

Old date: 2012-01-31 02:42:26 UTC

@@ -2,7 +2,7 @@
 local L		= mod:GetLocalizedStrings()
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
-mod:SetCreatureID(54499)--He has multiple IDs, sigh.
+mod:SetCreatureID(54499)
 mod:SetModelID(39021)
 mod:SetZone(24)--Hillsbread Foothills

trunk/DBM-WorldEvents/Holidays/Omen.lua

Action: added

Old revision: 0

Old date:

@@ -0,0 +1,49 @@
+local mod	= DBM:NewMod("Omen", "DBM-WorldEvents", 1)
+local L		= mod:GetLocalizedStrings()
+
+mod:SetRevision(("$Revision: 7125 $"):sub(12, -3))
+mod:SetCreatureID(15467)
+mod:SetModelID(15879)
+mod:SetZone(241)--Moonglade
+
+mod:RegisterCombat("combat")
+
+mod:RegisterEvents(
+	"SPELL_CAST_SUCCESS",
+	"SPELL_PERIODIC_DAMAGE",
+	"SPELL_PERIODIC_MISS"
+)
+
+local warnCleave				= mod:NewSpellAnnounce(104903, 2)
+local warnStarfall				= mod:NewSpellAnnounce(26540, 3)
+
+local specWarnStarfall			= mod:NewSpecialWarningMove(26540)
+
+local timerCleaveCD				= mod:NewCDTimer(8.5, 104903)
+local timerStarfallCD			= mod:NewCDTimer(15, 26540)
+
+function mod:OnCombatStart(delay)
+	timerCleaveCD:Start(10.5-delay)--Consistent?
+	timerStarfallCD:Start(11-delay)--^?
+end
+
+function mod:SPELL_CAST_SUCCESS(args)
+	if args:IsSpellID(104903) then
+		warnCleave:Show()
+		timerCleaveCD:Start()
+	elseif args:IsSpellID(26540) then
+		warnStarfall:Show()
+		timerStarfallCD:Start()
+	end
+end
+
+do 
+	local antiSpam = 0
+	function mod:SPELL_PERIODIC_DAMAGE(args)
+		if args:IsSpellID(26540) and args:IsPlayer() and GetTime() - antiSpam > 3 then
+			specWarnStarfall:Show()
+			antiSpam = GetTime()
+		end
+	end
+	mod.SPELL_PERIODIC_MISS = mod.SPELL_PERIODIC_DAMAGE
+end

trunk/DBM-WorldEvents/localization.en.lua

Action: modified

Old revision: 7242

Old date: 2012-01-31 02:42:26 UTC

@@ -1,5 +1,14 @@
 local L
 
+------------
+--  Omen  --
+------------
+L = DBM:GetModLocalization("Omen")
+
+L:SetGeneralLocalization({
+	name = "Omen"
+})
+
 -----------------------
 --  Apothecary Trio  --
 -----------------------

r7242 (Omega): move special warn purple back to ooze though. it's important to pre hot up the tanks before debuff goes out, not when it goes out.

Omega — Tue, 31 Jan 2012 02:42:26 GMT

Author: Omega
Date: Tue Jan 31 03:42:26 CET 2012
Revision: 7242

Log:

move special warn purple back to ooze though. it's important to pre hot up the tanks before debuff goes out, not when it goes out.

Updated

trunk/DBM-DragonSoul/Yorsahj.lua

Action: modified

Old revision: 7241

Old date: 2012-01-31 02:35:14 UTC

@@ -105,7 +105,6 @@
 	elseif args:IsSpellID(105171) then-- this spellid is debuff spellid(10h, 25h). damaging spellid is different. so added only 1 spellids.
 		timerDeepCorruption:Start()
 		warnDeepCorruption:Show()
-		specWarnPurple:Show()
 	end
 end
 
@@ -135,6 +134,7 @@
 		if #oozesHitTable == expectedOozes then
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
+		specWarnPurple:Show()
 	elseif args:IsSpellID(105027) and args:GetDestCreatureID() == 55312 then--Blue
 		table.insert(oozesHitTable, L.Blue)
 		if #oozesHitTable == expectedOozes then

r7241 (nbluewiz): # Yorsahj : added Deep Corruption stuff (purple debuff).

nbluewiz — Tue, 31 Jan 2012 02:35:14 GMT

Author: nbluewiz
Date: Tue Jan 31 03:35:14 CET 2012
Revision: 7241

Log:

# Yorsahj : added Deep Corruption stuff (purple debuff).

Updated

trunk/DBM-DragonSoul/Yorsahj.lua

Action: modified

Old revision: 7240

Old date: 2012-01-31 00:06:32 UTC

@@ -23,11 +23,12 @@
 local warnOozesHit		= mod:NewAnnounce("warnOozesHit", 3, 16372)
 local warnVoidBolt		= mod:NewStackAnnounce(108383, 3, nil, mod:IsTank() or mod:IsHealer())
 local warnManaVoid		= mod:NewSpellAnnounce(105530, 3)
+local warnDeepCorruption	= mod:NewSpellAnnounce(105171, 4)
 
 local specWarnOozes		= mod:NewSpecialWarningSpell("ej3978")
 local specWarnVoidBolt	= mod:NewSpecialWarningStack(108383, mod:IsTank(), 3)
 local specWarnManaVoid	= mod:NewSpecialWarningSpell(105530, mod:IsManaUser())
-local specWarnPurple	= mod:NewSpecialWarningSpell(110748, mod:IsTank() or mod:IsHealer())
+local specWarnPurple		= mod:NewSpecialWarningSpell(105171, mod:IsTank() or mod:IsHealer())
 
 local timerOozesCD		= mod:NewNextTimer(90, "ej3978")
 local timerOozesActive	= mod:NewTimer(7, "timerOozesActive", 16372) -- varies (7.0~8.5)
@@ -35,6 +36,7 @@
 local timerSearingCD	= mod:NewNextTimer(6, 108358)--Red ooze aoe
 local timerVoidBoltCD	= mod:NewNextTimer(6, 108383, nil, mod:IsTank())
 local timerVoidBolt		= mod:NewTargetTimer(21, 108383, nil, mod:IsTank() or mod:IsHealer())--Tooltip says 30 but combat logs clearly show it fading at 20-22 (varies)
+local timerDeepCorruption	= mod:NewBuffFadesTimer(25, 105171, nil, mod:IsTank() or mod:IsHealer())
 
 local berserkTimer		= mod:NewBerserkTimer(600)
 
@@ -100,6 +102,10 @@
 		else
 			timerSearingCD:Start()
 		end
+	elseif args:IsSpellID(105171) then-- this spellid is debuff spellid(10h, 25h). damaging spellid is different. so added only 1 spellids.
+		timerDeepCorruption:Start()
+		warnDeepCorruption:Show()
+		specWarnPurple:Show()
 	end
 end
 
@@ -129,7 +135,6 @@
 		if #oozesHitTable == expectedOozes then
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
-		specWarnPurple:Show()
 	elseif args:IsSpellID(105027) and args:GetDestCreatureID() == 55312 then--Blue
 		table.insert(oozesHitTable, L.Blue)
 		if #oozesHitTable == expectedOozes then

r7240 (nbluewiz): # Core : adjusted timer recovery function delay. # Madness of Deathwing : fixed for 25man Shrapnel warnings.

nbluewiz — Tue, 31 Jan 2012 00:06:32 GMT

Author: nbluewiz
Date: Tue Jan 31 01:06:32 CET 2012
Revision: 7240

Log:

# Core : adjusted timer recovery function delay.
# Madness of Deathwing : fixed for 25man Shrapnel warnings.

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-DragonSoul/MadnessDeathwing.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7239

Old date: 2012-01-30 18:15:51 UTC

@@ -2777,7 +2777,7 @@
 			DBM:AprilFools()
 		end
 		if #inCombat == 0 then
-			DBM:Schedule(2, requestTimers) -- not sure how late or early PLAYER_ENTERING_WORLD fires
+			DBM:Schedule(3.5, requestTimers) -- not sure how late or early PLAYER_ENTERING_WORLD fires. Since boss mod loading takes 3 sec after entering zone, delays more will be good?
 		end
 		self:LFG_UPDATE()
 --		self:Schedule(10, function() if not DBM.Options.HelpMessageShown then DBM.Options.HelpMessageShown = true DBM:AddMsg(DBM_CORE_NEED_SUPPORT) end end)

trunk/DBM-DragonSoul/MadnessDeathwing.lua

Action: modified

Old revision: 7239

Old date: 2012-01-30 18:15:51 UTC

@@ -172,7 +172,7 @@
 			specWarnShrapnel:Show()
 			ShrapnelCountdown:Start(6)
 		end
-		if (self:IsDifficulty("normal10", "heroic10") and #shrapnelTargets >= 3) or (self:IsDifficulty("normal25", "heroic25", "lfr25") and #shrapnelTargets >= 7) then
+		if (self:IsDifficulty("normal10", "heroic10") and #shrapnelTargets >= 3) or (self:IsDifficulty("normal25", "heroic25", "lfr25") and #shrapnelTargets >= 8) then
 			warnShrapnelTargets()
 		else
 			self:Schedule(0.3, warnShrapnelTargets)

r7239 (Omega): Add add warning spawn for big adds, and add timers for the first cast of blood corruption they do after they spawn.

Omega — Mon, 30 Jan 2012 18:15:51 GMT

Author: Omega
Date: Mon Jan 30 19:15:51 CET 2012
Revision: 7239

Log:

Add add warning spawn for big adds, and add timers for the first cast of blood corruption they do after they spawn.

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7238

Old date: 2012-01-30 17:53:10 UTC

@@ -26,16 +26,19 @@
 local warnGrip				= mod:NewTargetAnnounce(109459, 4)
 local warnNuclearBlast		= mod:NewCastAnnounce(105845, 4)
 local warnSealArmor			= mod:NewCastAnnounce(105847, 4)
+local warnAmalgamation		= mod:NewSpellAnnounce("ej4054", 3)--Amalgamation spawning
 
 local specWarnRoll			= mod:NewSpecialWarningSpell("ej4050", nil, nil, nil, true)--The actual roll
 local specWarnTendril		= mod:NewSpecialWarning("SpecWarnTendril")--A personal warning for you only if you're not gripped 3 seconds after roll started
 local specWarnGrip			= mod:NewSpecialWarningSpell(109459, mod:IsDps())
 local specWarnNuclearBlast	= mod:NewSpecialWarningRun(105845, mod:IsMelee())
 local specWarnSealArmor		= mod:NewSpecialWarningSpell(105847, mod:IsDps())
+local specWarnAmalgamation	= mod:NewSpecialWarningSpell("ej4054", false)
 
 local timerSealArmor		= mod:NewCastTimer(23, 105847)
 local timerBarrelRoll		= mod:NewCastTimer(5, "ej4050")
 local timerGripCD			= mod:NewNextTimer(32, 109457)
+local timerDeathCD			= mod:NewCDTimer(8.5, 106199)--8.5-10sec variation.
 
 local countdownRoll			= mod:NewCountdown(5, "ej4050")
 
@@ -255,6 +258,11 @@
 	local cid = self:GetCIDFromGUID(args.destGUID)
 	if cid == 53891 or cid == 56162 or cid == 56161 then
 		timerGripCD:Cancel(args.sourceGUID)
+		warnAmalgamation:Schedule(4.5)--4.5-5 seconds after corruption dies.
+		specWarnAmalgamation:Schedule(4.5)
+		if self:IsDifficulty("heroic10", "heroic25") then
+			timerDeathCD:Start(args.destGUID)
+		end
 	elseif cid == 56341 or cid == 56575 then
 		timerSealArmor:Cancel()
 	end

r7238 (Omega): 2 is too long for anti spam on bloods, so lower it down some.

Omega — Mon, 30 Jan 2012 17:53:10 GMT

Author: Omega
Date: Mon Jan 30 18:53:10 CET 2012
Revision: 7238

Log:

2 is too long for anti spam on bloods, so lower it down some.

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7237

Old date: 2012-01-28 18:40:06 UTC

@@ -55,11 +55,7 @@
 	if not UnitDebuff("player", GetSpellInfo(109454)) and not UnitIsDeadOrGhost("player") then
 		specWarnTendril:Show()
 	end
-	if mod.Options.InfoFrame and not DBM.InfoFrame:IsShown() then
-		DBM.InfoFrame:SetHeader(L.NoDebuff:format(GetSpellInfo(109454)))
-		DBM.InfoFrame:Show(5, "playergooddebuff", 109454)
 	end
-end
 
 local function clearTendrils()
 	if mod.Options.InfoFrame then
@@ -184,7 +180,7 @@
 	if args:IsSpellID(105248) then
 		residueCount = residueCount - 1
 		warnAbsorbedBlood:Cancel()--Just a little anti spam
-		warnAbsorbedBlood:Schedule(2, args.destName, args.amount or 1)
+		warnAbsorbedBlood:Schedule(1.25, args.destName, args.amount or 1)
 	elseif args:IsSpellID(105490, 109457, 109458, 109459) then
 		gripTargets[#gripTargets + 1] = args.destName
 		timerGripCD:Cancel(args.sourceGUID)
@@ -242,6 +238,10 @@
 		self:Schedule(8, clearTendrils)--Clearing 3 seconds after the roll should be sufficent
 		timerBarrelRoll:Start()
 		countdownRoll:Start(5)
+		if self.Options.InfoFrame and not DBM.InfoFrame:IsShown() then
+			DBM.InfoFrame:SetHeader(L.NoDebuff:format(GetSpellInfo(109454)))
+			DBM.InfoFrame:Show(5, "playergooddebuff", 109454)
+		end
 	elseif msg == L.DLevels or msg:find(L.DLevels) then
 		self:Unschedule(checkTendrils)
 		self:Unschedule(clearTendrils)

r7237 (Omega): Update core to properly detect and display classic raid sizes (where all of them return difficulty 1 regardless of size)

Omega — Sat, 28 Jan 2012 18:40:06 GMT

Author: Omega
Date: Sat Jan 28 19:40:06 CET 2012
Revision: 7237

Log:

Update core to properly detect and display classic raid sizes (where all of them return difficulty 1 regardless of size)

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7236

Old date: 2012-01-27 19:40:06 UTC

@@ -2361,7 +2361,17 @@
 			savedDifficulty = PLAYER_DIFFICULTY2.." - "
 		elseif mod:IsDifficulty("normal10") then
 			mod.stats.normalPulls = mod.stats.normalPulls + 1
+			local _, _, _, _, maxPlayers = GetInstanceInfo()
+			--Because classic raids that don't have sizes all return 1.
+			if maxPlayers == 40 then
+				savedDifficulty = PLAYER_DIFFICULTY1.." (40) - "
+			elseif maxPlayers == 25 then
+				savedDifficulty = PLAYER_DIFFICULTY1.." (25) - "
+			elseif maxPlayers == 20 then
+				savedDifficulty = PLAYER_DIFFICULTY1.." (20) - "
+			else
 			savedDifficulty = PLAYER_DIFFICULTY1.." (10) - "
+			end
 		elseif mod:IsDifficulty("heroic10") then
 			mod.stats.heroicPulls = mod.stats.heroicPulls + 1
 			savedDifficulty = PLAYER_DIFFICULTY2.." (10) - "

r7236 (Omega): make spammy plasma health option off by default even for healers. this really is just a 10 man option, on 25 man healers don't want 10 bars on their screen at a time (because on heroic this happens, pretty typically)

Omega — Fri, 27 Jan 2012 19:40:06 GMT

Author: Omega
Date: Fri Jan 27 20:40:06 CET 2012
Revision: 7236

Log:

make spammy plasma health option off by default even for healers. this really is just a 10 man option, on 25 man healers don't want 10 bars on their screen at a time (because on heroic this happens, pretty typically)

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7235

Old date: 2012-01-27 06:48:41 UTC

@@ -44,7 +44,7 @@
 mod:RemoveOption("HealthFrame")
 mod:AddBoolOption("InfoFrame", true)
 mod:AddBoolOption("SetIconOnGrip", true)
-mod:AddBoolOption("ShowShieldInfo", mod:IsHealer())
+mod:AddBoolOption("ShowShieldInfo", false)--on 25 man this is quite frankly a spammy nightmare, especially on heroic. off by default since it's really only sensible in 10 man. Besides I may be adding an alternate frame option for "grip damage needed"
 
 local gripTargets = {}
 local gripIcon = 6

r7235 (Omega): Remove the target check from nuclear on spine, it's important for everyone to know about it, whether you target or not. Added countdown option for roll

Omega — Fri, 27 Jan 2012 06:48:41 GMT

Author: Omega
Date: Fri Jan 27 07:48:41 CET 2012
Revision: 7235

Log:

Remove the target check from nuclear on spine, it's important for everyone to know about it, whether you target or not. Added countdown option for roll

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Updated

trunk/DBM-Firelands/FandralStaghelm.lua

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7234

Old date: 2012-01-26 06:24:27 UTC

@@ -37,6 +37,7 @@
 local timerBarrelRoll		= mod:NewCastTimer(5, "ej4050")
 local timerGripCD			= mod:NewNextTimer(32, 109457)
 
+local countdownRoll			= mod:NewCountdown(5, "ej4050")
 
 local soundNuclearBlast		= mod:NewSound(105845, nil, mod:IsMelee())
 
@@ -139,11 +140,11 @@
 end
 
 function mod:SPELL_CAST_START(args)
-	if args:IsSpellID(105845) and args.sourceGUID == UnitGUID("target") then--Only warn if it's your target, if it isn't you're probably not by the one exploding.
+	if args:IsSpellID(105845) then
 		warnNuclearBlast:Show()
 		specWarnNuclearBlast:Show()
 		soundNuclearBlast:Play()
-	elseif args:IsSpellID(105847, 105848) then -- sometimes spellid 105848, maybe related to positions?
+	elseif args:IsSpellID(105847, 105848) then -- Maybe related to positions?
 		warnSealArmor:Show()
 		specWarnSealArmor:Show()
 		if self:IsDifficulty("lfr25") then
@@ -235,14 +236,17 @@
 	if msg == L.DRoll or msg:find(L.DRoll) then
 		self:Unschedule(checkTendrils)--In case you manage to spam spin him, we don't want to get a bunch of extra stuff scheduled.
 		self:Unschedule(clearTendrils)--^
+		countdownRoll:Cancel()--^
 		specWarnRoll:Show()--Warn you right away.
 		self:Schedule(3, checkTendrils)--After 3 seconds of roll starting, check tendrals, you should have leveled him out by now if this wasn't on purpose.
 		self:Schedule(8, clearTendrils)--Clearing 3 seconds after the roll should be sufficent
 		timerBarrelRoll:Start()
+		countdownRoll:Start(5)
 	elseif msg == L.DLevels or msg:find(L.DLevels) then
 		self:Unschedule(checkTendrils)
 		self:Unschedule(clearTendrils)
 		clearTendrils()
+		countdownRoll:Cancel()
 		timerBarrelRoll:Cancel()
 	end
 end

trunk/DBM-Firelands/FandralStaghelm.lua

Action: modified

Old revision: 7234

Old date: 2012-01-26 06:24:27 UTC

@@ -51,44 +51,27 @@
 local kitty = false
 local targetScansDone = 0
 
---Verified by my logs, it seems despite the tooltip saying 20%, in 4.3 it's 15% per stack of adrenalin rush now.
 local abilityTimers = {
-	[0] = 17.3,--Still The same baseline. 17ish with slight variations or downward.
-	[1] = 14.4,
+	[0] = 17.3,--Still The same baseline.
+	[1] = 14.4,--Everything here onward nerfed in 4.3
 	[2] = 12,
 	[3] = 10.9,
 	[4] = 9.6,
-	[5] = 8.4,--8.4~8.9 variables.
-	[6] = 8.4,--seems to be always 8.4.
-	[7] = 7.2,--confirmed.
-	[8] = 7.2,--after 8 stack, confirmed by only 1 log.
+	[5] = 8.4,
+	[6] = 8.4,
+	[7] = 7.2,
+	[8] = 7.2,--Everyting up to here confirmed by MANY logs
 	[9] = 6.0,
 	[10]= 6.0,
 	[11]= 6.0,
 	[12]= 6.0,
-	[13]= 4.9,--may be not lower than 4.9 according to 4.2 data?
+	[13]= 4.9,
 	[14]= 4.9,
 	[15]= 4.9,
 	[16]= 4.9,
 }
+--Don't know at what point it caps at 3.7
 
---Keeping this around for now
---[[
-local oldabilityTimers = {
-	[0] = 17.3,--Sometimes this is 16.7
-	[1] = 13.4,--Sometimes this is 12.7 sigh. Wonder what causes this variation?
-	[2] = 11,--One of the few you can count on being consistent.
-	[3] = 8.6,--Really it's between 8.5 and 8.6
-	[4] = 7.4,--Sometimes 8 instead of 7.3-7.4
-	[5] = 7.4,--Varies from 7.3 or 7.4 as well
-	[6] = 6.1,--Varies between 6 even and 6.1 even.
-	[7] = 6.1,
-	[8] = 4.9,
-	[9] = 4.9,
-	[10]= 4.9
-}--]]
-
-
 local function clearLeapWarned()
 	recentlyJumped = false
 end
@@ -181,9 +164,9 @@
 		abilityCount = (args.amount or 1)--This should change your ability account to his current stack, which is disconnect friendly.
 		warnAdrenaline:Show(args.destName, args.amount or 1)
 		if kitty then
-			timerNextSpecial:Start(abilityTimers[abilityCount], GetSpellInfo(100208), abilityCount+1)
+			timerNextSpecial:Start(abilityTimers[abilityCount] or 3.7, GetSpellInfo(100208), abilityCount+1)
 		else
-			timerNextSpecial:Start(abilityTimers[abilityCount], GetSpellInfo(98474), abilityCount+1)
+			timerNextSpecial:Start(abilityTimers[abilityCount] or 3.7, GetSpellInfo(98474), abilityCount+1)
 		end
 	elseif args:IsSpellID(97235) then
 		warnFury:Show(args.destName, args.amount or 1)

r7234 (nbluewiz): # Hagara : fix Ice Lance stack warning error.

nbluewiz — Thu, 26 Jan 2012 06:24:27 GMT

Author: nbluewiz
Date: Thu Jan 26 07:24:27 CET 2012
Revision: 7234

Log:

# Hagara : fix Ice Lance stack warning error.

Updated

trunk/DBM-DragonSoul/Hagara.lua

Action: modified

Old revision: 7233

Old date: 2012-01-25 15:49:21 UTC

@@ -178,7 +178,7 @@
 
 function mod:SPELL_AURA_APPLIED_DOSE(args)
 	if args:IsSpellID(105316, 107061, 107062, 107063) then
-		if (self:IsDifficulty("lfr25") and args.amount % 5 == 0 or args.amount % 3 == 0) and args:IsPlayer() then--Warn every 3 stacks (6 stacks in LFR), don't want to spam TOO much.
+		if ((self:IsDifficulty("lfr25") and args.amount % 6 == 0) or (not self:IsDifficulty("lfr25") and args.amount % 3 == 0)) and args:IsPlayer() then--Warn every 3 stacks (6 stacks in LFR), don't want to spam TOO much.
 			specWarnIceLance:Show(args.amount)
 		end
 	end

r7233 (nbluewiz): # Core : added stuff specifying boss id for status whisper. # Blackhorn : updated status whisper stuff.

nbluewiz — Wed, 25 Jan 2012 15:49:21 GMT

Author: nbluewiz
Date: Wed Jan 25 16:49:21 CET 2012
Revision: 7233

Log:

# Core : added stuff specifying boss id for status whisper.
# Blackhorn : updated status whisper stuff.
# Yorsahj : tap clean up.
# Madness of Deathwing : updated Shrapnel warning.

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/MadnessDeathwing.lua

Updated

trunk/DBM-DragonSoul/Yorsahj.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7232

Old date: 2012-01-25 10:27:16 UTC

@@ -4601,6 +4601,11 @@
 	self.combatInfo.wipeTimer = t
 end
 
+-- updated for status whisper.
+function bossModPrototype:SetMainBossID(...)
+	self.mainbossid = ...
+end
+
 function bossModPrototype:GetBossHPString(cId)
         for i = 1, 4 do
 		local guid = UnitGUID("boss"..i)
@@ -4620,7 +4625,7 @@
 end
 
 function bossModPrototype:GetHP()
-	return self:GetBossHPString((self.combatInfo and self.combatInfo.mob) or self.creatureId)
+	return self:GetBossHPString(self.mainbossid or (self.combatInfo and self.combatInfo.mob) or self.creatureId)
 end
 
 function bossModPrototype:IsWipe()

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7232

Old date: 2012-01-25 10:27:16 UTC

@@ -3,7 +3,7 @@
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(56598)--56427 is Boss, but engage trigger needs the ship which is 56598
---TODO, find a way to fix it so status whispers return blackhorns health, not the ships health.
+mod:SetMainBossID(56427)
 mod:SetModelID(39399)
 mod:SetZone()
 mod:SetUsedIcons()

trunk/DBM-DragonSoul/MadnessDeathwing.lua

Action: modified

Old revision: 7232

Old date: 2012-01-25 10:27:16 UTC

@@ -172,7 +172,7 @@
 			specWarnShrapnel:Show()
 			ShrapnelCountdown:Start(6)
 		end
-		if (self:IsDifficulty("normal10") and #shrapnelTargets >= 3) then
+		if (self:IsDifficulty("normal10", "heroic10") and #shrapnelTargets >= 3) or (self:IsDifficulty("normal25", "heroic25", "lfr25") and #shrapnelTargets >= 7) then
 			warnShrapnelTargets()
 		else
 			self:Schedule(0.3, warnShrapnelTargets)

r7232 (nbluewiz): # Fandral Staghelm : update ability timers.

nbluewiz — Wed, 25 Jan 2012 10:27:16 GMT

Author: nbluewiz
Date: Wed Jan 25 11:27:16 CET 2012
Revision: 7232

Log:

# Fandral Staghelm : update ability timers.

Updated

trunk/DBM-Firelands/FandralStaghelm.lua

Action: modified

Old revision: 7231

Old date: 2012-01-25 08:46:40 UTC

@@ -58,12 +58,18 @@
 	[2] = 12,
 	[3] = 10.9,
 	[4] = 9.6,
-	[5] = 8.4,
-	[6] = 8.4,--Makes me wonder why this didn't get faster thn 5, but same thing happened iwth 4-5 on old timers.
-	[7] = 7.2,--Unknown, drycoded with 15% math. Probably wrong
-	[8] = 6.1,--Unknown, drycoded with 15% math. Probably wrong
-	[9] = 5.2,--Unknown, drycoded with 15% math. Probably wrong
-	[10]= 5.2--Unknown, Probably wrong
+	[5] = 8.4,--8.4~8.9 variables.
+	[6] = 8.4,--seems to be always 8.4.
+	[7] = 7.2,--confirmed.
+	[8] = 7.2,--after 8 stack, confirmed by only 1 log.
+	[9] = 6.0,
+	[10]= 6.0,
+	[11]= 6.0,
+	[12]= 6.0,
+	[13]= 4.9,--may be not lower than 4.9 according to 4.2 data?
+	[14]= 4.9,
+	[15]= 4.9,
+	[16]= 4.9,
 }
 
 --Keeping this around for now

r7231 (Omega): A lot of old comment cleanup, as well as some mod tweaks and code cleanups Madness: Cancel impale debuff timers when corruption dies, the ONLY thing debuff does is increases damage from impales, if corruption dead, we don't care about the debuff ;).

Omega — Wed, 25 Jan 2012 08:46:40 GMT

Author: Omega
Date: Wed Jan 25 09:46:40 CET 2012
Revision: 7231

Log:

*A lot of old comment cleanup, as well as some mod tweaks and code cleanups
*Madness: Cancel impale debuff timers when corruption dies, the ONLY thing debuff does is increases damage from impales, if corruption dead, we don't care about the debuff ;).
*Ultraxion: should now warn faster if we have expected number of fading light targets.

Some comments left to make sure people don't break stuff or because we still need the data to figure stuff out. but most that don't seem needed anymore are cleaned up.

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/DSTrash.lua

Updated

trunk/DBM-DragonSoul/Hagara.lua

Updated

trunk/DBM-DragonSoul/MadnessDeathwing.lua

Updated

trunk/DBM-DragonSoul/Morchok.lua

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Updated

trunk/DBM-DragonSoul/Ultraxion.lua

Updated

trunk/DBM-DragonSoul/Yorsahj.lua

Updated

trunk/DBM-DragonSoul/Zonozz.lua

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7230

Old date: 2012-01-25 07:25:07 UTC

@@ -3,6 +3,7 @@
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(56598)--56427 is Boss, but engage trigger needs the ship which is 56598
+--TODO, find a way to fix it so status whispers return blackhorns health, not the ships health.
 mod:SetModelID(39399)
 mod:SetZone()
 mod:SetUsedIcons()
@@ -48,14 +49,14 @@
 
 local timerCombatStart				= mod:NewTimer(20.5, "TimerCombatStart", 2457)
 local timerAdd						= mod:NewTimer(61, "TimerAdd", 107752)
-local timerHarpoonCD				= mod:NewNextTimer(6.5, 108038, nil, mod:IsDps())--CD when you don't fail at drakes
+local timerHarpoonCD				= mod:NewNextTimer(6.5, 108038, nil, mod:IsDps())
 local timerHarpoonActive			= mod:NewBuffActiveTimer(20, 108038, nil, mod:IsDps())--Seems to always hold at least 20 seconds, beyond that, RNG, but you always get at least 20 seconds before they "snap" free.
-local timerReloadingCast			= mod:NewCastTimer(10, 108039, nil, mod:IsDps())--You screwed up and let a drake get away, this makes a harpoon gun reload and regrab failed drakes after 10 seconds.
+local timerReloadingCast			= mod:NewCastTimer(10, 108039, nil, mod:IsDps())
 local timerTwilightOnslaught		= mod:NewCastTimer(7, 107588)
 local timerTwilightOnslaughtCD		= mod:NewNextCountTimer(35, 107588)
 local timerSapperCD					= mod:NewNextTimer(40, "ej4200", nil, nil, nil, 107752)
 local timerDegenerationCD			= mod:NewCDTimer(8.5, 109208, nil, mod:IsTank())--8.5-9.5 variation.
-local timerBladeRushCD				= mod:NewCDTimer(15.5, 107595)--Experiment, 15.5-20 seemed common for heroic, LFR was a variatable 20-25sec. Just need more data, a lot more.
+local timerBladeRushCD				= mod:NewCDTimer(15.5, 107595)
 local timerBroadsideCD				= mod:NewNextTimer(90, 110153)
 local timerRoarCD					= mod:NewCDTimer(19, 109228)--19~22 variables (i haven't seen any logs where this wasn't always 21.5, are 19s on WoL somewhere?)
 local timerTwilightFlamesCD			= mod:NewNextTimer(8, 108051)
@@ -226,7 +227,7 @@
 			end
 		end
 	elseif args:IsSpellID(108040) and not phase2Started then--Goriona is being shot by the ships Artillery Barrage (phase 2 trigger)
-		self:Schedule(10, Phase2Delay)--It seems you can still get phase 1 crap until blackhorn is on the deck itself(ie his yell 10 seconds after this trigger) so we delay canceling timers.
+		self:Schedule(10, Phase2Delay)--It seems you can still get phase 1 crap until blackhorn's yell 10 seconds after this trigger, so we delay canceling timers.
 		phase2Started = true
 		warnPhase2:Show()--We still warn phase 2 here though to get into position, especially since he can land on deck up to 5 seconds before his yell.
 		timerCombatStart:Start(5)--5-8 seems variation, we use shortest.
@@ -242,7 +243,7 @@
 
 function mod:SPELL_SUMMON(args)
 	if args:IsSpellID(108051, 109216, 109217, 109218) then
-		warnTwilightFlames:Show()--Target scanning? will need to put drake on focus and see
+		warnTwilightFlames:Show()
 		timerTwilightFlamesCD:Start()
 	end
 end
@@ -276,20 +277,14 @@
 	end
 end
 
-
---[[Useful reg expressions for WoL
-spellid = 108038 or fulltype = UNIT_DIED and (targetMobId = 56855 or targetMobId = 56587) or spellid = 108039
-spellid = 108038 and fulltype = SPELL_CAST_START or fulltype = UNIT_DIED and (targetMobId = 56855 or targetMobId = 56587) or spellid = 108039
---]]
-
 function mod:UNIT_DIED(args)
 	local cid = self:GetCIDFromGUID(args.destGUID)
-	if cid == 56427 then--Boss
+	if cid == 56427 then--Blackhorn
 		DBM:EndCombat(self)
 	elseif cid == 56848 or cid == 56854 then--Humanoids
 		timerBladeRushCD:Cancel(args.sourceGUID)
 		timerDegenerationCD:Cancel(args.sourceGUID)
-	elseif cid == 56855 or cid == 56587 then--Small Drakes (maybe each side has a unique ID? this could be useful in further filtering which harpoon is which side.
+	elseif cid == 56855 or cid == 56587 then--Drakes
 		drakesCount = drakesCount - 1
 		warnDrakesLeft:Show(drakesCount)
 		timerHarpoonActive:Cancel(args.sourceGUID)

trunk/DBM-DragonSoul/DSTrash.lua

Action: modified

Old revision: 7230

Old date: 2012-01-25 07:25:07 UTC

@@ -57,7 +57,7 @@
 
 function mod:SPELL_CAST_START(args)
 	if args:IsSpellID(107597) then -- this spell cast 3 sec. and use at target's cast end position. not begin.
-		self:ScheduleMethod(3, "BoulderTarget", args.sourceGUID)--0.2 worked for me, it was announcing boulder target, NOT tank.
+		self:ScheduleMethod(3, "BoulderTarget", args.sourceGUID)
 	end
 end

trunk/DBM-DragonSoul/Hagara.lua

Action: modified

Old revision: 7230

Old date: 2012-01-25 07:25:07 UTC

@@ -52,11 +52,11 @@
 local timerAssault			= mod:NewBuffActiveTimer(5, 107851, nil, mod:IsTank() or mod:IsTank())
 local timerAssaultCD		= mod:NewCDTimer(15.5, 107851, nil, mod:IsTank() or mod:IsTank())
 local timerStormPillarCD	= mod:NewNextTimer(5, 109557)--Both of these are just spammed every 5 seconds on new targets.
-local timerFrostFlakeCD		= mod:NewNextTimer(5, 109325)
+local timerFrostFlakeCD		= mod:NewNextTimer(5, 109325)--^
 
-local berserkTimer			= mod:NewBerserkTimer(480)	-- according to Icy-Veins
+local berserkTimer			= mod:NewBerserkTimer(480)
 
-local SpecialCountdown		= mod:NewCountdown(62, 105256)--Apparently countdown prototype doesn't support localized text, too lazy to do that now, so i'll just use tempest, even though it's enabled for both specials.
+local SpecialCountdown		= mod:NewCountdown(62, 105256)
 
 mod:AddBoolOption("RangeFrame")--Ice lance spreading in ice phases, and lighting linking in lighting phases (with reverse intent, staying within 10 yards, not out of 10 yards)
 mod:AddBoolOption("SetIconOnFrostflake", false)--You can use an icon if you want, but this is cast on a new target every 5 seconds, often times on 25 man 2-3 have it at same time while finding a good place to drop it.
@@ -86,7 +86,7 @@
 	table.wipe(tombTargets)
 	timerAssaultCD:Start(4-delay)
 	timerIceLanceCD:Start(10-delay)
---	timerFrostTombCD:Start(16-delay)--No longer cast on engage? most recent log she only casts it after specials now and not after pull
+--	timerFrostTombCD:Start(16-delay)--Not possible until (or if) a way is ever found to detect her enchant on pull.
 	timerSpecialCD:Start(30-delay)
 	SpecialCountdown:Start(30-delay)
 	berserkTimer:Start(-delay)
@@ -144,7 +144,7 @@
 			table.insert(tombIconTargets, DBM:GetRaidUnitId(args.destName))
 			self:UnscheduleMethod("SetTombIcons")
 			if (self:IsDifficulty("normal25") and #tombIconTargets >= 5) or (self:IsDifficulty("heroic25") and #tombIconTargets >= 6) or (self:IsDifficulty("normal10", "heroic10") and #tombIconTargets >= 2) then
-				self:SetTombIcons()--Sort and fire as early as possible once we have all targets.
+				self:SetTombIcons()
 			else
 				if self:LatencyCheck() then--Icon sorting is still sensitive and should not be done by laggy members that don't have all targets.
 					self:ScheduleMethod(0.3, "SetTombIcons")
@@ -157,7 +157,7 @@
 		else
 			self:Schedule(0.3, warnTombTargets)
 		end
-	elseif args:IsSpellID(107851, 110898, 110899, 110900) then--107851 10/25 man normal confirmed. 110900 is lfr25 difficulty.
+	elseif args:IsSpellID(107851, 110898, 110899, 110900) then
 		warnAssault:Show()
 		timerAssault:Start()
 		timerAssaultCD:Start()
@@ -173,23 +173,19 @@
 		if self.Options.SetIconOnFrostflake then
 			self:SetIcon(args.destName, 3)
 		end
-	elseif args:IsSpellID(105316, 107061, 107062, 107063) then
-		if (args.amount or 1) % 3 == 0 and args:IsPlayer() then--Warn every 3 stacks, don't want to spam TOO much.
-			specWarnIceLance:Show(args.amount)
 		end
 	end
-end
 
 function mod:SPELL_AURA_APPLIED_DOSE(args)
 	if args:IsSpellID(105316, 107061, 107062, 107063) then
-		if (args.amount or 1) % 3 == 0 and args:IsPlayer() then--Warn every 3 stacks, don't want to spam TOO much.
+		if (self:IsDifficulty("lfr25") and args.amount % 5 == 0 or args.amount % 3 == 0) and args:IsPlayer() then--Warn every 3 stacks (6 stacks in LFR), don't want to spam TOO much.
 			specWarnIceLance:Show(args.amount)
 		end
 	end
 end
 
 function mod:SPELL_AURA_REMOVED(args)
-	if args:IsSpellID(104451) and self.Options.SetIconOnFrostTomb then--104451 10/25 man normal confirmed.
+	if args:IsSpellID(104451) and self.Options.SetIconOnFrostTomb then
 		self:SetIcon(args.destName, 0)
 	elseif args:IsSpellID(105256, 109552, 109553, 109554) then--Tempest
 		timerFrostFlakeCD:Cancel()
@@ -267,9 +263,9 @@
 end
 
 function mod:SPELL_SUMMON(args)
-	if args:IsSpellID(105297) then -- comfirmed 25 man normal(lfg),
+	if args:IsSpellID(105297) then
 		lanceTargets[#lanceTargets + 1] = args.sourceName
 		self:Unschedule(warnLanceTargets)
-		self:Schedule(0.5, warnLanceTargets)--Maybe adjust timing to allow for more combining of people failing at spreading?
+		self:Schedule(0.5, warnLanceTargets)
 	end
 end
\ No newline at end of file

trunk/DBM-DragonSoul/MadnessDeathwing.lua

Action: modified

Old revision: 7230

Old date: 2012-01-25 07:25:07 UTC

@@ -34,10 +34,10 @@
 local specWarnImpale			= mod:NewSpecialWarningYou(106400)
 local specWarnImpaleOther		= mod:NewSpecialWarningTarget(106400, mod:IsTank())
 local specWarnElementiumBolt	= mod:NewSpecialWarningSpell(105651, nil, nil, nil, true)
-local specWarnTentacle			= mod:NewSpecialWarning("SpecWarnTentacle", mod:IsDps())--Maybe add healer to defaults too?
+local specWarnTentacle			= mod:NewSpecialWarning("SpecWarnTentacle")
 local specWarnHemorrhage		= mod:NewSpecialWarningSpell(105863, mod:IsDps())
 local specWarnFragments			= mod:NewSpecialWarningSpell("ej4115", nil, nil, nil, true)
-local specWarnTerror			= mod:NewSpecialWarningSpell("ej4117", mod:IsTank())--Not need to warn everyone, tanks for sure, everyone else depends on strat and set. Normally kill first set ignore second on normal.
+local specWarnTerror			= mod:NewSpecialWarningSpell("ej4117", mod:IsTank())
 local specWarnShrapnel			= mod:NewSpecialWarningYou(109598)
 local specWarnParasite			= mod:NewSpecialWarningYou(108649)
 local yellParasite				= mod:NewYell(108649)
@@ -47,11 +47,11 @@
 local timerImpale				= mod:NewTargetTimer(49.5, 106400, nil, mod:IsTank() or mod:IsHealer())--45 plus 4 second cast plus .5 delay between debuff ID swap.
 local timerImpaleCD				= mod:NewCDTimer(35, 106400, nil, mod:IsTank() or mod:IsHealer())
 local timerElementiumCast		= mod:NewCastTimer(7.5, 105651)
-local timerElementiumBlast		= mod:NewCastTimer(8, 109600)--8 variation depending on where it's actually going to land. Use the min time on variance to make sure healer Cds aren't up late.
+local timerElementiumBlast		= mod:NewCastTimer(8, 109600)--8-10 variation depending on where it's actually going to land. Use the min time on variance to make sure healer Cds aren't up late.
 local timerElementiumBoltCD		= mod:NewNextTimer(55.5, 105651)
-local timerHemorrhageCD			= mod:NewCDTimer(100.5, 105863)--Also the earliest observed. Also we use the UNIT event, not emote .3 seconds after it.
+local timerHemorrhageCD			= mod:NewCDTimer(100.5, 105863)
 local timerCataclysm			= mod:NewCastTimer(60, 106523)
-local timerCataclysmCD			= mod:NewCDTimer(130.5, 106523)--130.5-131.5 variations observed in several guilds logs. But DBM always uses the earliest time for a CD, not the average or upper threshold.
+local timerCataclysmCD			= mod:NewCDTimer(130.5, 106523)--130.5-131.5 variations
 local timerFragmentsCD			= mod:NewNextTimer(90, "ej4115", nil, nil, nil, 106708)--Gear icon for now til i find something more suitable
 local timerTerrorCD				= mod:NewNextTimer(90, "ej4117", nil, nil, nil, 106765)--^
 local timerShrapnel				= mod:NewCastTimer(6, 109598)
@@ -114,7 +114,7 @@
 			timerMutated:Start(11)
 			timerImpaleCD:Start(22)
 			timerElementiumBoltCD:Start(40.5)
-			if self:IsDifficulty("heroic10", "heroic25") then -- updated by kin raiders video. needs more review
+			if self:IsDifficulty("heroic10", "heroic25") then
 				timerHemorrhageCD:Start(55.5)--Appears to be 30 seconds earlier in heroic
 				timerParasiteCD:Start(11)
 			else
@@ -125,7 +125,7 @@
 			timerMutated:Start()
 			timerImpaleCD:Start(27.5)
 			timerElementiumBoltCD:Start()
-			if self:IsDifficulty("heroic10", "heroic25") then -- updated by kin raiders video. needs more review
+			if self:IsDifficulty("heroic10", "heroic25") then
 				timerHemorrhageCD:Start(70.5)
 				timerParasiteCD:Start(22)
 			else
@@ -134,11 +134,8 @@
 			timerCataclysmCD:Start()
 		end
 	elseif args:IsSpellID(106523, 110042, 110043, 110044) then
-		timerCataclysmCD:Cancel()--Just in case it comes early from another minor change like firstAspect change which wasn't on PTR, don't want to confuse peope with two cata bars.
 		warnCataclysm:Show()
 		timerCataclysm:Start()
---	elseif args:IsSpellID(108537) then--Thrall teleporting to back platform on engage. Beta testing for local independant pull trigger. (this should work, :\, maybe i did the startcombat wrong)
---		DBM:StartCombat(self, 0)
 	end
 end
 
@@ -147,10 +144,10 @@
 		warnElementiumBolt:Show()
 		if not UnitBuff("player", GetSpellInfo(109624)) and not UnitIsDeadOrGhost("player") then--Check for Nozdormu's Presence
 			specWarnElementiumBolt:Show()
-			timerElementiumBlast:Start()--Not up, explosion in 10 seconds
+			timerElementiumBlast:Start()
 		else
 			timerElementiumCast:Start()
-			timerElementiumBlast:Start(20)--Slowed by Nozdormu, explosion in 20 seconds
+			timerElementiumBlast:Start(20)
 			specWarnElementiumBolt:Schedule(7.5)
 		end
 	elseif args:IsSpellID(110063) and phase2 and self:IsInCombat() then--Astral Recall. Thrall teleports off back platform back to front on defeat.
@@ -159,7 +156,7 @@
 end
 
 function mod:SPELL_AURA_APPLIED(args)
-	if args:IsSpellID(106400) then--106444, 109631, 109632, 109633 are lingering debuff IDs, no reason to use them though cause that'd be a diff function with diff timing
+	if args:IsSpellID(106400) then
 		warnImpale:Show(args.destName)
 		timerImpale:Start(args.destName)
 		timerImpaleCD:Start()
@@ -168,10 +165,6 @@
 		else
 			specWarnImpaleOther:Show(args.destName)
 		end
-	-- confirmed spellid : 106794, 110141
-	-- 106794 is 10man debuff (confirmed), 106791 is used 10man SPELL_CAST_START event. 
-	-- In Game Tooltip, 106794 cast time is channeling, 106791 is 6 sec.. so I guess channeling spell is actually debuff.
-	-- In this rule, I guessed other spellids. (maybe 109598, 109599 used SPELL_CAST_START event, so removed)
 	elseif args:IsSpellID(106794, 110139, 110140, 110141) then
 		shrapnelTargets[#shrapnelTargets + 1] = args.destName
 		self:Unschedule(warnShrapnelTargets)
@@ -179,7 +172,7 @@
 			specWarnShrapnel:Show()
 			ShrapnelCountdown:Start(6)
 		end
-		if (self:IsDifficulty("normal10") and #shrapnelTargets >= 3) then -- confirmed only in 10man normal
+		if (self:IsDifficulty("normal10") and #shrapnelTargets >= 3) then
 			warnShrapnelTargets()
 		else
 			self:Schedule(0.3, warnShrapnelTargets)
@@ -203,7 +196,7 @@
 
 
 function mod:SPELL_AURA_REMOVED(args)
-	if args:IsSpellID(106444, 109631, 109632, 109633) then--Over here, we do use the secondary spellids to cancel the debuff target timer.
+	if args:IsSpellID(106444, 109631, 109632, 109633) then
 		timerImpale:Cancel(args.destName)
 	elseif args:IsSpellID(108649) then
 		timerUnstableCorruption:Start()
@@ -219,7 +212,7 @@
 
 function mod:UNIT_DIED(args)
 	local cid = self:GetCIDFromGUID(args.destGUID)
-	if cid == 56167 or cid == 56168 or cid == 56846 then--Wings and Arms. Why only 3 IDs? 1 missing?
+	if cid == 56167 or cid == 56168 or cid == 56846 then--Wings and Arms.
 		timerElementiumBoltCD:Cancel()
 		timerHemorrhageCD:Cancel()--Does this one cancel in event you super overgear this and stomp his ass this fast?
 		timerCataclysm:Cancel()
@@ -227,6 +220,7 @@
 	elseif cid == 56471 then--Mutated Corruption
 		timerImpaleCD:Cancel()
 		timerParasiteCD:Cancel()
+		timerImpale:Cancel()--Cancel impale debuff timers since they don't matter anymore until next platform (well after they cleared)
 	end
 end
 
@@ -234,14 +228,14 @@
 	if spellName == GetSpellInfo(110663) then--Elementium Meteor Transform (apparently this doesn't fire UNIT_DIED anymore, need to use this alternate method)
 		self:SendSync("BoltDied")--Send sync because Elementium bolts do not have a bossN arg, which means event only fires if it's current target/focus.
 	end
-	if not (uId == "boss1" or uId == "boss2") then return end--Anti spam to ignore all other args (like target/focus/mouseover)
+	if not uId:find("boss") then return end--Anti spam to ignore all other args (like target/focus/mouseover)
 	if spellName == GetSpellInfo(105853) then
 		warnHemorrhage:Show()
 		specWarnHemorrhage:Show()
 	elseif spellName == GetSpellInfo(105551) then--Spawn Blistering Tentacles
 		if not UnitBuff("player", GetSpellInfo(106028)) and not UnitIsDeadOrGhost("player") then--Check for Alexstrasza's Presence
 			warnTentacle:Show()
-			specWarnTentacle:Show()--It's not up so give special warning for these Tentacles.
+			specWarnTentacle:Show()
 		end
 	elseif spellName == GetSpellInfo(106708) and not phase2 then--Slump (Phase 2 start), sometimes it's double warned. bliz bug??
 		phase2 = true

trunk/DBM-DragonSoul/Morchok.lua

Action: modified

Old revision: 7230

Old date: 2012-01-25 07:25:07 UTC

@@ -94,7 +94,7 @@
 		if self.Options.RangeFrame then
 			DBM.RangeCheck:Hide()
 		end
-		if self:IsDifficulty("heroic10", "heroic25") then-- update this variable in heroic only (normal mode not needed)
+		if self:IsDifficulty("heroic10", "heroic25") then
 			kohcromSkip = 1
 		end
 	end
@@ -118,7 +118,7 @@
 					timerKohcromCD:Start(6, args.spellName)
 				end
 			end
-			if kohcromSkip and self:IsDifficulty("heroic10", "heroic25") then-- update this variable in heroic only (normal mode not needed)
+			if kohcromSkip and self:IsDifficulty("heroic10", "heroic25") then
 				kohcromSkip = 1
 			end
 		else
@@ -153,7 +153,7 @@
 					timerKohcromCD:Start(6, args.spellName)
 				end
 			end
-			if kohcromSkip and self:IsDifficulty("heroic10", "heroic25") then-- update this variable in heroic only (normal mode not needed)
+			if kohcromSkip and self:IsDifficulty("heroic10", "heroic25") then
 				kohcromSkip = 2
 			end
 		else
@@ -183,7 +183,7 @@
 		timerCrystal:Cancel()
 		timerKohcromCD:Cancel()
 		warnVortex:Show()
-		specwarnVortex:Show()--No reason to split the special warning into 2, it's just an attention getter and doesn't stay on screen like normal messages.
+		specwarnVortex:Show()
 		if self.Options.RangeFrame then
 			DBM.RangeCheck:Show(5)
 		end

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7230

Old date: 2012-01-25 07:25:07 UTC

@@ -7,7 +7,7 @@
 mod:SetZone()
 mod:SetUsedIcons(6, 5, 4, 3, 2, 1)
 
-mod:RegisterCombat("yell", L.Pull)--Engage trigger comes 30 seconds after encounter starts, because of this, the mod can miss the first round of ability casts such as first grip targets. have to use yell
+mod:RegisterCombat("yell", L.Pull)--INSTANCE_ENCOUNTER_ENGAGE_UNIT comes 30 seconds after encounter starts, because of this, the mod can miss the first round of ability casts such as first grip targets. have to use yell
 
 mod:RegisterEventsInCombat(
 	"SPELL_CAST_START",
@@ -25,7 +25,7 @@
 local warnResidue			= mod:NewCountAnnounce("ej4057", 3, nil, false) -- maybe info frame will be better. (temporarly added)
 local warnGrip				= mod:NewTargetAnnounce(109459, 4)
 local warnNuclearBlast		= mod:NewCastAnnounce(105845, 4)
-local warnSealArmor			= mod:NewCastAnnounce(105847, 4)--Cast by Burning Tendons when they spawn after you break a plate
+local warnSealArmor			= mod:NewCastAnnounce(105847, 4)
 
 local specWarnRoll			= mod:NewSpecialWarningSpell("ej4050", nil, nil, nil, true)--The actual roll
 local specWarnTendril		= mod:NewSpecialWarning("SpecWarnTendril")--A personal warning for you only if you're not gripped 3 seconds after roll started
@@ -72,7 +72,6 @@
 	table.wipe(gripTargets)
 end
 
---This wasn't working right on 25 man at all, i think more then one went out at a time, and it spam changed name, it didn't want to add more then 1 name to frame at a time so instead it kept replacing the frame, alli saw was about 6 names flash by within 1 second.
 local clearPlasmaTarget, setPlasmaTarget, clearPlasmaVariables
 do
 	local plasmaTargets = {}
@@ -200,7 +199,7 @@
 		end
 		self:Unschedule(showGripWarning)
 		self:Schedule(0.3, showGripWarning)
-	elseif args:IsSpellID(105479, 109362, 109363, 109364) then -- 105479 in 10 man. otherid is drycoded.
+	elseif args:IsSpellID(105479, 109362, 109363, 109364) then
 		if self.Options.ShowShieldInfo then
 			setPlasmaTarget(args.destGUID, args.destName)
 		end
@@ -215,7 +214,7 @@
 		if args.amount == 9 then
 			warnAbsorbedBlood:Show(args.destName, 9)
 		else
-			warnAbsorbedBlood:Schedule(2, args.destName, args.amount or 1)
+			warnAbsorbedBlood:Schedule(2, args.destName, args.amount)
 		end
 	end
 end
@@ -225,7 +224,7 @@
 		if self.Options.SetIconOnGrip then
 			self:SetIcon(args.destName, 0)
 		end
-	elseif args:IsSpellID(105479, 109362, 109363, 109364) then -- 105479 in 10 man. otherid is drycoded.
+	elseif args:IsSpellID(105479, 109362, 109363, 109364) then
 		if self.Options.ShowShieldInfo then
 			clearPlasmaTarget(args.destGUID, args.destName)
 		end

trunk/DBM-DragonSoul/Ultraxion.lua

Action: modified

Old revision: 7230

Old date: 2012-01-25 07:25:07 UTC

@@ -28,7 +28,7 @@
 local specWarnHourofTwilightN		= mod:NewSpecialWarning("specWarnHourofTwilightN", nil, false)
 local specWarnFadingLight			= mod:NewSpecialWarningYou(110080)
 local specWarnFadingLightOther		= mod:NewSpecialWarningTarget(110080, mod:IsTank())
-local specWarnTwilightEruption		= mod:NewSpecialWarningSpell(106388, nil, nil, nil, true)--Berserk, you have 5 seconds to finish off the boss ;)
+local specWarnTwilightEruption		= mod:NewSpecialWarningSpell(106388, nil, nil, nil, true)
 
 local timerCombatStart				= mod:NewTimer(35, "TimerCombatStart", 2457)
 local timerUnstableMonstrosity		= mod:NewNextTimer(60, 106372, nil, mod:IsHealer())
@@ -36,16 +36,16 @@
 local timerHourofTwilightCD			= mod:NewNextCountTimer(45.5, 109416)
 local timerTwilightEruption			= mod:NewCastTimer(5, 106388)
 local timerFadingLight				= mod:NewBuffFadesTimer(10, 110080)
-local timerFadingLightCD			= mod:NewNextTimer(10, 110080)--10 second on heroic, 15 on normal
+local timerFadingLightCD			= mod:NewNextTimer(10, 110080)
 local timerGiftofLight				= mod:NewNextTimer(80, 105896, nil, mod:IsHealer())
 local timerEssenceofDreams			= mod:NewNextTimer(155, 105900, nil, mod:IsHealer())
 local timerSourceofMagic			= mod:NewNextTimer(215, 105903, nil, mod:IsHealer())
-local timerLoomingDarkness			= mod:NewBuffFadesTimer(120, 106498)--Heroic ability, personal only timer.
+local timerLoomingDarkness			= mod:NewBuffFadesTimer(120, 106498)
 local timerRaidCDs					= mod:NewTimer(60, "timerRaidCDs", 2565, nil, false)--Does not need to be localized, has no option, uses ShowRaidCDs bool
 
 local berserkTimer					= mod:NewBerserkTimer(360)--some players regard as Ultraxian mod not shows berserk Timer. so it will be better to use Generic Berserk Timer..
 
-local FadingLightCountdown			= mod:NewCountdown(10, 110080)--5-10 second variation that's random according to EJ
+local FadingLightCountdown			= mod:NewCountdown(10, 110080)
 local HourofTwilightCountdown		= mod:NewCountdown(45.5, 109416, mod:IsHealer())--can be confusing with Fading Light, only enable for healer. (healers no dot affect by Fading Light)
 
 mod:AddBoolOption("ShowRaidCDs", false, "timer")--Off by default. This is for RAID cds not personal CDs. Shield wall is added because of 4pc bonus, it's assumed on heroic ultraxion you're tanks have 4pc.
@@ -107,9 +107,7 @@
 			timerFadingLightCD:Start(13)
 			timerHourofTwilight:Start(3)
 		else
-			if (self:IsDifficulty("lfr25") and self:IsTank()) or self:IsDifficulty("normal10", "normal25") then
 				timerFadingLightCD:Start(20)
-			end
 			timerHourofTwilight:Start()
 		end
 	elseif args:IsSpellID(106388) then
@@ -122,31 +120,31 @@
 	if args:IsSpellID(106372, 106376, 106377, 106378, 106379) then
 		timerUnstableMonstrosity:Start()
 	elseif args:IsSpellID(97462) and self:IsInCombat() and ((self.Options.ShowRaidCDs and not self.Options.ShowRaidCDsSelf) or (self.Options.ShowRaidCDs and self.Options.ShowRaidCDsSelf and UnitName("player") == args.sourceName)) then--Warrior Rallying Cry
-		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then--Last Defender of Azeroth
+		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then
 			timerRaidCDs:Start(90, args.spellName, args.sourceName)
 		else
 			timerRaidCDs:Start(180, args.spellName, args.sourceName)
 		end
 	elseif args:IsSpellID(871) and self:IsInCombat() and ((self.Options.ShowRaidCDs and not self.Options.ShowRaidCDsSelf) or (self.Options.ShowRaidCDs and self.Options.ShowRaidCDsSelf and UnitName("player") == args.sourceName)) then--Warrior Shield Wall (4pc Assumed)
-		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then--Last Defender of Azeroth
+		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then
 			timerRaidCDs:Start(60, args.spellName, args.sourceName)
 		else
 			timerRaidCDs:Start(120, args.spellName, args.sourceName)
 		end
 	elseif args:IsSpellID(62618) and self:IsInCombat() and ((self.Options.ShowRaidCDs and not self.Options.ShowRaidCDsSelf) or (self.Options.ShowRaidCDs and self.Options.ShowRaidCDsSelf and UnitName("player") == args.sourceName)) then--Paladin Divine Guardian (4pc assumed)
-		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then--Last Defender of Azeroth
+		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then
 			timerRaidCDs:Start(60, args.spellName, args.sourceName)
 		else
 			timerRaidCDs:Start(120, args.spellName, args.sourceName)
 		end
 	elseif args:IsSpellID(55233) and self:IsInCombat() and ((self.Options.ShowRaidCDs and not self.Options.ShowRaidCDsSelf) or (self.Options.ShowRaidCDs and self.Options.ShowRaidCDsSelf and UnitName("player") == args.sourceName)) then--DK Vampric Blood (4pc assumed)
-		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then--Last Defender of Azeroth
+		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then
 			timerRaidCDs:Start(30, args.spellName, args.sourceName)
 		else
 			timerRaidCDs:Start(60, args.spellName, args.sourceName)
 		end
 	elseif args:IsSpellID(22842) and self:IsInCombat() and ((self.Options.ShowRaidCDs and not self.Options.ShowRaidCDsSelf) or (self.Options.ShowRaidCDs and self.Options.ShowRaidCDsSelf and UnitName("player") == args.sourceName)) then--Druid Frenzied Regen (4pc assumed)
-		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then--Last Defender of Azeroth
+		if UnitDebuff(args.sourceName, GetSpellInfo(106218)) then
 			timerRaidCDs:Start(90, args.spellName, args.sourceName)
 		else
 			timerRaidCDs:Start(180, args.spellName, args.sourceName)
@@ -162,14 +160,12 @@
 	if args:IsSpellID(105925, 110068, 110069, 110070) then--Tank Only SpellIDS
 		fadingLightCount = fadingLightCount + 1
 		fadingLightTargets[#fadingLightTargets + 1] = args.destName
-		if self:IsDifficulty("heroic10", "heroic25") and fadingLightCount < 3 then--It's cast 3 times during hour of twilight buff duration on ultraxion heroic. 20 secomds remaining, 10 seconds remaining, and at 0 seconds remainings.
+		if self:IsDifficulty("heroic10", "heroic25") and fadingLightCount < 3 then
 			timerFadingLightCD:Start()
-		elseif self:IsDifficulty("normal10", "normal25") and fadingLightCount < 2 then--It's cast 2 times during hour of twilight buff duration on ultraxion normal. 15 secomds remaining and at 0 seconds remainings.
+		elseif self:IsDifficulty("normal10", "normal25", "lfr25") and fadingLightCount < 2 then
 			timerFadingLightCD:Start(15)
-		elseif self:IsDifficulty("lfr25") and self:IsTank() and fadingLightCount < 2 then--Only tanks get it in LFR
-			timerFadingLightCD:Start(15)
 		end
-		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(105925))) and GetTime() - fadingLightSpam > 1.5 then--Sometimes the combatlog doesn't report all fading lights, so we perform an additional aura check 
+		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(105925))) and GetTime() - fadingLightSpam > 2 then--Sometimes the combatlog doesn't report all fading lights, so we perform an additional aura check 
 			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)--Find out what our specific fading light is
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)--For some reason need to offset it by 1 second to make it accurate but otherwise it's perfect
@@ -179,18 +175,26 @@
 			specWarnFadingLightOther:Show(args.destName)
 		end
 		self:Unschedule(warnFadingLightTargets)
-		self:Schedule(0.3, warnFadingLightTargets)
+		if self:IsDifficulty("lfr25") or self:IsDifficulty("heroic25") and #fadingLightTargets >= 7 or self:IsDifficulty("normal25") and #fadingLightTargets >= 4 or self:IsDifficulty("heroic10") and #fadingLightTargets >= 3 or self:IsDifficulty("normal10") and #fadingLightTargets >= 2 then
+			warnFadingLightTargets()
+		else
+			self:Schedule(0.5, warnFadingLightTargets)
+		end
 	elseif args:IsSpellID(109075, 110078, 110079, 110080) then--Non Tank IDs
 		fadingLightTargets[#fadingLightTargets + 1] = args.destName
-		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109075))) and GetTime() - fadingLightSpam > 1.5 then
-			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)--Find out what our specific fading light is
+		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109075))) and GetTime() - fadingLightSpam > 2 then
+			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)
 			timerFadingLight:Start(duration-1)
 			fadingLightSpam = GetTime()
 		end
 		self:Unschedule(warnFadingLightTargets)
-		self:Schedule(0.3, warnFadingLightTargets)
+		if self:IsDifficulty("heroic25") and #fadingLightTargets >= 7 or self:IsDifficulty("normal25") and #fadingLightTargets >= 4 or self:IsDifficulty("heroic10") and #fadingLightTargets >= 3 or self:IsDifficulty("normal10") and #fadingLightTargets >= 2 then
+			warnFadingLightTargets()
+		else
+			self:Schedule(0.5, warnFadingLightTargets)
+		end
 	elseif args:IsSpellID(106498) and args:IsPlayer() then
 		timerLoomingDarkness:Start()
 	end

trunk/DBM-DragonSoul/Yorsahj.lua

Action: modified

Old revision: 7230

Old date: 2012-01-25 07:25:07 UTC

@@ -84,13 +84,13 @@
 
 function mod:SPELL_CAST_SUCCESS(args)
 	if args:IsSpellID(104849, 108383, 108384, 108385) then--Do not add any other ID, these are tank IDs. Raid aoe IDs coul be added as an alternate timer somewhere else maybe.
-		timerVoidBoltCD:Start()--Start CD off this not applied, that way we still get CD if a tank AMS's the debuff application.
+		timerVoidBoltCD:Start()
 	elseif args:IsSpellID(105530) then
 		warnManaVoid:Show()
 		specWarnManaVoid:Show()
 	elseif args:IsSpellID(105573, 108350, 108351, 108352) and self:IsInCombat() then
 		if yellowActive then
-			timerAcidCD:Start(3.5)--Strangely, ths is 3.5 even though base CD is 8.3-8.5
+			timerAcidCD:Start(3.5)--Strangely, this is 3.5 even though base CD is 8.3-8.5
 		else
 			timerAcidCD:Start()
 		end
@@ -126,29 +126,29 @@
 		yellowActive = true
 	elseif args:IsSpellID(104896) and args:GetDestCreatureID() == 55312 then--Purple
 		table.insert(oozesHitTable, L.Purple)
-		if #oozesHitTable == expectedOozes then--All of em absorbed
+		if #oozesHitTable == expectedOozes then
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
 		specWarnPurple:Show()
 	elseif args:IsSpellID(105027) and args:GetDestCreatureID() == 55312 then--Blue
 		table.insert(oozesHitTable, L.Blue)
-		if #oozesHitTable == expectedOozes then--All of em absorbed
+		if #oozesHitTable == expectedOozes then
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
 	elseif args:IsSpellID(104897) and args:GetDestCreatureID() == 55312 then--Red
 		table.insert(oozesHitTable, L.Red)
-		if #oozesHitTable == expectedOozes then--All of em absorbed
+		if #oozesHitTable == expectedOozes then
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
 	elseif args:IsSpellID(104894) and args:GetDestCreatureID() == 55312 then--Black
 		table.insert(oozesHitTable, L.Black)
-		if #oozesHitTable == expectedOozes then--All of em absorbed
+		if #oozesHitTable == expectedOozes then
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
 	elseif args:IsSpellID(104898) then--Green
 		if args:GetSrcCreatureID() == 55312 then--Only trigger the actual acid spits off the boss getting buff, not the oozes spawning.
 			table.insert(oozesHitTable, L.Green)
-			if #oozesHitTable == expectedOozes then--All of em absorbed
+			if #oozesHitTable == expectedOozes then
 				warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 			end
 		end
@@ -160,7 +160,7 @@
 mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
 
 function mod:SPELL_AURA_REMOVED(args)
-	if args:IsSpellID(104849, 108383, 108384, 108385) then--104849, 108383 confirmed 10 and 25 man normal, other 2 drycoded from wowhead.
+	if args:IsSpellID(104849, 108383, 108384, 108385) then
 		timerVoidBolt:Cancel(args.destName)
 	elseif args:IsSpellID(104901) and args:GetDestCreatureID() == 55312 then--Yellow Removed
 		yellowActive = false
@@ -178,7 +178,7 @@
 
 function mod:UNIT_SPELLCAST_SUCCEEDED(uId, spellName, _, _, spellID)
 	if not uId:find("boss") then return end--yor can apparently be boss 1 2 3 or 4. even though he's only boss, :o
-	if oozeColors[spellID] then--It doesn't really matter which table/ID we check for, spellids are same, only matters in warning.
+	if oozeColors[spellID] then
 		table.wipe(oozesHitTable)
 		specWarnOozes:Show()
 		timerVoidBoltCD:Start(42)

trunk/DBM-DragonSoul/Zonozz.lua

Action: modified

Old revision: 7230

Old date: 2012-01-25 07:25:07 UTC

@@ -31,7 +31,7 @@
 local yellShadows				= mod:NewYell(103434, nil, false, L.ShadowYell)--Requested by 10 man guilds, but a spammy mess in 25s, so off by default. With the option to enable when desired.
 
 local timerVoidofUnmakingCD		= mod:NewNextTimer(90.3, 103571, nil, nil, nil, 103527)
-local timerVoidDiffusionCD		= mod:NewCDTimer(5, 106836)--Can not be triggered more then once per 5 seconds.
+local timerVoidDiffusionCD		= mod:NewCDTimer(5, 106836)
 local timerFocusedAngerCD		= mod:NewCDTimer(6, 104543, nil, false)--Off by default as it may not be entirely useful information to know, but an option just for heck of it. You know SOMEONE is gonna request it
 local timerPsychicDrainCD		= mod:NewCDTimer(20, 104322)--Every 20-25 seconds, variates.
 local timerShadowsCD			= mod:NewCDTimer(25, 103434)--Every 25-30, variates
@@ -84,7 +84,7 @@
 	timerPsychicDrainCD:Start(16.5-delay)
 	timerShadowsCD:Start(-delay)
 	self:updateRangeFrame()
-	if not self:IsDifficulty("lfr25") then--Can confirm what others saw, LFR definitely doesn't have a 6 min berserk. It's either much longer or not there.
+	if not self:IsDifficulty("lfr25") then
 		berserkTimer:Start(-delay)
 	end
 end
@@ -111,20 +111,20 @@
 		timerShadowsCD:Cancel()
 		specWarnBlackBlood:Show()
 		timerBlackBlood:Start()
-		self:Schedule(30, blackBloodEnds)--More accurate way then tracking spell aura removed of black blood. Players dying in the phase were falsely triggering the phase ending early.
+		self:Schedule(30, blackBloodEnds)
 		if self:IsDifficulty("heroic10", "heroic25") then
-			if timerVoidofUnmakingCD:GetTime() > 45.3 then--Heroic has a failsafe in place, if CD exausts before 15 seconds after black phase ending, it's extended, probably to allow raid more time to repositoin vs normal
+			if timerVoidofUnmakingCD:GetTime() > 45.3 then--Heroic has a failsafe in place, if CD ends before 15 seconds after black phase ending, it's extended
 				timerVoidofUnmakingCD:Update(45.3, 90.3)
 			end
 		else
-			if timerVoidofUnmakingCD:GetTime() > 54.3 then--Normal also has a failsafe but much smaller, if it comes off CD before 6 seconds has passed after dark, it gets delayed until 6 seconds have passed
+			if timerVoidofUnmakingCD:GetTime() > 54.3 then--Normal also has a failsafe but much smaller
 				timerVoidofUnmakingCD:Update(54.3, 90.3)
 			end
 		end
 	elseif args:IsSpellID(104543, 109409, 109410, 109411) then
 		warnFocusedAnger:Show(args.destName, args.amount or 1)
 		timerFocusedAngerCD:Start()
-	elseif args:IsSpellID(106836) then--106836 confirmed 10/25 man normal, do NOT add 103527 to this, that's a seperate spellid for when BOSS is affected by diffusion, this warning is counting the ball stacks.
+	elseif args:IsSpellID(106836) then--Do NOT add 103527 to this, that's a seperate spellid for when BOSS is affected by diffusion, this warning is counting the ball stacks.
 		warnVoidDiffusion:Show(args.destName, args.amount or 1)
 		timerVoidDiffusionCD:Start()
 	elseif args:IsSpellID(103434, 104599, 104600, 104601) then
@@ -150,11 +150,11 @@
 	end
 end
 
---It looks this event doesn't fire in raid finder. It seems to still fire in normal and heroic modes.
 function mod:UNIT_SPELLCAST_SUCCEEDED(uId, spellName, _, _, spellID)
 	if uId ~= "boss1" then return end--Anti spam to ignore all other args (like target/focus/mouseover)
 	--Void of the unmaking cast, do not use spellname because we want to ignore events using spellid 103627 which fires when the sphere dispurses on the boss.
-	if spellID == 103571 and not voidWarned then--This spellid is same in 10/25 and raid finder, and assuming also same in heroic. No reason to use spellname, or other IDs.
+	--It looks this event doesn't fire in raid finder. It seems to still fire in normal and heroic modes.
+	if spellID == 103571 and not voidWarned then
 		if timerPsychicDrainCD:GetTime() == 0 then--Just a hack to prevent this from overriding first timer on pull, which is only drain that doesn't follow this rule
 			timerPsychicDrainCD:Start(8.5)
 		end
@@ -165,12 +165,10 @@
 	end
 end
 
---"<10.8> [UNIT_SPELLCAST_SUCCEEDED] Warlord Zon'ozz:Possible Target:boss1:Void of the Unmaking::0:103571", -- [371]
---"<11.0> [CHAT_MSG_MONSTER_YELL] CHAT_MSG_MONSTER_YELL#Gul'kafh an'qov N'Zoth.#Warlord Zon'ozz###Warlord Zon'ozz##0#0##0#3201##0#false", -- [413]
 --Backup trigger for LFR where UNIT_SPELLCAST_SUCCEEDED doesn't fire for void cast
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if (msg == L.voidYell or msg:find(L.voidYell)) and not voidWarned then
-		timerPsychicDrainCD:Start(8.3)--Yell comes .2 after unit event, so we adjust the timers.
+		timerPsychicDrainCD:Start(8.3)--Yell comes .2 after unit event in normal and heroic, so we adjust the timers for LFR for yell being later.
 		timerVoidofUnmakingCD:Start(90.1)
 		voidWarned = true
 		warnVoidofUnmaking:Show()

r7230 (nbluewiz): # some cd timer changes to next.

nbluewiz — Wed, 25 Jan 2012 07:25:07 GMT

Author: nbluewiz
Date: Wed Jan 25 08:25:07 CET 2012
Revision: 7230

Log:

# some cd timer changes to next.

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Updated

trunk/DBM-DragonSoul/Zonozz.lua

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7229

Old date: 2012-01-25 07:20:08 UTC

@@ -35,7 +35,7 @@
 
 local timerSealArmor		= mod:NewCastTimer(23, 105847)
 local timerBarrelRoll		= mod:NewCastTimer(5, "ej4050")
-local timerGripCD			= mod:NewCDTimer(32, 109457)
+local timerGripCD			= mod:NewNextTimer(32, 109457)
 
 
 local soundNuclearBlast		= mod:NewSound(105845, nil, mod:IsMelee())

trunk/DBM-DragonSoul/Zonozz.lua

Action: modified

Old revision: 7229

Old date: 2012-01-25 07:20:08 UTC

@@ -30,7 +30,7 @@
 local specWarnShadows			= mod:NewSpecialWarningYou(103434)
 local yellShadows				= mod:NewYell(103434, nil, false, L.ShadowYell)--Requested by 10 man guilds, but a spammy mess in 25s, so off by default. With the option to enable when desired.
 
-local timerVoidofUnmakingCD		= mod:NewCDTimer(90.3, 103571, nil, nil, nil, 103527)
+local timerVoidofUnmakingCD		= mod:NewNextTimer(90.3, 103571, nil, nil, nil, 103527)
 local timerVoidDiffusionCD		= mod:NewCDTimer(5, 106836)--Can not be triggered more then once per 5 seconds.
 local timerFocusedAngerCD		= mod:NewCDTimer(6, 104543, nil, false)--Off by default as it may not be entirely useful information to know, but an option just for heck of it. You know SOMEONE is gonna request it
 local timerPsychicDrainCD		= mod:NewCDTimer(20, 104322)--Every 20-25 seconds, variates.

r7229 (nbluewiz): # Core: updated battleground invite timer text. + cancels timer when enter or cancel. # Battlegrounds : fix building health bar showing on other battlegrounds (like Strands of Ancients, Wintergrasp ..)

nbluewiz — Wed, 25 Jan 2012 07:20:08 GMT

Author: nbluewiz
Date: Wed Jan 25 08:20:08 CET 2012
Revision: 7229

Log:

# Core: updated battleground invite timer text. + cancels timer when enter or cancel.
# Battlegrounds : fix building health bar showing on other battlegrounds (like Strands of Ancients, Wintergrasp ..)

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-PvP/Battlegrounds/IsleOfConquest.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7228

Old date: 2012-01-25 05:06:10 UTC

@@ -171,6 +171,7 @@
 local LastZoneText
 local LastZoneMapID
 local savedDifficulty
+local queuedBattlefield = {}
 
 local enableIcons = true -- set to false when a raid leader or a promoted player has a newer version of DBM
 
@@ -1484,10 +1485,16 @@
 end
 
 function DBM:UPDATE_BATTLEFIELD_STATUS()
-	if GetBattlefieldStatus(1) == "confirm" or GetBattlefieldStatus(2) == "confirm" then
-		DBM.Bars:CreateBar(85, DBM_LFG_INVITE, "Interface\\Icons\\Spell_Holy_BorrowedTime")	-- need to confirm the timer
+	for i = 1, 2 do
+		if GetBattlefieldStatus(i) == "confirm" then
+			queuedBattlefield[i] = select(2, GetBattlefieldStatus(i))
+			DBM.Bars:CreateBar(85, queuedBattlefield[i], "Interface\\Icons\\Spell_Holy_BorrowedTime")	-- need to confirm the timer
+		elseif queuedBattlefield[i] then
+			DBM.Bars:CancelBar(queuedBattlefield[i])
+			queuedBattlefield[i] = nil
 	end
 end
+end
 
 --Loading routeens hacks for world bosses based on target or mouseover.
 function DBM:UPDATE_MOUSEOVER_UNIT()

trunk/DBM-PvP/Battlegrounds/IsleOfConquest.lua

Action: modified

Old revision: 7228

Old date: 2012-01-25 05:06:10 UTC

@@ -153,7 +153,7 @@
 end
 
 function IsleOfConquest:SPELL_BUILDING_DAMAGE(args)
-	if args == nil or args.destName == nil or args.destGUID == nil or args.amount == nil then
+	if args == nil or args.destName == nil or args.destGUID == nil or args.amount == nil or not bgzone then
 		return
 	end
 	local guid = args.destGUID

r7228 (Omega): Confirmed, harpoons do work this way, precisely. Now if only i could find a more accurate way to account for add timer variations. just going to have to be imperfect without a real emote or yell :(

Omega — Wed, 25 Jan 2012 05:06:10 GMT

Author: Omega
Date: Wed Jan 25 06:06:10 CET 2012
Revision: 7228

Log:

Confirmed, harpoons do work this way, precisely. Now if only i could find a more accurate way to account for add timer variations. just going to have to be imperfect without a real emote or yell :(

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/Ultraxion.lua

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7227

Old date: 2012-01-25 01:40:53 UTC

@@ -48,7 +48,7 @@
 
 local timerCombatStart				= mod:NewTimer(20.5, "TimerCombatStart", 2457)
 local timerAdd						= mod:NewTimer(61, "TimerAdd", 107752)
-local timerHarpoonCD				= mod:NewCDTimer(48, 108038, nil, mod:IsDps())--CD when you don't fail at drakes
+local timerHarpoonCD				= mod:NewNextTimer(6.5, 108038, nil, mod:IsDps())--CD when you don't fail at drakes
 local timerHarpoonActive			= mod:NewBuffActiveTimer(20, 108038, nil, mod:IsDps())--Seems to always hold at least 20 seconds, beyond that, RNG, but you always get at least 20 seconds before they "snap" free.
 local timerReloadingCast			= mod:NewCastTimer(10, 108039, nil, mod:IsDps())--You screwed up and let a drake get away, this makes a harpoon gun reload and regrab failed drakes after 10 seconds.
 local timerTwilightOnslaught		= mod:NewCastTimer(7, 107588)
@@ -77,7 +77,6 @@
 local ignoredHarpoons = 0
 local twilightOnslaughtCount = 0
 local CVAR = false
---local recentlyReloaded = false
 
 local function Phase2Delay()
 	mod:UnscheduleMethod("AddsRepeat")
@@ -118,21 +117,19 @@
 		specWarnElites:Show()
 		timerAdd:Start()
 		self:ScheduleMethod(61, "AddsRepeat")
-		--Experimental harpoon stuff. Think it actually works this way.
-		--since the elites don't fire anything in logs unless you target every Twilight Elite Dreads's Drake before it ejects him to get log time stamps
---		"<15.9> [UNIT_SPELLCAST_SUCCEEDED] Twilight Assault Drake:Possible Target:target:Eject Passenger 1::0:60603", -- [180]
---		The two useless casts are ignored because they actually fail, every pull, the first harpoons fail once (and out of order too not at same time), and relaunch synced up after.
---		"<35.5> [CLEU] SPELL_AURA_APPLIED#false#0xF150DD6900007D9A#Skyfire Harpoon Gun#2584#0#0xF150DE1700008B45#Twilight Assault Drake#133704#0#108038#Harpoon#1#BUFF", -- [2369]
+		--Confirmed behavior for harpoons, only problem is, sometimes the add timer itself is off. :\ For example in this log it's 22.9, 60.8, 62.6
+		--We can't safetly use 60603 to fix it either cause we can't tell the trades apart in DBM. I only know mine are right because I personally targeted the drake that drops first add all 3 times.
+--		"<1.0> [INSTANCE_ENCOUNTER_ENGAGE_UNIT] Fake Args:#1#1#The Skyfire#0xF130DD1600021854#elite#4000000#nil#nil#nil#nil#normal#0#nil#nil#nil#nil#normal#0#nil#nil#nil#nil#normal#0#Real Args:", -- [24]
+--		"<23.9> [UNIT_SPELLCAST_SUCCEEDED] Twilight Assault Drake [[target:Eject Passenger 1::0:60603]]", -- [142]
+--		"<43.8> [CLEU] SPELL_AURA_APPLIED#false#0xF150DD6900021857#Skyfire Harpoon Gun#2584#0#0xF150DE1700021DDF#Twilight Assault Drake#133704#0#108038#Harpoon#1#BUFF", -- [1309]
+--		"<84.7> [UNIT_SPELLCAST_SUCCEEDED] Twilight Assault Drake [[target:Eject Passenger 1::0:60603]]", -- [3524]
+--		"<91.8> [CLEU] SPELL_AURA_APPLIED#false#0xF150DD6900021857#Skyfire Harpoon Gun#2584#0#0xF150DE1700022081#Twilight Assault Drake#2632#0#108038#Harpoon#1#BUFF", -- [3857]
+--		"<147.3> [UNIT_SPELLCAST_SUCCEEDED] Twilight Assault Drake [[target:Eject Passenger 1::0:60603]]", -- [7445]
+--		"<154.2> [CLEU] SPELL_AURA_APPLIED#false#0xF150DD6900021857#Skyfire Harpoon Gun#2584#0#0xF150DE17000222C0#Twilight Assault Drake#2632#0#108038#Harpoon#1#BUFF", -- [7868]
 		if addsCount == 1 then
 			timerHarpoonCD:Start(20)--20 seconds after first elites (Confirmed)
---		Pug was bad and i got distracted and didn't target the drake before it cast "Eject Passenger". 76.9 assumed based on established "elites" cd.
---		"<82.9> [CLEU] SPELL_AURA_APPLIED#false#0xF150DD6900007D4A#Skyfire Harpoon Gun#2584#0#0xF150DD0B00008C0E#Twilight Assault Drake#2632#0#108038#Harpoon#1#BUFF", -- [12268]
-		elseif addsCount == 2 then
-			timerHarpoonCD:Start(6)--6 in this log. Maybe 2nd and 3rd sets are both a 6-7 variation and only first is 20 seconds after? Then again the eject passenger time was assumed.
---		"<138.7> [UNIT_SPELLCAST_SUCCEEDED] Twilight Assault Drake:Possible Target:target:Eject Passenger 1::0:60603", -- [24162]
---		"<145.6> [CLEU] SPELL_AURA_APPLIED#false#0xF150DD6900007D9A#Skyfire Harpoon Gun#2584#0#0xF150DE1700008CB9#Twilight Assault Drake#2632#0#108038#Harpoon#1#BUFF", -- [25407]
-		elseif addsCount == 3 then
-			timerHarpoonCD:Start(7)--7 in this log. Maybe it's 6-7 like 2nd set?
+		else--6-7 seconds after sets 2 and 3.
+			timerHarpoonCD:Start()--6-7 second variation.
 		end
 	end
 end
@@ -145,7 +142,6 @@
 	ignoredHarpoons = 0
 	twilightOnslaughtCount = 0
 	CVAR = false
---	recentlyReloaded = false
 	timerCombatStart:Start(-delay)
 	timerAdd:Start(22.8-delay)
 	self:ScheduleMethod(22.8-delay, "AddsRepeat")
@@ -188,7 +184,6 @@
 	elseif args:IsSpellID(110210, 110213) then
 		timerTwilightBreath:Start()
 	elseif args:IsSpellID(108039) then
---		recentlyReloaded = true
 		warnReloading:Show()
 		timerReloadingCast:Start(args.sourceGUID)
 	end
@@ -224,11 +219,6 @@
 		else--We are passed the 2 useless ones, do everything as normal now.
 			warnHarpoon:Show(args.destName)
 			specWarnHarpoon:Show(args.destName)
---[[		if not recentlyReloaded then--No old drakes are up when this was cast, so start a fresh valid 48 second bar.
-				timerHarpoonCD:Start(args.sourceGUID)
-			else
-				timerHarpoonCD:Cancel()--Cancel all harpoon bars since the "Reloading" cast finished before old drake died, which alters and ruins the bar Cds this drake cycle.
-			end--]]
 			if self:IsDifficulty("heroic10", "heroic25") then
 				timerHarpoonActive:Start(nil, args.destGUID)
 			elseif self:IsDifficulty("normal10", "normal25") then
@@ -303,9 +293,6 @@
 		drakesCount = drakesCount - 1
 		warnDrakesLeft:Show(drakesCount)
 		timerHarpoonActive:Cancel(args.sourceGUID)
---[[		if drakesCount == 4 or drakesCount == 2 then
-			recentlyReloaded = false
-		end--]]
 	end
 end

trunk/DBM-DragonSoul/Ultraxion.lua

Action: modified

Old revision: 7227

Old date: 2012-01-25 01:40:53 UTC

@@ -169,7 +169,7 @@
 		elseif self:IsDifficulty("lfr25") and self:IsTank() and fadingLightCount < 2 then--Only tanks get it in LFR
 			timerFadingLightCD:Start(15)
 		end
-		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(105925))) and GetTime() - fadingLightSpam > 3 then--Sometimes the combatlog doesn't report all fading lights, so we perform an additional aura check 
+		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(105925))) and GetTime() - fadingLightSpam > 1.5 then--Sometimes the combatlog doesn't report all fading lights, so we perform an additional aura check 
 			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)--Find out what our specific fading light is
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)--For some reason need to offset it by 1 second to make it accurate but otherwise it's perfect
@@ -182,7 +182,7 @@
 		self:Schedule(0.3, warnFadingLightTargets)
 	elseif args:IsSpellID(109075, 110078, 110079, 110080) then--Non Tank IDs
 		fadingLightTargets[#fadingLightTargets + 1] = args.destName
-		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109075))) and GetTime() - fadingLightSpam > 3 then
+		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109075))) and GetTime() - fadingLightSpam > 1.5 then
 			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)--Find out what our specific fading light is
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)

r7227 (nbluewiz): # Core : fix difficulty bug.

nbluewiz — Wed, 25 Jan 2012 01:40:53 GMT

Author: nbluewiz
Date: Wed Jan 25 02:40:53 CET 2012
Revision: 7227

Log:

# Core : fix difficulty bug.

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7226

Old date: 2012-01-24 17:31:24 UTC

@@ -2351,19 +2351,19 @@
 			savedDifficulty = PLAYER_DIFFICULTY1.." - "
 		elseif mod:IsDifficulty("heroic5") then
 			mod.stats.heroicPulls = mod.stats.heroicPulls + 1
-			savedDifficulty = PLAYER_DIFFICULTY2.." (10) - "
+			savedDifficulty = PLAYER_DIFFICULTY2.." - "
 		elseif mod:IsDifficulty("normal10") then
 			mod.stats.normalPulls = mod.stats.normalPulls + 1
 			savedDifficulty = PLAYER_DIFFICULTY1.." (10) - "
 		elseif mod:IsDifficulty("heroic10") then
 			mod.stats.heroicPulls = mod.stats.heroicPulls + 1
-			savedDifficulty = PLAYER_DIFFICULTY2.." (25) - "
+			savedDifficulty = PLAYER_DIFFICULTY2.." (10) - "
 		elseif mod:IsDifficulty("normal25") then
 			mod.stats.normal25Pulls = mod.stats.normal25Pulls + 1
 			savedDifficulty = PLAYER_DIFFICULTY1.." (25) - "
 		elseif mod:IsDifficulty("heroic25") then
 			mod.stats.heroic25Pulls = mod.stats.heroic25Pulls + 1
-			savedDifficulty = PLAYER_DIFFICULTY2.." - "
+			savedDifficulty = PLAYER_DIFFICULTY2.." (25) - "
 		else--you were not in an instance when you started combat, this is an outdoor boss.
 			mod.stats.normalPulls = mod.stats.normalPulls + 1--Treat it as normal for kill stats.
 			savedDifficulty = ""--So lets just return no difficulty :)

r7226 (Snamor): esES update

Snamor — Tue, 24 Jan 2012 17:31:24 GMT

Author: Snamor
Date: Tue Jan 24 18:31:24 CET 2012
Revision: 7226

Log:

esES update

Updated

trunk/DBM-DragonSoul/localization.es.lua

Action: modified

Old revision: 7225

Old date: 2012-01-24 04:30:31 UTC

@@ -164,7 +164,7 @@
 	SapperEmote			= "¡Un draco desciende para dejar a un zapador Crepuscular en la cubierta!",
 	Broadside			= "spell:110153",
 	DeckFire			= "spell:110095",
-	GorionaRetreat			= "screeches in pain and retreats into the swirling clouds"--translate
+	GorionaRetreat			= "grita de dolor y se retira al remolino de nubes."
 })
 
 -------------------------

r7225 (Omega): ##Core, Player sizes actually in the difficulty messages now. At first i thought "why bother, they can look at # of players" But not nessesarily. It occured to me running some wrath 25 raids with 5-10 people, you can't tell in which one it is by the players. Someone saw my auto whisper and thought it was 10 man, :). So now they will know when i have 5 people, i'm 5 manning 25 man, not 10 man heh.

Omega — Tue, 24 Jan 2012 04:30:31 GMT

Author: Omega
Date: Tue Jan 24 05:30:31 CET 2012
Revision: 7225

Log:

##Core, Player sizes actually in the difficulty messages now. At first i thought "why bother, they can look at # of players" But not nessesarily. It occured to me running some wrath 25 raids with 5-10 people, you can't tell in which one it is by the players. Someone saw my auto whisper and thought it was 10 man, :). So now they will know when i have 5 people, i'm 5 manning 25 man, not 10 man heh.
#Blackhorn harpoon timer tweaks based on new logs.
DS trash comment for me to work on later. There is a UNIT event that can be used instead of a yell to avoid locals, as well as allow the the "skyrim" timer to still fire after a wipe (the RP/yell only happens first pull).

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/DSTrash.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7224

Old date: 2012-01-23 22:17:30 UTC

@@ -2346,15 +2346,21 @@
 		if mod:IsDifficulty("lfr25") then
 			mod.stats.lfr25Pulls = mod.stats.lfr25Pulls + 1
 			savedDifficulty = PLAYER_DIFFICULTY3.." - "
-		elseif mod:IsDifficulty("normal5", "normal10") then
+		elseif mod:IsDifficulty("normal5") then
 			mod.stats.normalPulls = mod.stats.normalPulls + 1
 			savedDifficulty = PLAYER_DIFFICULTY1.." - "
-		elseif mod:IsDifficulty("heroic5", "heroic10") then
+		elseif mod:IsDifficulty("heroic5") then
 			mod.stats.heroicPulls = mod.stats.heroicPulls + 1
-			savedDifficulty = PLAYER_DIFFICULTY2.." - "
+			savedDifficulty = PLAYER_DIFFICULTY2.." (10) - "
+		elseif mod:IsDifficulty("normal10") then
+			mod.stats.normalPulls = mod.stats.normalPulls + 1
+			savedDifficulty = PLAYER_DIFFICULTY1.." (10) - "
+		elseif mod:IsDifficulty("heroic10") then
+			mod.stats.heroicPulls = mod.stats.heroicPulls + 1
+			savedDifficulty = PLAYER_DIFFICULTY2.." (25) - "
 		elseif mod:IsDifficulty("normal25") then
 			mod.stats.normal25Pulls = mod.stats.normal25Pulls + 1
-			savedDifficulty = PLAYER_DIFFICULTY1.." - "
+			savedDifficulty = PLAYER_DIFFICULTY1.." (25) - "
 		elseif mod:IsDifficulty("heroic25") then
 			mod.stats.heroic25Pulls = mod.stats.heroic25Pulls + 1
 			savedDifficulty = PLAYER_DIFFICULTY2.." - "

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7224

Old date: 2012-01-23 22:17:30 UTC

@@ -74,6 +74,7 @@
 local lastFlames = 0
 local addsCount = 0
 local drakesCount = 6
+local ignoredHarpoons = 0
 local twilightOnslaughtCount = 0
 local CVAR = false
 --local recentlyReloaded = false
@@ -117,14 +118,21 @@
 		specWarnElites:Show()
 		timerAdd:Start()
 		self:ScheduleMethod(61, "AddsRepeat")
-		--Experimental harpoon stuff. Think it actually works this way but hard to log
+		--Experimental harpoon stuff. Think it actually works this way.
 		--since the elites don't fire anything in logs unless you target every Twilight Elite Dreads's Drake before it ejects him to get log time stamps
+--		"<15.9> [UNIT_SPELLCAST_SUCCEEDED] Twilight Assault Drake:Possible Target:target:Eject Passenger 1::0:60603", -- [180]
+--		The two useless casts are ignored because they actually fail, every pull, the first harpoons fail once (and out of order too not at same time), and relaunch synced up after.
+--		"<35.5> [CLEU] SPELL_AURA_APPLIED#false#0xF150DD6900007D9A#Skyfire Harpoon Gun#2584#0#0xF150DE1700008B45#Twilight Assault Drake#133704#0#108038#Harpoon#1#BUFF", -- [2369]
 		if addsCount == 1 then
-			timerHarpoonCD:Start(20)--20 seconds after first elites
+			timerHarpoonCD:Start(20)--20 seconds after first elites (Confirmed)
+--		Pug was bad and i got distracted and didn't target the drake before it cast "Eject Passenger". 76.9 assumed based on established "elites" cd.
+--		"<82.9> [CLEU] SPELL_AURA_APPLIED#false#0xF150DD6900007D4A#Skyfire Harpoon Gun#2584#0#0xF150DD0B00008C0E#Twilight Assault Drake#2632#0#108038#Harpoon#1#BUFF", -- [12268]
 		elseif addsCount == 2 then
-			timerHarpoonCD:Start(15)--15 seconds after second elites (going off memory, this may be 10)
+			timerHarpoonCD:Start(6)--6 in this log. Maybe 2nd and 3rd sets are both a 6-7 variation and only first is 20 seconds after? Then again the eject passenger time was assumed.
+--		"<138.7> [UNIT_SPELLCAST_SUCCEEDED] Twilight Assault Drake:Possible Target:target:Eject Passenger 1::0:60603", -- [24162]
+--		"<145.6> [CLEU] SPELL_AURA_APPLIED#false#0xF150DD6900007D9A#Skyfire Harpoon Gun#2584#0#0xF150DE1700008CB9#Twilight Assault Drake#2632#0#108038#Harpoon#1#BUFF", -- [25407]
 		elseif addsCount == 3 then
-			timerHarpoonCD:Start(10)--10 seconds after third elites (going off memory, this may be 5)
+			timerHarpoonCD:Start(7)--7 in this log. Maybe it's 6-7 like 2nd set?
 		end
 	end
 end
@@ -134,6 +142,7 @@
 	lastFlames = 0
 	addsCount = 0
 	drakesCount = 6
+	ignoredHarpoons = 0
 	twilightOnslaughtCount = 0
 	CVAR = false
 --	recentlyReloaded = false
@@ -210,6 +219,9 @@
 			end
 		end
 	elseif args:IsSpellID(108038) then
+		if ignoredHarpoons < 3 then--First two harpoons of fight are bugged, they fire early, apply to drake, even though they missed, then refire. we simply ignore first 2 bad casts to avoid spam and confusion.
+			ignoredHarpoons = ignoredHarpoons + 1
+		else--We are passed the 2 useless ones, do everything as normal now.
 		warnHarpoon:Show(args.destName)
 		specWarnHarpoon:Show(args.destName)
 --[[		if not recentlyReloaded then--No old drakes are up when this was cast, so start a fresh valid 48 second bar.
@@ -222,6 +234,7 @@
 		elseif self:IsDifficulty("normal10", "normal25") then
 			timerHarpoonActive:Start(25, args.destGUID)
 		end
+		end
 	elseif args:IsSpellID(108040) and not phase2Started then--Goriona is being shot by the ships Artillery Barrage (phase 2 trigger)
 		self:Schedule(10, Phase2Delay)--It seems you can still get phase 1 crap until blackhorn is on the deck itself(ie his yell 10 seconds after this trigger) so we delay canceling timers.
 		phase2Started = true

trunk/DBM-DragonSoul/DSTrash.lua

Action: modified

Old revision: 7224

Old date: 2012-01-23 22:17:30 UTC

@@ -71,6 +71,8 @@
 
 --	"<18.7> CHAT_MSG_MONSTER_YELL#It is good to see you again, Alexstrasza. I have been busy in my absence.#Deathwing###Notarget##0#0##0#3731##0#false", -- [1]
 --	"<271.9> [UNIT_SPELLCAST_SUCCEEDED] Twilight Assaulter:Possible Target:target:Twilight Escape::0:109904", -- [11926]
+--	"<101.5> CHAT_MSG_MONSTER_YELL#It is good to see you again, Alexstrasza. I have been busy in my absence.#Deathwing###Vounelli##0#0##0#3093##0#false", -- [1]
+--	"<133.3> [UNIT_SPELLCAST_SUCCEEDED] Thrall:Possible Target:target:Ward of Earth::0:108161", -- [875]
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.UltraxionTrash or msg:find(L.UltraxionTrash) then
 		timerDrakes:Start(253, GetSpellInfo(109904))

r7224 (arta): check for Fading Light debuff instead of Hour of Twilight? :S

arta — Mon, 23 Jan 2012 22:17:30 GMT

Author: arta
Date: Mon Jan 23 23:17:30 CET 2012
Revision: 7224

Log:

check for Fading Light debuff instead of Hour of Twilight? :S

Updated

trunk/DBM-DragonSoul/Ultraxion.lua

Action: modified

Old revision: 7223

Old date: 2012-01-23 09:00:47 UTC

@@ -169,8 +169,8 @@
 		elseif self:IsDifficulty("lfr25") and self:IsTank() and fadingLightCount < 2 then--Only tanks get it in LFR
 			timerFadingLightCD:Start(15)
 		end
-		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109416))) and GetTime() - fadingLightSpam > 3 then--Sometimes the combatlog doesn't report all fading lights, so we perform an additional aura check 
-			local _, _, _, _, _, duration, expires = UnitDebuff("player", GetSpellInfo(109416))--Find out what our specific fading light is
+		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(105925))) and GetTime() - fadingLightSpam > 3 then--Sometimes the combatlog doesn't report all fading lights, so we perform an additional aura check 
+			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)--Find out what our specific fading light is
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)--For some reason need to offset it by 1 second to make it accurate but otherwise it's perfect
 			timerFadingLight:Start(duration-1)
@@ -182,7 +182,7 @@
 		self:Schedule(0.3, warnFadingLightTargets)
 	elseif args:IsSpellID(109075, 110078, 110079, 110080) then--Non Tank IDs
 		fadingLightTargets[#fadingLightTargets + 1] = args.destName
-		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109416))) and GetTime() - fadingLightSpam > 3 then
+		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109075))) and GetTime() - fadingLightSpam > 3 then
 			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)--Find out what our specific fading light is
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)

r7223 (arta): lets add fadingLightSpam=0 in OnCombatStart() as well (just to be sure)

arta — Mon, 23 Jan 2012 09:00:47 GMT

Author: arta
Date: Mon Jan 23 10:00:47 CET 2012
Revision: 7223

Log:

lets add fadingLightSpam=0 in OnCombatStart() as well (just to be sure)

Updated

trunk/DBM-DragonSoul/Ultraxion.lua

Action: modified

Old revision: 7222

Old date: 2012-01-23 06:25:06 UTC

@@ -69,6 +69,7 @@
 	table.wipe(fadingLightTargets)
 	hourOfTwilightCount = 0
 	fadingLightCount = 0
+	fadingLightSpam = 0
 	warnHourofTwilightSoon:Schedule(30.5)
 	if self.Options.SpecWarnHoTN == "One" then
 		specWarnHourofTwilightN:Schedule(40.5, GetSpellInfo(109416), hourOfTwilightCount+1)

r7222 (Omega): maybe better harpoon timers. They need testing and probably adjustment, wish adds were easier to log

Omega — Mon, 23 Jan 2012 06:25:06 GMT

Author: Omega
Date: Mon Jan 23 07:25:06 CET 2012
Revision: 7222

Log:

maybe better harpoon timers. They need testing and probably adjustment, wish adds were easier to log

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7221

Old date: 2012-01-23 03:08:09 UTC

@@ -76,7 +76,7 @@
 local drakesCount = 6
 local twilightOnslaughtCount = 0
 local CVAR = false
-local recentlyReloaded = false
+--local recentlyReloaded = false
 
 local function Phase2Delay()
 	mod:UnscheduleMethod("AddsRepeat")
@@ -117,8 +117,17 @@
 		specWarnElites:Show()
 		timerAdd:Start()
 		self:ScheduleMethod(61, "AddsRepeat")
+		--Experimental harpoon stuff. Think it actually works this way but hard to log
+		--since the elites don't fire anything in logs unless you target every Twilight Elite Dreads's Drake before it ejects him to get log time stamps
+		if addsCount == 1 then
+			timerHarpoonCD:Start(20)--20 seconds after first elites
+		elseif addsCount == 2 then
+			timerHarpoonCD:Start(15)--15 seconds after second elites (going off memory, this may be 10)
+		elseif addsCount == 3 then
+			timerHarpoonCD:Start(10)--10 seconds after third elites (going off memory, this may be 5)
 	end
 end
+end
 
 function mod:OnCombatStart(delay)
 	phase2Started = false
@@ -127,7 +136,7 @@
 	drakesCount = 6
 	twilightOnslaughtCount = 0
 	CVAR = false
-	recentlyReloaded = false
+--	recentlyReloaded = false
 	timerCombatStart:Start(-delay)
 	timerAdd:Start(22.8-delay)
 	self:ScheduleMethod(22.8-delay, "AddsRepeat")
@@ -170,9 +179,9 @@
 	elseif args:IsSpellID(110210, 110213) then
 		timerTwilightBreath:Start()
 	elseif args:IsSpellID(108039) then
-		recentlyReloaded = true
+--		recentlyReloaded = true
 		warnReloading:Show()
-		timerReloadingCast:Start(args.sourceGUID)--This is your new CD for this harpoon.
+		timerReloadingCast:Start(args.sourceGUID)
 	end
 end
 
@@ -203,11 +212,11 @@
 	elseif args:IsSpellID(108038) then
 		warnHarpoon:Show(args.destName)
 		specWarnHarpoon:Show(args.destName)
-		if not recentlyReloaded then--No old drakes are up when this was cast, so start a fresh valid 48 second bar.
+--[[		if not recentlyReloaded then--No old drakes are up when this was cast, so start a fresh valid 48 second bar.
 			timerHarpoonCD:Start(args.sourceGUID)
 		else
 			timerHarpoonCD:Cancel()--Cancel all harpoon bars since the "Reloading" cast finished before old drake died, which alters and ruins the bar Cds this drake cycle.
-		end
+		end--]]
 		if self:IsDifficulty("heroic10", "heroic25") then
 			timerHarpoonActive:Start(nil, args.destGUID)
 		elseif self:IsDifficulty("normal10", "normal25") then
@@ -281,11 +290,11 @@
 		drakesCount = drakesCount - 1
 		warnDrakesLeft:Show(drakesCount)
 		timerHarpoonActive:Cancel(args.sourceGUID)
-		if drakesCount == 4 or drakesCount == 2 then
+--[[		if drakesCount == 4 or drakesCount == 2 then
 			recentlyReloaded = false
+		end--]]
 		end
 	end
-end
 
 function mod:UNIT_SPELLCAST_SUCCEEDED(uId, spellName)
 	if spellName == GetSpellInfo(107594) then--Blade Rush, cast start is not detectable, only cast finish, can't use target scanning, or pre warn (ie when the lines go out), only able to detect when they actually finish rush

r7221 (Omega): small tweak to account for both drakes getting away, and only 1 of them dying. we don't want to clear "recently reloaded" until drake count is 2 or 4 from a previous wave

Omega — Mon, 23 Jan 2012 03:08:09 GMT

Author: Omega
Date: Mon Jan 23 04:08:09 CET 2012
Revision: 7221

Log:

small tweak to account for both drakes getting away, and only 1 of them dying. we don't want to clear "recently reloaded" until drake count is 2 or 4 from a previous wave

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7220

Old date: 2012-01-22 07:02:39 UTC

@@ -281,9 +281,11 @@
 		drakesCount = drakesCount - 1
 		warnDrakesLeft:Show(drakesCount)
 		timerHarpoonActive:Cancel(args.sourceGUID)
+		if drakesCount == 4 or drakesCount == 2 then
 		recentlyReloaded = false
 	end
 end
+end
 
 function mod:UNIT_SPELLCAST_SUCCEEDED(uId, spellName)
 	if spellName == GetSpellInfo(107594) then--Blade Rush, cast start is not detectable, only cast finish, can't use target scanning, or pre warn (ie when the lines go out), only able to detect when they actually finish rush

r7220 (Omega): Akmahat fixes and tweaks Ultraxion anti spam for my CLEU work around so it doesn't start warning you 3 times for fading light :)

Omega — Sun, 22 Jan 2012 07:02:39 GMT

Author: Omega
Date: Sun Jan 22 08:02:39 CET 2012
Revision: 7220

Log:

Akmahat fixes and tweaks
Ultraxion anti spam for my CLEU work around so it doesn't start warning you 3 times for fading light :)

Updated

trunk/DBM-DragonSoul/Ultraxion.lua

Updated

trunk/DBM-Party-Cataclysm/WorldBosses/Akmahat.lua

trunk/DBM-DragonSoul/Ultraxion.lua

Action: modified

Old revision: 7219

Old date: 2012-01-21 20:35:21 UTC

@@ -35,7 +35,7 @@
 local timerHourofTwilight			= mod:NewCastTimer(5, 109416)
 local timerHourofTwilightCD			= mod:NewNextCountTimer(45.5, 109416)
 local timerTwilightEruption			= mod:NewCastTimer(5, 106388)
-local timerFadingLight				= mod:NewBuffFadesTimer(10, 110080)--Lets try again using duration, not expire. expire just isn't going to work because of GetTime() 4.3 change.
+local timerFadingLight				= mod:NewBuffFadesTimer(10, 110080)
 local timerFadingLightCD			= mod:NewNextTimer(10, 110080)--10 second on heroic, 15 on normal
 local timerGiftofLight				= mod:NewNextTimer(80, 105896, nil, mod:IsHealer())
 local timerEssenceofDreams			= mod:NewNextTimer(155, 105900, nil, mod:IsHealer())
@@ -49,7 +49,7 @@
 local HourofTwilightCountdown		= mod:NewCountdown(45.5, 109416, mod:IsHealer())--can be confusing with Fading Light, only enable for healer. (healers no dot affect by Fading Light)
 
 mod:AddBoolOption("ShowRaidCDs", false, "timer")--Off by default. This is for RAID cds not personal CDs. Shield wall is added because of 4pc bonus, it's assumed on heroic ultraxion you're tanks have 4pc.
-mod:AddBoolOption("ShowRaidCDsSelf", false, "timer")--Will be eliminated when popup options are supported.
+mod:AddBoolOption("ShowRaidCDsSelf", false, "timer")--TODO, make a popup optiopn and combine this with other booleane
 --Raid CDs will have following options: Don't show Raid CDs, Show only My Raid CDs, Show all raid CDs
 
 mod:AddDropdownOption("ResetHoTCounter", {"Never", "Reset3", "Reset3Always"}, "Reset3", "announce")
@@ -58,6 +58,7 @@
 local hourOfTwilightCount = 0
 local fadingLightCount = 0
 local fadingLightTargets = {}
+local fadingLightSpam = 0
 
 local function warnFadingLightTargets()
 	warnFadingLight:Show(fadingLightCount, table.concat(fadingLightTargets, "<, >"))
@@ -167,11 +168,12 @@
 		elseif self:IsDifficulty("lfr25") and self:IsTank() and fadingLightCount < 2 then--Only tanks get it in LFR
 			timerFadingLightCD:Start(15)
 		end
-		if args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109416)) then--Sometimes the combat log doesn't report all fading lights, so we make sure we dont have it.
+		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109416))) and GetTime() - fadingLightSpam > 3 then--Sometimes the combatlog doesn't report all fading lights, so we perform an additional aura check 
 			local _, _, _, _, _, duration, expires = UnitDebuff("player", GetSpellInfo(109416))--Find out what our specific fading light is
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)--For some reason need to offset it by 1 second to make it accurate but otherwise it's perfect
 			timerFadingLight:Start(duration-1)
+			fadingLightSpam = GetTime()
 		else
 			specWarnFadingLightOther:Show(args.destName)
 		end
@@ -179,11 +181,12 @@
 		self:Schedule(0.3, warnFadingLightTargets)
 	elseif args:IsSpellID(109075, 110078, 110079, 110080) then--Non Tank IDs
 		fadingLightTargets[#fadingLightTargets + 1] = args.destName
-		if args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109416)) then
+		if (args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109416))) and GetTime() - fadingLightSpam > 3 then
 			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)--Find out what our specific fading light is
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)
 			timerFadingLight:Start(duration-1)
+			fadingLightSpam = GetTime()
 		end
 		self:Unschedule(warnFadingLightTargets)
 		self:Schedule(0.3, warnFadingLightTargets)

trunk/DBM-Party-Cataclysm/WorldBosses/Akmahat.lua

Action: modified

Old revision: 7219

Old date: 2012-01-21 20:35:21 UTC

@@ -24,15 +24,15 @@
 
 local timerShockwaveCD		= mod:NewCDTimer(16, 94968)--Every 16 seconds shockwave and fury alternate unless mantle, is cast, then it's 18 seconds cause of the cast delay of mantle affecting both CDs
 local timerFuryofSandsCD	= mod:NewCDTimer(16, 94946)
-local timerSandsofTime		= mod:NewTargetTimer(15, 93578)
+local timerSandsofTime		= mod:NewBuffFadesTimer(15, 93578)
 local timerSandsofTimeCD	= mod:NewCDTimer(25, 93578)
 local timerMantleCD			= mod:NewCDTimer(43, 93561)--42.8-46.5 variations. a CD timer will suffice of 43
 
 mod:AddBoolOption("HealthFrame", true)
 
-local shieldValues = {
-	[93561] = 500000,
-}
+local sandsTargets = {}
+local sandsDebuffs = 0
+
 local showShieldHealthBar, hideShieldHealthBar
 do
 	local frame = CreateFrame("Frame") -- using a separate frame avoids the overhead of the DBM event handlers which are not meant to be used with frequently occuring events like all damage events...
@@ -70,10 +70,17 @@
 	end
 end
 
+local function showSandsgWarning()
+	warnSandsofTime:Show(table.concat(sandsTargets, "<, >"))
+	table.wipe(sandsTargets)
+end
+
 function mod:OnCombatStart(delay)
 	timerMantleCD:Start(23-delay)--Highly variable, i don't like it
 	timerShockwaveCD:Start(-delay)
 	timerFuryofSandsCD:Start(11-delay)
+	sandsDebuffs = 0
+	table.wipe(sandsTargets)
 end
 
 function mod:SPELL_CAST_START(args)
@@ -94,12 +101,15 @@
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(93561) then
 		local shieldname = GetSpellInfo(93561)
-		showShieldHealthBar(self, args.destGUID, shieldname, shieldValues[args.spellId] or 0)
+		showShieldHealthBar(self, args.destGUID, shieldname, 500000)
 		self:Schedule(60, hideShieldHealthBar)
 	elseif args:IsSpellID(93578) then
-		warnSandsofTime:Show(args.destName)
-		timerSandsofTime:Start(args.destName)
+		sandsTargets[#sandsTargets + 1] = args.destName
+		sandsDebuffs = sandsDebuffs + 1
+		timerSandsofTime:Start()
 		timerSandsofTimeCD:Start()
+		self:Unschedule(showSandsgWarning)
+		self:Schedule(0.3, showSandsgWarning)
 	end
 end
 
@@ -108,6 +118,9 @@
 		self:Unschedule(hideShieldHealthBar)
 		hideShieldHealthBar()
 	elseif args:IsSpellID(93578) then
-		timerSandsofTime:Cancel(args.destName)
+		sandsDebuffs = sandsDebuffs - 1
+		if sandsDebuffs == 0 then
+			timerSandsofTime:Cancel()
 	end
 end
+end

r7219 (Omega): Improvement to blackhorn. reloading cast start doesn't break the CDs, if the drake still dies before reloading finishes. Its allowing reload to actually finish casting, and harpoon the old drake that does, so cancel bars there instead. Should avoid canceling bars needlessly when drakes die to dots during reloading cast.

Omega — Sat, 21 Jan 2012 20:35:21 GMT

Author: Omega
Date: Sat Jan 21 21:35:21 CET 2012
Revision: 7219

Log:

Improvement to blackhorn. reloading cast start doesn't break the CDs, if the drake still dies before reloading finishes. Its allowing reload to actually finish casting, and harpoon the old drake that does, so cancel bars there instead. Should avoid canceling bars needlessly when drakes die to dots during reloading cast.

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/Zonozz.lua

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7218

Old date: 2012-01-21 05:22:44 UTC

@@ -172,7 +172,6 @@
 	elseif args:IsSpellID(108039) then
 		recentlyReloaded = true
 		warnReloading:Show()
-		timerHarpoonCD:Cancel()--you failed, the guns aren't going to follow their standard CD because they have to cleanup now. Cancel all of the harpoon CDs.
 		timerReloadingCast:Start(args.sourceGUID)--This is your new CD for this harpoon.
 	end
 end
@@ -204,8 +203,10 @@
 	elseif args:IsSpellID(108038) then
 		warnHarpoon:Show(args.destName)
 		specWarnHarpoon:Show(args.destName)
-		if not recentlyReloaded then--Don't start timer off a harpoon pulling an old drake in.
+		if not recentlyReloaded then--No old drakes are up when this was cast, so start a fresh valid 48 second bar.
 			timerHarpoonCD:Start(args.sourceGUID)
+		else
+			timerHarpoonCD:Cancel()--Cancel all harpoon bars since the "Reloading" cast finished before old drake died, which alters and ruins the bar Cds this drake cycle.
 		end
 		if self:IsDifficulty("heroic10", "heroic25") then
 			timerHarpoonActive:Start(nil, args.destGUID)

trunk/DBM-DragonSoul/Zonozz.lua

Action: modified

Old revision: 7218

Old date: 2012-01-21 05:22:44 UTC

@@ -112,7 +112,6 @@
 		specWarnBlackBlood:Show()
 		timerBlackBlood:Start()
 		self:Schedule(30, blackBloodEnds)--More accurate way then tracking spell aura removed of black blood. Players dying in the phase were falsely triggering the phase ending early.
-		--GetTime() Method returns elapsed values. so this will be working intended?
 		if self:IsDifficulty("heroic10", "heroic25") then
 			if timerVoidofUnmakingCD:GetTime() > 45.3 then--Heroic has a failsafe in place, if CD exausts before 15 seconds after black phase ending, it's extended, probably to allow raid more time to repositoin vs normal
 				timerVoidofUnmakingCD:Update(45.3, 90.3)

r7218 (Omega): Make sure bad harpoon timers don't start.

Omega — Sat, 21 Jan 2012 05:22:44 GMT

Author: Omega
Date: Sat Jan 21 06:22:44 CET 2012
Revision: 7218

Log:

Make sure bad harpoon timers don't start.

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7217

Old date: 2012-01-21 04:22:42 UTC

@@ -76,6 +76,7 @@
 local drakesCount = 6
 local twilightOnslaughtCount = 0
 local CVAR = false
+local recentlyReloaded = false
 
 local function Phase2Delay()
 	mod:UnscheduleMethod("AddsRepeat")
@@ -126,6 +127,7 @@
 	drakesCount = 6
 	twilightOnslaughtCount = 0
 	CVAR = false
+	recentlyReloaded = false
 	timerCombatStart:Start(-delay)
 	timerAdd:Start(22.8-delay)
 	self:ScheduleMethod(22.8-delay, "AddsRepeat")
@@ -168,6 +170,7 @@
 	elseif args:IsSpellID(110210, 110213) then
 		timerTwilightBreath:Start()
 	elseif args:IsSpellID(108039) then
+		recentlyReloaded = true
 		warnReloading:Show()
 		timerHarpoonCD:Cancel()--you failed, the guns aren't going to follow their standard CD because they have to cleanup now. Cancel all of the harpoon CDs.
 		timerReloadingCast:Start(args.sourceGUID)--This is your new CD for this harpoon.
@@ -201,7 +204,9 @@
 	elseif args:IsSpellID(108038) then
 		warnHarpoon:Show(args.destName)
 		specWarnHarpoon:Show(args.destName)
+		if not recentlyReloaded then--Don't start timer off a harpoon pulling an old drake in.
 		timerHarpoonCD:Start(args.sourceGUID)
+		end
 		if self:IsDifficulty("heroic10", "heroic25") then
 			timerHarpoonActive:Start(nil, args.destGUID)
 		elseif self:IsDifficulty("normal10", "normal25") then
@@ -275,6 +280,7 @@
 		drakesCount = drakesCount - 1
 		warnDrakesLeft:Show(drakesCount)
 		timerHarpoonActive:Cancel(args.sourceGUID)
+		recentlyReloaded = false
 	end
 end

r7217 (Omega): apply same fix to dps too

Omega — Sat, 21 Jan 2012 04:22:42 GMT

Author: Omega
Date: Sat Jan 21 05:22:42 CET 2012
Revision: 7217

Log:

apply same fix to dps too

Updated

trunk/DBM-DragonSoul/Ultraxion.lua

Action: modified

Old revision: 7216

Old date: 2012-01-21 04:16:06 UTC

@@ -179,7 +179,7 @@
 		self:Schedule(0.3, warnFadingLightTargets)
 	elseif args:IsSpellID(109075, 110078, 110079, 110080) then--Non Tank IDs
 		fadingLightTargets[#fadingLightTargets + 1] = args.destName
-		if args:IsPlayer() then
+		if args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109416)) then
 			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)--Find out what our specific fading light is
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)

r7216 (Omega): workaround for a bug where the combat log misses fading light casts, so if we detect it cast on someone else, we check player aura too to avoid player not getting alert

Omega — Sat, 21 Jan 2012 04:16:06 GMT

Author: Omega
Date: Sat Jan 21 05:16:06 CET 2012
Revision: 7216

Log:

workaround for a bug where the combat log misses fading light casts, so if we detect it cast on someone else, we check player aura too to avoid player not getting alert

Updated

trunk/DBM-DragonSoul/Ultraxion.lua

Action: modified

Old revision: 7215

Old date: 2012-01-21 00:54:45 UTC

@@ -167,8 +167,8 @@
 		elseif self:IsDifficulty("lfr25") and self:IsTank() and fadingLightCount < 2 then--Only tanks get it in LFR
 			timerFadingLightCD:Start(15)
 		end
-		if args:IsPlayer() then
-			local _, _, _, _, _, duration, expires = UnitDebuff("player", args.spellName)--Find out what our specific fading light is
+		if args:IsPlayer() or UnitDebuff("player", GetSpellInfo(109416)) then--Sometimes the combat log doesn't report all fading lights, so we make sure we dont have it.
+			local _, _, _, _, _, duration, expires = UnitDebuff("player", GetSpellInfo(109416))--Find out what our specific fading light is
 			specWarnFadingLight:Show()
 			FadingLightCountdown:Start(duration-1)--For some reason need to offset it by 1 second to make it accurate but otherwise it's perfect
 			timerFadingLight:Start(duration-1)

r7215 (oscarucb): add support to Yor'sahj module for raid leading tools (eg YorsahjAnnounce) who want to broadcast a target arrow

oscarucb — Sat, 21 Jan 2012 00:54:45 GMT

Author: oscarucb
Date: Sat Jan 21 01:54:45 CET 2012
Revision: 7215

Log:

add support to Yor'sahj module for raid leading tools (eg YorsahjAnnounce) who want to broadcast a target arrow

Updated

trunk/DBM-DragonSoul/Yorsahj.lua

Action: modified

Old revision: 7214

Old date: 2012-01-20 22:10:12 UTC

@@ -14,6 +14,7 @@
 	"SPELL_AURA_APPLIED",
 	"SPELL_AURA_APPLIED_DOSE",
 	"SPELL_AURA_REMOVED",
+	"CHAT_MSG_ADDON",
 	"UNIT_SPELLCAST_SUCCEEDED",
 	"UNIT_DIED"
 )
@@ -199,4 +200,28 @@
 	if cid == 55862 or cid == 55866 or cid == 55865 or cid == 55867 or cid == 55864 or cid == 55863 then--Oozes
 		expectedOozes = expectedOozes - 1
 	end
-end
\ No newline at end of file
+end
+
+-- support Yor'sahj raid leading tools (eg YorsahjAnnounce) who want to broadcast a target arrow
+RegisterAddonMessagePrefix("DBM-YORSAHJARROW")
+--mod:RegisterEvents("CHAT_MSG_ADDON") -- for debugging
+local oozePos = {
+  ["BLUE"] = 	{ 71, 34 },
+  ["PURPLE"] = 	{ 57, 13 },
+  ["RED"] = 	{ 37, 12 },
+  ["GREEN"] = 	{ 22, 34 },
+  ["YELLOW"] = 	{ 37, 85 },
+  ["BLACK"] = 	{ 71, 65 },
+}
+function mod:CHAT_MSG_ADDON(prefix, message, channel, sender)
+  if prefix ~= "DBM-YORSAHJARROW" then return end
+  local cmd = message or ""
+  cmd = cmd:match("^(%w+)") or ""
+  cmd = cmd:upper()
+  if cmd == "CLEAR" then
+    DBM.Arrow:Hide()
+  elseif oozePos[cmd] then
+    DBM.Arrow:ShowRunTo(oozePos[cmd][1]/100,oozePos[cmd][2]/100,nil,20)
+  end
+end
+

r7214 (Omega): Small heroic madness update now that i have looked at a recent decent log. http://www.worldoflogs.com/reports/rt-bccr5xom6ctgnr4l/xe/?enc=bosses&boss=56173&x=spellid+%3D+108649+or+spellid+%3D+108813+and+fulltype+%3D+SPELL_CAST_START+or+spellid+%3D+107018

Omega — Fri, 20 Jan 2012 22:10:12 GMT

Author: Omega
Date: Fri Jan 20 23:10:12 CET 2012
Revision: 7214

Log:

Small heroic madness update now that i have looked at a recent decent log. http://www.worldoflogs.com/reports/rt-bccr5xom6ctgnr4l/xe/?enc=bosses&boss=56173&x=spellid+%3D+108649+or+spellid+%3D+108813+and+fulltype+%3D+SPELL_CAST_START+or+spellid+%3D+107018

Updated

trunk/DBM-DragonSoul/MadnessDeathwing.lua

Action: modified

Old revision: 7213

Old date: 2012-01-20 19:31:17 UTC

@@ -57,7 +57,7 @@
 local timerShrapnel				= mod:NewCastTimer(6, 109598)
 local timerParasite				= mod:NewTargetTimer(10, 108649)
 local timerParasiteCD			= mod:NewCDTimer(60, 108649)
---local timerUnstableCorruption	= mod:NewCastTimer(10, 108813)--Don't have a spellid for it, wowhead has no data on spell :\ Will have to wait for logs
+local timerUnstableCorruption	= mod:NewCastTimer(13, 108813)--10 seconds for cast plus 3 seconds before the cast even begins after paracite fades
 
 local berserkTimer				= mod:NewBerserkTimer(900)
 
@@ -159,9 +159,9 @@
 end
 
 function mod:SPELL_AURA_APPLIED(args)
-	if args:IsSpellID(106400) then--106444, 109631, 109632, 109633 are debuff IDs, no reason to use them though cause that'd be a diff function with diff timing
+	if args:IsSpellID(106400) then--106444, 109631, 109632, 109633 are lingering debuff IDs, no reason to use them though cause that'd be a diff function with diff timing
 		warnImpale:Show(args.destName)
-		timerImpale:Start(args.destName)--May need to add anti spam for heroic. On heroic impale hits everyone near the tenticle not just the tank? But maybe this ID only hits tank so we'll be fine, don't know yet.
+		timerImpale:Start(args.destName)
 		timerImpaleCD:Start()
 		if args:IsPlayer() then
 			specWarnImpale:Show()
@@ -206,6 +206,7 @@
 	if args:IsSpellID(106444, 109631, 109632, 109633) then--Over here, we do use the secondary spellids to cancel the debuff target timer.
 		timerImpale:Cancel(args.destName)
 	elseif args:IsSpellID(108649) then
+		timerUnstableCorruption:Start()
 		if self.Options.SetIconOnParasite then
 			self:SetIcon(args.destName, 0)
 		end

r7213 (Omega): Small trash fixes to firelands.

Omega — Fri, 20 Jan 2012 19:31:17 GMT

Author: Omega
Date: Fri Jan 20 20:31:17 CET 2012
Revision: 7213

Log:

Small trash fixes to firelands.

Updated

trunk/DBM-DragonSoul/DSTrash.lua

Updated

trunk/DBM-Firelands/FirelandsTrash.lua

trunk/DBM-DragonSoul/DSTrash.lua

Action: modified

Old revision: 7212

Old date: 2012-01-20 11:35:07 UTC

@@ -57,7 +57,7 @@
 
 function mod:SPELL_CAST_START(args)
 	if args:IsSpellID(107597) then -- this spell cast 3 sec. and use at target's cast end position. not begin.
-		self:ScheduleMethod(3, "BoulderTarget", args.sourceGUID)
+		self:ScheduleMethod(3, "BoulderTarget", args.sourceGUID)--0.2 worked for me, it was announcing boulder target, NOT tank.
 	end
 end

trunk/DBM-Firelands/FirelandsTrash.lua

Action: modified

Old revision: 7212

Old date: 2012-01-20 11:35:07 UTC

@@ -93,7 +93,7 @@
 			specWarnFieroblast:Show()
 		end
 	elseif args:IsSpellID(99629) then--Druid of the Flame Leaping
-		self:ScheduleMethod(0.6, "LeapTarget", args.sourceGUID)
+		self:ScheduleMethod(1, "LeapTarget", args.sourceGUID)
 	elseif args:IsSpellID(99503) then
 		warnRaiselava:Show()
 		timerRaiseLavaCD:Start()
@@ -129,7 +129,8 @@
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 		
 function mod:UNIT_DIED(args)
-	if self:GetCIDFromGUID(args.destGUID) == 53141 then
+	local cid = self:GetCIDFromGUID(args.destGUID)
+	if cid == 53141 then
 		surgers = surgers - 1
 		if surgers <= 0 then 
 			surgers = 0
@@ -138,12 +139,14 @@
 				DBM.RangeCheck:Hide()
 			end
 		end
-	elseif self:GetCIDFromGUID(args.destGUID) == 53575 then
+	elseif cid == 53575 then
 		timerRaiseLavaCD:Cancel()
-	elseif self:GetCIDFromGUID(args.destGUID) == 53617 then
+	elseif cid == 53617 then
 		timerMoltenBoltCD:Cancel()
-	elseif self:GetCIDFromGUID(args.destGUID) == 53616 then
+	elseif cid == 53616 then
 		timerLavaSpawnCD:Cancel()
+	elseif cid == 53619 then
+		self:UnscheduleMethod("LeapTarget", args.destGUID)
 	end	
 end

r7212 (nbluewiz): # Blackhorn : fix Harpooning timer on normal difficulty. normal difficulty seems not to be 20 sec. # DSTrash : updated Boulder warn be more useful.

nbluewiz — Fri, 20 Jan 2012 11:35:07 GMT

Author: nbluewiz
Date: Fri Jan 20 12:35:07 CET 2012
Revision: 7212

Log:

# Blackhorn : fix Harpooning timer on normal difficulty. normal difficulty seems not to be 20 sec.
# DSTrash : updated Boulder warn be more useful.
# Alizabal : added Seething Hate specwarn for off tanks.

Updated

trunk/DBM-BaradinHold/Alizabal.lua

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/DSTrash.lua

trunk/DBM-BaradinHold/Alizabal.lua

Action: modified

Old revision: 7211

Old date: 2012-01-20 03:25:37 UTC

@@ -19,6 +19,7 @@
 
 local specWarnBladeDance		= mod:NewSpecialWarningRun(104995, nil, nil, true)--No sound, so it doesn't take from the glory of soundBladeDance
 local specWarnSkewer			= mod:NewSpecialWarningSpell(104936, mod:IsTank() or mod:IsHealer())
+local specWarnSeethingHate		= mod:NewSpecialWarningYou(105067, mod:IsTank())--off tank may need this warn. 
 
 local timerBladeDance			= mod:NewBuffActiveTimer(15, 104995)
 local timerBladeDanceCD			= mod:NewCDTimer(60, 104995)
@@ -73,6 +74,9 @@
 		end
 		warnSeethingHate:Show(args.destName)
 		timerSeethingHate:Start(args.destName)
+		if args:IsPlayer() then		
+			specWarnSeethingHate:Show()
+		end
 	elseif args:IsSpellID(105784) then--It seems the cast ID was disabled on live, so now gotta do this the dumb way.
 		bladeCasts = bladeCasts + 1
 		if bladeCasts > 1 then return end

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7211

Old date: 2012-01-20 03:25:37 UTC

@@ -202,8 +202,10 @@
 		warnHarpoon:Show(args.destName)
 		specWarnHarpoon:Show(args.destName)
 		timerHarpoonCD:Start(args.sourceGUID)
-		if not mod:IsDifficulty("lfr25") then--Don't start this in LFR, pretty sure there is no duration there, it's indefinite.
-			timerHarpoonActive:Start(args.destGUID)
+		if self:IsDifficulty("heroic10", "heroic25") then
+			timerHarpoonActive:Start(nil, args.destGUID)
+		elseif self:IsDifficulty("normal10", "normal25") then
+			timerHarpoonActive:Start(25, args.destGUID)
 		end
 	elseif args:IsSpellID(108040) and not phase2Started then--Goriona is being shot by the ships Artillery Barrage (phase 2 trigger)
 		self:Schedule(10, Phase2Delay)--It seems you can still get phase 1 crap until blackhorn is on the deck itself(ie his yell 10 seconds after this trigger) so we delay canceling timers.

trunk/DBM-DragonSoul/DSTrash.lua

Action: modified

Old revision: 7211

Old date: 2012-01-20 03:25:37 UTC

@@ -56,8 +56,8 @@
 end
 
 function mod:SPELL_CAST_START(args)
-	if args:IsSpellID(107597) then
-		self:ScheduleMethod(0.2, "BoulderTarget", args.sourceGUID)
+	if args:IsSpellID(107597) then -- this spell cast 3 sec. and use at target's cast end position. not begin.
+		self:ScheduleMethod(3, "BoulderTarget", args.sourceGUID)
 	end
 end

r7211 (Omega): maybe this will fix harpoon CD, it's still not triggering

Omega — Fri, 20 Jan 2012 03:25:37 GMT

Author: Omega
Date: Fri Jan 20 04:25:37 CET 2012
Revision: 7211

Log:

maybe this will fix harpoon CD, it's still not triggering

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7210

Old date: 2012-01-19 23:50:26 UTC

@@ -182,8 +182,6 @@
 		timerDevastateCD:Start()
 	elseif args:IsSpellID(107558, 108861, 109207, 109208) then
 		timerDegenerationCD:Start(args.sourceGUID)
-	elseif args:IsSpellID(108038) then
-		timerHarpoonCD:Start(args.sourceGUID)
 	end
 end
 
@@ -203,6 +201,7 @@
 	elseif args:IsSpellID(108038) then
 		warnHarpoon:Show(args.destName)
 		specWarnHarpoon:Show(args.destName)
+		timerHarpoonCD:Start(args.sourceGUID)
 		if not mod:IsDifficulty("lfr25") then--Don't start this in LFR, pretty sure there is no duration there, it's indefinite.
 			timerHarpoonActive:Start(args.destGUID)
 		end

r7210 (Omega): make the harpoon bars option default on only for dps, healers don't really care and they are a lot of bar spam for someone that doesn't need em. Also off for tanks because tanks have extra humanoid bars they are managing for the dread's frontal cone attack. This way there should be less bars on the screen by default

Omega — Thu, 19 Jan 2012 23:50:26 GMT

Author: Omega
Date: Fri Jan 20 00:50:26 CET 2012
Revision: 7210

Log:

make the harpoon bars option default on only for dps, healers don't really care and they are a lot of bar spam for someone that doesn't need em. Also off for tanks because tanks have extra humanoid bars they are managing for the dread's frontal cone attack. This way there should be less bars on the screen by default

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7209

Old date: 2012-01-19 15:13:43 UTC

@@ -48,9 +48,9 @@
 
 local timerCombatStart				= mod:NewTimer(20.5, "TimerCombatStart", 2457)
 local timerAdd						= mod:NewTimer(61, "TimerAdd", 107752)
-local timerHarpoonCD				= mod:NewCDTimer(48, 108038)--CD when you don't fail at drakes
-local timerHarpoonActive			= mod:NewBuffActiveTimer(20, 108038)--Seems to always hold at least 20 seconds, beyond that, RNG, but you always get at least 20 seconds before they "snap" free.
-local timerReloadingCast			= mod:NewCastTimer(10, 108039)--You screwed up and let a drake get away, this makes a harpoon gun reload and regrab failed drakes after 10 seconds.
+local timerHarpoonCD				= mod:NewCDTimer(48, 108038, nil, mod:IsDps())--CD when you don't fail at drakes
+local timerHarpoonActive			= mod:NewBuffActiveTimer(20, 108038, nil, mod:IsDps())--Seems to always hold at least 20 seconds, beyond that, RNG, but you always get at least 20 seconds before they "snap" free.
+local timerReloadingCast			= mod:NewCastTimer(10, 108039, nil, mod:IsDps())--You screwed up and let a drake get away, this makes a harpoon gun reload and regrab failed drakes after 10 seconds.
 local timerTwilightOnslaught		= mod:NewCastTimer(7, 107588)
 local timerTwilightOnslaughtCD		= mod:NewNextCountTimer(35, 107588)
 local timerSapperCD					= mod:NewNextTimer(40, "ej4200", nil, nil, nil, 107752)

r7209 (nbluewiz): # Spine of Deathwing : update residue warns.

nbluewiz — Thu, 19 Jan 2012 15:13:43 GMT

Author: nbluewiz
Date: Thu Jan 19 16:13:43 CET 2012
Revision: 7209

Log:

# Spine of Deathwing : update residue warns.

Updated

trunk/DBM-DragonSoul/SpineDeathwing.lua

Action: modified

Old revision: 7208

Old date: 2012-01-19 04:59:30 UTC

@@ -173,11 +173,8 @@
 function mod:SPELL_CAST_SUCCESS(args)
 	if args:IsSpellID(105219, 109371, 109372, 109373) then
 		residueCount = residueCount + 1
-		if residueCount == 9 then -- announce 9 stacks (ready to eat blood!)
 			warnResidue:Cancel()
-			warnResidue:Show(residueCount)
-		elseif residueCount > 4 and residueCount < 9 then -- annouce 5~8 stacks.
-			warnResidue:Cancel()
+		if residueCount > 4 and residueCount < 13 then -- announce 9 stacks (ready to eat blood!), sometimes it can be missing 2~3 stacks, announce to 12 stacks.
 			warnResidue:Schedule(2, residueCount)
 		end
 	end
@@ -213,11 +210,11 @@
 function mod:SPELL_AURA_APPLIED_DOSE(args)
 	if args:IsSpellID(105248) then
 		residueCount = residueCount - 1
-		if args.amount == 9 then
+		warnResidue:Cancel()
 			warnAbsorbedBlood:Cancel()--Just a little anti spam
+		if args.amount == 9 then
 			warnAbsorbedBlood:Show(args.destName, 9)
 		else
-			warnAbsorbedBlood:Cancel()--Just a little anti spam
 			warnAbsorbedBlood:Schedule(2, args.destName, args.amount or 1)
 		end
 	end

r7208 (Omega): do mot remove ship from boss health in phase 2 either, there is no reason to do this, the ship still takes damage from leftover sapper, or even goriona which CAN cast twilight barrage (in rare cases)

Omega — Thu, 19 Jan 2012 04:59:30 GMT

Author: Omega
Date: Thu Jan 19 05:59:30 CET 2012
Revision: 7208

Log:

do mot remove ship from boss health in phase 2 either, there is no reason to do this, the ship still takes damage from leftover sapper, or even goriona which CAN cast twilight barrage (in rare cases)

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7207

Old date: 2012-01-19 04:46:38 UTC

@@ -212,7 +212,6 @@
 		warnPhase2:Show()--We still warn phase 2 here though to get into position, especially since he can land on deck up to 5 seconds before his yell.
 		timerCombatStart:Start(5)--5-8 seems variation, we use shortest.
 		if DBM.BossHealth:IsShown() then
-			DBM.BossHealth:Clear()
 			DBM.BossHealth:AddBoss(56427, L.name)
 		end
 	elseif args:IsSpellID(110598, 110214) then

r7207 (Omega): fix a mistyped spellid

Omega — Thu, 19 Jan 2012 04:46:38 GMT

Author: Omega
Date: Thu Jan 19 05:46:38 CET 2012
Revision: 7207

Log:

fix a mistyped spellid

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7206

Old date: 2012-01-19 01:47:13 UTC

@@ -182,7 +182,7 @@
 		timerDevastateCD:Start()
 	elseif args:IsSpellID(107558, 108861, 109207, 109208) then
 		timerDegenerationCD:Start(args.sourceGUID)
-	elseif args:IsSpellID(108039) then
+	elseif args:IsSpellID(108038) then
 		timerHarpoonCD:Start(args.sourceGUID)
 	end
 end

r7206 (nbluewiz): koKR update

nbluewiz — Thu, 19 Jan 2012 01:47:13 GMT

Author: nbluewiz
Date: Thu Jan 19 02:47:13 CET 2012
Revision: 7206

Log:

koKR update

Updated

trunk/DBM-DragonSoul/localization.kr.lua

Action: modified

Old revision: 7205

Old date: 2012-01-19 01:33:50 UTC

@@ -86,7 +86,7 @@
 })
 
 L:SetTimerLocalization({
-	TimerSpecial			= "다음 폭풍 또는 얼음"
+	TimerSpecial			= "다음 번개 또는 얼음"
 })
 
 L:SetOptionLocalization({

r7205 (nbluewiz): #DStrash : fix bug in target announce in lfr dungeon.

nbluewiz — Thu, 19 Jan 2012 01:33:50 GMT

Author: nbluewiz
Date: Thu Jan 19 02:33:50 CET 2012
Revision: 7205

Log:

#DStrash : fix bug in target announce in lfr dungeon.

Updated

trunk/DBM-DragonSoul/DSTrash.lua

Action: modified

Old revision: 7204

Old date: 2012-01-18 08:38:49 UTC

@@ -26,14 +26,15 @@
 local antiSpam = 0
 
 function mod:BoulderTarget(sGUID)
-	local targetname = nil
+	local targetname, realm = nil
 	for i=1, GetNumRaidMembers() do
 		if UnitGUID("raid"..i.."target") == sGUID then
-			targetname = UnitName("raid"..i.."targettarget")
+			targetname, realm = UnitName("raid"..i.."targettarget")
 			break
 		end
 	end
 	if not targetname then return end
+	if realm then targetname = targetname.."-"..realm end
 	warnBoulder:Show(targetname)
 	if targetname == UnitName("player") then
 		specWarnBoulder:Show()

r7204 (nbluewiz): # Core : added difficulty text on kill, wipe message. # Blackhorn : fix self :)

nbluewiz — Wed, 18 Jan 2012 08:38:49 GMT

Author: nbluewiz
Date: Wed Jan 18 09:38:49 CET 2012
Revision: 7204

Log:

# Core : added difficulty text on kill, wipe message.
# Blackhorn : fix self :)

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7203

Old date: 2012-01-17 22:09:47 UTC

@@ -2444,7 +2444,7 @@
 					mod.stats.heroic25Pulls = mod.stats.heroic25Pulls - 1
 				end
 			end
-			self:AddMsg(DBM_CORE_COMBAT_ENDED:format(mod.combatInfo.name, strFromTime(thisTime)))
+			self:AddMsg(DBM_CORE_COMBAT_ENDED:format(savedDifficulty..mod.combatInfo.name, strFromTime(thisTime)))
 			local msg
 			for k, v in pairs(autoRespondSpam) do
 				msg = msg or chatPrefixShort..DBM_CORE_WHISPER_COMBAT_END_WIPE:format(UnitName("player"), savedDifficulty..(mod.combatInfo.name or ""))
@@ -2505,11 +2505,11 @@
 				end
 			end
 			if not lastTime then
-				self:AddMsg(DBM_CORE_BOSS_DOWN:format(mod.combatInfo.name, strFromTime(thisTime)))
+				self:AddMsg(DBM_CORE_BOSS_DOWN:format(savedDifficulty..mod.combatInfo.name, strFromTime(thisTime)))
 			elseif thisTime < (bestTime or math.huge) then
-				self:AddMsg(DBM_CORE_BOSS_DOWN_NEW_RECORD:format(mod.combatInfo.name, strFromTime(thisTime), strFromTime(bestTime)))
+				self:AddMsg(DBM_CORE_BOSS_DOWN_NEW_RECORD:format(savedDifficulty..mod.combatInfo.name, strFromTime(thisTime), strFromTime(bestTime)))
 			else
-				self:AddMsg(DBM_CORE_BOSS_DOWN_LONG:format(mod.combatInfo.name, strFromTime(thisTime), strFromTime(lastTime), strFromTime(bestTime)))
+				self:AddMsg(DBM_CORE_BOSS_DOWN_LONG:format(savedDifficulty..mod.combatInfo.name, strFromTime(thisTime), strFromTime(lastTime), strFromTime(bestTime)))
 			end
 			local msg
 			for k, v in pairs(autoRespondSpam) do

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7203

Old date: 2012-01-17 22:09:47 UTC

@@ -87,7 +87,7 @@
 	timerRoarCD:Start(10)
 	timerTwilightFlamesCD:Start(12)
 	timerShockwaveCD:Start(13)--13-16 second variation
-	if self:IsDifficulty("heroic10", "heroic25") then
+	if mod:IsDifficulty("heroic10", "heroic25") then
 		timerConsumingShroud:Start(45)	-- 45seconds once P2 starts?
 	end
 	if not mod:IsDifficulty("lfr25") then--Assumed, but i find it unlikely a 4 min berserk timer will be active on LFR

r7203 (ebmor): deDE update

ebmor — Tue, 17 Jan 2012 22:09:47 GMT

Author: ebmor
Date: Tue Jan 17 23:09:47 CET 2012
Revision: 7203

Log:

deDE update

Updated

trunk/DBM-Core/localization.de.lua

Action: modified

Old revision: 7202

Old date: 2012-01-17 16:54:56 UTC

@@ -153,7 +153,7 @@
 	target		= "%s auf >%%s<",
 	targetcount	= "%s (%%d) auf >%%s<",
 	spell		= "%s",
-	adds		= "%s remaining: %%d",
+	adds		= "%s verbleibend: %%d",
 	cast		= "Wirkt %s: %.1f Sek",
 	soon		= "%s bald",
 	prewarn 	= "%s in %s",
@@ -168,7 +168,7 @@
 	target		= "Verkünde Ziele von $spell:%s",
 	targetcount	= "Verkünde Ziele von $spell:%s",
 	spell		= "Zeige Warnung für $spell:%s",
-	adds		= "Announce how many $spell:%s remain",
+	adds		= "Verkünde die Anzahl der verbleibenden $spell:%s",
 	cast		= "Zeige Warnung, wenn $spell:%s gewirkt wird",
 	soon		= prewarnOption,
 	prewarn 	= prewarnOption,

r7202 (Snamor): esES update

Snamor — Tue, 17 Jan 2012 16:54:56 GMT

Author: Snamor
Date: Tue Jan 17 17:54:56 CET 2012
Revision: 7202

Log:

esES update

Updated

trunk/DBM-Core/localization.es.lua

Action: modified

Old revision: 7201

Old date: 2012-01-17 06:51:04 UTC

@@ -21,7 +21,7 @@
 DBM_CORE_MIN						= "min"
 DBM_CORE_MIN_FMT					= "%d min"
 DBM_CORE_SEC						= "seg"
-DBM_CORE_SEC_FMT					= "%d sec"
+DBM_CORE_SEC_FMT					= "%d seg"
 DBM_CORE_DEAD						= "muerto"
 DBM_CORE_OK							= "Aceptar"
 
@@ -153,7 +153,7 @@
 	target 		= "%s en >%%s<",
 	targetcount = "%s (%%d) en >%%s<",
 	spell 		= "%s",
-	adds		= "%s remaining: %%d",
+	adds		= "%s restantes: %%d",
 	cast 		= "Casteando %s: %.1f seg",
 	soon 		= "%s pronto",
 	prewarn 	= "%s en %s",
@@ -168,7 +168,7 @@
 	target		= "Anunciar objetivos de $spell:%s",
 	targetcount	= "Anunciar objetivos de $spell:%s",
 	spell		= "Mostrar aviso para $spell:%s",
-	adds		= "Announce how many $spell:%s remain",
+	adds		= "Anunciar cuantos $spell:%s quedan",
 	cast		= "Mostrar aviso cuando castee $spell:%s",
 	soon		= "Mostrar pre-aviso para $spell:%s",
 	prewarn		= "Mostrar pre-aviso para $spell:%s",

r7201 (ultrashining): zhTW update

ultrashining — Tue, 17 Jan 2012 06:51:04 GMT

Author: ultrashining
Date: Tue Jan 17 07:51:04 CET 2012
Revision: 7201

Log:

zhTW update

Updated

trunk/DBM-Core/localization.tw.lua

Updated

trunk/DBM-DragonSoul/localization.tw.lua

trunk/DBM-Core/localization.tw.lua

Action: modified

Old revision: 7200

Old date: 2012-01-17 00:50:11 UTC

@@ -153,7 +153,7 @@
 	target					= "%s:>%%s<",
 	targetcount				= "%s (%%d):>%%s<",
 	spell					= "%s",
-	adds					= "%s remaining: %%d",
+	adds					= "%s還剩餘:%%d",
 	cast					= "施放%s:%.1f秒",
 	soon					= "%s即將到來",
 	prewarn					= "%s在%s",
@@ -168,7 +168,7 @@
 	target					= "提示$spell:%s的目標",
 	targetcount				= "提示$spell:%s的目標",
 	spell					= "為$spell:%s顯示警告",
-	adds					= "Announce how many $spell:%s remain",
+	adds					= "提示$spell:%s的剩餘數量",
 	cast					= "當$spell:%s施放時顯示警告",
 	soon					= prewarnOption,
 	prewarn					= prewarnOption,

trunk/DBM-DragonSoul/localization.tw.lua

Action: modified

Old revision: 7200

Old date: 2012-01-17 00:50:11 UTC

@@ -90,7 +90,7 @@
 })
 
 L:SetOptionLocalization({
-	WarnPillars				= "發佈$journal:3919或$journal:4069的剩餘數量",
+	WarnPillars				= "提示$journal:3919或$journal:4069的剩餘數量",
 	TimerSpecial			= "為第一次特別技能$spell:105256或$spell:105465施放顯示計時器\n(第一次施放根據首領手中的武器的附魔)",
 	RangeFrame				= "為$spell:105269(3碼),$journal:4327(10碼)顯示距離框",
 	AnnounceFrostTombIcons	= "為$spell:104451的目標發佈圖示至團隊頻道\n(需要團隊隊長)",

r7200 (nbluewiz): koKR update

nbluewiz — Tue, 17 Jan 2012 00:50:11 GMT

Author: nbluewiz
Date: Tue Jan 17 01:50:11 CET 2012
Revision: 7200

Log:

koKR update

Updated

trunk/DBM-Core/localization.kr.lua

Action: modified

Old revision: 7199

Old date: 2012-01-16 23:37:02 UTC

@@ -153,7 +153,7 @@
 	target 		= "%s : >%%s<",
 	targetcount = "%s (%%d) : >%%s<",
 	spell 		= "%s",
-	adds		= "%s remaining: %%d",
+	adds		= "%s : %%d 남음",
 	cast 		= "주문시전 %s : %.1f 초",
 	soon 		= "곧 %s",
 	prewarn		= "곧 %s (%s 후)",
@@ -167,7 +167,7 @@
 	target		= "$spell:%s 대상 보기",
 	targetcount	= "$spell:%s 대상 보기",
 	spell 		= "$spell:%s 알림 보기",
-	adds		= "Announce how many $spell:%s remain",
+	adds		= "$spell:%s 남은 횟수 알림 보기",
 	cast 		= "$spell:%s 시전시 알림 보기",
 	soon 		= "$spell:%s 사전 알림 보기",
 	prewarn		= "$spell:%s 사전 알림 보기",

r7199 (DiabloHu): zhCN update

DiabloHu — Mon, 16 Jan 2012 23:37:02 GMT

Author: DiabloHu
Date: Tue Jan 17 00:37:02 CET 2012
Revision: 7199

Log:

zhCN update

Updated

trunk/DBM-Core/localization.cn.lua

Updated

trunk/DBM-DragonSoul/localization.cn.lua

trunk/DBM-Core/localization.cn.lua

Action: modified

Old revision: 7198

Old date: 2012-01-16 23:18:46 UTC

@@ -1,6 +1,6 @@
 -- Simplified Chinese by Diablohu(diablohudream@gmail.com) & yleaf(yaroot@gmail.com)
 -- merge traslation by bigfoot team  - yleaf 9-10-2010
--- Last update: 1/1/2012
+-- Last update: 1/17/2012
 
 if GetLocale() ~= "zhCN" then return end
 
@@ -157,7 +157,7 @@
 	target					= "%s：>%%s<",
 	targetcount				= "%s (%%d)：>%%s<",
 	spell					= "%s",
-	adds					= "%s remaining: %%d",
+	adds					= "%s剩余：%%d",
 	cast					= "正在施放 %s：%.1f秒",
 	soon					= "即将 %s",
 	prewarn					= "%2$s后 %1$s",
@@ -172,7 +172,7 @@
 	target					= "警报：$spell:%s的目标",
 	targetcount				= "警报：$spell:%s的目标",
 	spell					= "警报：$spell:%s",
-	adds					= "Announce how many $spell:%s remain",
+	adds					= "警报：$spell:%s剩余数量",
 	cast					= "警报：$spell:%s的施放",
 	soon					= prewarnOption,
 	prewarn					= prewarnOption,

trunk/DBM-DragonSoul/localization.cn.lua

Action: modified

Old revision: 7198

Old date: 2012-01-16 23:18:46 UTC

@@ -1,5 +1,5 @@
 -- Simplified Chinese by Diablohu(diablohudream@gmail.com)
--- Last update: 1/16/2012
+-- Last update: 1/17/2012
 
 if GetLocale() ~= "zhCN"  then return end
 
@@ -156,7 +156,8 @@
 L:SetOptionLocalization({
 	TimerCombatStart	= "计时条：战斗即将开始",
 	TimerAdd			= "计时条：下一波暮光精英",
-	SpecWarnElites		= "特殊警报：新的暮光精英出现"
+	SpecWarnElites		= "特殊警报：新的暮光精英出现",
+	SetTextures			= "在第1阶段自动禁用弹道纹理（第2阶段自动恢复）"
 })
 
 L:SetMiscLocalization({

r7198 (Omega): Add a cast announce for reloading. then i think i'm done with commit spam for now.

Omega — Mon, 16 Jan 2012 23:18:46 GMT

Author: Omega
Date: Tue Jan 17 00:18:46 CET 2012
Revision: 7198

Log:

Add a cast announce for reloading. then i think i'm done with commit spam for now.

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7197

Old date: 2012-01-16 22:57:15 UTC

@@ -25,6 +25,7 @@
 
 local warnDrakesLeft				= mod:NewAddsLeftAnnounce("ej4192", 2, 61248)
 local warnHarpoon					= mod:NewTargetAnnounce(108038, 2)
+local warnReloading					= mod:NewCastAnnounce(108039, 2)
 local warnTwilightOnslaught			= mod:NewCountAnnounce(108862, 4)
 local warnPhase2					= mod:NewPhaseAnnounce(2, 3)
 local warnRoar						= mod:NewSpellAnnounce(109228, 2)
@@ -167,6 +168,7 @@
 	elseif args:IsSpellID(110210, 110213) then
 		timerTwilightBreath:Start()
 	elseif args:IsSpellID(108039) then
+		warnReloading:Show()
 		timerHarpoonCD:Cancel()--you failed, the guns aren't going to follow their standard CD because they have to cleanup now. Cancel all of the harpoon CDs.
 		timerReloadingCast:Start(args.sourceGUID)--This is your new CD for this harpoon.
 	end

r7197 (Omega): use the damage bladerush spellid in optiontext, not cast one, since it has a more meaningful tooltip and spellicon

Omega — Mon, 16 Jan 2012 22:57:15 GMT

Author: Omega
Date: Mon Jan 16 23:57:15 CET 2012
Revision: 7197

Log:

use the damage bladerush spellid in optiontext, not cast one, since it has a more meaningful tooltip and spellicon

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7196

Old date: 2012-01-16 22:23:34 UTC

@@ -54,7 +54,7 @@
 local timerTwilightOnslaughtCD		= mod:NewNextCountTimer(35, 107588)
 local timerSapperCD					= mod:NewNextTimer(40, "ej4200", nil, nil, nil, 107752)
 local timerDegenerationCD			= mod:NewCDTimer(8.5, 109208, nil, mod:IsTank())--8.5-9.5 variation.
-local timerBladeRushCD				= mod:NewCDTimer(15.5, 107594)--Experiment, 15.5-20 seemed common for heroic, LFR was a variatable 20-25sec. Just need more data, a lot more.
+local timerBladeRushCD				= mod:NewCDTimer(15.5, 107595)--Experiment, 15.5-20 seemed common for heroic, LFR was a variatable 20-25sec. Just need more data, a lot more.
 local timerBroadsideCD				= mod:NewNextTimer(90, 110153)
 local timerRoarCD					= mod:NewCDTimer(19, 109228)--19~22 variables (i haven't seen any logs where this wasn't always 21.5, are 19s on WoL somewhere?)
 local timerTwilightFlamesCD			= mod:NewNextTimer(8, 108051)

r7196 (Omega): small tweak

Omega — Mon, 16 Jan 2012 22:23:34 GMT

Author: Omega
Date: Mon Jan 16 23:23:34 CET 2012
Revision: 7196

Log:

small tweak

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7195

Old date: 2012-01-16 21:45:47 UTC

@@ -167,7 +167,7 @@
 	elseif args:IsSpellID(110210, 110213) then
 		timerTwilightBreath:Start()
 	elseif args:IsSpellID(108039) then
-		timerHarpoonCD:Cancel()--you failed, this guns aren't going to follow their standard CD because they have to cleanup now. Cancel all of the harpoon CDs.
+		timerHarpoonCD:Cancel()--you failed, the guns aren't going to follow their standard CD because they have to cleanup now. Cancel all of the harpoon CDs.
 		timerReloadingCast:Start(args.sourceGUID)--This is your new CD for this harpoon.
 	end
 end
@@ -272,7 +272,7 @@
 	elseif cid == 56855 or cid == 56587 then--Small Drakes (maybe each side has a unique ID? this could be useful in further filtering which harpoon is which side.
 		drakesCount = drakesCount - 1
 		warnDrakesLeft:Show(drakesCount)
-		timerHarpoonActive:Cancel(args.destGUID)
+		timerHarpoonActive:Cancel(args.sourceGUID)
 	end
 end

r7195 (Omega): fix some invalid option spellids

Omega — Mon, 16 Jan 2012 21:45:47 GMT

Author: Omega
Date: Mon Jan 16 22:45:47 CET 2012
Revision: 7195

Log:

fix some invalid option spellids

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7194

Old date: 2012-01-16 21:41:28 UTC

@@ -47,8 +47,8 @@
 
 local timerCombatStart				= mod:NewTimer(20.5, "TimerCombatStart", 2457)
 local timerAdd						= mod:NewTimer(61, "TimerAdd", 107752)
-local timerHarpoonCD				= mod:NewCDTimer(48, 108039)--CD when you don't fail at drakes
-local timerHarpoonActive			= mod:NewBuffActiveTimer(20, 108039)--Seems to always hold at least 20 seconds, beyond that, RNG, but you always get at least 20 seconds before they "snap" free.
+local timerHarpoonCD				= mod:NewCDTimer(48, 108038)--CD when you don't fail at drakes
+local timerHarpoonActive			= mod:NewBuffActiveTimer(20, 108038)--Seems to always hold at least 20 seconds, beyond that, RNG, but you always get at least 20 seconds before they "snap" free.
 local timerReloadingCast			= mod:NewCastTimer(10, 108039)--You screwed up and let a drake get away, this makes a harpoon gun reload and regrab failed drakes after 10 seconds.
 local timerTwilightOnslaught		= mod:NewCastTimer(7, 107588)
 local timerTwilightOnslaughtCD		= mod:NewNextCountTimer(35, 107588)

r7194 (Omega): fix error in last

Omega — Mon, 16 Jan 2012 21:41:28 GMT

Author: Omega
Date: Mon Jan 16 22:41:28 CET 2012
Revision: 7194

Log:

fix error in last

Updated

trunk/DBM-Core/localization.cn.lua

Updated

trunk/DBM-Core/localization.de.lua

Updated

trunk/DBM-Core/localization.en.lua

Updated

trunk/DBM-Core/localization.es.lua

Updated

trunk/DBM-Core/localization.fr.lua

Updated

trunk/DBM-Core/localization.kr.lua

Updated

trunk/DBM-Core/localization.pt.lua

Updated

trunk/DBM-Core/localization.ru.lua

Updated

trunk/DBM-Core/localization.tw.lua

trunk/DBM-Core/localization.cn.lua

Action: modified

Old revision: 7193

Old date: 2012-01-16 21:13:55 UTC

@@ -157,7 +157,7 @@
 	target					= "%s：>%%s<",
 	targetcount				= "%s (%%d)：>%%s<",
 	spell					= "%s",
-	adds					= "%s remaining: %d",
+	adds					= "%s remaining: %%d",
 	cast					= "正在施放 %s：%.1f秒",
 	soon					= "即将 %s",
 	prewarn					= "%2$s后 %1$s",

trunk/DBM-Core/localization.de.lua

Action: modified

Old revision: 7193

Old date: 2012-01-16 21:13:55 UTC

@@ -153,7 +153,7 @@
 	target		= "%s auf >%%s<",
 	targetcount	= "%s (%%d) auf >%%s<",
 	spell		= "%s",
-	adds		= "%s remaining: %d",
+	adds		= "%s remaining: %%d",
 	cast		= "Wirkt %s: %.1f Sek",
 	soon		= "%s bald",
 	prewarn 	= "%s in %s",

trunk/DBM-Core/localization.en.lua

Action: modified

Old revision: 7193

Old date: 2012-01-16 21:13:55 UTC

@@ -152,7 +152,7 @@
 	target		= "%s on >%%s<",
 	targetcount	= "%s (%%d) on >%%s<",
 	spell		= "%s",
-	adds		= "%s remaining: %d",
+	adds		= "%s remaining: %%d",
 	cast		= "Casting %s: %.1f sec",
 	soon		= "%s soon",
 	prewarn		= "%s in %s",

trunk/DBM-Core/localization.es.lua

Action: modified

Old revision: 7193

Old date: 2012-01-16 21:13:55 UTC

@@ -153,7 +153,7 @@
 	target 		= "%s en >%%s<",
 	targetcount = "%s (%%d) en >%%s<",
 	spell 		= "%s",
-	adds		= "%s remaining: %d",
+	adds		= "%s remaining: %%d",
 	cast 		= "Casteando %s: %.1f seg",
 	soon 		= "%s pronto",
 	prewarn 	= "%s en %s",

trunk/DBM-Core/localization.fr.lua

Action: modified

Old revision: 7193

Old date: 2012-01-16 21:13:55 UTC

@@ -152,7 +152,7 @@
 	target	= "%s sur >%%s<",
 	targetcount	= "%s (%%d) sur >%%s<",
 	spell	= "%s",
-	adds	= "%s remaining: %d",
+	adds	= "%s remaining: %%d",
 	cast	= "Incantation |2 %s : %.1f sec",
 	soon	= "%s imminent",
 	prewarn = "%s de %s",

trunk/DBM-Core/localization.kr.lua

Action: modified

Old revision: 7193

Old date: 2012-01-16 21:13:55 UTC

@@ -153,7 +153,7 @@
 	target 		= "%s : >%%s<",
 	targetcount = "%s (%%d) : >%%s<",
 	spell 		= "%s",
-	adds		= "%s remaining: %d",
+	adds		= "%s remaining: %%d",
 	cast 		= "주문시전 %s : %.1f 초",
 	soon 		= "곧 %s",
 	prewarn		= "곧 %s (%s 후)",

trunk/DBM-Core/localization.pt.lua

Action: modified

Old revision: 7193

Old date: 2012-01-16 21:13:55 UTC

@@ -155,7 +155,7 @@
 	target	= "%s em >%%s<",
 	targetcount	= "%s (%%d) em >%%s<",
 	spell	= "%s",
-	adds		= "%s remaining: %d",
+	adds		= "%s remaining: %%d",
 	cast	= "Lançando %s: %.1f seg",
 	soon	= "%s em breve",
 	prewarn = "%s em %s",

trunk/DBM-Core/localization.ru.lua

Action: modified

Old revision: 7193

Old date: 2012-01-16 21:13:55 UTC

@@ -151,7 +151,7 @@
 	target = "%s на |3-5(>%%s<)",
 	targetcount = "%s (%%d) на |3-5(>%%s<)",
 	spell = "%s",
-	adds		= "%s remaining: %d",
+	adds		= "%s remaining: %%d",
 	cast = "Применение заклинания %s: %.1f сек",
 	soon = "Скоро %s",
 	prewarn = "%s через %s",

trunk/DBM-Core/localization.tw.lua

Action: modified

Old revision: 7193

Old date: 2012-01-16 21:13:55 UTC

@@ -153,7 +153,7 @@
 	target					= "%s:>%%s<",
 	targetcount				= "%s (%%d):>%%s<",
 	spell					= "%s",
-	adds		= "%s remaining: %d",
+	adds					= "%s remaining: %%d",
 	cast					= "施放%s:%.1f秒",
 	soon					= "%s即將到來",
 	prewarn					= "%s在%s",

r7193 (Omega): #Blackhorn. Added in Harpoon timers that will be very accurate if you don't screw up on drakes, if you do screw up the mod will just cancel them and give you a reloading timer (since based on 40+ logs, the CDs become a disaster once this happens and are really not fixable until reloading ends.)

Omega — Mon, 16 Jan 2012 21:13:55 GMT

Author: Omega
Date: Mon Jan 16 22:13:55 CET 2012
Revision: 7193

Log:

#Blackhorn. Added in Harpoon timers that will be very accurate if you don't screw up on drakes, if you do screw up the mod will just cancel them and give you a reloading timer (since based on 40+ logs, the CDs become a disaster once this happens and are really not fixable until reloading ends.)
##Core Added new generic for adds remaining, since it's common enough. didn't change over the old ones yet though. I only have DS journ extracted right now so i'll mess with rag and others later.

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-Core/localization.cn.lua

Updated

trunk/DBM-Core/localization.de.lua

Updated

trunk/DBM-Core/localization.en.lua

Updated

trunk/DBM-Core/localization.es.lua

Updated

trunk/DBM-Core/localization.fr.lua

Updated

trunk/DBM-Core/localization.kr.lua

Updated

trunk/DBM-Core/localization.pt.lua

Updated

trunk/DBM-Core/localization.ru.lua

Updated

trunk/DBM-Core/localization.tw.lua

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -3524,6 +3524,10 @@
 		return newAnnounce(self, "spell", spellId, color or 3, ...)
 	end
 
+	function bossModPrototype:NewAddsLeftAnnounce(spellId, color, ...)
+		return newAnnounce(self, "adds", spellId, color or 2, ...)
+	end
+
 	function bossModPrototype:NewCountAnnounce(spellId, color, ...)
 		return newAnnounce(self, "count", spellId, color or 3, ...)
 	end

trunk/DBM-Core/localization.cn.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -157,6 +157,7 @@
 	target					= "%s：>%%s<",
 	targetcount				= "%s (%%d)：>%%s<",
 	spell					= "%s",
+	adds					= "%s remaining: %d",
 	cast					= "正在施放 %s：%.1f秒",
 	soon					= "即将 %s",
 	prewarn					= "%2$s后 %1$s",
@@ -171,6 +172,7 @@
 	target					= "警报：$spell:%s的目标",
 	targetcount				= "警报：$spell:%s的目标",
 	spell					= "警报：$spell:%s",
+	adds					= "Announce how many $spell:%s remain",
 	cast					= "警报：$spell:%s的施放",
 	soon					= prewarnOption,
 	prewarn					= prewarnOption,

trunk/DBM-Core/localization.de.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -133,7 +133,7 @@
 	cdcount		= "%s CD (%%d)",
 	next		= "Nächster %s",
 	nextcount	= "Nächster %s (%%d)",
-	achievement	= "%s",
+	achievement	= "%s"
 }
 
 DBM_CORE_AUTO_TIMER_OPTIONS = {
@@ -145,7 +145,7 @@
 	cdcount		= "Abklingzeit von $spell:%s anzeigen",
 	next		= "Zeit bis nächstes $spell:%s anzeigen",
 	nextcount	= "Zeit bis nächstes $spell:%s anzeigen",
-	achievement	= "Zeit für %s anzeigen",
+	achievement	= "Zeit für %s anzeigen"
 }
 
 -- Auto-generated Warning Localizations
@@ -153,13 +153,14 @@
 	target	= "%s auf >%%s<",
 	targetcount	= "%s (%%d) auf >%%s<",
 	spell	= "%s",
+	adds		= "%s remaining: %d",
 	cast	= "Wirkt %s: %.1f Sek",
 	soon	= "%s bald",
 	prewarn = "%s in %s",
 	phase	= "Phase %s",
 	prephase= "Phase %s bald",
 	count	= "%s (%%d)",
-	stack	= "%s auf >%%s< (%%d)",
+	stack		= "%s auf >%%s< (%%d)"
 }
 
 local prewarnOption = "Zeige Vorwarnung für $spell:%s"
@@ -167,13 +168,14 @@
 	target		= "Verkünde Ziele von $spell:%s",
 	targetcount	= "Verkünde Ziele von $spell:%s",
 	spell		= "Zeige Warnung für $spell:%s",
+	adds		= "Announce how many $spell:%s remain",
 	cast		= "Zeige Warnung, wenn $spell:%s gewirkt wird",
 	soon		= prewarnOption,
 	prewarn 	= prewarnOption,
 	phase		= "Verkünde Phase %s",
 	prephase	= "Zeige Vorwarnung für Phase %s",
 	count		= "Zeige Warnung für $spell:%s",
-	stack		= "Verkünde $spell:%s Stapel",
+	stack		= "Verkünde $spell:%s Stapel"
 }
 
 -- Auto-generated Special Warning Localizations

trunk/DBM-Core/localization.en.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -152,6 +152,7 @@
 	target		= "%s on >%%s<",
 	targetcount	= "%s (%%d) on >%%s<",
 	spell		= "%s",
+	adds		= "%s remaining: %d",
 	cast		= "Casting %s: %.1f sec",
 	soon		= "%s soon",
 	prewarn		= "%s in %s",
@@ -166,6 +167,7 @@
 	target		= "Announce $spell:%s targets",
 	targetcount	= "Announce $spell:%s targets",
 	spell		= "Show warning for $spell:%s",
+	adds		= "Announce how many $spell:%s remain",
 	cast		= "Show warning when $spell:%s is being cast",
 	soon		= prewarnOption,
 	prewarn 	= prewarnOption,

trunk/DBM-Core/localization.es.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -133,7 +133,7 @@
 	cdcount		= "%s CD (%%d)",
 	next		= "Siguiente %s",
 	nextcount	= "Siguiente %s (%%d)",
-	achievement = "%s",
+	achievement = "%s"
 }
 
 DBM_CORE_AUTO_TIMER_OPTIONS = {
@@ -145,7 +145,7 @@
 	cdcount = "Mostrar cooldown de $spell:%s ",
 	next = "Mostrar tiempo para el siguiente $spell:%s ",
 	nextcount = "Mostrar tiempo para el siguiente $spell:%s ",
-	achievement = "Mostrar tiempo para %s",
+	achievement = "Mostrar tiempo para %s"
 }
 
 -- Auto-generated Warning Localizations
@@ -153,13 +153,14 @@
 	target = "%s en >%%s<",
 	targetcount = "%s (%%d) en >%%s<",
 	spell = "%s",
+	adds		= "%s remaining: %d",
 	cast = "Casteando %s: %.1f seg",
 	soon = "%s pronto",
 	prewarn = "%s en %s",
 	phase = "Fase %s",
 	prephase = "Fase %s pronto",
 	count = "%s (%%d)",
-	stack = "%s en >%%s< (%%d)",
+	stack		= "%s en >%%s< (%%d)"
 }
 
 local prewarnOption = "Mostrar una pre-alerta para $spell:%s"
@@ -167,13 +168,14 @@
 	target	= "Anunciar objetivos de $spell:%s",
 	targetcount	= "Anunciar objetivos de $spell:%s",
 	spell	= "Mostrar aviso para $spell:%s",
+	adds		= "Announce how many $spell:%s remain",
 	cast	= "Mostrar aviso cuando castee $spell:%s",
 	soon	= "Mostrar pre-aviso para $spell:%s",
 	prewarn	= "Mostrar pre-aviso para $spell:%s",
 	phase	= "Anunciar Fase %s",
 	prephase = "Mostrar pre-aviso para Fase %s",
 	count	= "Mostrar aviso para $spell:%s",
-	stack	= "Anunciar acumulaciones de $spell:%s",
+	stack		= "Anunciar acumulaciones de $spell:%s"
 }
 
 -- Auto-generated Special Warning Localizations

trunk/DBM-Core/localization.fr.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -132,7 +132,7 @@
 	cdcount		= "Rech. |2 %s (%%d)",
 	next		= "Proch. %s",
 	nextcount	= "Proch. %s (%%d)",
-	achievement	= "%s",
+	achievement	= "%s"
 }
 
 DBM_CORE_AUTO_TIMER_OPTIONS = {
@@ -144,7 +144,7 @@
 	cdcount		= "Durée de recharge de $spell:%s",
 	next		= "Délai avant le prochain $spell:%s",
 	nextcount	= "Délai avant le prochain $spell:%s",
-	achievement	= "Délai pour réussir %s",
+	achievement	= "Délai pour réussir %s"
 }
 
 -- Auto-generated Warning Localizations
@@ -152,13 +152,14 @@
 	target	= "%s sur >%%s<",
 	targetcount	= "%s (%%d) sur >%%s<",
 	spell	= "%s",
+	adds	= "%s remaining: %d",
 	cast	= "Incantation |2 %s : %.1f sec",
 	soon	= "%s imminent",
 	prewarn = "%s de %s",
 	phase	= "Phase %s",
 	prephase= "Phase %s imminente",
 	count	= "%s (%%d)",
-	stack	= "%s sur >%%s< (%%d)",
+	stack	= "%s sur >%%s< (%%d)"
 }
 
 local prewarnOption = "Alerte préventive concernant $spell:%s"
@@ -166,13 +167,14 @@
 	target	= "Alerte indiquant le(s) cible(s) de $spell:%s",
 	targetcount	= "Alerte indiquant le(s) cible(s) de $spell:%s",
 	spell	= "Alerte concernant $spell:%s",
+	adds		= "Announce how many $spell:%s remain",
 	cast	= "Alerte quand $spell:%s est incanté",
 	soon	= prewarnOption,
 	prewarn = prewarnOption,
 	phase	= "Alerte indiquant l'arrivée de la phase %s",
 	prephase= "Alerte préventive indiquant l'arrivée de la phase %s",
 	count	= "Alerte concernant $spell:%s",
-	stack	= "Alerte indiquant les cumuls de $spell:%s",
+	stack	= "Alerte indiquant les cumuls de $spell:%s"
 }
 
 -- Auto-generated Special Warning Localizations

trunk/DBM-Core/localization.kr.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -153,19 +153,21 @@
 	target 		= "%s : >%%s<",
 	targetcount = "%s (%%d) : >%%s<",
 	spell 		= "%s",
+	adds		= "%s remaining: %d",
 	cast 		= "주문시전 %s : %.1f 초",
 	soon 		= "곧 %s",
 	prewarn		= "곧 %s (%s 후)",
 	phase 		= "%s 단계",
 	prephase	= "곧 %s 단계",
 	count 		= "%s (%%d)",
-	stack 		= "%s : >%%s< (%%d)",
+	stack 		= "%s : >%%s< (%%d)"
 }
 
 DBM_CORE_AUTO_ANNOUNCE_OPTIONS = {
 	target		= "$spell:%s 대상 보기",
 	targetcount	= "$spell:%s 대상 보기",
 	spell 		= "$spell:%s 알림 보기",
+	adds		= "Announce how many $spell:%s remain",
 	cast 		= "$spell:%s 시전시 알림 보기",
 	soon 		= "$spell:%s 사전 알림 보기",
 	prewarn		= "$spell:%s 사전 알림 보기",

trunk/DBM-Core/localization.pt.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -135,7 +135,7 @@
 	cdcount		= "%s recarrega (%%d)",
 	next		= "Próx. %s",
 	nextcount	= "Próx. %s (%%d)",
-	achievement	= "%s",
+	achievement	= "%s"
 }
 
 DBM_CORE_AUTO_TIMER_OPTIONS = {
@@ -147,7 +147,7 @@
 	cdcount		= "Exibir cronógrafo para recarga de $spell:%s",
 	next		= "Exibir cronógrafo para o próximo $spell:%s",
 	nextcount	= "Exibir cronógrafo para o próximo $spell:%s",
-	achievement	= "Exibir cronógrafo para %s",
+	achievement	= "Exibir cronógrafo para %s"
 }
 
 -- Auto-generated Warning Localizations
@@ -155,13 +155,14 @@
 	target	= "%s em >%%s<",
 	targetcount	= "%s (%%d) em >%%s<",
 	spell	= "%s",
+	adds		= "%s remaining: %d",
 	cast	= "Lançando %s: %.1f seg",
 	soon	= "%s em breve",
 	prewarn = "%s em %s",
 	phase	= "Fase %s",
 	prephase= "Fase %s em breve",
 	count	= "%s (%%d)",
-	stack	= "%s em >%%s< (%%d)",
+	stack	= "%s em >%%s< (%%d)"
 }
 
 local prewarnOption = "Exibir aviso antecipado para $spell:%s"
@@ -169,13 +170,14 @@
 	target	= "Anunciar alvos de $spell:%s",
 	targetcount	= "Anunciar alvos de $spell:%s",
 	spell	= "Exibir aviso para $spell:%s",
+	adds		= "Announce how many $spell:%s remain",
 	cast	= "Exibir aviso quando $spell:%s está sendo lançado",
 	soon	= prewarnOption,
 	prewarn = prewarnOption,
 	phase	= "Anunciar Fase %s",
 	prephase= "Mostrar aviso antecipado para a Fase %s",
 	count	= "Exibir aviso para $spell:%s",
-	stack	= "Anunciar empilhamento de $spell:%s",
+	stack	= "Anunciar empilhamento de $spell:%s"
 }
 
 -- Auto-generated Special Warning Localizations

trunk/DBM-Core/localization.ru.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -131,7 +131,7 @@
 	cdcount		= "Восст. %s (%%d)",
 	next 		= "След. %s",
 	nextcount	= "След. %s (%%d)",
-	achievement = "%s",
+	achievement = "%s"
 }
 
 DBM_CORE_AUTO_TIMER_OPTIONS = {
@@ -151,13 +151,14 @@
 	target = "%s на |3-5(>%%s<)",
 	targetcount = "%s (%%d) на |3-5(>%%s<)",
 	spell = "%s",
+	adds		= "%s remaining: %d",
 	cast = "Применение заклинания %s: %.1f сек",
 	soon = "Скоро %s",
 	prewarn = "%s через %s",
 	phase = "Фаза %s",
 	prephase = "Скоро фаза %s",
 	count = "%s (%%d)",
-	stack = "%s на |3-5(>%%s<) (%%d)",
+	stack = "%s на |3-5(>%%s<) (%%d)"
 }
 
 local prewarnOption = "Предупреждать заранее о $spell:%s"
@@ -165,13 +166,14 @@
 	target = "Объявлять цели заклинания $spell:%s",
 	targetcount = "Объявлять цели заклинания $spell:%s",
 	spell = "Предупреждение для $spell:%s",
+	adds		= "Announce how many $spell:%s remain",
 	cast = "Предупреждать о применении заклинания $spell:%s",
 	soon = prewarnOption,
 	prewarn = prewarnOption,
 	phase = "Объявлять фазу %s",
 	prephase = "Предупреждать заранее о фазе %s",
 	count = "Предупреждение для $spell:%s",
-	stack = "Объявлять количество стаков $spell:%s",
+	stack = "Объявлять количество стаков $spell:%s"
 }
 
 -- Auto-generated Special Warning Localizations

trunk/DBM-Core/localization.tw.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -133,7 +133,7 @@
 	cdcount					= "%s冷卻 (%%d)",
 	next 					= "下一次%s",
 	nextcount 				= "下一次%s (%%d)",
-	achievement 			= "%s",
+	achievement 			= "%s"
 }
 
 DBM_CORE_AUTO_TIMER_OPTIONS = {
@@ -153,13 +153,14 @@
 	target					= "%s:>%%s<",
 	targetcount				= "%s (%%d):>%%s<",
 	spell					= "%s",
+	adds		= "%s remaining: %d",
 	cast					= "施放%s:%.1f秒",
 	soon					= "%s即將到來",
 	prewarn					= "%s在%s",
 	phase					= "第%s階段",
 	prephase				= "第%s階段 即將到來",
 	count					= "%s (%%d)",
-	stack					= "%s在>%%s< (%%d)",
+	stack					= "%s在>%%s< (%%d)"
 }
 
 local prewarnOption			= "為$spell:%s顯示預先警告"
@@ -167,13 +168,14 @@
 	target					= "提示$spell:%s的目標",
 	targetcount				= "提示$spell:%s的目標",
 	spell					= "為$spell:%s顯示警告",
+	adds		= "Announce how many $spell:%s remain",
 	cast					= "當$spell:%s施放時顯示警告",
 	soon					= prewarnOption,
 	prewarn					= prewarnOption,
 	phase					= "提示第%s階段",
 	prephase				= "為第%s階段顯示預先警告",
 	count					= "為$spell:%s顯示警告",
-	stack					= "提示$spell:%s的堆疊",
+	stack					= "提示$spell:%s的堆疊"
 }
 
 -- Auto-generated Special Warning Localizations

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7192

Old date: 2012-01-16 19:20:39 UTC

@@ -23,6 +23,7 @@
 	"UNIT_SPELLCAST_SUCCEEDED"
 )
 
+local warnDrakesLeft				= mod:NewAddsLeftAnnounce("ej4192", 2, 61248)
 local warnHarpoon					= mod:NewTargetAnnounce(108038, 2)
 local warnTwilightOnslaught			= mod:NewCountAnnounce(108862, 4)
 local warnPhase2					= mod:NewPhaseAnnounce(2, 3)
@@ -46,6 +47,9 @@
 
 local timerCombatStart				= mod:NewTimer(20.5, "TimerCombatStart", 2457)
 local timerAdd						= mod:NewTimer(61, "TimerAdd", 107752)
+local timerHarpoonCD				= mod:NewCDTimer(48, 108039)--CD when you don't fail at drakes
+local timerHarpoonActive			= mod:NewBuffActiveTimer(20, 108039)--Seems to always hold at least 20 seconds, beyond that, RNG, but you always get at least 20 seconds before they "snap" free.
+local timerReloadingCast			= mod:NewCastTimer(10, 108039)--You screwed up and let a drake get away, this makes a harpoon gun reload and regrab failed drakes after 10 seconds.
 local timerTwilightOnslaught		= mod:NewCastTimer(7, 107588)
 local timerTwilightOnslaughtCD		= mod:NewNextCountTimer(35, 107588)
 local timerSapperCD					= mod:NewNextTimer(40, "ej4200", nil, nil, nil, 107752)
@@ -68,6 +72,7 @@
 local phase2Started = false
 local lastFlames = 0
 local addsCount = 0
+local drakesCount = 6
 local twilightOnslaughtCount = 0
 local CVAR = false
 
@@ -117,6 +122,7 @@
 	phase2Started = false
 	lastFlames = 0
 	addsCount = 0
+	drakesCount = 6
 	twilightOnslaughtCount = 0
 	CVAR = false
 	timerCombatStart:Start(-delay)
@@ -160,6 +166,9 @@
 		timerShockwaveCD:Start()
 	elseif args:IsSpellID(110210, 110213) then
 		timerTwilightBreath:Start()
+	elseif args:IsSpellID(108039) then
+		timerHarpoonCD:Cancel()--you failed, this guns aren't going to follow their standard CD because they have to cleanup now. Cancel all of the harpoon CDs.
+		timerReloadingCast:Start(args.sourceGUID)--This is your new CD for this harpoon.
 	end
 end
 
@@ -171,6 +180,8 @@
 		timerDevastateCD:Start()
 	elseif args:IsSpellID(107558, 108861, 109207, 109208) then
 		timerDegenerationCD:Start(args.sourceGUID)
+	elseif args:IsSpellID(108039) then
+		timerHarpoonCD:Start(args.sourceGUID)
 	end
 end
 
@@ -190,9 +201,9 @@
 	elseif args:IsSpellID(108038) then
 		warnHarpoon:Show(args.destName)
 		specWarnHarpoon:Show(args.destName)
-	--"<2059.6> [CLEU] SPELL_AURA_APPLIED#false#0xF150DFAC0000253E#Skyfire Cannon#2584#0#0xF150DFAC0000253E#Skyfire Cannon#2584#0#108040#Artillery Barrage#5#BUFF", -- [61321]
-	--"<2067.7> [CAST_SUCCEEDED] Goriona:Possible Target:target:Eject Passenger 1::0:60603", -- [61429]
-	--"<2069.5> [MONSTER_YELL] CHAT_MSG_MONSTER_YELL#Looks like I'm doing this myself. Good!#Warmaster Blackhorn###Goriona##0#0##0#564##0#false", -- [61454]
+		if not mod:IsDifficulty("lfr25") then--Don't start this in LFR, pretty sure there is no duration there, it's indefinite.
+			timerHarpoonActive:Start(args.destGUID)
+		end
 	elseif args:IsSpellID(108040) and not phase2Started then--Goriona is being shot by the ships Artillery Barrage (phase 2 trigger)
 		self:Schedule(10, Phase2Delay)--It seems you can still get phase 1 crap until blackhorn is on the deck itself(ie his yell 10 seconds after this trigger) so we delay canceling timers.
 		phase2Started = true
@@ -245,15 +256,23 @@
 	end
 end
 
+
+--[[Useful reg expressions for WoL
+spellid = 108038 or fulltype = UNIT_DIED and (targetMobId = 56855 or targetMobId = 56587) or spellid = 108039
+spellid = 108038 and fulltype = SPELL_CAST_START or fulltype = UNIT_DIED and (targetMobId = 56855 or targetMobId = 56587) or spellid = 108039
+--]]
+
 function mod:UNIT_DIED(args)
 	local cid = self:GetCIDFromGUID(args.destGUID)
-	if cid == 56427 then
+	if cid == 56427 then--Boss
 		DBM:EndCombat(self)
-	elseif cid == 56781 then
-		timerTwilightFlamesCD:Cancel()
-	elseif cid == 56848 or cid == 56854 then
+	elseif cid == 56848 or cid == 56854 then--Humanoids
 		timerBladeRushCD:Cancel(args.sourceGUID)
 		timerDegenerationCD:Cancel(args.sourceGUID)
+	elseif cid == 56855 or cid == 56587 then--Small Drakes (maybe each side has a unique ID? this could be useful in further filtering which harpoon is which side.
+		drakesCount = drakesCount - 1
+		warnDrakesLeft:Show(drakesCount)
+		timerHarpoonActive:Cancel(args.destGUID)
 	end
 end
 
@@ -265,6 +284,10 @@
 
 function mod:OnSync(msg, sourceGUID)
 	if msg == "BladeRush" then
+		if self:IsDifficulty("heroic10", "heroic25") then
 		timerBladeRushCD:Start(sourceGUID)
+		else
+			timerBladeRushCD:Start(20, sourceGUID)--assumed based on LFR, which seemed to have a 20-25 variation, not 15-20
 	end
+	end
 end
\ No newline at end of file

r7192 (ebmor): deDE update (DragonSoul)

ebmor — Mon, 16 Jan 2012 19:20:39 GMT

Author: ebmor
Date: Mon Jan 16 20:20:39 CET 2012
Revision: 7192

Log:

deDE update (DragonSoul)

Updated

trunk/DBM-DragonSoul/localization.de.lua

Action: modified

Old revision: 7191

Old date: 2012-01-16 18:52:15 UTC

@@ -152,7 +152,8 @@
 L:SetOptionLocalization({
 	TimerCombatStart	= "Zeige Zeit bis Kampfbeginn",
 	TimerAdd			= "Zeige Zeit bis nächste Zwielichtelitegegner erscheinen",
-	SpecWarnElites		= "Zeige Spezialwarnung, wenn neue Zwielichtelitegegner erscheinen"
+	SpecWarnElites		= "Zeige Spezialwarnung, wenn neue Zwielichtelitegegner erscheinen",
+	SetTextures			= "Automatische Deaktivierung der Grafikeinstellung 'Projizierte Texturen'\nin Phase 1 (wird in Phase 2 automatisch wieder aktiviert)"
 })
 
 L:SetMiscLocalization({

r7191 (Snamor): esES update

Snamor — Mon, 16 Jan 2012 18:52:15 GMT

Author: Snamor
Date: Mon Jan 16 19:52:15 CET 2012
Revision: 7191

Log:

esES update

Updated

trunk/DBM-DragonSoul/localization.es.lua

Updated

trunk/DBM-Party-Cataclysm/localization.es.lua

Updated

trunk/DBM-PvP/localization.es.lua

Updated

trunk/DBM-WorldEvents/localization.es.lua

trunk/DBM-DragonSoul/localization.es.lua

Action: modified

Old revision: 7190

Old date: 2012-01-16 18:50:04 UTC

@@ -29,6 +29,7 @@
 L= DBM:GetModLocalization(324)
 
 L:SetWarningLocalization({
+
 })
 
 L:SetTimerLocalization({
@@ -36,11 +37,11 @@
 
 L:SetOptionLocalization({
 	ShadowYell			= "Gritar cuando te afecte $spell:104600\n(Solo dificultad Heroica)",
-	CustomRangeFrame	= "Range Frame options",
-	Never				= "Disabled",
-	Normal				= "Normal Range Frame",
-	DynamicPhase2		= "Phase2 Debuff Filtering",
-	DynamicAlways		= "Always Debuff Filtering"
+	CustomRangeFrame	= "Opciones de marco de distancia",
+	Never				= "Deshabilitado",
+	Normal				= "Distancia normal",
+	DynamicPhase2		= "Filtrar por debuff en Fase 2",
+	DynamicAlways		= "Siempre filtrar por debuff"
 })
 
 L:SetMiscLocalization({
@@ -53,6 +54,7 @@
 L= DBM:GetModLocalization(325)
 
 L:SetWarningLocalization({
+	warnOozesHit	= "%s absorbió %s"
 })
 
 L:SetTimerLocalization({
@@ -60,6 +62,7 @@
 })
 
 L:SetOptionLocalization({
+	warnOozesHit		= "Anunciar los mocos que absorbió el Boss",
 	timerOozesActive	= "Mostrar tiempo para que los mocos se pueden atacar",
 	RangeFrame			= "Mostrar distancia (4) para $spell:104898\n(Dificultad normal o superior)"
 })
@@ -80,6 +83,7 @@
 L= DBM:GetModLocalization(317)
 
 L:SetWarningLocalization({
+	WarnPillars				= "%s: %d restantes",
 	warnFrostTombCast		= "%s en 8 seg"
 })
 
@@ -88,6 +92,7 @@
 })
 
 L:SetOptionLocalization({
+	WarnPillars				= "Anunciar cuantas $journal:3919 o $journal:4069 quedan",
 	TimerSpecial			= "Mostrar tiempo para casteo de la primera habilidad especial",
 	RangeFrame				= "Mostrar distancia (3) para $spell:105269, (10) para $journal:4327",
 	AnnounceFrostTombIcons	= "Anunciar iconos de los objetivos de $spell:104451 a la banda\n(requiere líder)",
@@ -107,21 +112,26 @@
 L= DBM:GetModLocalization(331)
 
 L:SetWarningLocalization({
-	specWarnHourofTwilightN		= "%s (%%d)"--spellname Count
+	specWarnHourofTwilightN		= "%s (%d) en 5s"--spellname Count
 })
 
 L:SetTimerLocalization({
-	TimerCombatStart	= "Ultraxion aterriza",
-	timerRaidCDs		= "CD %s de %s listo"--spellname CD Castername
+	TimerCombatStart	= "Ultraxion activo",
+	timerRaidCDs		= "CD %s: %s"--spellname CD Castername
 })
 
 L:SetOptionLocalization({
 	TimerCombatStart	= "Mostrar tiempo para el inicio del combate",
-	ResetHoTCounter		= "Restart Hour of Twilight counter",--$spell doesn't work in this function apparently so use typed spellname for now.
-	Never				= "Never",
-	Reset3				= "Reset in sets of 3/2 (heroic/normal)",
-	Reset3Always		= "Always Reset in sets of 3",
-	ShowRaidCDs			= "Mostrar tiempos de CDs de Banda"
+	ResetHoTCounter		= "Reiniciar contador de Hora del crepusculo",--$spell doesn't work in this function apparently so use typed spellname for now.
+	Never				= "Nunca",
+	Reset3				= "En series de 3/2 (heroico/normal)",
+	Reset3Always		= "Siempre reiniciar en series de 3",
+	SpecWarnHoTN		= "Mostrar aviso especial 5s antes de Hora del Crepusculo (solo en series de 3)",
+	One					= "1 (ej: 1 4 7)",
+	Two					= "2 (ej: 2 5)",
+	Three				= "3 (ej: 3 6)",
+	ShowRaidCDs			= "Mostrar tiempos de CDs de Banda",
+	ShowRaidCDsSelf		= "Pero solo mostrar los CDs propios\n(Requiere 'Mostrar tiempos de CDs de Banda' activado)"
 })
 
 L:SetMiscLocalization({
@@ -135,6 +145,7 @@
 L= DBM:GetModLocalization(332)
 
 L:SetWarningLocalization({
+	SpecWarnElites	= "¡Élites Crepusculares!"
 })
 
 L:SetTimerLocalization({
@@ -144,13 +155,16 @@
 
 L:SetOptionLocalization({
 	TimerCombatStart	= "Mostrar tiempo para el inicio del combate",
-	TimerAdd			= "Mostrar tiempo para que salgan los siguientes Élites Crepusculares"
+	TimerAdd			= "Mostrar tiempo para que salgan los siguientes Élites Crepusculares",
+	SpecWarnElites		= "Mostrar un aviso especial cuando salgan nuevos Élites Crepusculares",
+	SetTextures			= "Deshabilitar automaticamente texturas proyectadas en la fase 1 (Se vuelven a activar en fase 2)"
 })
 
 L:SetMiscLocalization({
 	SapperEmote			= "¡Un draco desciende para dejar a un zapador Crepuscular en la cubierta!",
 	Broadside			= "spell:110153",
-	DeckFire			= "spell:110095"
+	DeckFire			= "spell:110095",
+	GorionaRetreat			= "screeches in pain and retreats into the swirling clouds"--translate
 })
 
 -------------------------

trunk/DBM-Party-Cataclysm/localization.es.lua

Action: modified

Old revision: 7190

Old date: 2012-01-16 18:50:04 UTC

@@ -1065,8 +1065,8 @@
 ----------------------
 L = DBM:GetModLocalization("AsiraDawnslayer")
 
-L:SetTimerLocalization{
-	TimerCombatStart	= "Combat starts"
+L:SetGeneralLocalization{
+	name = "Asira Puñal del Alba"
 }
 
 L:SetMiscLocalization{

trunk/DBM-PvP/localization.es.lua

Action: modified

Old revision: 7190

Old date: 2012-01-16 18:50:04 UTC

@@ -180,23 +180,20 @@
 })
 
 L:SetTimerLocalization({
-	TimerStart		= "¡La batalla va comenzar!", 
 	TimerPOI		= "%s",
 	TimerSiegeEngine	= "Máquina de asedio Lista"
 })
 
 L:SetOptionLocalization({
-	TimerStart		= "Mostrar tiempo para que comienze la Batalla.", 
 	TimerPOI		= "Mostrar tiempo para las Capturas",
 	TimerSiegeEngine	= "Mostrar tiempo para la construcción de Máquina de asedio",
 	WarnSiegeEngine		= "Mostrar aviso cuando Máquina de asedio esté lista",
-	WarnSiegeEngineSoon	= "Mostrar aviso cuando Máquina de asedio esté casi lista"
+	WarnSiegeEngineSoon	= "Mostrar aviso cuando Máquina de asedio esté casi lista",
+	ShowGatesHealth		= "Mostrar la vida de las puertas dañadas (Puede que muestre valores erréneos si te unes a una BG empezada!)"
 })
 
 L:SetMiscLocalization({
-	BgStart60		= "La batalla comenzará en 60 segundos.",
-	BgStart30		= "La batalla comenzará en 30 segundos.",
-	BgStart15		= "La batalla comenzará en 15 segundos.",
+	GatesHealthFrame		= "Puertas dañadas",
 	SiegeEngine				= "Máquina de asedio",
 	GoblinStartAlliance		= "¿Ves esas bombas de seforio? Úsalas en las puertas mientras reparo la máquina de asedio.",
 	GoblinStartHorde		= "Trabajaré en la máquina de asedio, solo cúbreme las espaldas. ¡Usa esas bombas de seforio en las puertas si las necesitas!",

trunk/DBM-WorldEvents/localization.es.lua

Action: modified

Old revision: 7190

Old date: 2012-01-16 18:50:04 UTC

@@ -11,9 +11,6 @@
 	name = "Los Tres Boticarios"
 })
 
-L:SetWarningLocalization({
-})
-
 L:SetTimerLocalization{
 	HummelActive	= "Hummel se activa",
 	BaxterActive	= "Baxter se activa",
@@ -126,14 +123,50 @@
 	name = "The Abominable Greench"
 })
 
+--------------------------
+--  Blastenheimer 5000  --
+--------------------------
+L = DBM:GetModLocalization("Cannon")
+
+L:SetGeneralLocalization({
+	name = "Ultracañón Pimpampum 5000"
+})
+
+-------------
+--  Gnoll  --
+-------------
+L = DBM:GetModLocalization("Gnoll")
+
+L:SetGeneralLocalization({
+	name = "Golpea al gnoll"
+})
+
 L:SetWarningLocalization({
+	warnGnoll		= "Sale un Gnoll",
+	warnHogger		= "Sale Hogger",
+	specWarnHogger	= "¡Sale Hogger!"
 })
 
-L:SetTimerLocalization{
-}
-
 L:SetOptionLocalization({
+	warnGnoll		= "Anunciar cuando sale un Gnoll",
+	warnHogger		= "Anunciar cuando sale un Hogger",
+	specWarnHogger	= "Mostrar aviso especial cuando sale un Hogger"
 })
 
-L:SetMiscLocalization({
+------------------------
+--  Shooting Gallery  --
+------------------------
+L = DBM:GetModLocalization("Shot")
+
+L:SetGeneralLocalization({
+	name = "Galería de tiro"
 })
+
+----------------------
+--  Tonk Challenge  --
+----------------------
+L = DBM:GetModLocalization("Tonks")
+
+L:SetGeneralLocalization({
+	name = "Combate de tonques"
+})

r7190 (Omega): forgot cancel bar for degeneration

Omega — Mon, 16 Jan 2012 18:50:04 GMT

Author: Omega
Date: Mon Jan 16 19:50:04 CET 2012
Revision: 7190

Log:

forgot cancel bar for degeneration

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7189

Old date: 2012-01-16 11:02:24 UTC

@@ -253,6 +253,7 @@
 		timerTwilightFlamesCD:Cancel()
 	elseif cid == 56848 or cid == 56854 then
 		timerBladeRushCD:Cancel(args.sourceGUID)
+		timerDegenerationCD:Cancel(args.sourceGUID)
 	end
 end

r7189 (ultrashining): zhTW update

ultrashining — Mon, 16 Jan 2012 11:02:24 GMT

Author: ultrashining
Date: Mon Jan 16 12:02:24 CET 2012
Revision: 7189

Log:

zhTW update

Updated

trunk/DBM-DragonSoul/localization.tw.lua

Updated

trunk/DBM-Party-Cataclysm/localization.tw.lua

trunk/DBM-DragonSoul/localization.tw.lua

Action: modified

Old revision: 7188

Old date: 2012-01-16 08:53:55 UTC

@@ -152,7 +152,8 @@
 L:SetOptionLocalization({
 	TimerCombatStart	= "為戰鬥開始時間顯示計時器",
 	TimerAdd			= "為下一次精英暮光顯示計時器",
-	SpecWarnElites		= "為新一波的精英暮光顯示特別警告"
+	SpecWarnElites		= "為新一波的精英暮光顯示特別警告",
+	SetTextures			= "在第一階段時自動的關閉投影材質特效\n(第二階段時還原為開啟)"
 })
 
 L:SetMiscLocalization({

trunk/DBM-Party-Cataclysm/localization.tw.lua

Action: modified

Old revision: 7188

Old date: 2012-01-16 08:53:55 UTC

@@ -222,7 +222,7 @@
 })
 
 L:SetMiscLocalization({
-	Brann				= "好了，快走吧!只需要把最後的登錄程序輸入到門的機關中...然後..."
+	Brann				= "好了，快走吧!只需要把最後的登錄程序輸入到門的機關中....然後..."
 })
 
 ------------

r7188 (nbluewiz): # Blackhorn : fixed Consuming Shroud timer shows on normal difficulty. # koKR update

nbluewiz — Mon, 16 Jan 2012 08:53:55 GMT

Author: nbluewiz
Date: Mon Jan 16 09:53:55 CET 2012
Revision: 7188

Log:

# Blackhorn : fixed Consuming Shroud timer shows on normal difficulty.
# koKR update

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/localization.kr.lua

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7187

Old date: 2012-01-16 06:41:54 UTC

@@ -81,7 +81,9 @@
 	timerRoarCD:Start(10)
 	timerTwilightFlamesCD:Start(12)
 	timerShockwaveCD:Start(13)--13-16 second variation
+	if self:IsDifficulty("heroic10", "heroic25") then
 	timerConsumingShroud:Start(45)	-- 45seconds once P2 starts?
+	end
 	if not mod:IsDifficulty("lfr25") then--Assumed, but i find it unlikely a 4 min berserk timer will be active on LFR
 		berserkTimer:Start()
 	end

trunk/DBM-DragonSoul/localization.kr.lua

Action: modified

Old revision: 7187

Old date: 2012-01-16 06:41:54 UTC

@@ -152,7 +152,8 @@
 L:SetOptionLocalization({
 	TimerCombatStart	= "전투 시작 바 표시",
 	TimerAdd			= "다음 황혼의 정예병 등장 바 표시",
-	SpecWarnElites		= "황혼의 정예병 등장시 특수 경고 보기"
+	SpecWarnElites		= "황혼의 정예병 등장시 특수 경고 보기",
+	SetTextures			= "1 단계 진행 도중 텍스쳐 투영 효과 끄기\n(2 단계에서 다시 활성화 됩니다.)"
 })
 
 L:SetMiscLocalization({

r7187 (Omega): Add in auto projected textures option for Blackhorn. the fight is infinitely easier in phase 1 with them off, but a pain in the balls in phase 2 with them still off. Now dbm can mess with this setting so we don't have to.

Omega — Mon, 16 Jan 2012 06:41:54 GMT

Author: Omega
Date: Mon Jan 16 07:41:54 CET 2012
Revision: 7187

Log:

Add in auto projected textures option for Blackhorn. the fight is infinitely easier in phase 1 with them off, but a pain in the balls in phase 2 with them still off. Now dbm can mess with this setting so we don't have to.

Updated

trunk/DBM-BlackwingDescent/Maloriak.lua

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/localization.en.lua

trunk/DBM-BlackwingDescent/Maloriak.lua

Action: modified

Old revision: 7186

Old date: 2012-01-16 06:28:46 UTC

@@ -69,7 +69,7 @@
 mod:AddBoolOption("BitingChillIcon", false)
 mod:AddBoolOption("ConsumingFlamesIcon", false)
 mod:AddBoolOption("RangeFrame")
-mod:AddBoolOption("SetTextures", true)--Blizz sucks and just about ALL friendly spells cover dark sludge and make you unable to see it.
+mod:AddBoolOption("SetTextures", true)--Just about ALL friendly spells cover dark sludge and make it very hard to see it.
 
 local adds = 18
 local AddsInterrupted = false

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7186

Old date: 2012-01-16 06:28:46 UTC

@@ -63,10 +63,13 @@
 local twilightOnslaughtCountdown	= mod:NewCountdown(35, 107588)
 local berserkTimer					= mod:NewBerserkTimer(240)
 
+mod:AddBoolOption("SetTextures", false)--Disable projected textures in phase 1, because no harmful spells use them in phase 1, but friendly spells make the blade rush lines harder to see.
+
 local phase2Started = false
 local lastFlames = 0
 local addsCount = 0
 local twilightOnslaughtCount = 0
+local CVAR = false
 
 local function Phase2Delay()
 	mod:UnscheduleMethod("AddsRepeat")
@@ -82,7 +85,10 @@
 	if not mod:IsDifficulty("lfr25") then--Assumed, but i find it unlikely a 4 min berserk timer will be active on LFR
 		berserkTimer:Start()
 	end
+	if mod.Options.SetTextures and not GetCVarBool("projectedTextures") and CVAR then--Confirm we turned them off in phase 1 before messing with anything.
+		SetCVar("projectedTextures", 1)--Turn them back on for phase 2 if we're the ones that turned em off on pull.
 end
+end
 
 function mod:ShockwaveTarget()
 	local targetname = self:GetBossTarget(56427)
@@ -110,6 +116,7 @@
 	lastFlames = 0
 	addsCount = 0
 	twilightOnslaughtCount = 0
+	CVAR = false
 	timerCombatStart:Start(-delay)
 	timerAdd:Start(22.8-delay)
 	self:ScheduleMethod(22.8-delay, "AddsRepeat")
@@ -126,8 +133,18 @@
 		DBM.BossHealth:Clear()
 		DBM.BossHealth:AddBoss(56598, shipname)
 	end
+	if self.Options.SetTextures and GetCVarBool("projectedTextures") then--This is only true if projected textures were on when we pulled and option to control setting is also on.
+		CVAR = true--so set this variable to true, which means we are allowed to mess with users graphics settings
+		SetCVar("projectedTextures", 0)
 end
+end
 
+function mod:OnCombatEnd()
+	if self.Options.SetTextures and not GetCVarBool("projectedTextures") and CVAR then--Only turn them back on if they are off now, but were on when we pulled, and the setting is enabled.
+		SetCVar("projectedTextures", 1)
+	end
+end
+
 function mod:SPELL_CAST_START(args)
 	if args:IsSpellID(107588) then
 		twilightOnslaughtCount = twilightOnslaughtCount + 1

trunk/DBM-DragonSoul/localization.en.lua

Action: modified

Old revision: 7186

Old date: 2012-01-16 06:28:46 UTC

@@ -151,7 +151,8 @@
 L:SetOptionLocalization({
 	TimerCombatStart	= "Show timer for start of combat",
 	TimerAdd			= "Show timer for next Twilight Elites spawn",
-	SpecWarnElites		= "Show special warning for new Twilight Elites"
+	SpecWarnElites		= "Show special warning for new Twilight Elites",
+	SetTextures			= "Automatically disable projected textures in phase 1\n(returns it to enabled in phase 2)"
 })
 
 L:SetMiscLocalization({

r7186 (Omega): add some more tank options, tweak blade rush CD bar

Omega — Mon, 16 Jan 2012 06:28:46 GMT

Author: Omega
Date: Mon Jan 16 07:28:46 CET 2012
Revision: 7186

Log:

add some more tank options, tweak blade rush CD bar

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7185

Old date: 2012-01-16 03:08:13 UTC

@@ -42,17 +42,20 @@
 local yellShockwave					= mod:NewYell(108046)
 local specWarnTwilightFlames		= mod:NewSpecialWarningMove(108076)
 local specWarnSunder				= mod:NewSpecialWarningStack(108043, mod:IsTank(), 3)
+local specWarnSunderOther			= mod:NewSpecialWarningTarget(108043, mod:IsTank())
 
 local timerCombatStart				= mod:NewTimer(20.5, "TimerCombatStart", 2457)
 local timerAdd						= mod:NewTimer(61, "TimerAdd", 107752)
 local timerTwilightOnslaught		= mod:NewCastTimer(7, 107588)
 local timerTwilightOnslaughtCD		= mod:NewNextCountTimer(35, 107588)
 local timerSapperCD					= mod:NewNextTimer(40, "ej4200", nil, nil, nil, 107752)
-local timerBladeRushCD				= mod:NewCDTimer(17, 107594)--Experiment, 17sec seemed common for heroic, LFR was a variatable 20-25sec? Just need more data, a lot more.
+local timerDegenerationCD			= mod:NewCDTimer(8.5, 109208, nil, mod:IsTank())--8.5-9.5 variation.
+local timerBladeRushCD				= mod:NewCDTimer(15.5, 107594)--Experiment, 15.5-20 seemed common for heroic, LFR was a variatable 20-25sec. Just need more data, a lot more.
 local timerBroadsideCD				= mod:NewNextTimer(90, 110153)
 local timerRoarCD					= mod:NewCDTimer(19, 109228)--19~22 variables (i haven't seen any logs where this wasn't always 21.5, are 19s on WoL somewhere?)
 local timerTwilightFlamesCD			= mod:NewNextTimer(8, 108051)
 local timerShockwaveCD				= mod:NewCDTimer(23, 108046)
+local timerDevastateCD				= mod:NewCDTimer(8.5, 108042, nil, mod:IsTank())
 local timerSunder					= mod:NewTargetTimer(30, 108043, nil, mod:IsTank() or mod:IsHealer())
 local timerConsumingShroud			= mod:NewCDTimer(30, 110598)
 local timerTwilightBreath			= mod:NewCDTimer(20.5, 110213, nil, mod:IsTank() or mod:IsHealer())
@@ -108,8 +111,8 @@
 	addsCount = 0
 	twilightOnslaughtCount = 0
 	timerCombatStart:Start(-delay)
-	timerAdd:Start(24-delay)
-	self:ScheduleMethod(24-delay, "AddsRepeat")
+	timerAdd:Start(22.8-delay)
+	self:ScheduleMethod(22.8-delay, "AddsRepeat")
 	timerTwilightOnslaughtCD:Start(48-delay, 1)
 	twilightOnslaughtCountdown:Start(48-delay)
 	if self:IsDifficulty("heroic10", "heroic25") then
@@ -142,9 +145,13 @@
 end
 
 function mod:SPELL_CAST_SUCCESS(args)
-	if args:IsSpellID(108044, 109228, 109229, 109230) then -- 108044 is 10 man / 109228 lfr. other drycoded.
+	if args:IsSpellID(108044, 109228, 109229, 109230) then
 		warnRoar:Show()
 		timerRoarCD:Start()
+	elseif args:IsSpellID(108042) then
+		timerDevastateCD:Start()
+	elseif args:IsSpellID(107558, 108861, 109207, 109208) then
+		timerDegenerationCD:Start(args.sourceGUID)
 	end
 end
 
@@ -152,9 +159,15 @@
 	if args:IsSpellID(108043) then
 		warnSunder:Show(args.destName, args.amount or 1)
 		timerSunder:Start(args.destName)
-		if (args.amount or 0) >= 3 and args:IsPlayer() then
+		if args:IsPlayer() then
+			if (args.amount or 1) >= 3 then
 			specWarnSunder:Show(args.amount)
 		end
+		else
+			if (args.amount or 1) >= 2 and not UnitDebuff("player", GetSpellInfo(108043)) then--Other tank has 2 or more sunders and you have none.
+				specWarnSunderOther:Show(args.destName)--So nudge you to taunt it off other tank already.
+			end
+		end
 	elseif args:IsSpellID(108038) then
 		warnHarpoon:Show(args.destName)
 		specWarnHarpoon:Show(args.destName)

r7185 (Omega): add special warning for standing in deckfire

Omega — Mon, 16 Jan 2012 03:08:13 GMT

Author: Omega
Date: Mon Jan 16 04:08:13 CET 2012
Revision: 7185

Log:

add special warning for standing in deckfire

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7184

Old date: 2012-01-15 22:53:48 UTC

@@ -34,7 +34,8 @@
 
 local specWarnHarpoon				= mod:NewSpecialWarningTarget(108038, false)
 local specWarnTwilightOnslaught		= mod:NewSpecialWarningSpell(107588, nil, nil, nil, true)
-local specWarnDeckFire				= mod:NewSpecialWarningSpell(110095, false, nil, nil, true)
+local specWarnDeckFireCast			= mod:NewSpecialWarningSpell(110095, false, nil, nil, true)
+local specWarnDeckFire				= mod:NewSpecialWarningMove(110095)
 local specWarnElites				= mod:NewSpecialWarning("SpecWarnElites", mod:IsTank())
 local specWarnShockwave				= mod:NewSpecialWarningMove(108046)
 local specWarnShockwaveOther		= mod:NewSpecialWarningTarget(108046, false)
@@ -189,8 +190,13 @@
 			specWarnTwilightFlames:Show()
 			lastFlames = GetTime()
 		end
+	elseif args:IsSpellID(110095) then
+		if args:IsPlayer() and GetTime() - lastFlames > 3  then
+			specWarnDeckFire:Show()
+			lastFlames = GetTime()
 	end
 end
+end
 mod.SPELL_MISSED = mod.SPELL_DAMAGE
 
 function mod:RAID_BOSS_EMOTE(msg)
@@ -199,7 +205,7 @@
 	elseif msg == L.Broadside or msg:find(L.Broadside) then
 		timerBroadsideCD:Start()
 	elseif msg == L.DeckFire or msg:find(L.DeckFire) then
-		specWarnDeckFire:Show()
+		specWarnDeckFireCast:Show()
 	elseif msg == L.GorionaRetreat or msg:find(L.GorionaRetreat) then
 		timerTwilightBreath:Cancel()
 		timerConsumingShroud:Cancel()

r7184 (Omega): Add trash warning for standing in twilight drake fire

Omega — Sun, 15 Jan 2012 22:53:48 GMT

Author: Omega
Date: Sun Jan 15 23:53:48 CET 2012
Revision: 7184

Log:

Add trash warning for standing in twilight drake fire

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Updated

trunk/DBM-DragonSoul/DSTrash.lua

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7183

Old date: 2012-01-15 19:38:23 UTC

@@ -47,7 +47,7 @@
 local timerTwilightOnslaught		= mod:NewCastTimer(7, 107588)
 local timerTwilightOnslaughtCD		= mod:NewNextCountTimer(35, 107588)
 local timerSapperCD					= mod:NewNextTimer(40, "ej4200", nil, nil, nil, 107752)
-local timerBladeRushCD				= mod:NewCDTimer(17, 107594)--Experiment, should be precise, if it even works right. Hate casts that have no reasonable trigger :(
+local timerBladeRushCD				= mod:NewCDTimer(17, 107594)--Experiment, 17sec seemed common for heroic, LFR was a variatable 20-25sec? Just need more data, a lot more.
 local timerBroadsideCD				= mod:NewNextTimer(90, 110153)
 local timerRoarCD					= mod:NewCDTimer(19, 109228)--19~22 variables (i haven't seen any logs where this wasn't always 21.5, are 19s on WoL somewhere?)
 local timerTwilightFlamesCD			= mod:NewNextTimer(8, 108051)

trunk/DBM-DragonSoul/DSTrash.lua

Action: modified

Old revision: 7183

Old date: 2012-01-15 19:38:23 UTC

@@ -2,10 +2,12 @@
 local L		= mod:GetLocalizedStrings()
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
---mod:SetModelID(29539)
+mod:SetModelID(39378)
 
 mod:RegisterEvents(
 	"SPELL_CAST_START",
+	"SPELL_DAMAGE",
+	"SPELL_MISSED",
 	"CHAT_MSG_MONSTER_YELL"
 )
 
@@ -14,12 +16,15 @@
 local specWarnBoulder		= mod:NewSpecialWarningMove(107597)
 local specWarnBoulderNear	= mod:NewSpecialWarningClose(107597)
 local yellBoulder			= mod:NewYell(107597)
+local specWarnFlames		= mod:NewSpecialWarningMove(105579)
 
 local timerDrakes			= mod:NewTimer(253, "TimerDrakes", 61248)
 
 mod:RemoveOption("HealthFrame")
 mod:RemoveOption("SpeedKillTimer")
 
+local antiSpam = 0
+
 function mod:BoulderTarget(sGUID)
 	local targetname = nil
 	for i=1, GetNumRaidMembers() do
@@ -55,6 +60,14 @@
 	end
 end
 
+function mod:SPELL_DAMAGE(args)
+	if args:IsSpellID(105579) and args:IsPlayer() and GetTime() - antiSpam >= 3 then
+		specWarnFlames:Show()
+		antiSpam = GetTime()
+	end
+end
+mod.SPELL_MISSED = mod.SPELL_DAMAGE
+
 --	"<18.7> CHAT_MSG_MONSTER_YELL#It is good to see you again, Alexstrasza. I have been busy in my absence.#Deathwing###Notarget##0#0##0#3731##0#false", -- [1]
 --	"<271.9> [UNIT_SPELLCAST_SUCCEEDED] Twilight Assaulter:Possible Target:target:Twilight Escape::0:109904", -- [11926]
 function mod:CHAT_MSG_MONSTER_YELL(msg)

r7183 (Omega): track nil instance difficulty as normal for boss stats Small code cleanups

Omega — Sun, 15 Jan 2012 19:38:23 GMT

Author: Omega
Date: Sun Jan 15 20:38:23 CET 2012
Revision: 7183

Log:

track nil instance difficulty as normal for boss stats
Small code cleanups

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-DragonSoul/Morchok.lua

Updated

trunk/DBM-DragonSoul/Yorsahj.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7182

Old date: 2012-01-15 16:24:39 UTC

@@ -2359,6 +2359,7 @@
 			mod.stats.heroic25Pulls = mod.stats.heroic25Pulls + 1
 			savedDifficulty = PLAYER_DIFFICULTY2.." - "
 		else--you were not in an instance when you started combat, this is an outdoor boss.
+			mod.stats.normalPulls = mod.stats.normalPulls + 1--Treat it as normal for kill stats.
 			savedDifficulty = ""--So lets just return no difficulty :)
 		end
 		self:AddMsg(DBM_CORE_COMBAT_STARTED:format(savedDifficulty..mod.combatInfo.name))

trunk/DBM-DragonSoul/Morchok.lua

Action: modified

Old revision: 7182

Old date: 2012-01-15 16:24:39 UTC

@@ -36,9 +36,9 @@
 local timerCrushArmor	= mod:NewTargetTimer(20, 103687, nil, mod:IsTank())
 local timerCrystal		= mod:NewCDTimer(12, 103640)	-- 12-14sec variation (is also time till 'detonate')
 local timerStomp 		= mod:NewCDTimer(12, 108571)	-- 12-14sec variation
-local timerVortexNext	= mod:NewCDTimer(74, 110047)--96~97 sec after last vortex. must subtract vortex 17 + vortex buff 5 sec. 74 sec left
+local timerVortexNext	= mod:NewCDTimer(74, 110047)--96~97 sec after last vortex. must subtract blood 17 + vortex buff 5 sec. 74 sec left
 local timerBlood		= mod:NewBuffActiveTimer(17, 103851)
-local timerKohcromCD	= mod:NewTimer(6, "KohcromCD", 55342)--Enable when we have actual timing for any of his abilies, timer value here will be useless placeholder.
+local timerKohcromCD	= mod:NewTimer(6, "KohcromCD", 55342)--Enable when we have actual timing for any of his abilies
 --Basically any time morchok casts, we'll start an echo timer for when it will be mimiced by his twin Kohcrom. 
 --We will not start timers using Kohcrom's casts, it'll waste WAY too much space.
 --EJ is pretty clear, they are cast shortly after morchok, always. So echo timer is perfect and clean solution.

trunk/DBM-DragonSoul/Yorsahj.lua

Action: modified

Old revision: 7182

Old date: 2012-01-15 16:24:39 UTC

@@ -119,40 +119,34 @@
 		end
 	elseif args:IsSpellID(104901) and args:GetDestCreatureID() == 55312 then--Yellow
 		table.insert(oozesHitTable, L.Yellow)
-		warnOozesHit:Cancel()
 		if #oozesHitTable == expectedOozes then--All of em absorbed
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
 		yellowActive = true
 	elseif args:IsSpellID(104896) and args:GetDestCreatureID() == 55312 then--Purple
 		table.insert(oozesHitTable, L.Purple)
-		warnOozesHit:Cancel()
 		if #oozesHitTable == expectedOozes then--All of em absorbed
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
 		specWarnPurple:Show()
 	elseif args:IsSpellID(105027) and args:GetDestCreatureID() == 55312 then--Blue
 		table.insert(oozesHitTable, L.Blue)
-		warnOozesHit:Cancel()
 		if #oozesHitTable == expectedOozes then--All of em absorbed
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
 	elseif args:IsSpellID(104897) and args:GetDestCreatureID() == 55312 then--Red
 		table.insert(oozesHitTable, L.Red)
-		warnOozesHit:Cancel()
 		if #oozesHitTable == expectedOozes then--All of em absorbed
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
 	elseif args:IsSpellID(104894) and args:GetDestCreatureID() == 55312 then--Black
 		table.insert(oozesHitTable, L.Black)
-		warnOozesHit:Cancel()
 		if #oozesHitTable == expectedOozes then--All of em absorbed
 			warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 		end
 	elseif args:IsSpellID(104898) then--Green
 		if args:GetSrcCreatureID() == 55312 then--Only trigger the actual acid spits off the boss getting buff, not the oozes spawning.
 			table.insert(oozesHitTable, L.Green)
-			warnOozesHit:Cancel()
 			if #oozesHitTable == expectedOozes then--All of em absorbed
 				warnOozesHit:Show(bossName, table.concat(oozesHitTable, ", "))
 			end

r7182 (DiabloHu): zhCN update

DiabloHu — Sun, 15 Jan 2012 16:24:39 GMT

Author: DiabloHu
Date: Sun Jan 15 17:24:39 CET 2012
Revision: 7182

Log:

zhCN update

Updated

trunk/DBM-DragonSoul/localization.cn.lua

Action: modified

Old revision: 7181

Old date: 2012-01-15 02:22:44 UTC

@@ -1,5 +1,5 @@
 -- Simplified Chinese by Diablohu(diablohudream@gmail.com)
--- Last update: 1/15/2012
+-- Last update: 1/16/2012
 
 if GetLocale() ~= "zhCN"  then return end
 
@@ -163,7 +163,7 @@
 	SapperEmote			= "一条幼龙俯冲下来，往甲板上投放了一个暮光工兵！",
 	Broadside			= "spell:110153",
 	DeckFire			= "spell:110095",
-	GorionaRetreat		= "screeches in pain and retreats into the swirling clouds"
+	GorionaRetreat		= "痛苦地尖叫并退入了云海的漩涡中"
 })
 
 -------------------------

r7181 (Omega): add difficulty to pull messages

Omega — Sun, 15 Jan 2012 02:22:44 GMT

Author: Omega
Date: Sun Jan 15 03:22:44 CET 2012
Revision: 7181

Log:

add difficulty to pull messages

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 7180

Old date: 2012-01-15 02:07:21 UTC

@@ -2339,7 +2339,6 @@
 			return
 		end
 		table.insert(inCombat, mod)
-		self:AddMsg(DBM_CORE_COMBAT_STARTED:format(mod.combatInfo.name))
 		if mod.inCombatOnlyEvents and not mod.inCombatOnlyEventsRegistered then
 			mod.inCombatOnlyEventsRegistered = 1
 			mod:RegisterEvents(unpack(mod.inCombatOnlyEvents))
@@ -2362,6 +2361,7 @@
 		else--you were not in an instance when you started combat, this is an outdoor boss.
 			savedDifficulty = ""--So lets just return no difficulty :)
 		end
+		self:AddMsg(DBM_CORE_COMBAT_STARTED:format(savedDifficulty..mod.combatInfo.name))
 		mod.inCombat = true
 		mod.blockSyncs = nil
 		mod.combatInfo.pull = GetTime() - (delay or 0)

r7180 (Omega): fix something, guess you can get GUID from unit events.

Omega — Sun, 15 Jan 2012 02:07:21 GMT

Author: Omega
Date: Sun Jan 15 03:07:21 CET 2012
Revision: 7180

Log:

fix something, guess you can get GUID from unit events.

Updated

trunk/DBM-DragonSoul/Blackhorn.lua

Action: modified

Old revision: 7179

Old date: 2012-01-14 15:29:28 UTC

@@ -220,13 +220,9 @@
 
 function mod:UNIT_SPELLCAST_SUCCEEDED(uId, spellName)
 	if spellName == GetSpellInfo(107594) then--Blade Rush, cast start is not detectable, only cast finish, can't use target scanning, or pre warn (ie when the lines go out), only able to detect when they actually finish rush
-		if uId == "target" then--Hack to get GUID, i'm not sure if it's possible to get GUID from UNIT_SPELLCAST_SUCCEEDED or not, all i see is unitname in transcriptor
-			self:SendSync("BladeRush", UnitGUID("target"))--Send your target's GUID since we know it's right, because the UNIT_SPELLCAST_SUCCEEDED came from your target.
-		elseif uId == "focus" then
-			self:SendSync("BladeRush", UnitGUID("focus"))--Send your focus GUID since we know it's right, because the UNIT_SPELLCAST_SUCCEEDED came from your focus.
+		self:SendSync("BladeRush", UnitGUID(uId))
 		end
 	end
-end
 
 function mod:OnSync(msg, sourceGUID)
 	if msg == "BladeRush" then

r7179 (DiabloHu): zhCN update

DiabloHu — Sat, 14 Jan 2012 15:29:28 GMT

Author: DiabloHu
Date: Sat Jan 14 16:29:28 CET 2012
Revision: 7179

Log:

zhCN update

Updated

trunk/DBM-DragonSoul/localization.cn.lua

Action: modified

Old revision: 7178

Old date: 2012-01-14 12:52:15 UTC

@@ -1,5 +1,5 @@
 -- Simplified Chinese by Diablohu(diablohudream@gmail.com)
--- Last update: 1/14/2012
+-- Last update: 1/15/2012
 
 if GetLocale() ~= "zhCN"  then return end
 
@@ -125,9 +125,9 @@
 	TimerCombatStart	= "计时条：战斗即将开始",
 	ResetHoTCounter		= "重新开始目光审判计数器",--$spell doesn't work in this function apparently so use typed spellname for now.
 	Never				= "从不",
-	Reset3				= "每3/2秒（英雄/普通难度）重置一次",
-	Reset3Always		= "总是每3秒进行重置",
-	SpecWarnHoTN		= "特殊警报：目光审判施放5秒前（仅3套）",
+	Reset3				= "每3/2次（英雄/普通难度）重置一次",
+	Reset3Always		= "总是每3次进行重置",
+	SpecWarnHoTN		= "特殊警报：目光审判施放5秒前（仅针对每3次重置）",
 	One					= "1 (如 1 4 7)",
 	Two					= "2 (如 2 5)",
 	Three				= "3 (如 3 6)",

Deadly Boss Mods

r7279 (nbluewiz): # fix SPELL_BUILDING_DAMAGE in pvp mod.

r7278 (Omega): increase residue count some, because it's good to know how many are down for rolling off his back too.

r7277 (nbluewiz): more fixes

r7276 (nbluewiz): fix more unchanged.

r7275 (Omega): Dummy commit (well not completely useless, adding blue to credits) Note to Blue, old content mods, i'll start from bottom you start from top ;)

r7274 (nbluewiz): hopefully fixed all stuff.

r7273 (Omega): Blackwing touch

r7272 (nbluewiz): oops, missed.

r7271 (nbluewiz): Blackwing Descent

r7270 (Omega): match up blue's change for uniformity on 5 man mods

r7269 (Omega): Throne

r7268 (Omega): All 5 man mods and world event mods

r7267 (nbluewiz): # Better to use UnitGUID as player identify. (because can cause error for some player use their nicknames as boss names. like Baleroc, Ragnaros, Blackhorn...)

r7266 (nbluewiz): Baradin Hold and Bastion of Twilight

r7265 (Omega): Firelands

r7264 (Omega): actually pretty up blackhorn a little, no reason for the extra nesting

r7263 (Omega): Think this should cover the DS mod conversions. to make sure the alpha is at least functional there, gonna work on rest of raids now.

r7262 (nbluewiz): # Core : Fix broken args (like: spellid) for recent changes. And no reason to build args table for noArgTableEvents? Changed it, too.

r7261 (nbluewiz): # Rhyolith : Countdown 1 not works, so removed it.

r7260 (tandanu): oozeGUIDS[sourceGUID] = true -- Remove it ...

r7259 (tandanu): Implement fast event processing for high volume events (like SPELL_DAMAGE), these new events will no longer be using the DBM args table but the raw event arguments

r7258 (tandanu): add SWING/SPELL_DAMAGE/MISSED based ooze tracking

r7257 (Omega): refine it more.

r7256 (Omega): Work in progress, remove respawned oozes from residue count

r7255 (Omega): also, it's 7sec based on many logs.

r7254 (Omega): Rhyolith update, phase 2 doesn't need a yell anymore.

r7253 (oscarucb): ensure DBM-Arrow calls SetMapToCurrentZone at least once nested zone maps like in DS can confuse the existing heuristic

r7252 (ebmor): deDE update (Omen)

r7251 (arta): Dont shot statistics on PvP pages

r7250 (nbluewiz): # Rhyolith : Reset Stomp timer on phase 2 start.

r7249 (Snamor): esES update

r7248 (ultrashining): zhTW update

r7247 (nbluewiz): koKR update

r7246 (nbluewiz): # Yorsahj : revert Purples spec warn spell id.

r7245 (Omega): Long overdo, i meant to do this sooner. Use EJ for fragments and sparks on rhyolith to shorten the announce/bar text (spellids have "summon" in them, too much text)

r7244 (Omega): might work better if i actually load it

r7243 (Omega): Omen boss, just cause.

r7242 (Omega): move special warn purple back to ooze though. it's important to pre hot up the tanks before debuff goes out, not when it goes out.

r7241 (nbluewiz): # Yorsahj : added Deep Corruption stuff (purple debuff).

r7240 (nbluewiz): # Core : adjusted timer recovery function delay. # Madness of Deathwing : fixed for 25man Shrapnel warnings.

r7239 (Omega): Add add warning spawn for big adds, and add timers for the first cast of blood corruption they do after they spawn.

r7238 (Omega): 2 is too long for anti spam on bloods, so lower it down some.

r7237 (Omega): Update core to properly detect and display classic raid sizes (where all of them return difficulty 1 regardless of size)

r7236 (Omega): make spammy plasma health option off by default even for healers. this really is just a 10 man option, on 25 man healers don't want 10 bars on their screen at a time (because on heroic this happens, pretty typically)

r7235 (Omega): Remove the target check from nuclear on spine, it's important for everyone to know about it, whether you target or not. Added countdown option for roll

r7234 (nbluewiz): # Hagara : fix Ice Lance stack warning error.

r7233 (nbluewiz): # Core : added stuff specifying boss id for status whisper. # Blackhorn : updated status whisper stuff.

r7232 (nbluewiz): # Fandral Staghelm : update ability timers.

r7231 (Omega): *A lot of old comment cleanup, as well as some mod tweaks and code cleanups *Madness: Cancel impale debuff timers when corruption dies, the ONLY thing debuff does is increases damage from impales, if corruption dead, we don't care about the debuff ;).

r7230 (nbluewiz): # some cd timer changes to next.

r7229 (nbluewiz): # Core: updated battleground invite timer text. + cancels timer when enter or cancel. # Battlegrounds : fix building health bar showing on other battlegrounds (like Strands of Ancients, Wintergrasp ..)

r7228 (Omega): Confirmed, harpoons do work this way, precisely. Now if only i could find a more accurate way to account for add timer variations. just going to have to be imperfect without a real emote or yell :(

r7227 (nbluewiz): # Core : fix difficulty bug.

r7226 (Snamor): esES update

r7224 (arta): check for Fading Light debuff instead of Hour of Twilight? :S

r7223 (arta): lets add fadingLightSpam=0 in OnCombatStart() as well (just to be sure)

r7222 (Omega): maybe better harpoon timers. They need testing and probably adjustment, wish adds were easier to log

r7221 (Omega): small tweak to account for both drakes getting away, and only 1 of them dying. we don't want to clear "recently reloaded" until drake count is 2 or 4 from a previous wave

r7220 (Omega): Akmahat fixes and tweaks Ultraxion anti spam for my CLEU work around so it doesn't start warning you 3 times for fading light :)

r7218 (Omega): Make sure bad harpoon timers don't start.

r7217 (Omega): apply same fix to dps too

r7216 (Omega): workaround for a bug where the combat log misses fading light casts, so if we detect it cast on someone else, we check player aura too to avoid player not getting alert

r7215 (oscarucb): add support to Yor'sahj module for raid leading tools (eg YorsahjAnnounce) who want to broadcast a target arrow

r7214 (Omega): Small heroic madness update now that i have looked at a recent decent log. http://www.worldoflogs.com/reports/rt-bccr5xom6ctgnr4l/xe/?enc=bosses&boss=56173&x=spellid+%3D+108649+or+spellid+%3D+108813+and+fulltype+%3D+SPELL_CAST_START+or+spellid+%3D+107018

r7213 (Omega): Small trash fixes to firelands.

r7212 (nbluewiz): # Blackhorn : fix Harpooning timer on normal difficulty. normal difficulty seems not to be 20 sec. # DSTrash : updated Boulder warn be more useful.

r7211 (Omega): maybe this will fix harpoon CD, it's still not triggering

r7209 (nbluewiz): # Spine of Deathwing : update residue warns.

r7208 (Omega): do mot remove ship from boss health in phase 2 either, there is no reason to do this, the ship still takes damage from leftover sapper, or even goriona which CAN cast twilight barrage (in rare cases)

r7207 (Omega): fix a mistyped spellid

r7206 (nbluewiz): koKR update

r7205 (nbluewiz): #DStrash : fix bug in target announce in lfr dungeon.

r7204 (nbluewiz): # Core : added difficulty text on kill, wipe message. # Blackhorn : fix self :)

r7203 (ebmor): deDE update

r7202 (Snamor): esES update

r7201 (ultrashining): zhTW update

r7200 (nbluewiz): koKR update

r7199 (DiabloHu): zhCN update

r7198 (Omega): Add a cast announce for reloading. then i think i'm done with commit spam for now.

r7231 (Omega): A lot of old comment cleanup, as well as some mod tweaks and code cleanups Madness: Cancel impale debuff timers when corruption dies, the ONLY thing debuff does is increases damage from impales, if corruption dead, we don't care about the debuff ;).