Deadly Boss Mods

r3787 (Omega): #ICC/Putricide: Added more missing heroic spellids

Omega — Wed, 10 Mar 2010 22:29:54 GMT

Author: Omega
Date: Wed Mar 10 23:29:54 CET 2010
Revision: 3787

Log:

#ICC/Putricide: Added more missing heroic spellids

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3786

Old date: 2010-03-10 21:14:28 UTC

@@ -171,7 +171,7 @@
 end
 
 function mod:SPELL_CAST_START(args)
-	if args:IsSpellID(70351, 71966) then
+	if args:IsSpellID(70351, 71966, 71967, 71968) then
 		warnUnstableExperimentSoon:Cancel()
 		warnUnstableExperiment:Show()
 		timerUnstableExperimentCD:Start()

r3786 (arta): Festergut , Sync fix. http://www.deadlybossmods.com/phpbb3/viewtopic.php?f=2&t=2425

arta — Wed, 10 Mar 2010 21:14:28 GMT

Author: arta
Date: Wed Mar 10 22:14:28 CET 2010
Revision: 3786

Log:

Festergut , Sync fix. http://www.deadlybossmods.com/phpbb3/viewtopic.php?f=2&t=2425

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3785

Old date: 2010-03-09 19:26:55 UTC

@@ -130,7 +130,7 @@
 
 function mod:OnSync(event, arg)
 	if event == "Goo" then
-		if GetRaidUnitId(arg) ~= "none" then -- TODO: confirm that the spell actually targets a player and no an area or a dummy (like the Void Reaver orb did)
+		if DBM:GetRaidUnitId(arg) ~= "none" then -- TODO: confirm that the spell actually targets a player and no an area or a dummy (like the Void Reaver orb did)
 			self:AddMsg(("DBM-Debug: Malleable Goo on %s?"):format(arg))
 		end
 		warnGoo:Show()

r3785 (Nalumis): deDE update (Patchwerk)

Nalumis — Tue, 09 Mar 2010 19:26:55 GMT

Author: Nalumis
Date: Tue Mar 09 20:26:55 CET 2010
Revision: 3785

Log:

deDE update (Patchwerk)

Updated

trunk/DBM-Naxx/localization.de.lua

Action: modified

Old revision: 3784

Old date: 2010-03-09 16:09:33 UTC

@@ -165,7 +165,7 @@
 
 L:SetMiscLocalization({
 	yell1 = "Flickwerk will spielen!", 
-	yell2 = "Kel’Thuzad macht Flickwerk zu seinem Abgesandten von Krieg!",
+	yell2 = "Kel’Thuzad macht Flickwerk zu seinem Abgesandten des Kriegs!",
 	HatefulStrike = "Hasserfüllter Stoß --> %s [%s]"
 })

r3784 (Nalumis): deDE update (Lich King)

Nalumis — Tue, 09 Mar 2010 16:09:33 GMT

Author: Nalumis
Date: Tue Mar 09 17:09:33 CET 2010
Revision: 3784

Log:

deDE update (Lich King)

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3783

Old date: 2010-03-09 15:29:24 UTC

@@ -453,7 +453,8 @@
 	WarnPhase3Soon			= "Übergang in Phase 3 bald",
 	specWarnDefileCast		= "Entweihen auf dir - Lauf weg",
 	specWarnDefileNear		= "Entweihen in deiner Nähe - Aufpassen",
-	warnNecroticPlagueJump	= "Nekrotische Seuche auf >%s< gesprungen"
+	warnNecroticPlagueJump	= "Nekrotische Seuche auf >%s< gesprungen",
+	WarningValkyrSpawned 	= "Neue Schattenwächterin der Val'kyr (%d)"
 }
 
 L:SetTimerLocalization{
@@ -470,6 +471,7 @@
 	TimerNecroticPlagueCleanse	= "Zeige Timer um Nekrotische Seuche vor dem ersten Tick zu reinigen",
 	PhaseTransition			= "Zeige Timer für Phasenübergänge",
 	WarnPhase2Soon			= "Zeige Vorwarnung für Übergang in Phase 2 (bei ~73%)",
+	WarningValkyrSpawned	= "Zeige Warnung für neue Schattenwächterin der Val'kyr",
 	WarnPhase3Soon			= "Zeige Vorwarnung für Übergang in Phase 3 (bei ~43%)",
 	specWarnDefileCast		= "Zeige Spezialwarnung für $spell:72762 auf dir",
 	specWarnDefileNear		= "Zeige Spezialwarnung für $spell:72762 in deiner Nähe",

r3783 (bluenyx): koKR update

bluenyx — Tue, 09 Mar 2010 15:29:24 GMT

Author: bluenyx
Date: Tue Mar 09 16:29:24 CET 2010
Revision: 3783

Log:

koKR update

Updated

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 3782

Old date: 2010-03-09 12:03:05 UTC

@@ -452,7 +452,8 @@
 	WarnPhase3Soon				= "곧 3 단계 전환",
 	specWarnDefileCast			= "당신에게 파멸! - 이동!",
 	specWarnDefileNear			= "당신 주변에 파멸! - 이동!",
-	warnNecroticPlagueJump		= "괴저 역병 전이 : >%s<"	
+	warnNecroticPlagueJump		= "괴저 역병 전이 : >%s<",
+	WarningValkyrSpawned 		= "발키르 어둠수호병 소환 (%d)"
 }
 
 L:SetTimerLocalization{
@@ -468,6 +469,7 @@
 	warnNecroticPlagueJump		= "$spell:73912 이동 대상 알리기",	
 	TimerNecroticPlagueCleanse	= "$spell:73912의 첫 번째 틱 이후 지속 타이머 보기",	
 	PhaseTransition				= "다음 단계 전환 타이머 보기",	
+	WarningValkyrSpawned		= "발키르 어둠수호병 소환 경고 보기",	
 	WarnPhase2Soon				= "2 단계 전환 사전 경고 보기(73% 이하)",
 	WarnPhase3Soon				= "3 단계 전환 사전 경고 보기(43% 이하)",
 	specWarnDefileCast			= "당신에게 $spell:72762이 시전된 경우 특수 경고 보기",

r3782 (Azael): zhtw update

Azael — Tue, 09 Mar 2010 12:03:05 GMT

Author: Azael
Date: Tue Mar 09 13:03:05 CET 2010
Revision: 3782

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 3781

Old date: 2010-03-09 10:17:44 UTC

@@ -446,7 +446,8 @@
 	WarnPhase2Soon			= "轉換第2階段 即將到來",
 	WarnPhase3Soon			= "轉換第3階段 即將到來",
 	specWarnDefileCast		= "你中了汙染 - 快離開",
-	specWarnDefileNear		= "你附近的人中了汙染 - 小心"
+	specWarnDefileNear		= "你附近的人中了汙染 - 小心",
+	WarningValkyrSpawned 		= "華爾琪影衛出現 (%d)"
 }
 
 L:SetTimerLocalization{
@@ -463,6 +464,7 @@
 	TimerNecroticPlagueCleanse	= "為淨化第一次堆疊前的亡域瘟疫顯示計時器",
 	PhaseTransition			= "為轉換階段顯示計時器",
 	WarnPhase2Soon			= "為轉換第2階段顯示預先警告 (大約73%)",
+	WarningValkyrSpawned		= "為華爾琪影衛的出現顯示警告",
 	WarnPhase3Soon			= "為轉換第3階段顯示預先警告 (大約43%)",
 	specWarnDefileCast		= "當你中了$spell:72762時顯示特別警告",
 	specWarnDefileNear		= "當你附近的人中了$spell:72762時顯示特別警告",
@@ -472,7 +474,7 @@
 	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
 	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
 	TrapIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539),
-	ValkyrIcon			= "為華爾琪設置標記"
+	ValkyrIcon			= "為華爾琪影衛設置標記"
 }
 
 L:SetMiscLocalization{

r3781 (Omega): #ICC/LichKing: Added missing enrage spellids for heroic. Adding 4 missing spellids for second remorseless winter cast detection.

Omega — Tue, 09 Mar 2010 10:17:44 GMT

Author: Omega
Date: Tue Mar 09 11:17:44 CET 2010
Revision: 3781

Log:

#ICC/LichKing: Added missing enrage spellids for heroic. Adding 4 missing spellids for second remorseless winter cast detection.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3780

Old date: 2010-03-09 04:37:34 UTC

@@ -133,7 +133,7 @@
 end
 
 function mod:SPELL_CAST_START(args)
-	if args:IsSpellID(68981, 74270, 74271, 74272) then -- Remorseless Winter (phase transition start)
+	if args:IsSpellID(68981, 74270, 74271, 74272) or args:IsSpellID(72259, 74273, 74274, 74275) then -- Remorseless Winter (phase transition start) Set1 is first cast, set2 is second cast
 		warnRemorselessWinter:Show()
 		timerPhaseTransition:Start()
 		timerShamblingHorror:Cancel()
@@ -209,17 +209,11 @@
 end
 
 function mod:SPELL_AURA_APPLIED(args)
-	if args:IsSpellID(72143, 72146) then -- Shambling Horror enrage effect.
+	if args:IsSpellID(72143, 72146, 72147, 72148) then -- Shambling Horror enrage effect.
 		warnShamblingEnrage:Show(args.destName)
 	end
 end
---[[
-function mod:SPELL_DISPEL(args)
-	if args:IsSpellID(70337, 73912, 73913, 73914, 70338, 73785, 73786, 73787) then -- Necrotic Plague
-		self:SetIcon(args.destName, 0)
-	end
-end
---]]
+
 do
 	local valkIcons = {}
 	local currentIcon = 2

r3780 (Vampik): ruRU update

Vampik — Tue, 09 Mar 2010 04:37:34 GMT

Author: Vampik
Date: Tue Mar 09 05:37:34 CET 2010
Revision: 3780

Log:

ruRU update

Updated

trunk/DBM-Icecrown/localization.ru.lua

Action: modified

Old revision: 3779

Old date: 2010-03-08 23:18:47 UTC

@@ -449,7 +449,8 @@
 	WarnPhase3Soon			= "Скоро переход в фазу 3",
 	specWarnDefileCast		= "Осквернение на вас - отбегите",
 	specWarnDefileNear		= "Осквернение около вас - остерегайтесь",
-	warnNecroticPlagueJump	= "Мертвящая чума перепрыгнула на |3-3(>%s<)"
+	warnNecroticPlagueJump	= "Мертвящая чума перепрыгнула на |3-3(>%s<)",
+	WarningValkyrSpawned 	= "Валь'кира - страж Тьмы (%d)"
 }
 
 L:SetTimerLocalization{
@@ -466,6 +467,7 @@
 	TimerNecroticPlagueCleanse	= "Отсчет времени для очищения Мертвящей чумы до первого тика",
 	PhaseTransition			= "Отсчет времени для переходной фазы",
 	WarnPhase2Soon			= "Предупреждать заранее о переходе в фазу 2 (на ~73%)",
+	WarningValkyrSpawned	= "Предупреждение о появлении Валь'киры - стража Тьмы",
 	WarnPhase3Soon			= "Предупреждать заранее о переходе в фазу 3 (на ~43%)",
 	specWarnDefileCast		= "Спец-предупреждение, когда $spell:72762 на вас",
 	specWarnDefileNear		= "Спец-предупреждение, когда $spell:72762 около вас",

r3779 (Omega): #ICC/LichKing: Announce which valk set it is on lich king (drycoded-untested) ICC/Festergut: use right spellid for festergut goo warning tooltip

Omega — Mon, 08 Mar 2010 23:18:47 GMT

Author: Omega
Date: Tue Mar 09 00:18:47 CET 2010
Revision: 3779

Log:

#ICC/LichKing: Announce which valk set it is on lich king (drycoded-untested)
ICC/Festergut: use right spellid for festergut goo warning tooltip

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3778

Old date: 2010-03-08 22:20:32 UTC

@@ -33,7 +33,7 @@
 local warnDefileSoon		= mod:NewSoonAnnounce(73708, 3)	--Phase 2+ Ability
 local warnSoulreaper		= mod:NewSpellAnnounce(73797, 4, nil, mod:IsTank() or mod:IsHealer()) --Phase 2+ Ability
 local warnDefileCast		= mod:NewTargetAnnounce(72762, 4) --Phase 2+ Ability
-local warnSummonValkyr		= mod:NewSpellAnnounce(69037, 3) --Phase 2 Add
+local warnSummonValkyr		= mod:NewAnnounce("WarningValkyrSpawned", 3, 69037) --Phase 2 Add
 local warnPhase3Soon		= mod:NewAnnounce("WarnPhase3Soon", 1)
 local warnSummonVileSpirit	= mod:NewSpellAnnounce(70498, 2) --Phase 3 Add
 local warnHarvestSoul		= mod:NewTargetAnnounce(74325, 4) --Phase 3 Ability
@@ -48,7 +48,7 @@
 local specWarnWinter		= mod:NewSpecialWarningMove(73791) --Transition Ability
 local specWarnHarvestSoul	= mod:NewSpecialWarningYou(74325) --Phase 3+ Ability
 local specWarnInfest		= mod:NewSpecialWarningSpell(73779, false) --Phase 1+ Ability
-local specwarnSoulreaper	= mod:NewSpecialWarningTarget(73797, false) --phase 2+
+local specwarnSoulreaper	= mod:NewSpecialWarningTarget(73797, mod:IsTank()) --phase 2+
 local specWarnTrap			= mod:NewSpecialWarningYou(73539) --Heroic Ability
 
 local timerCombatStart		= mod:NewTimer(54.5, "TimerCombatStart", 2457)
@@ -82,6 +82,7 @@
 local warned_preP2 = false
 local warned_preP3 = false
 local lastPlagueCast = 0
+local Valkset = 0
 
 function mod:OnCombatStart(delay)
 	berserkTimer:Start(-delay)
@@ -90,6 +91,7 @@
 	warned_preP3 = false
 	self:NextPhase()
 	lastPlagueCast = 0
+	Valkset = 0
 end
 
 function mod:DefileTarget()
@@ -232,7 +234,8 @@
 	function mod:SPELL_SUMMON(args)
 		if args:IsSpellID(69037) then -- Summon Val'kyr
 			if time() - lastValk > 15 then -- show the warning and timer just once for all three summon events
-				warnSummonValkyr:Show()
+				Valkset = Valkset + 1
+				warnSummonValkyr:Show(Valkset)
 				timerSummonValkyr:Start()
 				lastValk = time()
 				if self.Options.ValkyrIcon then
@@ -301,7 +304,7 @@
 		timerSummonValkyr:Start(20)
 		timerSoulreaperCD:Start(40)
 		timerDefileCD:Start(38)
-		timerInfestCD:Start(13)
+		timerInfestCD:Start(14)
 		warnDefileSoon:Schedule(33)
 	elseif phase == 3 then
 		timerVileSpirit:Start(20)

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3778

Old date: 2010-03-08 22:20:32 UTC

@@ -34,8 +34,8 @@
 
 local berserkTimer			= mod:NewBerserkTimer(300)
 
-local warnGoo				= mod:NewSpellAnnounce(72458, 4)
-local timerGooCD			= mod:NewCDTimer(10, 72458)
+local warnGoo				= mod:NewSpellAnnounce(72549, 4)
+local timerGooCD			= mod:NewCDTimer(10, 72549)
 
 mod:AddBoolOption("RangeFrame", mod:IsRanged())
 mod:AddBoolOption("SetIconOnGasSpore", true)

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 3778

Old date: 2010-03-08 22:20:32 UTC

@@ -447,7 +447,8 @@
 	WarnPhase3Soon			= "Phase 3 transition soon",
 	specWarnDefileCast		= "Defile on you - Move away",
 	specWarnDefileNear		= "Defile near you - Watch out",
-	warnNecroticPlagueJump	= "Necrotic Plague jumped to >%s<"
+	warnNecroticPlagueJump	= "Necrotic Plague jumped to >%s<",
+	WarningValkyrSpawned 	= "Val'kyr Shadowguard spawn (%d)"
 }
 
 L:SetTimerLocalization{
@@ -464,6 +465,7 @@
 	TimerNecroticPlagueCleanse	= "Show timer to cleanse Necrotic Plague before\nthe first tick",
 	PhaseTransition			= "Show time for phase transitions",
 	WarnPhase2Soon			= "Show pre-warning for Phase 2 transition (at ~73%)",
+	WarningValkyrSpawned	= "Show warning for Val'kyr Shadowguard spawns",
 	WarnPhase3Soon			= "Show pre-warning for Phase 3 transition (at ~43%)",
 	specWarnDefileCast		= "Show special warning for $spell:72762 on you",
 	specWarnDefileNear		= "Show special warning for $spell:72762 near you",

r3778 (Nalumis): deDE update (Auriaya)

Nalumis — Mon, 08 Mar 2010 22:20:32 GMT

Author: Nalumis
Date: Mon Mar 08 23:20:32 CET 2010
Revision: 3778

Log:

deDE update (Auriaya)

Updated

trunk/DBM-Ulduar/localization.de.lua

Action: modified

Old revision: 3777

Old date: 2010-03-08 16:50:49 UTC

@@ -2,7 +2,6 @@
 
 -- fehlende Übersetzungen:
 --
--- Auriaya
 -- General Vezax (Hard Mode)
 -- Yogg-Saron
 -- Algalon
@@ -273,7 +272,7 @@
 
 L:SetMiscLocalization{
 	Defender 		= "Wilder Verteidiger (%d)",
-	YellPull = "Some things are better left alone!"	--to be translated
+	YellPull = "In manche Dinge mischt man sich besser nicht ein!"
 }
 
 L:SetTimerLocalization{

r3777 (Nalumis): deDE update (Kologarn)

Nalumis — Mon, 08 Mar 2010 16:50:49 GMT

Author: Nalumis
Date: Mon Mar 08 17:50:49 CET 2010
Revision: 3777

Log:

deDE update (Kologarn)

Updated

trunk/DBM-Ulduar/localization.de.lua

Action: modified

Old revision: 3776

Old date: 2010-03-08 12:08:57 UTC

@@ -249,7 +249,7 @@
 	achievementDisarmed		= "Zeige Timer für Erfolg 'Arm dran, weil Arm ab'",
 	WarnGrip				= "Verkünde Ziele von Steinerner Griff",
 	SetIconOnGripTarget		= "Setze Zeichen auf Steinerner-Griff-Ziele",
-	SetIconOnEyebeamTarget	= "Setze Zeichen auf Ziele von Fokussierter Augenstrahl (Quadrat)",
+	SetIconOnEyebeamTarget	= "Setze Zeichen auf Ziele von Fokussierter Augenstrahl (Mond)",
 	PlaySoundOnEyebeam		= "Spiele Sound bei Fokussiertem Augenstrahl"
 }

r3776 (Azael): zhtw update Rotface typo bug fix

Azael — Mon, 08 Mar 2010 12:08:57 GMT

Author: Azael
Date: Mon Mar 08 13:08:57 CET 2010
Revision: 3776

Log:

zhtw update
Rotface typo bug fix

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Updated

trunk/DBM-Ulduar/localization.tw.lua

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 3775

Old date: 2010-03-08 07:25:40 UTC

@@ -51,7 +51,7 @@
 local function warnRFVileGasTargets()
 	warnVileGas:Show(table.concat(RFVileGasTargets, "<, >"))
 	table.wipe(RFVileGasTargets)
-	timerVileGas:Start()
+	timerVileGasCD:Start()
 end
 
 function mod:OnCombatStart(delay)

trunk/DBM-Ulduar/localization.tw.lua

Action: modified

Old revision: 3775

Old date: 2010-03-08 07:25:40 UTC

@@ -234,7 +234,7 @@
 	achievementDisarmed		= "為成就:卸除手臂顯示計時器",
 	WarnGrip			= "提示堅石之握的目標",
 	SetIconOnGripTarget		= "為堅石之握的目標設置標記",
-	SetIconOnEyebeamTarget		= "為集束目光的目標設置標記 (正方)",
+	SetIconOnEyebeamTarget		= "為集束目光的目標設置標記 (月亮)",
 	PlaySoundOnEyebeam		= "為集束目光播放音效"
 }

r3775 (Vampik): ruRU update

Vampik — Mon, 08 Mar 2010 07:25:40 GMT

Author: Vampik
Date: Mon Mar 08 08:25:40 CET 2010
Revision: 3775

Log:

ruRU update

Updated

trunk/DBM-Icecrown/localization.ru.lua

Updated

trunk/DBM-Ulduar/localization.ru.lua

trunk/DBM-Icecrown/localization.ru.lua

Action: modified

Old revision: 3774

Old date: 2010-03-07 23:38:17 UTC

@@ -370,9 +370,14 @@
 	warnPortalOpen	= "Открытие порталов"
 }
 
+L:SetTimerLocalization{
+	timerPortalsOpen	= "Открытие порталов"
+}
+
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton	= "Устанавливать метку на Исторгающего пламя скелета (череп)",
 	warnPortalOpen				= "Предупреждение об открытии порталов",
+	timerPortalsOpen			= "Отсчет времени для открытия порталов",
 	warnCorrosion				= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }
 
@@ -394,7 +399,8 @@
 
 L:SetTimerLocalization{
 	TimerNextAirphase		= "След. воздушная фаза",
-	TimerNextGroundphase	= "След. наземная фаза"
+	TimerNextGroundphase	= "След. наземная фаза",
+	achievementMystic		= "Время для устранения Таинственной энергии"
 }
 
 L:SetWarningLocalization{
@@ -418,7 +424,8 @@
 	AnnounceFrostBeaconIcons= "Объявлять метки целей заклинания $spell:70126 в рейд-чат\n(требуются права лидера или помощника)",
 	SetIconOnFrostBeacon	= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(70126),
 	SetIconOnUnchainedMagic	= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69762),
-	ClearIconsOnAirphase	= "Снимать все метки перед воздушной фазой"
+	ClearIconsOnAirphase	= "Снимать все метки перед воздушной фазой",
+	RangeFrame				= "Показывать окно допустимой дистанции (10 нормале, 20 героик)\n(показывает только игроков с метками)"
 }
 
 L:SetMiscLocalization{
@@ -441,7 +448,8 @@
 	WarnPhase2Soon			= "Скоро переход в фазу 2",
 	WarnPhase3Soon			= "Скоро переход в фазу 3",
 	specWarnDefileCast		= "Осквернение на вас - отбегите",
-	specWarnDefileNear		= "Осквернение около вас - остерегайтесь"
+	specWarnDefileNear		= "Осквернение около вас - остерегайтесь",
+	warnNecroticPlagueJump	= "Мертвящая чума перепрыгнула на |3-3(>%s<)"
 }
 
 L:SetTimerLocalization{
@@ -454,7 +462,8 @@
 L:SetOptionLocalization{
 	TimerCombatStart		= "Отсчет времени до начала боя",
 	TimerRoleplay			= "Отсчет времени для представления",
-	TimerNecroticPlagueCleanse	= "Отсчет времени до первого тика Мертвящей чумы (для очищения)",
+	warnNecroticPlagueJump	= "Объявлять цели прыжков $spell:73912",
+	TimerNecroticPlagueCleanse	= "Отсчет времени для очищения Мертвящей чумы до первого тика",
 	PhaseTransition			= "Отсчет времени для переходной фазы",
 	WarnPhase2Soon			= "Предупреждать заранее о переходе в фазу 2 (на ~73%)",
 	WarnPhase3Soon			= "Предупреждать заранее о переходе в фазу 3 (на ~43%)",
@@ -474,5 +483,6 @@
 	YellDefile		= "Осквернение на мне!",
 	YellTrap		= "Теневая ловушка на мне!",
 	YellKill		= "Сомнений нет: ВЫ величайшие герои Азерота. Вы преодолели все препятствия, которые я воздвиг перед вами. Сильнейшие из моих слуг пали под вашим натиском… сгорели в пламени вашей ярости...",
-	LKRoleplay		= "Что движет вами?.. Праведность? Не знаю..."	--Need to confirm
+	LKRoleplay		= "Что движет вами?.. Праведность? Не знаю...",	--Need to confirm
+	PlagueWhisper	= "You have been infected by"
 }

trunk/DBM-Ulduar/localization.ru.lua

Action: modified

Old revision: 3774

Old date: 2010-03-07 23:38:17 UTC

@@ -242,7 +242,7 @@
 	achievementDisarmed		= "Отсчет времени для достижения Обезоружен",
 	WarnGrip				= "Объявлять цели заклинания Каменная хватка",
 	SetIconOnGripTarget		= "Устанавливать метки на цели заклинания Каменная хватка",
-	SetIconOnEyebeamTarget	= "Устанавливать метки на цели заклинания Сосредоточенный взгляд (квадрат)",
+	SetIconOnEyebeamTarget	= "Устанавливать метки на цели заклинания Сосредоточенный взгляд (луна)",
 	PlaySoundOnEyebeam		= "Звуковой сигнал при Сосредоточенном взгляде"
 }

r3774 (Omega): Added malleable goo cd timer to experimental festergut stuff.

Omega — Sun, 07 Mar 2010 23:38:17 GMT

Author: Omega
Date: Mon Mar 08 00:38:17 CET 2010
Revision: 3774

Log:

Added malleable goo cd timer to experimental festergut stuff.

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3773

Old date: 2010-03-07 23:00:54 UTC

@@ -35,6 +35,7 @@
 local berserkTimer			= mod:NewBerserkTimer(300)
 
 local warnGoo				= mod:NewSpellAnnounce(72458, 4)
+local timerGooCD			= mod:NewCDTimer(10, 72458)
 
 mod:AddBoolOption("RangeFrame", mod:IsRanged())
 mod:AddBoolOption("SetIconOnGasSpore", true)
@@ -133,6 +134,7 @@
 			self:AddMsg(("DBM-Debug: Malleable Goo on %s?"):format(arg))
 		end
 		warnGoo:Show()
+		timerGooCD:Start()
 	end
 end

r3773 (Omega): turn anti spam code back on since it wasn't cause of error

Omega — Sun, 07 Mar 2010 23:00:54 GMT

Author: Omega
Date: Mon Mar 08 00:00:54 CET 2010
Revision: 3773

Log:

turn anti spam code back on since it wasn't cause of error

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3772

Old date: 2010-03-07 22:40:31 UTC

@@ -81,7 +81,7 @@
 local phase	= 0
 local warned_preP2 = false
 local warned_preP3 = false
---local lastPlagueCast = 0
+local lastPlagueCast = 0
 
 function mod:OnCombatStart(delay)
 	berserkTimer:Start(-delay)
@@ -89,7 +89,7 @@
 	warned_preP2 = false
 	warned_preP3 = false
 	self:NextPhase()
---	lastPlagueCast = 0
+	lastPlagueCast = 0
 end
 
 function mod:DefileTarget()
@@ -173,7 +173,7 @@
 		warnNecroticPlague:Show(args.destName)
 		timerNecroticPlagueCD:Start()
 		timerNecroticPlagueCleanse:Start()
---		lastPlagueCast = GetTime()
+		lastPlagueCast = GetTime()
 		if self.Options.NecroticPlagueIcon then
 			self:SetIcon(args.destName, 7, 5)
 		end
@@ -328,7 +328,7 @@
 
 function mod:OnSync(msg, target)
 	if msg == "PlagueOn" then
---		if GetTime() - lastPlagueCast > 1 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
+		if GetTime() - lastPlagueCast > 1 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
 			warnNecroticPlagueJump:Show(target)	--We only want this function to work when it jumps from target to target.
 			timerNecroticPlagueCleanse:Start()
 			if target == UnitName("player") then
@@ -337,6 +337,6 @@
 			if self.Options.NecroticPlagueIcon then
 				self:SetIcon(target, 7, 5)
 			end
---		end
 	end
 end
+end

r3772 (tandanu): fix minSyncRevision

tandanu — Sun, 07 Mar 2010 22:40:31 GMT

Author: tandanu
Date: Sun Mar 07 23:40:31 CET 2010
Revision: 3772

Log:

fix minSyncRevision

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 3771

Old date: 2010-03-07 22:23:30 UTC

@@ -1404,6 +1404,7 @@
 		local mod, revision, event, arg = strsplit("\t", msg)
 		mod = DBM:GetModByName(mod or "")
 		if mod and event and arg and revision then
+			revision = tonumber(revision) or 0
 			mod:ReceiveSync(event, arg, sender, revision)
 		end
 	end

r3771 (Omega): another attempt to fix

Omega — Sun, 07 Mar 2010 22:23:30 GMT

Author: Omega
Date: Sun Mar 07 23:23:30 CET 2010
Revision: 3771

Log:

another attempt to fix

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3770

Old date: 2010-03-07 22:14:43 UTC

@@ -81,7 +81,7 @@
 local phase	= 0
 local warned_preP2 = false
 local warned_preP3 = false
-local lastPlagueCast = 0
+--local lastPlagueCast = 0
 
 function mod:OnCombatStart(delay)
 	berserkTimer:Start(-delay)
@@ -89,7 +89,7 @@
 	warned_preP2 = false
 	warned_preP3 = false
 	self:NextPhase()
-	lastPlagueCast = 0
+--	lastPlagueCast = 0
 end
 
 function mod:DefileTarget()
@@ -173,7 +173,7 @@
 		warnNecroticPlague:Show(args.destName)
 		timerNecroticPlagueCD:Start()
 		timerNecroticPlagueCleanse:Start()
-		lastPlagueCast = GetTime()
+--		lastPlagueCast = GetTime()
 		if self.Options.NecroticPlagueIcon then
 			self:SetIcon(args.destName, 7, 5)
 		end
@@ -328,7 +328,7 @@
 
 function mod:OnSync(msg, target)
 	if msg == "PlagueOn" then
-		if GetTime() - lastPlagueCast > 1 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
+--		if GetTime() - lastPlagueCast > 1 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
 			warnNecroticPlagueJump:Show(target)	--We only want this function to work when it jumps from target to target.
 			timerNecroticPlagueCleanse:Start()
 			if target == UnitName("player") then
@@ -337,6 +337,6 @@
 			if self.Options.NecroticPlagueIcon then
 				self:SetIcon(target, 7, 5)
 			end
+--		end
 		end
 	end
-end

r3770 (Omega): tweak to necrotic plague on lich king, now to do more tests

Omega — Sun, 07 Mar 2010 22:14:43 GMT

Author: Omega
Date: Sun Mar 07 23:14:43 CET 2010
Revision: 3770

Log:

tweak to necrotic plague on lich king, now to do more tests

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3769

Old date: 2010-03-07 21:43:50 UTC

@@ -328,7 +328,7 @@
 
 function mod:OnSync(msg, target)
 	if msg == "PlagueOn" then
-		if GetTime() - lastPlagueCast > 2 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
+		if GetTime() - lastPlagueCast > 1 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
 			warnNecroticPlagueJump:Show(target)	--We only want this function to work when it jumps from target to target.
 			timerNecroticPlagueCleanse:Start()
 			if target == UnitName("player") then

r3769 (tandanu): add support for a simple malleable goo detection and warning

tandanu — Sun, 07 Mar 2010 21:43:50 GMT

Author: tandanu
Date: Sun Mar 07 22:43:50 CET 2010
Revision: 3769

Log:

add support for a simple malleable goo detection and warning

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3768

Old date: 2010-03-07 21:23:37 UTC

@@ -9,7 +9,8 @@
 mod:RegisterEvents(
 	"SPELL_CAST_START",
 	"SPELL_AURA_APPLIED",
-	"SPELL_AURA_APPLIED_DOSE"
+	"SPELL_AURA_APPLIED_DOSE",
+	"UNIT_SPELLCAST_SUCCEEDED"
 )
 
 local warnInhaledBlight		= mod:NewAnnounce("InhaledBlight", 3, 71912)
@@ -33,6 +34,8 @@
 
 local berserkTimer			= mod:NewBerserkTimer(300)
 
+local warnGoo				= mod:NewSpellAnnounce(72458, 4)
+
 mod:AddBoolOption("RangeFrame", mod:IsRanged())
 mod:AddBoolOption("SetIconOnGasSpore", true)
 
@@ -50,15 +53,15 @@
 local noCheck = true
 
 local function findMin(a)
+	local min = a[1]
 	local index = 1
-	local value = a[index]
-	for i, val in ipairs(a) do
-		if val < value then
+	for i, v in ipairs(a) do
+		if v < min then
 			index = i
-			value = val
+			min = v
 		end
 	end
-	return value, index
+	return min, index
 end
 --]]
 local function warnGasSporeTargets()
@@ -117,6 +120,22 @@
 	end
 end
 
+function mod:UNIT_SPELLCAST_SUCCEEDED(uId, spellName)
+	if spellName == GetSpellInfo(72299) then -- Malleable Goo Summon Trigger (10 player normal) (the other 3 spell ids are not needed here since all spells have the same name)
+		uId = uId or "none" -- TODO: confirm that we have a valid unit id here
+		self:SendSync("Goo", UnitName(uId.."target"))
+	end
+end
+
+function mod:OnSync(event, arg)
+	if event == "Goo" then
+		if GetRaidUnitId(arg) ~= "none" then -- TODO: confirm that the spell actually targets a player and no an area or a dummy (like the Void Reaver orb did)
+			self:AddMsg(("DBM-Debug: Malleable Goo on %s?"):format(arg))
+		end
+		warnGoo:Show()
+	end
+end
+
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(69279) then	-- Gas Spore
 		gasSporeTargets[#gasSporeTargets + 1] = args.destName

r3768 (Omega): Kologarn uses moon for eye beam targets, not square. fixed locals to reflect this

Omega — Sun, 07 Mar 2010 21:23:37 GMT

Author: Omega
Date: Sun Mar 07 22:23:37 CET 2010
Revision: 3768

Log:

Kologarn uses moon for eye beam targets, not square. fixed locals to reflect this

Updated

trunk/DBM-Ulduar/localization.en.lua

Action: modified

Old revision: 3767

Old date: 2010-03-07 21:07:58 UTC

@@ -240,7 +240,7 @@
 	achievementDisarmed		= "Show timer for Disarm achievement",
 	WarnGrip				= "Announce Grip targets",
 	SetIconOnGripTarget		= "Set icons on Grip targets",
-	SetIconOnEyebeamTarget	= "Set icons on Focused Eyebeam targets (square)",
+	SetIconOnEyebeamTarget	= "Set icons on Focused Eyebeam targets (moon)",
 	PlaySoundOnEyebeam		= "Play sound on Focused Eyebeam"
 }

r3767 (Omega): more fixes

Omega — Sun, 07 Mar 2010 21:07:58 GMT

Author: Omega
Date: Sun Mar 07 22:07:58 CET 2010
Revision: 3767

Log:

more fixes

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3766

Old date: 2010-03-07 21:05:30 UTC

@@ -74,9 +74,9 @@
 	unchainedIcons = 7
 	if self.Options.RangeFrame then
 		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
-			DBM.RangeCheck:Show(GetRaidTargetIndex, 20)
+			DBM.RangeCheck:Show(20, GetRaidTargetIndex)
 		else
-			DBM.RangeCheck:Show(GetRaidTargetIndex, 10)
+			DBM.RangeCheck:Show(10, GetRaidTargetIndex)
 		end
 	end
 end

r3766 (Omega): Trying to fix lich king lua error, hopefully this does it?

Omega — Sun, 07 Mar 2010 21:05:30 GMT

Author: Omega
Date: Sun Mar 07 22:05:30 CET 2010
Revision: 3766

Log:

Trying to fix lich king lua error, hopefully this does it?

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3765

Old date: 2010-03-07 11:18:14 UTC

@@ -89,6 +89,7 @@
 	warned_preP2 = false
 	warned_preP3 = false
 	self:NextPhase()
+	lastPlagueCast = 0
 end
 
 function mod:DefileTarget()
@@ -172,7 +173,7 @@
 		warnNecroticPlague:Show(args.destName)
 		timerNecroticPlagueCD:Start()
 		timerNecroticPlagueCleanse:Start()
-		lastPlagueCast = time()
+		lastPlagueCast = GetTime()
 		if self.Options.NecroticPlagueIcon then
 			self:SetIcon(args.destName, 7, 5)
 		end
@@ -327,7 +328,7 @@
 
 function mod:OnSync(msg, target)
 	if msg == "PlagueOn" then
-		if time() - lastPlagueCast > 2 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
+		if GetTime() - lastPlagueCast > 2 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
 			warnNecroticPlagueJump:Show(target)	--We only want this function to work when it jumps from target to target.
 			timerNecroticPlagueCleanse:Start()
 			if target == UnitName("player") then

r3765 (bluenyx): koKR update

bluenyx — Sun, 07 Mar 2010 11:18:14 GMT

Author: bluenyx
Date: Sun Mar 07 12:18:14 CET 2010
Revision: 3765

Log:

koKR update

Updated

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 3764

Old date: 2010-03-07 08:46:03 UTC

@@ -465,6 +465,7 @@
 L:SetOptionLocalization{
 	TimerCombatStart			= "전투 시작 타이머 보기",
 	TimerRoleplay				= "이벤트 타이머 보기",	
+	warnNecroticPlagueJump		= "$spell:73912 이동 대상 알리기",	
 	TimerNecroticPlagueCleanse	= "$spell:73912의 첫 번째 틱 이후 지속 타이머 보기",	
 	PhaseTransition				= "다음 단계 전환 타이머 보기",	
 	WarnPhase2Soon				= "2 단계 전환 사전 경고 보기(73% 이하)",
@@ -485,5 +486,5 @@
 	YellTrap				= "나에게 암흑의 덫!!!",	
 	YellKill				= "어떤 의문도 남지 않았다. 어떤 의심도 없다. 너희는 아제로스의 가장 위대한 용사들이다. 너희 앞에 놓아둔 모든 도전을 극복해 내었다. 가장 강력한 종들이 너희의 무자비한 살육 앞에 쓰러졌지... 너희가 억눌렀던 분노 앞에 말이다...",
 	LKRoleplay				= "진정으로 정의에 이끌렸단 말이냐? 궁금하구나...",
-	PlagueWhisper			= "역병 전이 :"
+	PlagueWhisper			= "You have been infected by" --역병 전이 : 
 }
\ No newline at end of file

r3764 (Nalumis): deDE update (Sindragosa)

Nalumis — Sun, 07 Mar 2010 08:46:03 GMT

Author: Nalumis
Date: Sun Mar 07 09:46:03 CET 2010
Revision: 3764

Log:

deDE update (Sindragosa)

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3763

Old date: 2010-03-07 07:36:52 UTC

@@ -428,14 +428,15 @@
 	AnnounceFrostBeaconIcons= "Poste Zeichen für Ziele von $spell:70126 in Raidchat\n(benötigt aktivierte Ankündigungen und (L)- oder (A)-Status)",
  	SetIconOnFrostBeacon	= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(70126),
 	SetIconOnUnchainedMagic	= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69762),
-	ClearIconsOnAirphase	= "Entferne alle Zeichen vor der Luftphase"
+	ClearIconsOnAirphase	= "Entferne alle Zeichen vor der Luftphase",
+	RangeFrame				= "Zeige Abstandsfenster (10 m normal, 20 m heroisch)\n(zeigt nur Spieler mit Raidzeichen an)"
 }
 
 L:SetMiscLocalization{
 	YellAirphase	= "Euer Vormarsch endet hier! Keiner wird überleben!",
 	YellPhase2		= "Fühlt die grenzenlose Macht meines Meisters, und verzweifelt!",
 	BeaconIconSet			= "Frostleuchtfeuer-Zeichen {rt%d} auf %s gesetzt",
-	YellPull		= "Ihr seid Narren, euch hierher zu wagen. Der eisige Wind Nordends wird eure Seelen verschlingen!"
+	YellPull		= "Ihr seid Narren, euch hierher zu wagen. Der eisige Wind Nordends wird eure Seelen verschlingen!"	-- momentan nicht verwendet
 }
 
 ---------------------

r3763 (Omega): Remove some more syncs. Stuff should be localized by now and i don't like using excessive syncing just to work around unlocalized strings. I prefer cleaner more memory efficient code and less addon 2 addon traffic if we don't need it. Only using syncing for boss whispers, or brand new mods, or bosses with phasing/split raid teams.

Omega — Sun, 07 Mar 2010 07:36:52 GMT

Author: Omega
Date: Sun Mar 07 08:36:52 CET 2010
Revision: 3763

Log:

Remove some more syncs. Stuff should be localized by now and i don't like using excessive syncing just to work around unlocalized strings. I prefer cleaner more memory efficient code and less addon 2 addon traffic if we don't need it. Only using syncing for boss whispers, or brand new mods, or bosses with phasing/split raid teams.

Updated

trunk/DBM-Coliseum/Anub'arak.lua

Updated

trunk/DBM-Coliseum/Jaraxxus.lua

Updated

trunk/DBM-Coliseum/NorthrendBeasts.lua

Updated

trunk/DBM-Coliseum/Twins.lua

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathwhisper.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/LowerSpireTrash.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/PlagueworksTrash.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Updated

trunk/DBM-Onyxia/Onyxia.lua

Updated

trunk/DBM-Ulduar/Algalon.lua

Updated

trunk/DBM-Ulduar/Kologarn.lua

trunk/DBM-Coliseum/Anub'arak.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -204,30 +204,15 @@
 		Burrowed = true
 		timerAdds:Cancel()
 		warnAdds:Cancel()
-		self:SendSync("Burrow")
+		warnSubmerge:Show()
+		warnEmergeSoon:Schedule(55)
+		timerEmerge:Start()
+		timerFreezingSlash:Stop()
 	elseif msg and msg:find(L.Emerge) then
 		Burrowed = false
 		timerAdds:Start(5)
 		warnAdds:Schedule(5)
 		self:ScheduleMethod(5, "Adds")
-		self:SendSync("Emerge")
-	end
-end
-
-function mod:RemoveBuffs()
-	CancelUnitBuff("player", (GetSpellInfo(47440)))		-- Commanding Shout
-	CancelUnitBuff("player", (GetSpellInfo(48161)))		-- Power Word: Fortitude
-	CancelUnitBuff("player", (GetSpellInfo(48162)))		-- Prayer of Fortitude
-	CancelUnitBuff("player", (GetSpellInfo(69377)))		-- Runescroll of Fortitude
-end
-
-function mod:OnSync(msg, arg)
-	if msg == "Burrow" then
-		warnSubmerge:Show()
-		warnEmergeSoon:Schedule(55)
-		timerEmerge:Start()
-		timerFreezingSlash:Stop()
-	elseif msg == "Emerge" then
 		warnEmerge:Show()
 		warnSubmergeSoon:Schedule(65)
 		specWarnSubmergeSoon:Schedule(65)
@@ -241,3 +226,10 @@
 	end
 end
 
+function mod:RemoveBuffs()
+	CancelUnitBuff("player", (GetSpellInfo(47440)))		-- Commanding Shout
+	CancelUnitBuff("player", (GetSpellInfo(48161)))		-- Power Word: Fortitude
+	CancelUnitBuff("player", (GetSpellInfo(48162)))		-- Prayer of Fortitude
+	CancelUnitBuff("player", (GetSpellInfo(69377)))		-- Runescroll of Fortitude
+end
+

trunk/DBM-Coliseum/Jaraxxus.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -227,12 +227,6 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.FirstPull or msg:find(L.FirstPull) then
-		self:SendSync("FirstPull")
-	end
-end
-
-function mod:OnSync(msg, arg)
-	if msg == "FirstPull" then
 		timerCombatStart:Start()
 	end
 end
\ No newline at end of file

trunk/DBM-Coliseum/NorthrendBeasts.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -302,11 +302,26 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.Phase2 or msg:find(L.Phase2) then
-		self:SendSync("Phase2")
+		self:ScheduleMethod(17, "WormsEmerge")
+		timerCombatStart:Show(15)
+		updateHealthFrame(2)
+		if self.Options.RangeFrame then
+			DBM.RangeCheck:Show(10)
+		end
 	elseif msg == L.Phase3 or msg:find(L.Phase3) then
-		self:SendSync("Phase3")
+		updateHealthFrame(3)
+		if self:IsDifficulty("heroic10", "heroic25") then
+			enrageTimer:Start()
 	end
+		self:UnscheduleMethod("WormsSubmerge")
+		timerNextCrash:Start(45)
+		timerNextBoss:Cancel()
+		timerSubmerge:Cancel()
+		if self.Options.RangeFrame then
+			DBM.RangeCheck:Hide()
 end
+	end
+end
 
 function mod:UNIT_DIED(args)
 	local cid = self:GetCIDFromGUID(args.destGUID)
@@ -345,26 +360,3 @@
 		end
 	end
 end
-
-function mod:OnSync(msg, arg)
-	if msg == "Phase2" then
-		self:ScheduleMethod(17, "WormsEmerge")
-		timerCombatStart:Show(15)
-		updateHealthFrame(2)
-		if self.Options.RangeFrame then
-			DBM.RangeCheck:Show(10)
-		end
-	elseif msg == "Phase3" then
-		updateHealthFrame(3)
-		if self:IsDifficulty("heroic10", "heroic25") then
-			enrageTimer:Start()
-		end
-		self:UnscheduleMethod("WormsSubmerge")
-		timerNextCrash:Start(45)
-		timerNextBoss:Cancel()
-		timerSubmerge:Cancel()
-		if self.Options.RangeFrame then
-			DBM.RangeCheck:Hide()
-		end
-	end
-end
\ No newline at end of file

trunk/DBM-Coliseum/Twins.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -10,7 +10,6 @@
 
 mod:RegisterEvents(
 	"SPELL_CAST_START",
-	"CHAT_MSG_MONSTER_YELL",
 	"SPELL_AURA_APPLIED",
 	"SPELL_AURA_REMOVED"
 )

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -220,14 +220,6 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.YellAirphase or msg:find(L.YellAirphase) then
-		self:SendSync("Airphase")
-	elseif msg == L.YellPhase2 or msg:find(L.YellPhase2) then
-		self:SendSync("Phase2")
-	end
-end
-
-function mod:OnSync(msg, arg)
-	if msg == "Airphase" then
 		warnAirphase:Show()
 		timerNextFrostBreath:Cancel()
 		timerNextBlisteringCold:Start(84)--Not exact anywhere from 85-110seconds after airphase begin
@@ -237,7 +229,7 @@
 		if self.Options.ClearIconsOnAirphase then
 			self:ClearIcons()
 		end
-	elseif msg == "Phase2" then
+	elseif msg == L.YellPhase2 or msg:find(L.YellPhase2) then
 		warnPhase2:Show()
 		timerNextAirphase:Cancel()
 		timerNextGroundphase:Cancel()

trunk/DBM-Icecrown/TheLowerSpire/Deathwhisper.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -220,7 +220,7 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.YellReanimatedFanatic or msg:find(L.YellReanimatedFanatic) then
-		self:SendSync("ReanimatedFanatic")
+		warnReanimating:Show()
 	end
 end
 
@@ -228,10 +228,4 @@
 	if empoweredAdherent or deformedFanatic then
 		self:TrySetTarget()
 	end
-end
-
-function mod:OnSync(msg, arg)
-	if msg == "ReanimatedFanatic" then
-		warnReanimating:Show()
-	end
 end
\ No newline at end of file

trunk/DBM-Icecrown/TheLowerSpire/LowerSpireTrash.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -74,12 +74,6 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.WarderTrap1 or msg == L.WarderTrap2 or msg == L.WarderTrap3 then
-		self:SendSync("WarderTrap")
-	end
-end
-
-function mod:OnSync(msg, arg)
-	if msg == "WarderTrap" then
 		specWarnTrap:Show()
 	end
-end
\ No newline at end of file
+end

trunk/DBM-Icecrown/ThePlagueworks/PlagueworksTrash.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -76,12 +76,7 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.FleshreaperTrap1 or msg == L.FleshreaperTrap2 or msg == L.FleshreaperTrap3 then
-		self:SendSync("FleshreaperTrap")
-	end
-end
-
-function mod:OnSync(msg, arg)
-	if msg == "FleshreaperTrap" then
 		specWarnTrap:Show()
 	end
 end
+

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -124,6 +124,8 @@
 	end
 end
 
+mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
+
 function mod:SPELL_AURA_REMOVED(args)
 	if args:IsSpellID(69674, 71224, 73022, 73023) then
 		timerMutatedInfection:Cancel(args.destName)
@@ -148,14 +150,6 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if (msg == L.YellSlimePipes1 or msg:find(L.YellSlimePipes1)) or (msg == L.YellSlimePipes2 or msg:find(L.YellSlimePipes2)) then
-		self:SendSync("PoisonSlimePipes")
-	end
-end
-
-function mod:OnSync(msg, arg)
-	if msg == "PoisonSlimePipes" then
 		self:WallSlime()
 	end
 end
-
-mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED

trunk/DBM-Onyxia/Onyxia.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -61,9 +61,27 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.YellP2 or msg:find(L.YellP2) then
-		self:SendSync("Phase2")
+		phase = 2
+		warnPhase2:Show()
+--		preWarnDeepBreath:Schedule(72)	-- Pre-Warn Deep Breath
+		timerNextDeepBreath:Start(77)
+		timerAchieveWhelps:Start()
+		timerNextFlameBreath:Cancel()
+		self:ScheduleMethod(5, "Whelps")
+		sndFunny:Schedule(10, "Interface\\AddOns\\DBM-Onyxia\\sounds\\throw-more-dots.mp3")
+		sndFunny:Schedule(17, "Interface\\AddOns\\DBM-Onyxia\\sounds\\whelps-left-side-even-side-handle-it.mp3")
 	elseif msg == L.YellP3 or msg:find(L.YellP3) then
-		self:SendSync("Phase3")
+		phase = 3
+		warnPhase3:Show()
+		self:UnscheduleMethod("Whelps")
+		timerWhelps:Stop()
+		timerNextDeepBreath:Stop()
+		warnWhelpsSoon:Cancel()
+--		preWarnDeepBreath:Cancel()
+		sndFunny:Schedule(20, "Interface\\AddOns\\DBM-Onyxia\\sounds\\now-hit-it-very-hard-and-fast.mp3")
+   		sndFunny:Schedule(35, "Interface\\AddOns\\DBM-Onyxia\\sounds\\i-dont-see-enough-dots.mp3")
+		sndFunny:Schedule(50, "Interface\\AddOns\\DBM-Onyxia\\sounds\\hit-it-like-you-mean-it.mp3")
+		sndFunny:Schedule(65, "Interface\\AddOns\\DBM-Onyxia\\sounds\\throw-more-dots.mp3")
 	end
 end
 
@@ -102,30 +120,4 @@
 		warned_preP3 = true
 		warnPhase3Soon:Show()	
 	end
-end
-
-function mod:OnSync(msg)
-	if msg == "Phase2" then
-		phase = 2
-		warnPhase2:Show()
---		preWarnDeepBreath:Schedule(72)	-- Pre-Warn Deep Breath
-		timerNextDeepBreath:Start(77)
-		timerAchieveWhelps:Start()
-		timerNextFlameBreath:Cancel()
-		self:ScheduleMethod(5, "Whelps")
-		sndFunny:Schedule(10, "Interface\\AddOns\\DBM-Onyxia\\sounds\\throw-more-dots.mp3")
-		sndFunny:Schedule(17, "Interface\\AddOns\\DBM-Onyxia\\sounds\\whelps-left-side-even-side-handle-it.mp3")
-	elseif msg == "Phase3" then
-		phase = 3
-		warnPhase3:Show()
-		self:UnscheduleMethod("Whelps")
-		timerWhelps:Stop()
-		timerNextDeepBreath:Stop()
-		warnWhelpsSoon:Cancel()
---		preWarnDeepBreath:Cancel()
-		sndFunny:Schedule(20, "Interface\\AddOns\\DBM-Onyxia\\sounds\\now-hit-it-very-hard-and-fast.mp3")
-   		sndFunny:Schedule(35, "Interface\\AddOns\\DBM-Onyxia\\sounds\\i-dont-see-enough-dots.mp3")
-		sndFunny:Schedule(50, "Interface\\AddOns\\DBM-Onyxia\\sounds\\hit-it-like-you-mean-it.mp3")
-		sndFunny:Schedule(65, "Interface\\AddOns\\DBM-Onyxia\\sounds\\throw-more-dots.mp3")
-	end
 end
\ No newline at end of file

trunk/DBM-Ulduar/Algalon.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -33,7 +33,7 @@
 local announceCosmicSmash		= mod:NewAnnounce("WarningCosmicSmash", 3, 62311)
 local announcePhasePunch		= mod:NewAnnounce("WarningPhasePunch", 4, 65108, mod:IsHealer() or mod:IsTank())
 
-local specwarnStarLow			= mod:NewSpecialWarning("warnStarLow", mod:IsHealer())
+local specwarnStarLow			= mod:NewSpecialWarning("warnStarLow", mod:IsHealer() or mod:IsTank())
 local specWarnPhasePunch		= mod:NewSpecialWarningStack(64412, nil, 4)
 local specWarnBigBang			= mod:NewSpecialWarningSpell(64584)
 local specWarnCosmicSmash		= mod:NewSpecialWarningSpell(64598)

trunk/DBM-Ulduar/Kologarn.lua

Action: modified

Old revision: 3762

Old date: 2010-03-07 05:35:59 UTC

@@ -12,7 +12,6 @@
 	"SPELL_AURA_APPLIED_DOSE",
 	"SPELL_AURA_REMOVED",
 	"SPELL_DAMAGE",
---	"CHAT_MSG_MONSTER_YELL",
 	"CHAT_MSG_RAID_BOSS_WHISPER",
 	"UNIT_DIED"
 )

r3762 (Azael): zhtw update

Azael — Sun, 07 Mar 2010 05:35:59 GMT

Author: Azael
Date: Sun Mar 07 06:35:59 CET 2010
Revision: 3762

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 3761

Old date: 2010-03-07 03:47:46 UTC

@@ -397,7 +397,8 @@
 
 L:SetTimerLocalization{
 	TimerNextAirphase		= "下一次 空中階段",
-	TimerNextGroundphase		= "下一次 地上階段"
+	TimerNextGroundphase		= "下一次 地上階段",
+	achievementMystic		= "清除秘能連擊疊加"
 }
 
 L:SetWarningLocalization{
@@ -421,7 +422,8 @@
 	AnnounceFrostBeaconIcons	= "公佈$spell:70126目標設置的標記到團隊頻道\n(需要團隊隊長或助理權限)",
 	SetIconOnFrostBeacon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(70126),
 	SetIconOnUnchainedMagic		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69762),
-	ClearIconsOnAirphase		= "空中階段前清除所有標記"
+	ClearIconsOnAirphase		= "空中階段前清除所有標記",
+	RangeFrame			= "顯示距離框 (普通10碼, 困難20碼)\n(只會顯示已標記的玩家)"
 }
 
 L:SetMiscLocalization{

r3761 (bluenyx): koKR update

bluenyx — Sun, 07 Mar 2010 03:47:46 GMT

Author: bluenyx
Date: Sun Mar 07 04:47:46 CET 2010
Revision: 3761

Log:

koKR update

Updated

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 3760

Old date: 2010-03-06 22:54:00 UTC

@@ -369,12 +369,17 @@
 
 L:SetWarningLocalization{
 	warnCorrosion				= "%s : >%s< (%s)",		-- Corrosion on >args.destName< (args.amount)
-	warnPortalOpen				= "포탈 열림"	
+	warnPortalOpen				= "차원문 열림"	
 }
 
+L:SetTimerLocalization{
+	timerPortalsOpen			= "차원문 열림"
+}
+
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton	= "타오르는 해골에게 공격대 아이콘 설정(해골)",
 	warnPortalOpen				= "$spell:72483 열림 경고 보기",	
+	timerPortalsOpen			= "악몽의 차원문이 열릴 때 타이머 보기",	
 	warnCorrosion				= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "알 수 없음")
 }
 
@@ -396,7 +401,8 @@
 
 L:SetTimerLocalization{
 	TimerNextAirphase		= "다음 공중 단계",
-	TimerNextGroundphase	= "다음 지상 단계"
+	TimerNextGroundphase	= "다음 지상 단계",
+	achievementMystic		= "신비한 아픔 업적 타이머"	
 }
 
 L:SetWarningLocalization{
@@ -420,7 +426,8 @@
 	AnnounceFrostBeaconIcons	= "$spell:70126 대상 공격대 아이콘을 채팅으로 알리기\n(공대장 혹은 부공대장 권한이 있을 경우)",	
 	SetIconOnFrostBeacon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(70126),
 	SetIconOnUnchainedMagic		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69762),
-	ClearIconsOnAirphase		= "공중 단계 전 모든 공격대 아이콘 제거"
+	ClearIconsOnAirphase		= "공중 단계 전 모든 공격대 아이콘 제거",
+	RangeFrame					= "거리 프레임 보기(일반 10m, 영웅 20m)\n(공격대 아이콘 설정된 플레이어만 보임)"
 
 }
 
@@ -444,7 +451,8 @@
 	WarnPhase2Soon			= "곧 2 단계 전환",
 	WarnPhase3Soon			= "곧 3 단계 전환",
 	specWarnDefileCast		= "당신에게 파멸! - 이동!",
-	specWarnDefileNear		= "당신 주변에 파멸! - 이동!"
+	specWarnDefileNear			= "당신 주변에 파멸! - 이동!",
+	warnNecroticPlagueJump		= "괴저 역병 전이 : >%s<"	
 }
 
 L:SetTimerLocalization{

r3760 (Omega): swapped args around for range option.

Omega — Sat, 06 Mar 2010 22:54:00 GMT

Author: Omega
Date: Sat Mar 06 23:54:00 CET 2010
Revision: 3760

Log:

swapped args around for range option.

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3759

Old date: 2010-03-06 22:49:30 UTC

@@ -74,9 +74,9 @@
 	unchainedIcons = 7
 	if self.Options.RangeFrame then
 		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
-			DBM.RangeCheck:Show(20, GetRaidTargetIndex)
+			DBM.RangeCheck:Show(GetRaidTargetIndex, 20)
 		else
-			DBM.RangeCheck:Show(10, GetRaidTargetIndex)
+			DBM.RangeCheck:Show(GetRaidTargetIndex, 10)
 		end
 	end
 end

r3759 (Omega): #ICC/Sindragosa: Show range frame 10 in normal, 20 in heroic using raid icon filter. ICC/Sindragosa: Re-enabled default on for unchained magic, since it's required for range frame functionality, the bugs should be fixed now with it anyways.

Omega — Sat, 06 Mar 2010 22:49:30 GMT

Author: Omega
Date: Sat Mar 06 23:49:30 CET 2010
Revision: 3759

Log:

#ICC/Sindragosa: Show range frame 10 in normal, 20 in heroic using raid icon filter.
ICC/Sindragosa: Re-enabled default on for unchained magic, since it's required for range frame functionality, the bugs should be fixed now with it anyways.
#ICC/Sindragosa: Added an achievement timer for mystic buffet that shows how long you have to clear stacks before achievement is failed. (only monitors your stacks, no one else's. everyone is responsible for their own stacks). r3756

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

Updated

trunk/DBM-PvP/localization.en.lua

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3758

Old date: 2010-03-06 22:22:04 UTC

@@ -52,9 +52,10 @@
 
 local soundBlisteringCold = mod:NewSound(70123)
 mod:AddBoolOption("SetIconOnFrostBeacon", true)
-mod:AddBoolOption("SetIconOnUnchainedMagic", false)
+mod:AddBoolOption("SetIconOnUnchainedMagic", true)
 mod:AddBoolOption("ClearIconsOnAirphase", true)
 mod:AddBoolOption("AnnounceFrostBeaconIcons", false)
+mod:AddBoolOption("RangeFrame")
 
 local beaconTargets		= {}
 local beaconIconTargets	= {}
@@ -71,8 +72,21 @@
 	table.wipe(beaconIconTargets)
 	table.wipe(unchainedTargets)
 	unchainedIcons = 7
+	if self.Options.RangeFrame then
+		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
+			DBM.RangeCheck:Show(20, GetRaidTargetIndex)
+		else
+			DBM.RangeCheck:Show(10, GetRaidTargetIndex)
 end
+	end
+end
 
+function mod:OnCombatEnd()
+	if self.Options.RangeFrame then
+		DBM.RangeCheck:Hide()
+	end
+end
+
 do
 	local function sort_by_group(v1, v2)
 		return DBM:GetRaidSubgroup(UnitName(v1)) < DBM:GetRaidSubgroup(UnitName(v2))

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 3758

Old date: 2010-03-06 22:22:04 UTC

@@ -422,14 +422,15 @@
 	AnnounceFrostBeaconIcons= "Announce icons for $spell:70126 targets to raid chat\n(requires announce to be enabled and leader/promoted status)",
 	SetIconOnFrostBeacon	= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(70126),
 	SetIconOnUnchainedMagic	= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69762),
-	ClearIconsOnAirphase	= "Clear all icons before air phase"
+	ClearIconsOnAirphase	= "Clear all icons before air phase",
+	RangeFrame				= "Show range frame (10 normal, 20 heroic)\n(will only show raid icon marked players)"
 }
 
 L:SetMiscLocalization{
 	YellAirphase	= "Your incursion ends here! None shall survive!",
 	YellPhase2		= "Now, feel my master's limitless power and despair!",
 	BeaconIconSet	= "Frost Beacon icon {rt%d} set on %s",
-	YellPull		= "You are fools to have come to this place. The icy winds of Northrend will consume your souls!"
+	YellPull		= "You are fools to have come to this place. The icy winds of Northrend will consume your souls!"--Not currently in use.
 }
 
 ---------------------

trunk/DBM-PvP/localization.en.lua

Action: modified

Old revision: 3758

Old date: 2010-03-06 22:22:04 UTC

@@ -229,7 +229,7 @@
 	NovaSound			= "Play sound on $spell:65279",
 	timerMobOvercharge	= "Show timer for Overcharged mob (stacking debuff)",
 	EmalonEnrage		= "Show timer for $spell:26662",
-	RangeFrame			= "Show range frame (10 m)"
+	RangeFrame			= "Show range frame (10)"
 }
 
 ---------------------------------

r3758 (Nalumis): deDE update (Sindragosa)

Nalumis — Sat, 06 Mar 2010 22:22:04 GMT

Author: Nalumis
Date: Sat Mar 06 23:22:04 CET 2010
Revision: 3758

Log:

deDE update (Sindragosa)

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3757

Old date: 2010-03-06 21:32:08 UTC

@@ -403,7 +403,8 @@
 
 L:SetTimerLocalization{
 	TimerNextAirphase		= "Nächste Luftphase",
-	TimerNextGroundphase	= "Nächste Bodenphase"
+	TimerNextGroundphase	= "Nächste Bodenphase",
+	achievementMystic		= "Ablaufzeit für Mystischer Puffer"
 }
 
 L:SetWarningLocalization{

r3757 (Omega): Remove syncing when it's not important. Will only use syncing for important combat related events and not optional combat start/roleplay timers. Should reduce addon traffic and simplify mods slightly, as well as fix any bugs with different functions needing diff args in the sync function.

Omega — Sat, 06 Mar 2010 21:32:08 GMT

Author: Omega
Date: Sat Mar 06 22:32:08 CET 2010
Revision: 3757

Log:

Remove syncing when it's not important. Will only use syncing for important combat related events and not optional combat start/roleplay timers. Should reduce addon traffic and simplify mods slightly, as well as fix any bugs with different functions needing diff args in the sync function.

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3756

Old date: 2010-03-06 20:43:04 UTC

@@ -46,6 +46,7 @@
 local timerChilledtotheBone		= mod:NewBuffActiveTimer(8, 70106)
 local timerMysticBuffet			= mod:NewBuffActiveTimer(8, 70128)
 local timerNextMysticBuffet		= mod:NewNextTimer(6, 70128)
+local timerMysticAchieve		= mod:NewAchievementTimer(24, 4620, "achievementMystic")--May need tweaks, will also need modifying for 3.3.3 nerf to achievement
 
 local berserkTimer				= mod:NewBerserkTimer(600)
 
@@ -165,9 +166,12 @@
 			if (args.amount or 1) >= 4 then
 				specWarnMysticBuffet:Show(args.amount)
 			end
+			if (args.amount or 1) < 2 then
+				timerMysticAchieve:Start()
 		end
 	end
 end
+end
 
 mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
 
@@ -186,8 +190,12 @@
 		if self.Options.SetIconOnUnchainedMagic then
 			self:SetIcon(args.destName, 0)
 		end
+	elseif args:IsSpellID(70127, 72528, 72529, 72530) then
+		if args:IsPlayer() then
+			timerMysticAchieve:Cancel()
 	end
 end
+end
 
 function mod:UNIT_HEALTH(uId)
 	if not warned_P2 and self:GetUnitCreatureId(uId) == 36853 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.38 then

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3756

Old date: 2010-03-06 20:43:04 UTC

@@ -313,9 +313,9 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.LKPull or msg:find(L.LKPull) then
-		self:SendSync("LKPull")
+		timerCombatStart:Start()
 	elseif msg == L.LKRoleplay or msg:find(L.LKRoleplay) then
-		self:SendSync("LKRoleplay")
+		timerRoleplay:Start()
 	end
 end
 
@@ -326,11 +326,7 @@
 end
 
 function mod:OnSync(msg, target)
-	if msg == "LKPull" then
-		timerCombatStart:Start()
-	elseif msg == "LKRoleplay" then
-		timerRoleplay:Start()
-	elseif msg == "PlagueOn" then
+	if msg == "PlagueOn" then
 		if time() - lastPlagueCast > 2 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
 			warnNecroticPlagueJump:Show(target)	--We only want this function to work when it jumps from target to target.
 			timerNecroticPlagueCleanse:Start()

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Action: modified

Old revision: 3756

Old date: 2010-03-06 20:43:04 UTC

@@ -178,16 +178,8 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg == L.PullAlliance or msg:find(L.PullAlliance, 1, true) then
-		self:SendSync("PullAlliance")
-	elseif msg == L.PullHorde or msg:find(L.PullHorde, 1, true) then
-		self:SendSync("PullHorde")
-	end
-end
-
-function mod:OnSync(msg, arg)
-	if msg == "PullAlliance" then
 		timerCombatStart:Start()
-	elseif msg == "PullHorde" then
+	elseif msg == L.PullHorde or msg:find(L.PullHorde, 1, true) then
 		timerCombatStart:Start(99)
 	end
 end
\ No newline at end of file

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 3756

Old date: 2010-03-06 20:43:04 UTC

@@ -397,7 +397,8 @@
 
 L:SetTimerLocalization{
 	TimerNextAirphase		= "Next air phase",
-	TimerNextGroundphase	= "Next ground phase"
+	TimerNextGroundphase	= "Next ground phase",
+	achievementMystic		= "Time to clear Mystic stacks"
 }
 
 L:SetWarningLocalization{

r3756 (Omega): Fix a valithria lua error

Omega — Sat, 06 Mar 2010 20:43:04 GMT

Author: Omega
Date: Sat Mar 06 21:43:04 CET 2010
Revision: 3756

Log:

Fix a valithria lua error

Updated

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Action: modified

Old revision: 3755

Old date: 2010-03-06 20:08:22 UTC

@@ -28,7 +28,7 @@
 
 local timerLayWaste		= mod:NewBuffActiveTimer(12, 69325)
 local timerNextPortal	= mod:NewCDTimer(46, 72483, nil, mod:IsHealer())
-local timerPortalsOpen	= mod:NewBuffActiveTimer(10, "timerPortalsOpen", 72483, mod:IsHealer())
+local timerPortalsOpen	= mod:NewTimer(10, "timerPortalsOpen", 72483, mod:IsHealer())
 local timerGutSpray		= mod:NewTargetTimer(12, 71283, nil, mod:IsTank() or mod:IsHealer())
 local timerCorrosion	= mod:NewTargetTimer(6, 70751, nil, false)

r3755 (bluenyx): koKR update

bluenyx — Sat, 06 Mar 2010 20:08:22 GMT

Author: bluenyx
Date: Sat Mar 06 21:08:22 CET 2010
Revision: 3755

Log:

koKR update

Updated

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 3754

Old date: 2010-03-06 18:36:20 UTC

@@ -476,5 +476,6 @@
 	YellDefile				= "저에게 파멸!!!",
 	YellTrap				= "나에게 암흑의 덫!!!",	
 	YellKill				= "어떤 의문도 남지 않았다. 어떤 의심도 없다. 너희는 아제로스의 가장 위대한 용사들이다. 너희 앞에 놓아둔 모든 도전을 극복해 내었다. 가장 강력한 종들이 너희의 무자비한 살육 앞에 쓰러졌지... 너희가 억눌렀던 분노 앞에 말이다...",
-	LKRoleplay				= "진정으로 정의에 이끌렸단 말이냐? 궁금하구나..."
+	LKRoleplay				= "진정으로 정의에 이끌렸단 말이냐? 궁금하구나...",
+	PlagueWhisper			= "역병 전이 :"
 }
\ No newline at end of file

r3754 (Snamor): #ICC/All: esES update #Ulduar/All: esES update

Snamor — Sat, 06 Mar 2010 18:36:20 GMT

Author: Snamor
Date: Sat Mar 06 19:36:20 CET 2010
Revision: 3754

Log:

#ICC/All: esES update
#Ulduar/All: esES update

Updated

trunk/DBM-Icecrown/localization.es.lua

Updated

trunk/DBM-Ulduar/localization.es.lua

trunk/DBM-Icecrown/localization.es.lua

Action: modified

Old revision: 3753

Old date: 2010-03-06 17:32:04 UTC

@@ -376,9 +376,14 @@
 	warnPortalOpen	= "Se abren los portales"
 }
 
+L:SetTimerLocalization{
+	timerPortalsOpen	= "Se abren los portales"
+}
+
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton	= "Poner icono en Esqueleto llameante (calavera)",
 	warnPortalOpen				= "Mostrar aviso cuando $spell:72483 se abren",
+	timerPortalsOpen			= "Mostrar tiempo para la apertura de Portal Pesadilla",
 	warnCorrosion	= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }
 
@@ -447,7 +452,8 @@
 	WarnPhase2Soon			= "Transición a la Fase 2 pronto",
 	WarnPhase3Soon			= "Transición a la Fase 3 pronto",
 	specWarnDefileCast		= "Profanar en ti ¡Muévete!",
-	specWarnDefileNear		= "Profanar cerca de ti ¡Ten cuidado!"
+	specWarnDefileNear		= "Profanar cerca de ti ¡Ten cuidado!",
+	warnNecroticPlagueJump	= "Peste necrótica saltó a >%s<"
 }
 
 L:SetTimerLocalization{
@@ -460,6 +466,7 @@
 L:SetOptionLocalization{
 	TimerCombatStart		= "Mostrar tiempo para el inicio del combate",
 	TimerRoleplay			= "Mostrar tiempo para Diálogo",
+	warnNecroticPlagueJump	= "Anunciar los objetivos donde $spell:73912 ha saltado",
 	TimerNecroticPlagueCleanse	= "Mostrar tiempo para purgar Peste necrótica\nantes de la primera marca",
 	PhaseTransition			= "Mostrar tiempo para las transiciones de fase",
 	WarnPhase2Soon			= "Mostrar pre-aviso para transición a la Fase 2 (al ~73%)",

trunk/DBM-Ulduar/localization.es.lua

Action: modified

Old revision: 3753

Old date: 2010-03-06 17:32:04 UTC

@@ -351,7 +351,7 @@
 L:SetMiscLocalization{
 	YellPhase1	= "Interlopers! You mortals who dare to interfere with my sport will pay.... Wait--you...",
 	YellPhase2	= "Impertinent whelps, you dare challenge me atop my pedestal? I will crush you myself!",
-	YellKill	= "Stay your arms! I yield!",
+	YellKill	= "¡Guardad las armas! ¡Me rindo!",
 	ChargeOn	= "Cargar relámpago: %s",
 	Charge		= "Fallos de Cargar relámpago (este try): %s" 
 }

r3753 (Nalumis): frFR update by ckeurk

Nalumis — Sat, 06 Mar 2010 17:32:04 GMT

Author: Nalumis
Date: Sat Mar 06 18:32:04 CET 2010
Revision: 3753

Log:

frFR update by ckeurk

Updated

trunk/DBM-Core/localization.fr.lua

Action: modified

Old revision: 3752

Old date: 2010-03-06 16:46:00 UTC

@@ -69,6 +69,8 @@
 DBM_CORE_RANGECHECK_SETRANGE_TO		= "%d m"
 DBM_CORE_RANGECHECK_LOCK			= "Verrouiller la fenêtre"
 
+DBM_LFG_INVITE						= "LFG Invite"
+
 DBM_CORE_SLASHCMD_HELP				= {
 	"Commandes slash disponible:",
 	"/dbm version: Vérifie la version du raid (alias: ver)",
@@ -91,6 +93,8 @@
 DBM_CORE_BREAK_START				= "La pause démarre maintenant -- vous avez %s minute(s)!"
 DBM_CORE_BREAK_MIN					= "La pause finit dans %s minutes!"
 DBM_CORE_BREAK_SEC					= "La pause finit dans %s secondes!"
+DBM_CORE_TIMER_BREAK				= "Break time!"-----
+DBM_CORE_ANNOUNCE_BREAK_OVER		= "Break time is over"-----
 
 DBM_CORE_TIMER_PULL					= "Pull dans"
 DBM_CORE_ANNOUNCE_PULL				= "Pull dans %d sec"
@@ -133,13 +137,58 @@
 DBM_CORE_AUTO_ANNOUNCE_OPTIONS = {
 	target	= "Annonce la cible de |cff71d5ff|Hspell:%d|h%s|h|r",
 	spell	= "Montre une alerte pour |cff71d5ff|Hspell:%d|h%s|h|r",
-	cast	= "Montre une alerte quand |cff71d5ff|Hspell:%d|h%s|h|r is being cast",
+	cast	= "Montre une alerte quand |cff71d5ff|Hspell:%d|h%s|h|r est en cours de cast",
 	soon	= "Montre une alerte avant |cff71d5ff|Hspell:%d|h%s|h|r",
 	prewarn	= "Montre une alerte avant |cff71d5ff|Hspell:%d|h%s|h|r",
 	phase	= "Montre une alerte pour la phase %d",
 }
 
+-- Auto-generated Special Warning Localizations
+DBM_CORE_AUTO_SPEC_WARN_OPTIONS = {
+	spell 		= "Afficher l’alerte spéciale pour $spell:%d",
+	dispel 		= "Afficher l’alerte spéciale à dispel/spellsteal \n $spell:%d",
+	interupt	= "Afficher l’alerte spéciale interrompre $spell:%d",
+	you 		= "Afficher l’alerte spéciale lorsque vous êtes affecté par $spell:%d",
+	target 		= "Afficher l’alerte spéciale quand quelqu'un est touché par $spell:%d",
+	close 		= "Afficher l’alerte spéciale quand quelqu'un est proche de vous \n affected by $spell:%d",
+	move 		= "Afficher l’alerte spéciale lorsque vous êtes affecté par $spell:%d",
+	run 		= "Afficher l’alerte spéciale pour $spell:%d",
+	cast 		= "Afficher l’alerte spéciale pour $spell:%d cast",
+	stack 		= "Afficher l’alerte spéciale pour >=%d des piles de \n $spell:%d"
+}
+
+DBM_CORE_AUTO_SPEC_WARN_TEXTS = {
+	spell = "%s!",
+	dispel = "%s on %%s - dispel maintenant",
+	interupt = "%s - interrompre maintenant",
+	you = "%s sur toi",
+	target = "%s sur %%s",
+	close = "%s sur %%s près de vous",
+	move = "%s - bouge vite",
+	run = "%s - éloigne toi",
+	cast = "%s - stop cast",
+	stack = "%s (%%d)"
+}
+
+
+DBM_CORE_AUTO_ICONS_OPTION_TEXT		= "Set d'icônes sur $spell:%d en targets"
+DBM_CORE_AUTO_SOUND_OPTION_TEXT		= "jouer un son sur $spell:%d"
+
+
 -- New special warnings
 DBM_CORE_MOVE_SPECIAL_WARNING_BAR	= "Alerte spéciale déplaçable"
 DBM_CORE_MOVE_SPECIAL_WARNING_TEXT	= "Alerte spéciale"
 
+DBM_CORE_RANGE_CHECK_ZONE_UNSUPPORTED	= "Une %d vérification de distance n'est pas supporté dans cette zone.\nLes distances autorisés est 10, 11, 15 et 28 yard."
+
+DBM_ARROW_MOVABLE					= "Bouger la Flèche"
+
+DBM_ARROW_ERROR_USAGE	= {
+	"DBM-flèche usage:",
+	"/dbm flèche   crée une flèche qui pointe vers une locataion spécifiques (0 < x/y < 100)",
+	"/dbm flèche  crée une flèche qui pointe vers un joueur précis dans votre groupe ou raid",
+	"/dbm flèche cache la flèche",
+	"/dbm flèche fait déplacer",
+}
+
+

r3752 (Vampik): Fixed variables name mismatch in LichKing mod

Vampik — Sat, 06 Mar 2010 16:46:00 GMT

Author: Vampik
Date: Sat Mar 06 17:46:00 CET 2010
Revision: 3752

Log:

Fixed variables name mismatch in LichKing mod

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3751

Old date: 2010-03-06 03:40:46 UTC

@@ -325,7 +325,7 @@
 	end
 end
 
-function mod:OnSync(msg, arg)
+function mod:OnSync(msg, target)
 	if msg == "LKPull" then
 		timerCombatStart:Start()
 	elseif msg == "LKRoleplay" then

r3751 (Azael): zhtw update

Azael — Sat, 06 Mar 2010 03:40:46 GMT

Author: Azael
Date: Sat Mar 06 04:40:46 CET 2010
Revision: 3751

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 3750

Old date: 2010-03-05 23:23:44 UTC

@@ -457,6 +457,7 @@
 L:SetOptionLocalization{
 	TimerCombatStart		= "為戰鬥開始顯示計時器",
 	TimerRoleplay			= "為角色扮演事件顯示計時器",
+	warnNecroticPlagueJump		= "提示$spell:73912跳躍後的目標",
 	TimerNecroticPlagueCleanse	= "為淨化第一次堆疊前的亡域瘟疫顯示計時器",
 	PhaseTransition			= "為轉換階段顯示計時器",
 	WarnPhase2Soon			= "為轉換第2階段顯示預先警告 (大約73%)",

r3750 (Nalumis): deDE update

Nalumis — Fri, 05 Mar 2010 23:23:44 GMT

Author: Nalumis
Date: Sat Mar 06 00:23:44 CET 2010
Revision: 3750

Log:

deDE update

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3749

Old date: 2010-03-05 22:29:42 UTC

@@ -374,9 +374,14 @@
 	warnPortalOpen	= "Portale offen"
 }
 
+L:SetTimerLocalization{
+	timerPortalsOpen	= "Portale offen"
+}
+
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton		= "Setze Zeichen auf Loderndes Skelett (Totenkopf)",
-	warnPortalOpen				= "Zeige Warnung bei $spell:72483",
+	warnPortalOpen				= "Zeige Warnung wenn Alptraumportale geöffnet sind",
+	timerPortalsOpen			= "Zeige Timer wenn Alptraumportale geöffnet sind",
 	warnCorrosion	= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }
 
@@ -445,7 +450,8 @@
 	WarnPhase2Soon			= "Übergang in Phase 2 bald",
 	WarnPhase3Soon			= "Übergang in Phase 3 bald",
 	specWarnDefileCast		= "Entweihen auf dir - Lauf weg",
-	specWarnDefileNear		= "Entweihen in deiner Nähe - Aufpassen"
+	specWarnDefileNear		= "Entweihen in deiner Nähe - Aufpassen",
+	warnNecroticPlagueJump	= "Nekrotische Seuche auf >%s< gesprungen"
 }
 
 L:SetTimerLocalization{
@@ -458,6 +464,7 @@
 L:SetOptionLocalization{
 	TimerCombatStart		= "Zeige Timer für Kampfbeginn",
 	TimerRoleplay			= "Zeige Timer für Rollenspiel",
+	warnNecroticPlagueJump	= "Verkünde Sprungziele von $spell:73912",
 	TimerNecroticPlagueCleanse	= "Zeige Timer um Nekrotische Seuche vor dem ersten Tick zu reinigen",
 	PhaseTransition			= "Zeige Timer für Phasenübergänge",
 	WarnPhase2Soon			= "Zeige Vorwarnung für Übergang in Phase 2 (bei ~73%)",

r3749 (Omega): #ICC/Valithria: Better clarification on open portal timer ICC/Lich King: Better clarification on when a plague has jumped to distinguish it from LK casts.

Omega — Fri, 05 Mar 2010 22:29:42 GMT

Author: Omega
Date: Fri Mar 05 23:29:42 CET 2010
Revision: 3749

Log:

#ICC/Valithria: Better clarification on open portal timer
ICC/Lich King: Better clarification on when a plague has jumped to distinguish it from LK casts.

Updated

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Action: modified

Old revision: 3748

Old date: 2010-03-05 21:43:42 UTC

@@ -28,7 +28,7 @@
 
 local timerLayWaste		= mod:NewBuffActiveTimer(12, 69325)
 local timerNextPortal	= mod:NewCDTimer(46, 72483, nil, mod:IsHealer())
-local timerPortalsOpen	= mod:NewBuffActiveTimer(10, 72483, nil, mod:IsHealer())
+local timerPortalsOpen	= mod:NewBuffActiveTimer(10, "timerPortalsOpen", 72483, mod:IsHealer())
 local timerGutSpray		= mod:NewTargetTimer(12, 71283, nil, mod:IsTank() or mod:IsHealer())
 local timerCorrosion	= mod:NewTargetTimer(6, 70751, nil, false)

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3748

Old date: 2010-03-05 21:43:42 UTC

@@ -27,6 +27,7 @@
 local warnDrudgeGhouls		= mod:NewSpellAnnounce(70358, 2) --Phase 1 Add
 local warnShamblingEnrage	= mod:NewTargetAnnounce(72143, 3, nil, mod:IsHealer() or mod:IsTank() or mod:CanRemoveEnrage()) --Phase 1 Add Ability
 local warnNecroticPlague	= mod:NewTargetAnnounce(73912, 4) --Phase 1+ Ability
+local warnNecroticPlagueJump= mod:NewAnnounce("warnNecroticPlagueJump", 4, 73912) --Phase 1+ Ability
 local warnInfest			= mod:NewSpellAnnounce(73779, 3, nil, mod:IsHealer()) --Phase 1 & 2 Ability
 local warnPhase2Soon		= mod:NewAnnounce("WarnPhase2Soon", 1)
 local warnDefileSoon		= mod:NewSoonAnnounce(73708, 3)	--Phase 2+ Ability
@@ -331,7 +332,7 @@
 		timerRoleplay:Start()
 	elseif msg == "PlagueOn" then
 		if time() - lastPlagueCast > 2 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
-			warnNecroticPlague:Show(target)	--We only want this function to work when it jumps from target to target.
+			warnNecroticPlagueJump:Show(target)	--We only want this function to work when it jumps from target to target.
 			timerNecroticPlagueCleanse:Start()
 			if target == UnitName("player") then
 				specWarnNecroticPlague:Show()

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 3748

Old date: 2010-03-05 21:43:42 UTC

@@ -368,9 +368,14 @@
 	warnPortalOpen	= "Portals open"
 }
 
+L:SetTimerLocalization{
+	timerPortalsOpen	= "Portals open"
+}
+
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton	= "Set icon on Blazing Skeleton (skull)",
-	warnPortalOpen				= "Show warning when $spell:72483 are opened up",
+	warnPortalOpen				= "Show warning when Nightmare Portals are opened up",
+	timerPortalsOpen			= "Show timer when Nightmare Portals are opened up",
 	warnCorrosion				= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }
 
@@ -439,7 +444,8 @@
 	WarnPhase2Soon			= "Phase 2 transition soon",
 	WarnPhase3Soon			= "Phase 3 transition soon",
 	specWarnDefileCast		= "Defile on you - Move away",
-	specWarnDefileNear		= "Defile near you - Watch out"
+	specWarnDefileNear		= "Defile near you - Watch out",
+	warnNecroticPlagueJump	= "Necrotic Plague jumped to >%s<"
 }
 
 L:SetTimerLocalization{
@@ -452,6 +458,7 @@
 L:SetOptionLocalization{
 	TimerCombatStart		= "Show timer for start of combat",
 	TimerRoleplay			= "Show timer for roleplay event",
+	warnNecroticPlagueJump	= "Announce $spell:73912 jump targets",
 	TimerNecroticPlagueCleanse	= "Show timer to cleanse Necrotic Plague before\nthe first tick",
 	PhaseTransition			= "Show time for phase transitions",
 	WarnPhase2Soon			= "Show pre-warning for Phase 2 transition (at ~73%)",

r3748 (Nalumis): deDE update (Lich King)

Nalumis — Fri, 05 Mar 2010 21:43:42 GMT

Author: Nalumis
Date: Fri Mar 05 22:43:42 CET 2010
Revision: 3748

Log:

deDE update (Lich King)

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3747

Old date: 2010-03-05 21:26:53 UTC

@@ -479,5 +479,5 @@
 	YellTrap				= "Schattenfalle auf mir!",
 	YellKill				= "No questions remain unanswered. No doubts linger. You ARE Azeroth's greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...",	-- to be translated
 	LKRoleplay				= "Is it truly righteousness that drives you? I wonder...",	-- to be translated
-	PlagueWhisper			= "Seuche"	-- untested (boss whisper!)
+	PlagueWhisper			= "You have been infected by"	-- yes, it is really whispered in English
 }

r3747 (Nalumis): deDE update (Lich King) - untested, but better than non-localized :)

Nalumis — Fri, 05 Mar 2010 21:26:53 GMT

Author: Nalumis
Date: Fri Mar 05 22:26:53 CET 2010
Revision: 3747

Log:

deDE update (Lich King) - untested, but better than non-localized :)

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3746

Old date: 2010-03-05 12:01:01 UTC

@@ -479,5 +479,5 @@
 	YellTrap				= "Schattenfalle auf mir!",
 	YellKill				= "No questions remain unanswered. No doubts linger. You ARE Azeroth's greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...",	-- to be translated
 	LKRoleplay				= "Is it truly righteousness that drives you? I wonder...",	-- to be translated
-	PlagueWhisper			= "You have been infected by"	-- to be translated (boss whisper!)
+	PlagueWhisper			= "Seuche"	-- untested (boss whisper!)
 }

r3746 (Azael): zhtw update

Azael — Fri, 05 Mar 2010 12:01:01 GMT

Author: Azael
Date: Fri Mar 05 13:01:01 CET 2010
Revision: 3746

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 3745

Old date: 2010-03-05 07:28:12 UTC

@@ -477,5 +477,6 @@
 	YellDefile			= "我中了汙染!",
 	YellTrap			= "我中了暗影陷阱!",
 	YellKill			= "沒有問題尚未解答。沒有任何懷疑。你們就是艾澤拉斯最偉大的勇士。你們克服了每一個我所設下的考驗。我最強大的僕人們都在你們不屈不撓的猛攻中倒下…在你們奔放的怒火之中…",
-	LKRoleplay			= "你們的原動力真的是正義感嗎？我很懷疑……"
+	LKRoleplay			= "你們的原動力真的是正義感嗎？我很懷疑……",
+	PlagueWhisper			= "You have been infected by"
 }
\ No newline at end of file

r3745 (Nalumis): deDE update (Lich King)

Nalumis — Fri, 05 Mar 2010 07:28:12 GMT

Author: Nalumis
Date: Fri Mar 05 08:28:12 CET 2010
Revision: 3745

Log:

deDE update (Lich King)

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3744

Old date: 2010-03-05 07:13:35 UTC

@@ -478,5 +478,6 @@
 	YellDefile				= "Entweihen auf mir!",
 	YellTrap				= "Schattenfalle auf mir!",
 	YellKill				= "No questions remain unanswered. No doubts linger. You ARE Azeroth's greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...",	-- to be translated
-	LKRoleplay				= "Is it truly righteousness that drives you? I wonder..."	-- to be translated
+	LKRoleplay				= "Is it truly righteousness that drives you? I wonder...",	-- to be translated
+	PlagueWhisper			= "You have been infected by"	-- to be translated (boss whisper!)
 }

r3744 (Omega): #ICC/Sindragosa: Changed instability to 5 seconds, down from 8 do to recent hotfixes. #ICC/Rotface: Added Vile Gas warnings and CD timer for heroic rotface.

Omega — Fri, 05 Mar 2010 07:13:35 GMT

Author: Omega
Date: Fri Mar 05 08:13:35 CET 2010
Revision: 3744

Log:

#ICC/Sindragosa: Changed instability to 5 seconds, down from 8 do to recent hotfixes.
#ICC/Rotface: Added Vile Gas warnings and CD timer for heroic rotface.
#ICC/Lich King: Now supports detecting necrotic plagues that jump from player to player (requires entire raid using 3744 or higher for syncing of targets)

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3743

Old date: 2010-03-04 05:31:41 UTC

@@ -42,7 +42,7 @@
 local timerNextFrostBreath		= mod:NewNextTimer(22, 71056, nil, mod:IsTank() or mod:IsHealer())
 local timerNextBlisteringCold	= mod:NewCDTimer(69, 70123)
 local timerBlisteringCold		= mod:NewCastTimer(6, 70123)
-local timerInstability			= mod:NewBuffActiveTimer(8, 69766)
+local timerInstability			= mod:NewBuffActiveTimer(5, 69766)
 local timerChilledtotheBone		= mod:NewBuffActiveTimer(8, 70106)
 local timerMysticBuffet			= mod:NewBuffActiveTimer(8, 70128)
 local timerNextMysticBuffet		= mod:NewNextTimer(6, 70128)

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3743

Old date: 2010-03-04 05:31:41 UTC

@@ -16,7 +16,8 @@
 	"SPELL_SUMMON",
 	"SPELL_DAMAGE",
 	"UNIT_HEALTH",
-	"CHAT_MSG_MONSTER_YELL"
+	"CHAT_MSG_MONSTER_YELL",
+	"CHAT_MSG_RAID_BOSS_WHISPER"
 )
 
 local warnRemorselessWinter = mod:NewSpellAnnounce(74270, 3) --Phase Transition Start Ability
@@ -79,20 +80,8 @@
 local phase	= 0
 local warned_preP2 = false
 local warned_preP3 = false
+local lastPlagueCast = 0
 
---[[local function isunitdebuffed(spellID)
-	local name = GetSpellInfo(spellID)
-	if not name then return false end
-
-	for i=1, 40, 1 do
-		local debuffname = UnitDebuff("player", i, "HARMFUL")
-		if debuffname == name then
-			return true
-		end
-	end
-	return false
-end--]]
-
 function mod:OnCombatStart(delay)
 	berserkTimer:Start(-delay)
 	phase = 0
@@ -178,19 +167,17 @@
 end
 
 function mod:SPELL_CAST_SUCCESS(args)
-	if args:IsSpellID(70337, 73912, 73913, 73914) then -- Necrotic Plague (SPELL_AURA_APPLIED is not fired for this spell, there is no way to detect jumps to other players.)
+	if args:IsSpellID(70337, 73912, 73913, 73914) then -- Necrotic Plague (SPELL_AURA_APPLIED is not fired for this spell)
 		warnNecroticPlague:Show(args.destName)
 		timerNecroticPlagueCD:Start()
 		timerNecroticPlagueCleanse:Start()
+		lastPlagueCast = time()
 		if self.Options.NecroticPlagueIcon then
 			self:SetIcon(args.destName, 7, 5)
 		end
 		if args:IsPlayer() then
 			specWarnNecroticPlague:Show()
 		end
---[[		if (isunitdebuffed(70338) or isunitdebuffed(73785) or isunitdebuffed(73786) or isunitdebuffed(73787) or isunitdebuffed(70337) or isunitdebuffed(73912) or isunitdebuffed(73913) or isunitdebuffed(73914)) then
-			specWarnNecroticPlague:Show()
-		end--]]
 	elseif args:IsSpellID(69409, 73797, 73798, 73799) then -- Soul reaper (MT debuff)
 		warnSoulreaper:Show(args.destName)
 		specwarnSoulreaper:Show(args.destName)
@@ -331,10 +318,27 @@
 	end
 end
 
+function mod:CHAT_MSG_RAID_BOSS_WHISPER(msg)
+	if msg:find(L.PlagueWhisper) then
+		self:SendSync("PlagueOn", UnitName("player"))
+	end
+end
+
 function mod:OnSync(msg, arg)
 	if msg == "LKPull" then
 		timerCombatStart:Start()
 	elseif msg == "LKRoleplay" then
 		timerRoleplay:Start()
+	elseif msg == "PlagueOn" then
+		if time() - lastPlagueCast > 2 then --Dirty hack to prevent function from doing anything for lich kings direct casts of necrotic plague.
+			warnNecroticPlague:Show(target)	--We only want this function to work when it jumps from target to target.
+			timerNecroticPlagueCleanse:Start()
+			if target == UnitName("player") then
+				specWarnNecroticPlague:Show()
 	end
+			if self.Options.NecroticPlagueIcon then
+				self:SetIcon(target, 7, 5)
 end
+		end
+	end
+end

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3743

Old date: 2010-03-04 05:31:41 UTC

@@ -95,6 +95,7 @@
 	timerInhaledBlight:Start(-delay)
 	timerGasSporeCD:Start(20-delay)--This may need tweaking
 	table.wipe(gasSporeTargets)
+	table.wipe(vileGasTargets)
 	gasSporeIcon = 8
 	gasSporeCast = 0
 --	noCheck = true

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 3743

Old date: 2010-03-04 05:31:41 UTC

@@ -25,6 +25,7 @@
 local warnOozeSpawn				= mod:NewAnnounce("WarnOozeSpawn", 1)
 local warnStickyOoze			= mod:NewSpellAnnounce(69774, 1)
 local warnUnstableOoze			= mod:NewAnnounce("WarnUnstableOoze", 2, 69558)
+local warnVileGas				= mod:NewTargetAnnounce(72272, 3)
 
 local specWarnMutatedInfection	= mod:NewSpecialWarningYou(71224)
 local specWarnStickyOoze		= mod:NewSpecialWarningMove(69774)
@@ -32,22 +33,35 @@
 local specWarnSlimeSpray		= mod:NewSpecialWarningSpell(69508, false)--For people that need a bigger warning to move
 local specWarnRadiatingOoze		= mod:NewSpecialWarningSpell(69760, false)
 local specWarnLittleOoze		= mod:NewSpecialWarning("specWarnLittleOoze")
+local specWarnVileGas			= mod:NewSpecialWarningYou(72272)
 
 local timerStickyOoze			= mod:NewNextTimer(16, 69774, nil, mod:IsTank())
 local timerWallSlime			= mod:NewTimer(20, "NextPoisonSlimePipes", 69789)
 local timerSlimeSpray			= mod:NewNextTimer(21, 69508)
 local timerMutatedInfection		= mod:NewTargetTimer(12, 71224)
 local timerOozeExplosion		= mod:NewCastTimer(4, 69839)
+local timerVileGasCD			= mod:NewNextTimer(30, 72272)
 
 local soundMutatedInfection		= mod:NewSound(71224)
 mod:AddBoolOption("InfectionIcon", true)
 mod:AddBoolOption("ExplosionIcon", false)
 
+local RFVileGasTargets	= {}
+
+local function warnRFVileGasTargets()
+	warnVileGas:Show(table.concat(RFVileGasTargets, "<, >"))
+	table.wipe(RFVileGasTargets)
+	timerVileGas:Start()
+end
+
 function mod:OnCombatStart(delay)
 	timerWallSlime:Start(25-delay)
 	self:ScheduleMethod(25-delay, "WallSlime")
 	InfectionIcon = 7
+	if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
+		timerVileGasCD:Start(25-delay)
 end
+end
 
 function mod:WallSlime()
 	if self:IsInCombat() then
@@ -99,8 +113,16 @@
 				InfectionIcon = 7
 			end
 		end	
+	elseif args:IsSpellID(72272) then	-- Vile Gas(Heroic Rotface only, 25 man spellid the same as 10?)
+		RFVileGasTargets[#RFVileGasTargets + 1] = args.destName
+		timerVileGasCD:Start()
+		if args:IsPlayer() then
+			specWarnVileGas:Show()
 	end
+		self:Unschedule(warnRFVileGasTargets)
+		self:Schedule(0.8, warnRFVileGasTargets)
 end
+end
 
 function mod:SPELL_AURA_REMOVED(args)
 	if args:IsSpellID(69674, 71224, 73022, 73023) then

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 3743

Old date: 2010-03-04 05:31:41 UTC

@@ -472,5 +472,6 @@
 	YellDefile		= "Defile on me!",
 	YellTrap		= "Shadow Trap on me!",
 	YellKill		= "No questions remain unanswered. No doubts linger. You ARE Azeroth's greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...",
-	LKRoleplay		= "Is it truly righteousness that drives you? I wonder..."
+	LKRoleplay		= "Is it truly righteousness that drives you? I wonder...",
+	PlagueWhisper	= "You have been infected by"
 }

r3743 (Omega): ICC/Sindragosa: Tweak blistering cold timer after air phase

Omega — Thu, 04 Mar 2010 05:31:41 GMT

Author: Omega
Date: Thu Mar 04 06:31:41 CET 2010
Revision: 3743

Log:

ICC/Sindragosa: Tweak blistering cold timer after air phase

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3742

Old date: 2010-03-03 21:02:45 UTC

@@ -208,7 +208,7 @@
 	if msg == "Airphase" then
 		warnAirphase:Show()
 		timerNextFrostBreath:Cancel()
-		timerNextBlisteringCold:Start(89)--Not exact anywhere from 90-110seconds after airphase begin
+		timerNextBlisteringCold:Start(84)--Not exact anywhere from 85-110seconds after airphase begin
 		timerNextAirphase:Start()
 		timerNextGroundphase:Start()
 		warnGroundphaseSoon:Schedule(40)

r3742 (Omega): ICC/Putricide: Removed SPELL_AURA_APPLIED_DOSE = SPELL_AURA_APPLIED to prevent unbound plague icon being set every second. SPELL_AURA_APPLIED_DOSE is now declared by itself and mutated plague is only function under it.

Omega — Wed, 03 Mar 2010 21:02:45 GMT

Author: Omega
Date: Wed Mar 03 22:02:45 CET 2010
Revision: 3742

Log:

ICC/Putricide: Removed SPELL_AURA_APPLIED_DOSE = SPELL_AURA_APPLIED to prevent unbound plague icon being set every second. SPELL_AURA_APPLIED_DOSE is now declared by itself and mutated plague is only function under it.
ICC/Blood Trash: As of this week blood sap is now trinketable, it wasn't all previous weeks but it worked this week. Tweaked trash mod to remove timer now if you do trinket it.

Updated

trunk/DBM-Icecrown/TheCrimsonHall/CrimsonHallTrash.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

trunk/DBM-Icecrown/TheCrimsonHall/CrimsonHallTrash.lua

Action: modified

Old revision: 3741

Old date: 2010-03-03 19:31:05 UTC

@@ -56,5 +56,7 @@
 	if args:IsSpellID(70451) then
 		timerBloodMirror:Cancel(args.destName)
 		self:SetIcon(args.destName, 0)
+	elseif args:IsSpellID(70432) then
+		timerBloodSap:Cancel(args.destName)
 	end
 end
\ No newline at end of file

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3741

Old date: 2010-03-03 19:31:05 UTC

@@ -286,7 +286,12 @@
 	end
 end
 
-mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
+function mod:SPELL_AURA_APPLIED_DOSE(args)
+	if args:IsSpellID(72451, 72463, 72671, 72672) then	-- Mutated Plague
+		warnMutatedPlague:Show(args.spellName, args.destName, args.amount or 1)
+		timerMutatedPlagueCD:Start()
+	end
+end
 
 function mod:SPELL_AURA_REMOVED(args)
 	if args:IsSpellID(70447, 72836, 72837, 72838) then

r3741 (Nalumis): deDE update (Coliseum)

Nalumis — Wed, 03 Mar 2010 19:31:05 GMT

Author: Nalumis
Date: Wed Mar 03 20:31:05 CET 2010
Revision: 3741

Log:

deDE update (Coliseum)

Updated

trunk/DBM-Coliseum/localization.de.lua

Action: modified

Old revision: 3740

Old date: 2010-03-03 12:35:49 UTC

@@ -1,10 +1,5 @@
 if GetLocale() ~= "deDE" then return end
 
--- fehlende Übersetzungen:
---
--- Fraktionschampions
--- Zwillingsval'kyr
-
 local L
 
 ------------------------
@@ -138,9 +133,9 @@
 	Broln              = "Scha - Broln Starkhorn",			-- 34455
 	Harkzog            = "Hex - Harkzog",					-- 34450
 	Narrhok            = "Kri - Narrhok Stahlbrecher",		-- 34453
-	AllianceVictory    = "GLORY TO THE ALLIANCE!",	-- to be translated
+	AllianceVictory    = "EHRE DER ALLIANZ!",
 	HordeVictory       = "That was just a taste of what the future brings. FOR THE HORDE!",	-- to be translated
-	YellKill           = "A shallow and tragic victory. We are weaker as a whole from the losses suffered today. Who but the Lich King could benefit from such foolishness? Great warriors have lost their lives. And for what? The true threat looms ahead - the Lich King awaits us all in death."	-- to be translated
+	YellKill           = "Ein tragischer Sieg. Wir wurden schwächer durch die heutigen Verluste. Wer außer dem Lichkönig profitiert von solchen Torheiten? Große Krieger gaben ihr Leben. Und wofür? Die wahre Bedrohung erwartet uns noch - der Lichkönig erwartet uns alle im Tod."
 } 
 
 L:SetOptionLocalization{
@@ -171,7 +166,7 @@
 }
 
 L:SetMiscLocalization{
-	YellPull	= "In the name of our dark master. For the Lich King. You. Will. Die.",	-- to be translated
+	YellPull	= "Im Namen unseres dunklen Meisters. Für den Lichkönig. Ihr. Werdet. Sterben.",
 	Fjola		= "Fjola Lichtbann",
 	Eydis		= "Eydis Nachtbann"
 }

r3740 (Azael): zhtw update

Azael — Wed, 03 Mar 2010 12:35:49 GMT

Author: Azael
Date: Wed Mar 03 13:35:49 CET 2010
Revision: 3740

Log:

zhtw update

Updated

trunk/DBM-ChamberOfAspects/DBM-ChamberOfAspects.toc

Updated

trunk/DBM-Icecrown/localization.tw.lua

trunk/DBM-ChamberOfAspects/DBM-ChamberOfAspects.toc

Action: modified

Old revision: 3739

Old date: 2010-03-02 12:03:19 UTC

@@ -2,7 +2,7 @@
 ## Title:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Chamber of Aspects|r
 ## Title-deDE:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Kammer der Aspekte|r
 ## Title-ruRU:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Палата Аспектов|r
-## Title-zhTW:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0黑曜聖所|r
+## Title-zhTW:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0守護巨龍之間|r
 ## Title-koKR:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0흑요석 성소|r
 ## Title-frFR:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Chambre des Aspects|r
 ## Title-esES:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0El Sagrario Obsidiana|r
@@ -19,7 +19,7 @@
 ## X-DBM-Mod-Name: Chamber of Aspects
 ## X-DBM-Mod-Name-deDE: Kammer der Aspekte
 ## X-DBM-Mod-Name-ruRU: Палата Аспектов
-## X-DBM-Mod-Name-zhTW: 黑曜聖所
+## X-DBM-Mod-Name-zhTW: 守護巨龍之間
 ## X-DBM-Mod-Name-koKR: 고룡쉼터 사원
 ## X-DBM-Mod-Name-frFR : Chambre des aspects
 ## X-DBM-Mod-Name-esES: El Sagrario Obsidiana

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 3739

Old date: 2010-03-02 12:03:19 UTC

@@ -468,7 +468,8 @@
 	DefileIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
 	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
 	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
-	TrapIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
+	TrapIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539),
+	ValkyrIcon			= "為華爾琪設置標記"
 }
 
 L:SetMiscLocalization{

r3739 (bluenyx): koKR update

bluenyx — Tue, 02 Mar 2010 12:03:19 GMT

Author: bluenyx
Date: Tue Mar 02 13:03:19 CET 2010
Revision: 3739

Log:

koKR update

Updated

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 3738

Old date: 2010-03-02 09:36:46 UTC

@@ -468,7 +468,8 @@
 	DefileIcon					= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
 	NecroticPlagueIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
 	RagingSpiritIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
-	TrapIcon					= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
+	TrapIcon					= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539),
+	ValkyrIcon					= "발키리에 공격대 아이콘 설정"
 }
 L:SetMiscLocalization{
 	LKPull					= "그러니까 성스러운 빛이 자랑하던 정의가 마침내 왔다 이건가? 폴드링, 서리한을 내려놓고 자비라도 애걸하라는 건가?",

r3738 (Omega): removed unused code from iron council mod, also removed rune of power special warning if a boss gets buff as that particular buff is applied and removed too much during fight to be watching it and degrading performance. instead just check runemasters target when he casts instead to figure out who it's on much cleaner.

Omega — Tue, 02 Mar 2010 09:36:46 GMT

Author: Omega
Date: Tue Mar 02 10:36:46 CET 2010
Revision: 3738

Log:

removed unused code from iron council mod, also removed rune of power special warning if a boss gets buff as that particular buff is applied and removed too much during fight to be watching it and degrading performance. instead just check runemasters target when he casts instead to figure out who it's on much cleaner.

Updated

trunk/DBM-Ulduar/IronCouncil.lua

Updated

trunk/DBM-Ulduar/localization.de.lua

Updated

trunk/DBM-Ulduar/localization.en.lua

Updated

trunk/DBM-Ulduar/localization.es.lua

Updated

trunk/DBM-Ulduar/localization.fr.lua

Updated

trunk/DBM-Ulduar/localization.kr.lua

Updated

trunk/DBM-Ulduar/localization.ru.lua

Updated

trunk/DBM-Ulduar/localization.tw.lua

trunk/DBM-Ulduar/IronCouncil.lua

Action: modified

Old revision: 3737

Old date: 2010-03-02 07:29:45 UTC

@@ -49,12 +49,11 @@
 -- Runemaster Molgeim
 -- Lightning Blast ... don't know, maybe 63491
 local timerShieldofRunes		= mod:NewBuffActiveTimer(15, 63967)
-local warnRuneofPower			= mod:NewSpellAnnounce(64320, 1)
+local warnRuneofPower			= mod:NewTargetAnnounce(64320, 2)
 local warnRuneofDeath			= mod:NewSpellAnnounce(63490, 2)
 local warnShieldofRunes			= mod:NewSpellAnnounce(63489, 2)
 local warnRuneofSummoning		= mod:NewSpellAnnounce(62273, 3)
 local specwarnRuneofDeath		= mod:NewSpecialWarningMove(63490)
-local specwarnRuneofPower		= mod:NewSpecialWarning("RuneofPower", false)
 local timerRuneofDeathDura		= mod:NewNextTimer(30, 63490)
 local timerRuneofPower			= mod:NewCDTimer(30, 61974)
 local timerRuneofDeath			= mod:NewCDTimer(30, 63490)
@@ -71,11 +70,11 @@
 	disruptIcon = 7
 end
 
---[[function mod:OnCombatEnd()
-	if DBM.RangeCheck:IsShown() then
-		DBM.RangeCheck:Hide()
+function mod:RuneTarget()
+	local targetname = self:GetBossTarget(32927)
+	if not targetname then return end
+		warnRuneofPower:Show(targetname)
 	end
-end--]]
 
 local function warnStaticDisruptionTargets()
 	warnStaticDisruption:Show(table.concat(disruptTargets, "<, >"))
@@ -105,7 +104,7 @@
 		warnRuneofDeath:Show()
 		timerRuneofDeathDura:Start()
 	elseif args:IsSpellID(64321, 61974) then	-- Rune of Power
-		warnRuneofPower:Show()
+		self:ScheduleMethod(0.1, "RuneTarget")
 		timerRuneofPower:Start()
 	elseif args:IsSpellID(61869, 63481) then	-- Overload
 		timerOverload:Start()
@@ -121,8 +120,6 @@
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(61903, 63493) then		-- Fusion Punch
 		timerFusionPunchActive:Start(args.destName)
-	elseif args:IsSpellID(64320) and not args:IsDestTypePlayer() then	-- Rune of Power
-		specwarnRuneofPower:Show(args.destName)
 	elseif args:IsSpellID(62269, 63490) then	-- Rune of Death - move away from it
 		if args:IsPlayer() then
 			specwarnRuneofDeath:Show()
@@ -143,14 +140,9 @@
 			if mod:IsDifficulty("heroic10") then
 				mod:SetIcon(args.destName, 8, 60) -- skull for 60 seconds (until meltdown)
 			else
-				mod:SetIcon(args.destName, 8, 30) -- skull for 30 seconds (until meltdown)
+				mod:SetIcon(args.destName, 8, 35) -- skull for 35 seconds (until meltdown)
 			end
 		end
---[[	if args:IsPlayer() then
-			if self.Options.RangeFrame then
-				DBM.RangeCheck:Show(30)
-			end
-		end--]]
 	elseif args:IsSpellID(63486, 61887) then	-- Lightning Tendrils
 		timerLightningTendrils:Start()
 		specwarnLightningTendrils:Show()

trunk/DBM-Ulduar/localization.de.lua

Action: modified

Old revision: 3737

Old date: 2010-03-02 07:29:45 UTC

@@ -148,8 +148,7 @@
 }
 
 L:SetWarningLocalization{
-	WarningSupercharge			= "Superladung auf Boss",
-	RuneofPower					= "Rune der Macht auf >%s<",
+	WarningSupercharge			= "Superladung auf Boss"
 }
 
 L:SetTimerLocalization{
@@ -162,8 +161,7 @@
 	SetIconOnStaticDisruption		= "Setze Zeichen auf Ziel von Statische Störung",
 	AlwaysWarnOnOverload			= "Warne immer bei Überladen (ansonsten nur wenn Boss im Ziel)",
 	PlaySoundOnOverload			= "Spiele Sound bei Überladen",
-	PlaySoundDeathRune			= "Spiele Sound bei Rune des Todes",
-	RuneofPower        			= "Zeige Spezialwarnung wenn Boss von Rune der Macht betroffen ist"
+	PlaySoundDeathRune			= "Spiele Sound bei Rune des Todes"
 }
 
 L:SetMiscLocalization{

trunk/DBM-Ulduar/localization.en.lua

Action: modified

Old revision: 3737

Old date: 2010-03-02 07:29:45 UTC

@@ -139,8 +139,7 @@
 }
 
 L:SetWarningLocalization{
-	WarningSupercharge	= "Supercharge incoming",
-	RuneofPower			= "Rune of Power on >%s<"
+	WarningSupercharge	= "Supercharge incoming"
 }
 
 L:SetTimerLocalization{
@@ -153,8 +152,7 @@
 	SetIconOnStaticDisruption	= "Set icons on Static Disruption targets",
 	AlwaysWarnOnOverload		= "Always warn on Overload (otherwise, only when targeted)",
 	PlaySoundOnOverload			= "Play sound on Overload",
-	PlaySoundDeathRune			= "Play sound on Rune of Death",
-	RuneofPower        			= "Show special warning when Boss is affected by Rune of Power"
+	PlaySoundDeathRune			= "Play sound on Rune of Death"
 }
 
 L:SetMiscLocalization{

trunk/DBM-Ulduar/localization.es.lua

Action: modified

Old revision: 3737

Old date: 2010-03-02 07:29:45 UTC

@@ -142,8 +142,7 @@
 }
 
 L:SetWarningLocalization{
-	WarningSupercharge			= "Supercarga",
-	RuneofPower			= "Runa de Poder en >%s<"
+	WarningSupercharge			= "Supercarga"
 }
 
 L:SetTimerLocalization{
@@ -156,8 +155,7 @@
 	SetIconOnStaticDisruption		= "Poner icono para el objetivo de Perturbación estática",
 	AlwaysWarnOnOverload			= "Siempre avisar Sobrecarga",
 	PlaySoundOnOverload			= "Reproducir sonido para Sobrecarga",
-	PlaySoundDeathRune			= "Reproducir sonido para Runa de muerte",
-	RuneofPower        			= "Mostrar aviso especial cuando al boss le afecta Runa de poder"
+	PlaySoundDeathRune			= "Reproducir sonido para Runa de muerte"
 }
 
 L:SetMiscLocalization{

trunk/DBM-Ulduar/localization.fr.lua

Action: modified

Old revision: 3737

Old date: 2010-03-02 07:29:45 UTC

@@ -147,8 +147,7 @@
 	WarningSupercharge			= "Supercharge imminente",
 	RuneofDeath					= "Rune de mort - BOUGEZ",
 	LightningTendrils			= "Vrilles de foudre - COURREZ",
-	Overload					= "Surchage - BOUGEZ",
-	RuneofPower        			= "Rune de puissance sur >%s<"
+	Overload					= "Surchage - BOUGEZ"
 }
 
 L:SetTimerLocalization{
@@ -164,8 +163,7 @@
 	Overload					= "Montre une alerte spéciale pour la Surcharge",
 	AlwaysWarnOnOverload		= "Toujours alerter pour la surcharge (sinon seulement quand ciblé)",
 	PlaySoundOnOverload			= "Joue un son à la surcharge",
-	PlaySoundDeathRune			= "Joue un son pour les runes de mort",
-	RuneofPower        			= "Montre une alerte spéciale quand le boss est affecter par la Rune de puissance"
+	PlaySoundDeathRune			= "Joue un son pour les runes de mort"
 }
 
 L:SetMiscLocalization{

trunk/DBM-Ulduar/localization.kr.lua

Action: modified

Old revision: 3737

Old date: 2010-03-02 07:29:45 UTC

@@ -143,8 +143,7 @@
 }
 
 L:SetWarningLocalization{
-	WarningSupercharge			= "전기 충전 시전",
-	RuneofPower        			= "마력의 룬 : >%s<"	
+	WarningSupercharge			= "전기 충전 시전"
 }
 
 L:SetTimerLocalization{
@@ -157,8 +156,7 @@
 	PlaySoundLightningTendrils		= "번개 덩굴일 때 소리 재생",
 	PlaySoundDeathRune				= "죽음의 룬일 때 소리 재생",
 	SetIconOnOverwhelmingPower		= "압도적인 힘 대상 아이콘 설정",
-	SetIconOnStaticDisruption		= "전자기 붕괴 대상 타겟 아이콘 설정하기(하드 모드)",
-	RuneofPower        				= "보스가 마력의 룬의 영향을 받을 경우 특수 경고 보기"	
+	SetIconOnStaticDisruption		= "전자기 붕괴 대상 타겟 아이콘 설정하기(하드 모드)"	
 }
 
 L:SetMiscLocalization{

trunk/DBM-Ulduar/localization.ru.lua

Action: modified

Old revision: 3737

Old date: 2010-03-02 07:29:45 UTC

@@ -141,8 +141,7 @@
 }
 
 L:SetWarningLocalization{
-	WarningSupercharge	= "Суперзаряд",
-	RuneofPower			= "Руна силы на |3-5(>%s<)"
+	WarningSupercharge	= "Суперзаряд"
 }
 
 L:SetTimerLocalization{
@@ -155,8 +154,7 @@
 	SetIconOnStaticDisruption	= "Устанавливать метки на цели заклинания Статический сбой",
 	AlwaysWarnOnOverload		= "Всегда предупреждать при Перегрузке (иначе, только когда босс в цели)",
 	PlaySoundOnOverload			= "Звуковой сигнал при Перегрузке",
-	PlaySoundDeathRune			= "Звуковой сигнал при Рунах смерти",
-	RuneofPower        			= "Спец-предупреждение, когда босс под воздействием Руны силы"
+	PlaySoundDeathRune			= "Звуковой сигнал при Рунах смерти"
 }
 
 L:SetMiscLocalization{

trunk/DBM-Ulduar/localization.tw.lua

Action: modified

Old revision: 3737

Old date: 2010-03-02 07:29:45 UTC

@@ -136,8 +136,7 @@
 }
 
 L:SetWarningLocalization{
-	WarningSupercharge		= "超級充能 即將到來",
-	RuneofPower        		= "力之符文: >%s<"
+	WarningSupercharge		= "超級充能 即將到來"
 }
 
 L:SetTimerLocalization{
@@ -150,8 +149,7 @@
 	SetIconOnStaticDisruption	= "為靜電崩裂的目標設置標記",
 	AlwaysWarnOnOverload		= "總是對超載顯示警告(否則只有當目標是風暴召喚者的時候顯示)",
 	PlaySoundOnOverload		= "當超載施放時播放音效",
-	PlaySoundDeathRune		= "當死亡符文施放時播放音效",
-	RuneofPower        		= "當首領獲得力之符文時顯示特別警告"
+	PlaySoundDeathRune		= "當死亡符文施放時播放音效"
 }
 
 L:SetMiscLocalization{

r3737 (Omega): Many localized warnings that didn't have icons now have icons.

Omega — Tue, 02 Mar 2010 07:29:45 GMT

Author: Omega
Date: Tue Mar 02 08:29:45 CET 2010
Revision: 3737

Log:

Many localized warnings that didn't have icons now have icons.

Updated

trunk/DBM-Coliseum/Jaraxxus.lua

Updated

trunk/DBM-Coliseum/Twins.lua

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Updated

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Updated

trunk/DBM-Icecrown/TheCrimsonHall/BPCouncil.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathwhisper.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/GunshipBattle.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/LordMarrowgar.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/PlagueworksTrash.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Updated

trunk/DBM-Party-WotLK/PitofSaron/ForgemasterGarfrost.lua

Updated

trunk/DBM-Party-WotLK/PitofSaron/Ick.lua

Updated

trunk/DBM-PvP/VaultofArchavon/Koralon.lua

Updated

trunk/DBM-PvP/VaultofArchavon/Toravon.lua

trunk/DBM-Coliseum/Jaraxxus.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -32,7 +32,7 @@
 local warnFlame					= mod:NewTargetAnnounce(68123, 4)
 local warnFlesh					= mod:NewTargetAnnounce(66237, 4, nil, mod:IsHealer())
 --local warnTouch				= mod:NewTargetAnnounce(66209, 3)
-local warnNetherPower			= mod:NewAnnounce("WarnNetherPower", 4)
+local warnNetherPower			= mod:NewAnnounce("WarnNetherPower", 4, 67009)
 
 local specWarnFlame				= mod:NewSpecialWarningRun(67072)
 local specWarnFlesh				= mod:NewSpecialWarningYou(66237)

trunk/DBM-Coliseum/Twins.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -20,8 +20,6 @@
 	34496, L.Eydis
 )
 
-mod:AddBoolOption("HealthFrame", true)
-
 local warnSpecial					= mod:NewAnnounce("WarnSpecialSpellSoon", 3)
 local warnTouchDebuff				= mod:NewAnnounce("WarningTouchDebuff", 2, 66823)
 local warnPoweroftheTwins			= mod:NewAnnounce("WarningPoweroftheTwins", 4)		
@@ -41,6 +39,7 @@
 
 mod:AddBoolOption("SpecialWarnOnDebuff", false, "announce")
 mod:AddBoolOption("SetIconOnDebuffTarget", true)
+mod:AddBoolOption("HealthFrame", true)
 
 
 local debuffTargets					= {}

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -18,13 +18,13 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warnAirphase				= mod:NewAnnounce("WarnAirphase", 2)
-local warnGroundphaseSoon		= mod:NewAnnounce("WarnGroundphaseSoon", 2)
+local warnAirphase				= mod:NewAnnounce("WarnAirphase", 2, 43810)
+local warnGroundphaseSoon		= mod:NewAnnounce("WarnGroundphaseSoon", 2, 43810)
 local warnPhase2soon			= mod:NewAnnounce("warnPhase2soon", 1)
 local warnPhase2				= mod:NewPhaseAnnounce(2, 2)
-local warnInstability			= mod:NewAnnounce("warnInstability", 2, nil, false)
-local warnChilledtotheBone		= mod:NewAnnounce("warnChilledtotheBone", 2, nil, false)
-local warnMysticBuffet			= mod:NewAnnounce("warnMysticBuffet", 2, nil, false)
+local warnInstability			= mod:NewAnnounce("warnInstability", 2, 69766, false)
+local warnChilledtotheBone		= mod:NewAnnounce("warnChilledtotheBone", 2, 70106, false)
+local warnMysticBuffet			= mod:NewAnnounce("warnMysticBuffet", 2, 70128, false)
 local warnFrostBeacon			= mod:NewTargetAnnounce(70126, 4)
 local warnBlisteringCold		= mod:NewSpellAnnounce(70123, 3)
 local warnFrostBreath			= mod:NewSpellAnnounce(71056, 2, nil, mod:IsTank() or mod:IsHealer())

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -16,7 +16,7 @@
 	"UNIT_TARGET"
 )
 
-local warnCorrosion		= mod:NewAnnounce("warnCorrosion", 2, nil, false)
+local warnCorrosion		= mod:NewAnnounce("warnCorrosion", 2, 70751, false)
 local warnGutSpray		= mod:NewTargetAnnounce(71283, 3, nil, mod:IsTank() or mod:IsHealer())
 local warnManaVoid		= mod:NewSpellAnnounce(71741, 2, nil, not mod:IsMelee())
 local warnSupression	= mod:NewSpellAnnounce(70588, 3)
@@ -91,7 +91,7 @@
 		timerGutSpray:Start(args.destName)
 		self:Unschedule(warnGutSprayTargets)
 		self:Schedule(0.3, warnGutSprayTargets)
-	elseif args:IsSpellID(70751) then--Corrosion (spellids drycoded, will confirm later)
+	elseif args:IsSpellID(70751, 71738, 72022, 72023) then--Corrosion (spellids drycoded, will confirm later)
 		warnCorrosion:Show(args.spellName, args.destName, args.amount or 1)
 		timerCorrosion:Start(args.destName)
 	elseif args:IsSpellID(69325, 71730) then--Lay Waste (spellids drycoded, will confirm later)

trunk/DBM-Icecrown/TheCrimsonHall/BPCouncil.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -23,8 +23,8 @@
 	"UNIT_TARGET"
 )
 
-local warnTargetSwitch			= mod:NewAnnounce("WarnTargetSwitch", 2)
-local warnTargetSwitchSoon		= mod:NewAnnounce("WarnTargetSwitchSoon", 1)
+local warnTargetSwitch			= mod:NewAnnounce("WarnTargetSwitch", 3, 70952)
+local warnTargetSwitchSoon		= mod:NewAnnounce("WarnTargetSwitchSoon", 2, 70952)
 local warnConjureFlames			= mod:NewCastAnnounce(71718, 2)
 local warnEmpoweredFlamesCast	= mod:NewCastAnnounce(72040, 3)
 local warnEmpoweredFlames		= mod:NewTargetAnnounce(72040, 4)
@@ -39,7 +39,7 @@
 local specWarnEmpoweredFlames	= mod:NewSpecialWarningRun(72040)
 local specWarnShadowPrison		= mod:NewSpecialWarningStack(72999, nil, 10)
 
-local timerTargetSwitch			= mod:NewTimer(47, "TimerTargetSwitch")	-- every 46-47seconds
+local timerTargetSwitch			= mod:NewTimer(47, "TimerTargetSwitch", 70952)	-- every 46-47seconds
 local timerDarkNucleusCD		= mod:NewCDTimer(10, 71943, nil, false)	-- usually every 10 seconds but sometimes more
 local timerConjureFlamesCD		= mod:NewCDTimer(20, 71718)				-- every 20-30 seconds but never more often than every 20sec
 local timerShockVortex			= mod:NewCDTimer(16.5, 72037)			-- Seen a range from 16,8 - 21,6

trunk/DBM-Icecrown/TheLowerSpire/Deathwhisper.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -28,7 +28,7 @@
 local warnDarkEmpowerment			= mod:NewSpellAnnounce(70901, 4)
 local warnPhase2					= mod:NewPhaseAnnounce(2, 1)	
 local warnFrostbolt					= mod:NewCastAnnounce(72007, 2)
-local warnTouchInsignificance		= mod:NewAnnounce("WarnTouchInsignificance", 2, nil, mod:IsTank() or mod:IsHealer())
+local warnTouchInsignificance		= mod:NewAnnounce("WarnTouchInsignificance", 2, 71204, mod:IsTank() or mod:IsHealer())
 local warnDarkMartyrdom				= mod:NewSpellAnnounce(72499, 4)
 
 local specWarnVampricMight			= mod:NewSpecialWarningDispel(70674, canPurge)

trunk/DBM-Icecrown/TheLowerSpire/GunshipBattle.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -25,7 +25,7 @@
 local warnExperienced		= mod:NewTargetAnnounce(71188, 1, nil, false)		-- might be spammy
 local warnVeteran			= mod:NewTargetAnnounce(71193, 2, nil, false)		-- might be spammy
 local warnElite				= mod:NewTargetAnnounce(71195, 3, nil, false)		-- might be spammy
-local warnBattleFury		= mod:NewAnnounce("WarnBattleFury", 2, nil, mod:IsTank())
+local warnBattleFury		= mod:NewAnnounce("WarnBattleFury", 2, 72306, mod:IsTank())
 local warnBladestorm		= mod:NewSpellAnnounce(69652, 3, nil, mod:IsMelee())
 local warnWoundingStrike	= mod:NewTargetAnnounce(69651, 2)
 local warnAddsSoon			= mod:NewAnnounce("WarnAddsSoon", 2)

trunk/DBM-Icecrown/TheLowerSpire/LordMarrowgar.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -17,7 +17,7 @@
 
 local preWarnWhirlwind   	= mod:NewSoonAnnounce(69076, 3)
 local warnBoneSpike			= mod:NewCastAnnounce(69057, 2)
-local warnImpale			= mod:NewAnnounce("WarnImpale", 4)
+local warnImpale			= mod:NewAnnounce("WarnImpale", 4, 72669)
 
 local specWarnColdflame		= mod:NewSpecialWarningMove(70825)
 local specWarnWhirlwind		= mod:NewSpecialWarningRun(69076)

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -12,8 +12,8 @@
 	"SPELL_AURA_APPLIED_DOSE"
 )
 
-local warnInhaledBlight		= mod:NewAnnounce("InhaledBlight", 3)
-local warnGastricBloat		= mod:NewAnnounce("WarnGastricBloat", 2, nil, mod:IsTank() or mod:IsHealer())
+local warnInhaledBlight		= mod:NewAnnounce("InhaledBlight", 3, 71912)
+local warnGastricBloat		= mod:NewAnnounce("WarnGastricBloat", 2, 72551, mod:IsTank() or mod:IsHealer())
 local warnGasSpore			= mod:NewTargetAnnounce(69279, 4)
 local warnVileGas			= mod:NewTargetAnnounce(73020, 3)

trunk/DBM-Icecrown/ThePlagueworks/PlagueworksTrash.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -13,7 +13,7 @@
 )
 
 local warnZombies		= mod:NewSpellAnnounce(71159, 2)
-local warnMortalWound	= mod:NewAnnounce("warnMortalWound", 2, nil, false)
+local warnMortalWound	= mod:NewAnnounce("warnMortalWound", 2, 71127, false)
 local warnDecimateSoon	= mod:NewSoonAnnounce(71123, 3)
 
 local specWarnDecimate		= mod:NewSpecialWarningSpell(71123)

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -26,7 +26,7 @@
 local warnMalleableGoo				= mod:NewSpellAnnounce(72295, 2)		-- Phase 2 ability
 local warnChokingGasBomb			= mod:NewSpellAnnounce(71255, 3)		-- Phase 2 ability
 local warnPhase3Soon				= mod:NewAnnounce("WarnPhase3Soon", 2)
-local warnMutatedPlague				= mod:NewAnnounce("WarnMutatedPlague", 2, nil, mod:IsTank() or mod:IsHealer()) -- Phase 3 ability
+local warnMutatedPlague				= mod:NewAnnounce("WarnMutatedPlague", 2, 72451, mod:IsTank() or mod:IsHealer()) -- Phase 3 ability
 local warnOozeVariable				= mod:NewTargetAnnounce(70352, 2)			-- Heroic Ability
 local warnGasVariable				= mod:NewTargetAnnounce(70353, 2)			-- Heroic Ability

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -24,7 +24,7 @@
 local warnRadiatingOoze			= mod:NewSpellAnnounce(69760, 3)
 local warnOozeSpawn				= mod:NewAnnounce("WarnOozeSpawn", 1)
 local warnStickyOoze			= mod:NewSpellAnnounce(69774, 1)
-local warnUnstableOoze			= mod:NewAnnounce("WarnUnstableOoze", 2)
+local warnUnstableOoze			= mod:NewAnnounce("WarnUnstableOoze", 2, 69558)
 
 local specWarnMutatedInfection	= mod:NewSpecialWarningYou(71224)
 local specWarnStickyOoze		= mod:NewSpecialWarningMove(69774)
@@ -34,7 +34,7 @@
 local specWarnLittleOoze		= mod:NewSpecialWarning("specWarnLittleOoze")
 
 local timerStickyOoze			= mod:NewNextTimer(16, 69774, nil, mod:IsTank())
-local timerWallSlime			= mod:NewTimer(20, "NextPoisonSlimePipes")
+local timerWallSlime			= mod:NewTimer(20, "NextPoisonSlimePipes", 69789)
 local timerSlimeSpray			= mod:NewNextTimer(21, 69508)
 local timerMutatedInfection		= mod:NewTargetTimer(12, 71224)
 local timerOozeExplosion		= mod:NewCastTimer(4, 69839)

trunk/DBM-Party-WotLK/PitofSaron/ForgemasterGarfrost.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -15,7 +15,7 @@
 
 local warnForgeWeapon			= mod:NewSpellAnnounce(70335, 2)
 local warnDeepFreeze			= mod:NewTargetAnnounce(70384, 2)
-local warnSaroniteRock			= mod:NewAnnounce("warnSaroniteRock", 3)
+local warnSaroniteRock			= mod:NewAnnounce("warnSaroniteRock", 3, 70851)
 local specWarnSaroniteRock		= mod:NewSpecialWarning("specWarnSaroniteRock")
 local specWarnSaroniteRockNear	= mod:NewSpecialWarning("specWarnSaroniteRockNear")
 local specWarnPermafrost		= mod:NewSpecialWarning("specWarnPermafrost")

trunk/DBM-Party-WotLK/PitofSaron/Ick.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -17,7 +17,7 @@
 
 local warnPursuitCast			= mod:NewCastAnnounce(68987, 3)
 local warnPoisonNova			= mod:NewCastAnnounce(68989, 3)
-local warnPursuit				= mod:NewAnnounce("warnPursuit", 4)
+local warnPursuit				= mod:NewAnnounce("warnPursuit", 4, 68987)
 
 local specWarnToxic				= mod:NewSpecialWarningMove(70436)
 local specWarnMines				= mod:NewSpecialWarningRun(69015)

trunk/DBM-PvP/VaultofArchavon/Koralon.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -19,7 +19,7 @@
 local warnMeteor			= mod:NewSpellAnnounce(67333, 3)
 local warnMeteorSoon		= mod:NewPreWarnAnnounce(68161, 5, 2)
 local timerNextMeteor		= mod:NewNextTimer(47, 68161)
-local WarnBurningFury		= mod:NewAnnounce("BurningFury", 2)
+local WarnBurningFury		= mod:NewAnnounce("BurningFury", 2, 66721)
 local timerNextBurningFury	= mod:NewNextTimer(20, 66721)
 
 local specWarnCinder		= mod:NewSpecialWarningMove(67332)

trunk/DBM-PvP/VaultofArchavon/Toravon.lua

Action: modified

Old revision: 3736

Old date: 2010-03-02 05:44:42 UTC

@@ -14,9 +14,9 @@
 )
 
 local warnFreezingGround	= mod:NewSpellAnnounce(72104, 1)
-local warnWhiteout			= mod:NewSpellAnnounce(72096, 3)
-local warnOrb				= mod:NewSpellAnnounce(72095, 4)
-local WarnFrostbite			= mod:NewAnnounce("Frostbite", 2, nil, mod:IsHealer() or mod:IsTank())
+local warnWhiteout			= mod:NewSpellAnnounce(72096, 2)
+local warnOrb				= mod:NewSpellAnnounce(72095, 3)
+local WarnFrostbite			= mod:NewAnnounce("Frostbite", 2, 72098, mod:IsHealer() or mod:IsTank())
 
 local timerNextFrostbite	= mod:NewNextTimer(5, 72098, nil, mod:IsTank())
 local timerFrostbite		= mod:NewTargetTimer(20, 72098, nil, mod:IsHealer() or mod:IsTank())

r3736 (Omega): Oops, the special warning for choking gas bomb i added had an option but i didn't actually put it in the event. Fixed now :)

Omega — Tue, 02 Mar 2010 05:44:42 GMT

Author: Omega
Date: Tue Mar 02 06:44:42 CET 2010
Revision: 3736

Log:

Oops, the special warning for choking gas bomb i added had an option but i didn't actually put it in the event. Fixed now :)

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3735

Old date: 2010-03-02 05:38:36 UTC

@@ -36,7 +36,7 @@
 local specWarnGaseousBloatOther		= mod:NewSpecialWarningTarget(70672, false)
 local specWarnMalleableGoo			= mod:NewSpecialWarning("specWarnMalleableGoo")
 local specWarnMalleableGooNear		= mod:NewSpecialWarning("specWarnMalleableGooNear")
-local specWarnChokingGasBomb		= mod:NewSpecialWarningSpell(71255, mod:IsMelee())
+local specWarnChokingGasBomb		= mod:NewSpecialWarningSpell(71255, mod:IsTank())
 local specWarnOozeVariable			= mod:NewSpecialWarningYou(70352)		-- Heroic Ability
 local specWarnGasVariable			= mod:NewSpecialWarningYou(70353)		-- Heroic Ability
 local specWarnUnboundPlague			= mod:NewSpecialWarning("specWarnUnboundPlague") -- you have to drop the debuff by staying very close to an other player
@@ -217,6 +217,7 @@
 		spamPuddle = GetTime()
 	elseif args:IsSpellID(71255) then
 		warnChokingGasBomb:Show()
+		specWarnChokingGasBomb:Show()
 		timerChokingGasBombCD:Start()
 	elseif args:IsSpellID(72615, 72295, 74280, 74281) then
 		warnMalleableGoo:Show()

r3735 (Omega): #ICC/Sindragosa: Unchained magic no longer uses skull at all, it uses icons 7 and under, so it doesn't mess with frost beacon icon for phase 3.

Omega — Tue, 02 Mar 2010 05:38:36 GMT

Author: Omega
Date: Tue Mar 02 06:38:36 CET 2010
Revision: 3735

Log:

#ICC/Sindragosa: Unchained magic no longer uses skull at all, it uses icons 7 and under, so it doesn't mess with frost beacon icon for phase 3.
#ICC/Sindragosa: Unchained magic icons are no longer cleared on timer but instead on debuff removal. this will prevent icons from getting improperly removed in air phase off beacon targets hopefully.
ICC/Sindragosa: Unchained magic icons are now off by default since they caused a lot of problem and it wasn't a popular feature request anyways. hopefully all bugs are now fixed but just in case they aren't new option default is off.

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3734

Old date: 2010-03-02 05:29:08 UTC

@@ -12,6 +12,7 @@
 	"SPELL_CAST_START",
 	"SPELL_AURA_APPLIED",
 	"SPELL_AURA_APPLIED_DOSE",
+	"SPELL_AURA_REMOVED",
 	"SPELL_CAST_SUCCESS",
 	"UNIT_HEALTH",
 	"CHAT_MSG_MONSTER_YELL"
@@ -50,7 +51,7 @@
 
 local soundBlisteringCold = mod:NewSound(70123)
 mod:AddBoolOption("SetIconOnFrostBeacon", true)
-mod:AddBoolOption("SetIconOnUnchainedMagic", true)
+mod:AddBoolOption("SetIconOnUnchainedMagic", false)
 mod:AddBoolOption("ClearIconsOnAirphase", true)
 mod:AddBoolOption("AnnounceFrostBeaconIcons", false)
 
@@ -58,7 +59,7 @@
 local beaconIconTargets	= {}
 local unchainedTargets	= {}
 local warned_P2 = false
-local unchainedIcons = 8
+local unchainedIcons = 7
 
 function mod:OnCombatStart(delay)
 	berserkTimer:Start(-delay)
@@ -68,7 +69,7 @@
 	table.wipe(beaconTargets)
 	table.wipe(beaconIconTargets)
 	table.wipe(unchainedTargets)
-	unchainedIcons = 8
+	unchainedIcons = 7
 end
 
 do
@@ -99,7 +100,7 @@
 local function warnUnchainedTargets()
 	warnUnchainedMagic:Show(table.concat(unchainedTargets, "<, >"))
 	table.wipe(unchainedTargets)
-	unchainedIcons = 8
+	unchainedIcons = 7
 end
 
 function mod:SPELL_CAST_START(args)
@@ -131,7 +132,7 @@
 			specWarnUnchainedMagic:Show()
 		end
 		if self.Options.SetIconOnUnchainedMagic then
-			self:SetIcon(args.destName, unchainedIcons, 30)
+			self:SetIcon(args.destName, unchainedIcons)
 			unchainedIcons = unchainedIcons - 1
 		end
 		self:Unschedule(warnUnchainedTargets)
@@ -180,6 +181,14 @@
 	end
 end	
 
+function mod:SPELL_AURA_REMOVED(args)
+	if args:IsSpellID(69762) then
+		if self.Options.SetIconOnUnchainedMagic then
+			self:SetIcon(args.destName, 0)
+		end
+	end
+end
+
 function mod:UNIT_HEALTH(uId)
 	if not warned_P2 and self:GetUnitCreatureId(uId) == 36853 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.38 then
 		warned_P2 = true

r3734 (Omega): Fix lua error in sindragosa, forgot a nil on frost breath

Omega — Tue, 02 Mar 2010 05:29:08 GMT

Author: Omega
Date: Tue Mar 02 06:29:08 CET 2010
Revision: 3734

Log:

Fix lua error in sindragosa, forgot a nil on frost breath

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3733

Old date: 2010-03-01 23:04:19 UTC

@@ -26,7 +26,7 @@
 local warnMysticBuffet			= mod:NewAnnounce("warnMysticBuffet", 2, nil, false)
 local warnFrostBeacon			= mod:NewTargetAnnounce(70126, 4)
 local warnBlisteringCold		= mod:NewSpellAnnounce(70123, 3)
-local warnFrostBreath			= mod:NewSpellAnnounce(71056, 2, mod:IsTank() or mod:IsHealer())
+local warnFrostBreath			= mod:NewSpellAnnounce(71056, 2, nil, mod:IsTank() or mod:IsHealer())
 local warnUnchainedMagic		= mod:NewTargetAnnounce(69762, 2, nil, not mod:IsMelee())
 
 local specWarnBlisteringCold	= mod:NewSpecialWarningRun(70123)

r3733 (Omega): #CC/Jaraxxus: Added an Incinerate Flesh warning target announce (default on only for healers) ICC/BWL: Blood mirror target announce changed to default tank/healer only.

Omega — Mon, 01 Mar 2010 23:04:19 GMT

Author: Omega
Date: Tue Mar 02 00:04:19 CET 2010
Revision: 3733

Log:

#CC/Jaraxxus: Added an Incinerate Flesh warning target announce (default on only for healers)
ICC/BWL: Blood mirror target announce changed to default tank/healer only.
ICC/Deathbringer: Boiling blood target announce changed to healer only defaults.
ICC/Festergut: Special warning for inhaled blight >=3 changed to default on for tanks.
ICC/Festergut: Vile Gas buff active timer changed to default on only for ranged.
#ICC/Putricide: Added special warning for choking gas bombs (defaults set to on for melee only)
ICC/Rotface: Sticky Ooze timer set to default on only for tanks now.

Updated

trunk/DBM-Coliseum/Jaraxxus.lua

Updated

trunk/DBM-Coliseum/NorthrendBeasts.lua

Updated

trunk/DBM-Icecrown/TheCrimsonHall/Lanathel.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/GunshipBattle.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

trunk/DBM-Coliseum/Jaraxxus.lua

Action: modified

Old revision: 3732

Old date: 2010-03-01 21:59:12 UTC

@@ -30,6 +30,7 @@
 local warnPortalSoon			= mod:NewSoonAnnounce(67900, 3)
 local warnVolcanoSoon			= mod:NewSoonAnnounce(67901, 3)
 local warnFlame					= mod:NewTargetAnnounce(68123, 4)
+local warnFlesh					= mod:NewTargetAnnounce(66237, 4, nil, mod:IsHealer())
 --local warnTouch				= mod:NewTargetAnnounce(66209, 3)
 local warnNetherPower			= mod:NewAnnounce("WarnNetherPower", 4)
 
@@ -138,6 +139,7 @@
 
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(67051, 67050, 67049, 66237) then			-- Incinerate Flesh
+		warnFlesh:Show(args.destName)
 		timerFlesh:Start(args.destName)
 		timerFleshCD:Start()
 		if self.Options.IncinerateFleshIcon then

trunk/DBM-Coliseum/NorthrendBeasts.lua

Action: modified

Old revision: 3732

Old date: 2010-03-01 21:59:12 UTC

@@ -21,10 +21,10 @@
 
 local warnImpaleOn			= mod:NewTargetAnnounce(67478, 2, nil, mod:IsTank() or mod:IsHealer())
 local warnFireBomb			= mod:NewSpellAnnounce(66317, 3, nil, false)
-local warnBreath			= mod:NewSpellAnnounce(67650, 1)
+local warnBreath			= mod:NewSpellAnnounce(67650, 2)
 local warnRage				= mod:NewSpellAnnounce(67657, 3)
 local warnSlimePool			= mod:NewSpellAnnounce(67643, 2, nil, mod:IsMelee())
-local warnToxin				= mod:NewTargetAnnounce(66823, 2)
+local warnToxin				= mod:NewTargetAnnounce(66823, 3)
 local warnBile				= mod:NewTargetAnnounce(66869, 3)
 local WarningSnobold		= mod:NewAnnounce("WarningSnobold", 4)
 local warnEnrageWorm		= mod:NewSpellAnnounce(68335, 3)

trunk/DBM-Icecrown/TheCrimsonHall/Lanathel.lua

Action: modified

Old revision: 3732

Old date: 2010-03-01 21:59:12 UTC

@@ -17,7 +17,7 @@
 )
 
 local warnPactDarkfallen			= mod:NewTargetAnnounce(71340, 4)
-local warnBloodMirror				= mod:NewTargetAnnounce(71510, 3)
+local warnBloodMirror				= mod:NewTargetAnnounce(71510, 3, nil, mod:IsTank() or mod:IsHealer())
 local warnSwarmingShadows			= mod:NewTargetAnnounce(71266, 4)
 local warnInciteTerror				= mod:NewSpellAnnounce(73070, 3)
 local warnVampricBite				= mod:NewTargetAnnounce(71727, 2)

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Action: modified

Old revision: 3732

Old date: 2010-03-01 21:59:12 UTC

@@ -15,12 +15,12 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warnFrenzySoon		= mod:NewAnnounce("warnFrenzySoon", 1, 72737, mod:IsTank() or mod:IsHealer())
+local warnFrenzySoon		= mod:NewAnnounce("warnFrenzySoon", 2, 72737, mod:IsTank() or mod:IsHealer())
 local warnAddsSoon			= mod:NewPreWarnAnnounce(72173, 10, 3)
 local warnFrenzy			= mod:NewSpellAnnounce(72737, 2, nil, mod:IsTank() or mod:IsHealer())
 local warnBloodNova			= mod:NewSpellAnnounce(73058, 2)
 local warnMark				= mod:NewTargetAnnounce(72444, 4)
-local warnBoilingBlood		= mod:NewTargetAnnounce(72441, 2)
+local warnBoilingBlood		= mod:NewTargetAnnounce(72441, 2, nil, mod:IsHealer())
 local warnRuneofBlood		= mod:NewTargetAnnounce(72410, 3, nil, mod:IsTank() or mod:IsHealer())
 
 local specWarnMarkCast		= mod:NewSpecialWarningYou(72444, false)--Experimental

trunk/DBM-Icecrown/TheLowerSpire/GunshipBattle.lua

Action: modified

Old revision: 3732

Old date: 2010-03-01 21:59:12 UTC

@@ -21,14 +21,12 @@
 	"SPELL_CAST_SUCCESS"
 )
 
-local isMelee = mod:IsMelee()
-
 local warnBelowZero			= mod:NewSpellAnnounce(69705, 4)
 local warnExperienced		= mod:NewTargetAnnounce(71188, 1, nil, false)		-- might be spammy
 local warnVeteran			= mod:NewTargetAnnounce(71193, 2, nil, false)		-- might be spammy
 local warnElite				= mod:NewTargetAnnounce(71195, 3, nil, false)		-- might be spammy
 local warnBattleFury		= mod:NewAnnounce("WarnBattleFury", 2, nil, mod:IsTank())
-local warnBladestorm		= mod:NewSpellAnnounce(69652, 3, nil, isMelee)
+local warnBladestorm		= mod:NewSpellAnnounce(69652, 3, nil, mod:IsMelee())
 local warnWoundingStrike	= mod:NewTargetAnnounce(69651, 2)
 local warnAddsSoon			= mod:NewAnnounce("WarnAddsSoon", 2)

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3732

Old date: 2010-03-01 21:59:12 UTC

@@ -21,10 +21,10 @@
 local specWarnGasSpore		= mod:NewSpecialWarningYou(69279)
 local specWarnVileGas		= mod:NewSpecialWarningYou(71218)
 local specWarnGastricBloat	= mod:NewSpecialWarningStack(72551, nil, 9)
-local specWarnInhaled3		= mod:NewSpecialWarningStack(71912, false, 3)
+local specWarnInhaled3		= mod:NewSpecialWarningStack(71912, mod:IsTank(), 3)
 
 local timerGasSpore			= mod:NewBuffActiveTimer(12, 69279)
-local timerVileGas			= mod:NewBuffActiveTimer(6, 71219)
+local timerVileGas			= mod:NewBuffActiveTimer(6, 71219, nil, mod:IsRanged())
 local timerGasSporeCD		= mod:NewNextTimer(40, 69279)		-- Every 40 seconds except after 3rd and 6th cast, then it's 50sec CD
 local timerPungentBlight	= mod:NewNextTimer(33, 71219)		-- 33 seconds after 3rd stack of inhaled
 local timerInhaledBlight	= mod:NewNextTimer(34, 71912)		-- 34 seconds'ish

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3732

Old date: 2010-03-01 21:59:12 UTC

@@ -20,12 +20,12 @@
 local warnUnstableExperiment		= mod:NewSpellAnnounce(70351, 4)
 local warnVolatileOozeAdhesive		= mod:NewTargetAnnounce(70447, 3)
 local warnGaseousBloat				= mod:NewTargetAnnounce(70672, 3)
-local warnPhase2Soon				= mod:NewAnnounce("WarnPhase2Soon", 1)
+local warnPhase2Soon				= mod:NewAnnounce("WarnPhase2Soon", 2)
 local warnTearGas					= mod:NewSpellAnnounce(71617, 2)		-- Phase transition normal
 local warnVolatileExperiment		= mod:NewSpellAnnounce(72840, 4)		-- Phase transition heroic
 local warnMalleableGoo				= mod:NewSpellAnnounce(72295, 2)		-- Phase 2 ability
 local warnChokingGasBomb			= mod:NewSpellAnnounce(71255, 3)		-- Phase 2 ability
-local warnPhase3Soon				= mod:NewAnnounce("WarnPhase3Soon", 1)
+local warnPhase3Soon				= mod:NewAnnounce("WarnPhase3Soon", 2)
 local warnMutatedPlague				= mod:NewAnnounce("WarnMutatedPlague", 2, nil, mod:IsTank() or mod:IsHealer()) -- Phase 3 ability
 local warnOozeVariable				= mod:NewTargetAnnounce(70352, 2)			-- Heroic Ability
 local warnGasVariable				= mod:NewTargetAnnounce(70353, 2)			-- Heroic Ability
@@ -36,6 +36,7 @@
 local specWarnGaseousBloatOther		= mod:NewSpecialWarningTarget(70672, false)
 local specWarnMalleableGoo			= mod:NewSpecialWarning("specWarnMalleableGoo")
 local specWarnMalleableGooNear		= mod:NewSpecialWarning("specWarnMalleableGooNear")
+local specWarnChokingGasBomb		= mod:NewSpecialWarningSpell(71255, mod:IsMelee())
 local specWarnOozeVariable			= mod:NewSpecialWarningYou(70352)		-- Heroic Ability
 local specWarnGasVariable			= mod:NewSpecialWarningYou(70353)		-- Heroic Ability
 local specWarnUnboundPlague			= mod:NewSpecialWarning("specWarnUnboundPlague") -- you have to drop the debuff by staying very close to an other player

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 3732

Old date: 2010-03-01 21:59:12 UTC

@@ -30,10 +30,10 @@
 local specWarnStickyOoze		= mod:NewSpecialWarningMove(69774)
 local specWarnOozeExplosion		= mod:NewSpecialWarningRun(69839)
 local specWarnSlimeSpray		= mod:NewSpecialWarningSpell(69508, false)--For people that need a bigger warning to move
-local specWarnRadiatingOoze		= mod:NewSpecialWarningSpell(69760, false)--Some strats purposely run to this so option is defaulted to off
+local specWarnRadiatingOoze		= mod:NewSpecialWarningSpell(69760, false)
 local specWarnLittleOoze		= mod:NewSpecialWarning("specWarnLittleOoze")
 
-local timerStickyOoze			= mod:NewNextTimer(16, 69774)
+local timerStickyOoze			= mod:NewNextTimer(16, 69774, nil, mod:IsTank())
 local timerWallSlime			= mod:NewTimer(20, "NextPoisonSlimePipes")
 local timerSlimeSpray			= mod:NewNextTimer(21, 69508)
 local timerMutatedInfection		= mod:NewTargetTimer(12, 71224)

r3732 (Omega): added a space between ")" and "then"

Omega — Mon, 01 Mar 2010 21:59:12 GMT

Author: Omega
Date: Mon Mar 01 22:59:12 CET 2010
Revision: 3732

Log:

added a space between ")" and "then"

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

r3731 (Vampik): Fixed heroic Putricide lua errors and logic

Vampik — Mon, 01 Mar 2010 21:29:47 GMT

Author: Vampik
Date: Mon Mar 01 22:29:47 CET 2010
Revision: 3731

Log:

Fixed heroic Putricide lua errors and logic

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3730

Old date: 2010-03-01 21:23:42 UTC

@@ -139,7 +139,7 @@
 	for i=1, GetNumRaidMembers(), 1 do
 		if not UnitIsUnit("player", "raid"..i) then
 			temprange = DBM.RangeCheck:GetDistance("raid"..i, myX, myY)
-			if temprange > 0 and temprange < 30 and temprange < mydistance then
+			if temprange and temprange < 30 and (temprange < mydistance or mydistance == 0)then
 				if UnitHealth("raid"..i) > 5000 and not isDebuffed("raid"..i) then	-- don't acquire targets with debuffs like "Plage Sickness", Red/Green Slime,..
 					mytarget = "raid"..i
 					mydistance = temprange
@@ -299,7 +299,7 @@
 	elseif args:IsSpellID(72855, 72856) then 						-- Unbound Plague
 		timerUnboundPlague:Stop(args.destName)
 		if args:IsPlayer() then
-			specWarnUnboundPlague:Unschedule()
+			specWarnUnboundPlague:Cancel()
 			self:UnscheduleMethod("AcquireTargetForUnboundPlague")
 		end
 		if self.Options.UnboundPlagueIcon then

r3730 (Vampik): Fixed IsRanged - priest was missing

Vampik — Mon, 01 Mar 2010 21:23:42 GMT

Author: Vampik
Date: Mon Mar 01 22:23:42 CET 2010
Revision: 3730

Log:

Fixed IsRanged - priest was missing

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 3729

Old date: 2010-03-01 17:05:05 UTC

@@ -2386,10 +2386,11 @@
 			or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) >= 51)
 end
 
-function bossModPrototype:isRanged()
+function bossModPrototype:IsRanged()
 	return select(2, UnitClass("player")) == "MAGE"
 			or select(2, UnitClass("player")) == "HUNTER"
 			or select(2, UnitClass("player")) == "WARLOCK"
+			or select(2, UnitClass("player")) == "PRIEST"
 			or (select(2, UnitClass("player")) == "PALADIN" and select(3, GetTalentTabInfo(1)) >= 51)
      		or (select(2, UnitClass("player")) == "SHAMAN" and select(3, GetTalentTabInfo(2)) < 51)
 			or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) < 51)

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Action: modified

Old revision: 3729

Old date: 2010-03-01 17:05:05 UTC

@@ -36,7 +36,7 @@
 
 local enrageTimer			= mod:NewBerserkTimer(480)
 
-mod:AddBoolOption("RangeFrame", mod:isRanged())
+mod:AddBoolOption("RangeFrame", mod:IsRanged())
 mod:AddBoolOption("RunePowerFrame", true, "misc")
 mod:AddBoolOption("SetIconOnBoilingBlood", false)
 mod:AddBoolOption("SetIconOnMarkCast", false)

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3729

Old date: 2010-03-01 17:05:05 UTC

@@ -33,7 +33,7 @@
 
 local berserkTimer			= mod:NewBerserkTimer(300)
 
-mod:AddBoolOption("RangeFrame", mod:isRanged())
+mod:AddBoolOption("RangeFrame", mod:IsRanged())
 mod:AddBoolOption("SetIconOnGasSpore", true)
 
 local gasSporeTargets	= {}

r3729 (Nalumis): deDE update (Lich King)

Nalumis — Mon, 01 Mar 2010 17:05:05 GMT

Author: Nalumis
Date: Mon Mar 01 18:05:05 CET 2010
Revision: 3729

Log:

deDE update (Lich King)

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3728

Old date: 2010-03-01 13:58:20 UTC

@@ -469,7 +469,8 @@
 	DefileIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
 	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
 	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
-	TrapIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
+	TrapIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539),
+	ValkyrIcon				= "Setze Zeichen auf Valkyren"
 }
 
 L:SetMiscLocalization{

r3728 (Vampik): ruRU update

Vampik — Mon, 01 Mar 2010 13:58:20 GMT

Author: Vampik
Date: Mon Mar 01 14:58:20 CET 2010
Revision: 3728

Log:

ruRU update

Updated

trunk/DBM-Icecrown/localization.ru.lua

Action: modified

Old revision: 3727

Old date: 2010-03-01 09:43:28 UTC

@@ -465,7 +465,8 @@
 	DefileIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
 	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
 	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
-	TrapIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
+	TrapIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539),
+	ValkyrIcon			= "Устанавливать метки на Валь'кир"
 }
 
 L:SetMiscLocalization{

r3727 (Omega): Put valk icon option with other icon options cause i think it looks better ;)

Omega — Mon, 01 Mar 2010 09:43:28 GMT

Author: Omega
Date: Mon Mar 01 10:43:28 CET 2010
Revision: 3727

Log:

Put valk icon option with other icon options cause i think it looks better ;)

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3726

Old date: 2010-03-01 09:41:35 UTC

@@ -72,9 +72,9 @@
 mod:AddBoolOption("NecroticPlagueIcon")
 mod:AddBoolOption("RagingSpiritIcon")
 mod:AddBoolOption("TrapIcon")
+mod:AddBoolOption("ValkyrIcon")
 mod:AddBoolOption("YellOnDefile", true, "announce")
 mod:AddBoolOption("YellOnTrap", true, "announce")
-mod:AddBoolOption("ValkyrIcon")
 
 local phase	= 0
 local warned_preP2 = false

r3726 (Omega): #DBM/ALL: Many updates across multiple mods for better default checks, and priority color settings.

Omega — Mon, 01 Mar 2010 09:41:35 GMT

Author: Omega
Date: Mon Mar 01 10:41:35 CET 2010
Revision: 3726

Log:

#DBM/ALL: Many updates across multiple mods for better default checks, and priority color settings.

Updated

trunk/DBM-Coliseum/Anub'arak.lua

Updated

trunk/DBM-Coliseum/Champions.lua

Updated

trunk/DBM-Coliseum/Jaraxxus.lua

Updated

trunk/DBM-Coliseum/Twins.lua

Updated

trunk/DBM-EyeOfEternity/Malygos.lua

Updated

trunk/DBM-Onyxia/Onyxia.lua

Updated

trunk/DBM-Party-WotLK/ForgeofSouls/Bronjahm.lua

Updated

trunk/DBM-Party-WotLK/ForgeofSouls/DevourerofSouls.lua

Updated

trunk/DBM-Party-WotLK/HallsOfStone/BrannBronzebeard.lua

Updated

trunk/DBM-Party-WotLK/PitofSaron/ForgemasterGarfrost.lua

Updated

trunk/DBM-Party-WotLK/PitofSaron/Ick.lua

Updated

trunk/DBM-Party-WotLK/PitofSaron/ScourgelordTyrannus.lua

Updated

trunk/DBM-Party-WotLK/TrialoftheChampion/Black_Knight.lua

Updated

trunk/DBM-Party-WotLK/TrialoftheChampion/Champions.lua

Updated

trunk/DBM-Party-WotLK/TrialoftheChampion/Confessor.lua

Updated

trunk/DBM-Party-WotLK/TrialoftheChampion/Eadric_the_Pure.lua

Updated

trunk/DBM-Party-WotLK/WorldEvents/ApothecaryTrio.lua

Updated

trunk/DBM-Party-WotLK/WorldEvents/CorenDirebrew.lua

Updated

trunk/DBM-Party-WotLK/WorldEvents/HeadlessHorseman.lua

Updated

trunk/DBM-PvP/VaultofArchavon/Archavon.lua

Updated

trunk/DBM-PvP/VaultofArchavon/Emalon.lua

Updated

trunk/DBM-PvP/VaultofArchavon/Koralon.lua

Updated

trunk/DBM-PvP/VaultofArchavon/Toravon.lua

Updated

trunk/DBM-Ulduar/Algalon.lua

Updated

trunk/DBM-Ulduar/YoggSaron.lua

trunk/DBM-Coliseum/Anub'arak.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -25,7 +25,7 @@
 local Burrowed				= false 
 
 -- Pursue
-local warnPursue			= mod:NewTargetAnnounce(67574, 2)
+local warnPursue			= mod:NewTargetAnnounce(67574, 4)
 local specWarnPursue		= mod:NewSpecialWarning("SpecWarnPursue")
 local warnHoP				= mod:NewTargetAnnounce(10278, 2, nil, false)--Heroic strat revolves around kiting pursue and using Hand of Protection.
 local timerHoP				= mod:NewBuffActiveTimer(10, 10278, nil, false)--So we will track bops to make this easier.
@@ -40,7 +40,7 @@
 -- Submerge
 local warnSubmerge			= mod:NewAnnounce("WarnSubmerge", 3, "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendBurrow.blp")
 local warnSubmergeSoon		= mod:NewAnnounce("WarnSubmergeSoon", 1, "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendBurrow.blp")
-local specWarnSubmergeSoon	= mod:NewSpecialWarning("specWarnSubmergeSoon", false)
+local specWarnSubmergeSoon	= mod:NewSpecialWarning("specWarnSubmergeSoon", mod:IsTank())
 local timerSubmerge			= mod:NewTimer(75, "TimerSubmerge", "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendBurrow.blp")
 
 -- Phases
@@ -55,14 +55,14 @@
 mod:AddBoolOption("AnnouncePColdIconsRemoved", false)
 
 -- Freezing Slash
-local warnFreezingSlash		= mod:NewTargetAnnounce(66012, 2)
-local timerFreezingSlash	= mod:NewCDTimer(20, 66012)
+local warnFreezingSlash		= mod:NewTargetAnnounce(66012, 2, nil, mod:IsHealer() or mod:IsTank())
+local timerFreezingSlash	= mod:NewCDTimer(20, 66012, nil, mod:IsHealer() or mod:IsTank())
 
 -- Shadow Strike
 local timerShadowStrike		= mod:NewNextTimer(30.5, 66134)
 local preWarnShadowStrike	= mod:NewSoonAnnounce(66134, 3)
 local warnShadowStrike		= mod:NewSpellAnnounce(66134, 4)
-local specWarnShadowStrike	= mod:NewSpecialWarning("SpecWarnShadowStrike", false)
+local specWarnShadowStrike	= mod:NewSpecialWarning("SpecWarnShadowStrike", mod:IsTank())
 
 function mod:OnCombatStart(delay)
 	Burrowed = false

trunk/DBM-Coliseum/Champions.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -56,25 +56,23 @@
 	)
 end
 
-local isMelee = mod:IsMelee()
-
 local isDispeller = select(2, UnitClass("player")) == "WARRIOR"
 				or select(2, UnitClass("player")) == "PRIEST"
 				or select(2, UnitClass("player")) == "SHAMAN"
 
-local warnHellfire			= mod:NewSpellAnnounce(68147, 1)
-local preWarnBladestorm 	= mod:NewSoonAnnounce(65947, 2)
-local warnBladestorm		= mod:NewSpellAnnounce(65947, 1)
-local warnHeroism			= mod:NewSpellAnnounce(65983, 2)
-local warnBloodlust			= mod:NewSpellAnnounce(65980, 2)
+local warnHellfire			= mod:NewSpellAnnounce(68147, 4)
+local preWarnBladestorm 	= mod:NewSoonAnnounce(65947, 3)
+local warnBladestorm		= mod:NewSpellAnnounce(65947, 4)
+local warnHeroism			= mod:NewSpellAnnounce(65983, 3)
+local warnBloodlust			= mod:NewSpellAnnounce(65980, 3)
 local warnHandofFreedom		= mod:NewTargetAnnounce(68758, 2)
-local warnHandofProt		= mod:NewTargetAnnounce(66009, 2)
-local warnDivineShield		= mod:NewSpellAnnounce(66010, 2)
-local warnIceBlock			= mod:NewSpellAnnounce(65802, 2)
+local warnHandofProt		= mod:NewTargetAnnounce(66009, 3)
+local warnDivineShield		= mod:NewSpellAnnounce(66010, 3)
+local warnIceBlock			= mod:NewSpellAnnounce(65802, 3)
 local warnShadowstep		= mod:NewSpellAnnounce(66178, 2)
 local warnDeathgrip			= mod:NewTargetAnnounce(66017, 2)
-local warnCyclone			= mod:NewTargetAnnounce(65859, 2, false)
-local warnSheep				= mod:NewTargetAnnounce(65801, 2, false)
+local warnCyclone			= mod:NewTargetAnnounce(65859, 1, nil, false)
+local warnSheep				= mod:NewTargetAnnounce(65801, 1, nil, false)
 
 local timerBladestorm		= mod:NewBuffActiveTimer(8, 65947)
 local timerShadowstepCD		= mod:NewCDTimer(30, 66178)
@@ -86,7 +84,7 @@
 local specWarnDivineShield	= mod:NewSpecialWarningDispel(66010, isDispeller) 
 local specWarnIceBlock		= mod:NewSpecialWarningDispel(65802, isDispeller)
 
-mod:AddBoolOption("PlaySoundOnBladestorm", isMelee)
+mod:AddBoolOption("PlaySoundOnBladestorm", mod:IsMelee())
 
 
 function mod:OnCombatStart(delay)

trunk/DBM-Coliseum/Jaraxxus.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -27,9 +27,9 @@
 	    		 or select(2, UnitClass("player")) == "PRIEST"
 
 local warnFelFireball			= mod:NewCastAnnounce(66532, 2)
-local warnPortalSoon			= mod:NewSoonAnnounce(67900, 2)
-local warnVolcanoSoon			= mod:NewSoonAnnounce(67901, 2)
-local warnFlame					= mod:NewTargetAnnounce(68123, 3)
+local warnPortalSoon			= mod:NewSoonAnnounce(67900, 3)
+local warnVolcanoSoon			= mod:NewSoonAnnounce(67901, 3)
+local warnFlame					= mod:NewTargetAnnounce(68123, 4)
 --local warnTouch				= mod:NewTargetAnnounce(66209, 3)
 local warnNetherPower			= mod:NewAnnounce("WarnNetherPower", 4)

trunk/DBM-Coliseum/Twins.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -22,7 +22,7 @@
 
 mod:AddBoolOption("HealthFrame", true)
 
-local warnSpecial					= mod:NewAnnounce("WarnSpecialSpellSoon", 2)
+local warnSpecial					= mod:NewAnnounce("WarnSpecialSpellSoon", 3)
 local warnTouchDebuff				= mod:NewAnnounce("WarningTouchDebuff", 2, 66823)
 local warnPoweroftheTwins			= mod:NewAnnounce("WarningPoweroftheTwins", 4)		
 local specWarnSpecial				= mod:NewSpecialWarning("SpecWarnSpecial")

trunk/DBM-EyeOfEternity/Malygos.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -13,12 +13,12 @@
 	"SPELL_AURA_APPLIED"
 )
 
-local warnSpark			= mod:NewAnnounce("WarningSpark", 1, 59381)
+local warnSpark			= mod:NewAnnounce("WarningSpark", 2, 59381)
 local warnVortex		= mod:NewSpellAnnounce(56105, 3)
 local warnVortexSoon	= mod:NewSoonAnnounce(56105, 2)
-local warnBreathInc		= mod:NewAnnounce("WarningBreathSoon", 3, 60071)
-local warnBreath		= mod:NewAnnounce("WarningBreath", 4, 60071)
-local warnSurge			= mod:NewTargetAnnounce(60936, 2)
+local warnBreathInc		= mod:NewAnnounce("WarningBreathSoon", 3, 60072)
+local warnBreath		= mod:NewAnnounce("WarningBreath", 4, 60072)
+local warnSurge			= mod:NewTargetAnnounce(60936, 3)
 
 local specWarnSurge		= mod:NewSpecialWarningYou(60936)
 
@@ -26,7 +26,7 @@
 local timerSpark		= mod:NewTimer(30, "TimerSpark", 59381)
 local timerVortex		= mod:NewCastTimer(11, 56105)
 local timerVortexCD		= mod:NewNextTimer(60, 56105)
-local timerBreath		= mod:NewTimer(59, "TimerBreath", 60071)
+local timerBreath		= mod:NewTimer(59, "TimerBreath", 60072)
 local timerAchieve      = mod:NewAchievementTimer(360, 1875, "TimerSpeedKill")
 
 local guids = {}

trunk/DBM-Onyxia/Onyxia.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -14,19 +14,15 @@
 	"UNIT_HEALTH"
 )
 
-local isMelee = select(2, UnitClass("player")) == "ROGUE"
-	     or select(2, UnitClass("player")) == "WARRIOR"
-	     or select(2, UnitClass("player")) == "DEATHKNIGHT"
-
 local warnWhelpsSoon		= mod:NewAnnounce("WarnWhelpsSoon", 1)
 local warnPhase2			= mod:NewPhaseAnnounce(2)
 local warnPhase3			= mod:NewPhaseAnnounce(3)
-local warnPhase2Soon		= mod:NewAnnounce("WarnPhase2Soon", 2)
-local warnPhase3Soon		= mod:NewAnnounce("WarnPhase3Soon", 2)
+local warnPhase2Soon		= mod:NewAnnounce("WarnPhase2Soon", 1)
+local warnPhase3Soon		= mod:NewAnnounce("WarnPhase3Soon", 1)
 
 --local preWarnDeepBreath     = mod:NewSoonAnnounce(17086, 2)--Experimental, if it is off please let me know.
 local specWarnBreath		= mod:NewSpecialWarningRun(17086)
-local specWarnBlastNova		= mod:NewSpecialWarningRun(68958, isMelee)
+local specWarnBlastNova		= mod:NewSpecialWarningRun(68958, mod:IsMelee())
 
 local timerNextFlameBreath	= mod:NewCDTimer(20, 68970)--Breath she does on ground in frontal cone.
 local timerNextDeepBreath	= mod:NewCDTimer(35, 17086)--Range from 35-60seconds in between based on where she moves to.
@@ -35,7 +31,7 @@
 local timerAchieve			= mod:NewAchievementTimer(300, 4405, "TimerSpeedKill") 
 local timerAchieveWhelps	= mod:NewAchievementTimer(10, 4406, "TimerWhelps") 
 
-local soundBlastNova		= mod:NewSound(68958, nil, isMelee)
+local soundBlastNova		= mod:NewSound(68958, nil, mod:IsMelee())
 local soundDeepBreath 		= mod:NewSound(17086)
 local sndFunny				= mod:NewSound(nil, "SoundWTF", false)

trunk/DBM-Party-WotLK/ForgeofSouls/Bronjahm.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -13,7 +13,7 @@
 )
 
 local warnSoulstormSoon		= mod:NewSoonAnnounce(68872, 2)
-local warnCorruptSoul		= mod:NewTargetAnnounce(68839)
+local warnCorruptSoul		= mod:NewTargetAnnounce(68839, 3)
 local specwarnSoulstorm		= mod:NewSpecialWarning("specwarnSoulstorm")
 local timerSoulstormCast	= mod:NewCastTimer(4, 68872)

trunk/DBM-Party-WotLK/ForgeofSouls/DevourerofSouls.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -11,11 +11,11 @@
 	"SPELL_AURA_APPLIED"
 )
 
-local warnPhantomBlast			= mod:NewSpellAnnounce(68982)
-local warnUnleashedSouls		= mod:NewSpellAnnounce(68939)
-local warnWailingSouls			= mod:NewSpellAnnounce(68899)
-local warnWellofSouls			= mod:NewSpellAnnounce(68820)
-local warnMirroredSoul			= mod:NewTargetAnnounce(69051)
+local warnPhantomBlast			= mod:NewSpellAnnounce(68982, 2)
+local warnUnleashedSouls		= mod:NewSpellAnnounce(68939, 3)
+local warnWailingSouls			= mod:NewSpellAnnounce(68899, 4)
+local warnWellofSouls			= mod:NewSpellAnnounce(68820, 3)
+local warnMirroredSoul			= mod:NewTargetAnnounce(69051, 4)
 local timerMirroredSoul			= mod:NewTargetTimer(8, 69051)
 local timerUnleashedSouls		= mod:NewBuffActiveTimer(5, 68939)
 local specwarnMirroredSoul		= mod:NewSpecialWarning("specwarnMirroredSoul")

trunk/DBM-Party-WotLK/HallsOfStone/BrannBronzebeard.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -15,7 +15,7 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warningPhase	= mod:NewAnnounce("WarningPhase", 3)
+local warningPhase	= mod:NewAnnounce("WarningPhase", 2)
 local timerEvent	= mod:NewTimer(302, "timerEvent")
 
 function mod:OnCombatStart(delay)

trunk/DBM-Party-WotLK/PitofSaron/ForgemasterGarfrost.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -13,9 +13,9 @@
 	"CHAT_MSG_RAID_BOSS_WHISPER"
 )
 
-local warnForgeWeapon			= mod:NewSpellAnnounce(70335)
-local warnDeepFreeze			= mod:NewTargetAnnounce(70384)
-local warnSaroniteRock			= mod:NewAnnounce("warnSaroniteRock")
+local warnForgeWeapon			= mod:NewSpellAnnounce(70335, 2)
+local warnDeepFreeze			= mod:NewTargetAnnounce(70384, 2)
+local warnSaroniteRock			= mod:NewAnnounce("warnSaroniteRock", 3)
 local specWarnSaroniteRock		= mod:NewSpecialWarning("specWarnSaroniteRock")
 local specWarnSaroniteRockNear	= mod:NewSpecialWarning("specWarnSaroniteRockNear")
 local specWarnPermafrost		= mod:NewSpecialWarning("specWarnPermafrost")

trunk/DBM-Party-WotLK/PitofSaron/Ick.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -15,22 +15,20 @@
 	"SPELL_PERIODIC_DAMAGE"
 )
 
-local isMelee = mod:IsMelee()
+local warnPursuitCast			= mod:NewCastAnnounce(68987, 3)
+local warnPoisonNova			= mod:NewCastAnnounce(68989, 3)
+local warnPursuit				= mod:NewAnnounce("warnPursuit", 4)
 
-local warnPursuitCast			= mod:NewCastAnnounce(68987)
-local warnPoisonNova			= mod:NewCastAnnounce(68989)
-local warnPursuit				= mod:NewAnnounce("warnPursuit")
-
 local specWarnToxic				= mod:NewSpecialWarningMove(70436)
 local specWarnMines				= mod:NewSpecialWarningRun(69015)
 local specWarnPursuit			= mod:NewSpecialWarning("specWarnPursuit")
-local specWarnPoisonNova		= mod:NewSpecialWarningRun(68989, isMelee)
+local specWarnPoisonNova		= mod:NewSpecialWarningRun(68989, mod:IsMelee())
 
 local timerPursuitCast			= mod:NewCastTimer(5, 68987)
 local timerPursuitConfusion		= mod:NewBuffActiveTimer(12, 69029)
 local timerPoisonNova			= mod:NewCastTimer(5, 68989)
 
-local soundPoisonNova	= mod:NewSound(68989, nil, isMelee)
+local soundPoisonNova	= mod:NewSound(68989, nil, mod:IsMelee())
 local soundPursuit		= mod:NewSound(68987)
 mod:AddBoolOption("SetIconOnPursuitTarget", true)

trunk/DBM-Party-WotLK/PitofSaron/ScourgelordTyrannus.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -18,10 +18,10 @@
 	"SPELL_PERIODIC_DAMAGE"
 )
 
-local warnUnholyPower			= mod:NewSpellAnnounce(69629)
-local warnForcefulSmash			= mod:NewSpellAnnounce(69627)
-local warnOverlordsBrand		= mod:NewTargetAnnounce(69172)
-local warnHoarfrost				= mod:NewSpellAnnounce(69246)
+local warnUnholyPower			= mod:NewSpellAnnounce(69629, 3)
+local warnForcefulSmash			= mod:NewSpellAnnounce(69627, 2)
+local warnOverlordsBrand		= mod:NewTargetAnnounce(69172, 4)
+local warnHoarfrost				= mod:NewSpellAnnounce(69246, 2)
 
 local specWarnHoarfrost			= mod:NewSpecialWarning("specWarnHoarfrost")
 local specWarnHoarfrostNear		= mod:NewSpecialWarning("specWarnHoarfrostNear")

trunk/DBM-Party-WotLK/TrialoftheChampion/Black_Knight.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -14,9 +14,9 @@
 	"SPELL_DAMAGE"
 )
 
-local warnExplode			= mod:NewAnnounce("warnExplode")
-local warnGhoulExplode		= mod:NewTargetAnnounce(67751)
-local warnMarked			= mod:NewTargetAnnounce(67823)
+local warnExplode			= mod:NewAnnounce("warnExplode", 4)
+local warnGhoulExplode		= mod:NewTargetAnnounce(67751, 4)
+local warnMarked			= mod:NewTargetAnnounce(67823, 3)
 local timerMarked			= mod:NewTargetTimer(10, 67823)
 local timerExplode			= mod:NewCastTimer(4, 67886)
 local specWarnDesecration	= mod:NewSpecialWarningMove(67876)

trunk/DBM-Party-WotLK/TrialoftheChampion/Champions.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -18,10 +18,10 @@
 				 or select(2, UnitClass("player")) == "PRIEST"
 				 or select(2, UnitClass("player")) == "SHAMAN"
 
-local warnHealingWave		= mod:NewSpellAnnounce(68318)
-local warnHaste				= mod:NewTargetAnnounce(66045)
-local warnPolymorph			= mod:NewTargetAnnounce(66043)
-local warnHexOfMending		= mod:NewTargetAnnounce(67534)
+local warnHealingWave		= mod:NewSpellAnnounce(68318, 2)
+local warnHaste				= mod:NewTargetAnnounce(66045, 2)
+local warnPolymorph			= mod:NewTargetAnnounce(66043, 1)
+local warnHexOfMending		= mod:NewTargetAnnounce(67534, 1)
 local specWarnPoison		= mod:NewSpecialWarningMove(68316)
 local specWarnHaste			= mod:NewSpecialWarningDispel(66045, isDispeller)

trunk/DBM-Party-WotLK/TrialoftheChampion/Confessor.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -17,13 +17,13 @@
              or select(2, UnitClass("player")) == "PRIEST"
              or select(2, UnitClass("player")) == "SHAMAN"
 
-local warnReflectiveShield	= mod:NewTargetAnnounce(66515)
-local warnRenew				= mod:NewTargetAnnounce(66537)
-local warnOldWounds			= mod:NewTargetAnnounce(67679)
+local warnReflectiveShield	= mod:NewTargetAnnounce(66515, 2)
+local warnRenew				= mod:NewTargetAnnounce(66537, 2)
+local warnOldWounds			= mod:NewTargetAnnounce(67679, 3)
 local timerOldWounds		= mod:NewTargetTimer(12, 67679)
-local warnHolyFire			= mod:NewTargetAnnounce(67676)
+local warnHolyFire			= mod:NewTargetAnnounce(67676, 3)
 local timerHolyFire			= mod:NewTargetTimer(8, 67676)
-local warnShadows			= mod:NewTargetAnnounce(67678)
+local warnShadows			= mod:NewTargetAnnounce(67678, 2)
 local timerShadows          = mod:NewTargetTimer(5, 67678)
 local specwarnRenew			= mod:NewSpecialWarningDispel(66537, isDispeller)

trunk/DBM-Party-WotLK/TrialoftheChampion/Eadric_the_Pure.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -17,9 +17,9 @@
 local isDispeller = select(2, UnitClass("player")) == "PRIEST"
 				 or select(2, UnitClass("player")) == "PALADIN"
 
-local warnHammerofRighteous		= mod:NewSpellAnnounce(66867)
-local warnVengeance             = mod:NewSpellAnnounce(66889)
-local warnHammerofJustice		= mod:NewTargetAnnounce(66940)
+local warnHammerofRighteous		= mod:NewSpellAnnounce(66867, 3)
+local warnVengeance             = mod:NewSpellAnnounce(66889, 3)
+local warnHammerofJustice		= mod:NewTargetAnnounce(66940, 2)
 local timerVengeance			= mod:NewBuffActiveTimer(6, 66889)
 local specwarnRadiance			= mod:NewSpecialWarning("specwarnRadiance")
 local specwarnHammerofJustice	= mod:NewSpecialWarningDispel(66940, isDispeller)

trunk/DBM-Party-WotLK/WorldEvents/ApothecaryTrio.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -12,7 +12,7 @@
 	"CHAT_MSG_MONSTER_SAY"
 )
 
-local warnChainReaction			= mod:NewCastAnnounce(68821)
+local warnChainReaction			= mod:NewCastAnnounce(68821, 3)
 
 local specWarnPerfumeSpill		= mod:NewSpecialWarningMove(68927)
 local specWarnCologneSpill		= mod:NewSpecialWarningMove(68934)

trunk/DBM-Party-WotLK/WorldEvents/CorenDirebrew.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -12,11 +12,9 @@
 	"SPELL_CAST_SUCCESS"
 )
 
-local isMelee = mod:IsMelee()
-
-local warnBarrel			= mod:NewTargetAnnounce(51413)
+local warnBarrel			= mod:NewTargetAnnounce(51413, 4)
 local timerBarrel			= mod:NewTargetTimer(8, 51413)
-local specWarnDisarm		= mod:NewSpecialWarningRun(47310, isMelee)
+local specWarnDisarm		= mod:NewSpecialWarningRun(47310, mod:IsMelee())
 local specWarnBrew			= mod:NewSpecialWarning("specWarnBrew")
 local timerBrew				= mod:NewTargetTimer(10, 47376)
 local specWarnBrewStun		= mod:NewSpecialWarning("specWarnBrewStun")

trunk/DBM-Party-WotLK/WorldEvents/HeadlessHorseman.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -12,8 +12,8 @@
 	"CHAT_MSG_MONSTER_SAY"
 )
 
-local warnConflag				= mod:NewTargetAnnounce(42380)
-local warnSquashSoul			= mod:NewTargetAnnounce(42514)
+local warnConflag				= mod:NewTargetAnnounce(42380, 3)
+local warnSquashSoul			= mod:NewTargetAnnounce(42514, 2)
 local timerConflag				= mod:NewTargetTimer(4, 42380)
 local timerSquashSoul			= mod:NewTargetTimer(15, 42514)
 local warnHorsemanSoldiers		= mod:NewAnnounce("warnHorsemanSoldiers")

trunk/DBM-PvP/VaultofArchavon/Archavon.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -17,12 +17,12 @@
 --11/19 19:20:16.527  SPELL_AURA_REMOVED,0xF150007995000007,"Archavon the Stone Watcher",0xa48,0xF140544DF3000002,"Teufelssaurier",0x1114,58678,"Rock Shards",0x1,DEBUFF
 
 local warnShards			= mod:NewTargetAnnounce(58678, 2)
-local warnGrab				= mod:NewAnnounce("WarningGrab", 2, 53041)
+local warnGrab				= mod:NewAnnounce("WarningGrab", 4, 53041)
 local timerShards			= mod:NewBuffActiveTimer(4, 58678)
 
 local warnLeap				= mod:NewSpellAnnounce(60894, 3)
 local warnStomp				= mod:NewSpellAnnounce(60880, 3)
-local warnStompSoon			= mod:NewPreWarnAnnounce(60880, 5, 1)
+local warnStompSoon			= mod:NewPreWarnAnnounce(60880, 5, 2)
 local timerNextStomp		= mod:NewNextTimer(45, 60880)
 
 local timerArchavonEnrage	= mod:NewTimer(300, "ArchavonEnrage", 26662)

trunk/DBM-PvP/VaultofArchavon/Emalon.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -15,10 +15,11 @@
 	"SPELL_AURA_REMOVED"
 )
 
-local specWarnNova			= mod:NewSpecialWarningRun(65279)
 local warnNova				= mod:NewSpellAnnounce(65279, 3)
 local warnOverCharge		= mod:NewSpellAnnounce(64218, 2)
 
+local specWarnNova			= mod:NewSpecialWarningRun(65279)
+
 local timerNova				= mod:NewCastTimer(65279)
 local timerNovaCD			= mod:NewCDTimer(45, 65279)--Varies, 45-60seconds in between nova's
 local timerOvercharge		= mod:NewNextTimer(45, 64218)

trunk/DBM-PvP/VaultofArchavon/Koralon.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -12,14 +12,14 @@
 	"SPELL_AURA_APPLIED_DOSE"
 )
 
-local warnBreath			= mod:NewSpellAnnounce(67328)
+local warnBreath			= mod:NewSpellAnnounce(67328, 3)
 local timerBreath			= mod:NewBuffActiveTimer(4.5, 67328)
 local timerBreathCD			= mod:NewCDTimer(45, 67328)--Seems to variate, but 45sec cooldown looks like a good testing number to start.
 
 local warnMeteor			= mod:NewSpellAnnounce(67333, 3)
-local warnMeteorSoon		= mod:NewPreWarnAnnounce(68161, 5, 1)
+local warnMeteorSoon		= mod:NewPreWarnAnnounce(68161, 5, 2)
 local timerNextMeteor		= mod:NewNextTimer(47, 68161)
-local WarnBurningFury		= mod:NewAnnounce("BurningFury", 3)
+local WarnBurningFury		= mod:NewAnnounce("BurningFury", 2)
 local timerNextBurningFury	= mod:NewNextTimer(20, 66721)
 
 local specWarnCinder		= mod:NewSpecialWarningMove(67332)

trunk/DBM-PvP/VaultofArchavon/Toravon.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -13,13 +13,13 @@
 	"SPELL_AURA_APPLIED_DOSE"
 )
 
-local warnFreezingGround	= mod:NewSpellAnnounce(72104)
-local warnWhiteout			= mod:NewSpellAnnounce(72096)
-local warnOrb				= mod:NewSpellAnnounce(72095)
-local WarnFrostbite			= mod:NewAnnounce("Frostbite", 3)
+local warnFreezingGround	= mod:NewSpellAnnounce(72104, 1)
+local warnWhiteout			= mod:NewSpellAnnounce(72096, 3)
+local warnOrb				= mod:NewSpellAnnounce(72095, 4)
+local WarnFrostbite			= mod:NewAnnounce("Frostbite", 2, nil, mod:IsHealer() or mod:IsTank())
 
-local timerNextFrostbite	= mod:NewNextTimer(5, 72098, nil, false)
-local timerFrostbite		= mod:NewTargetTimer(20, 72098)
+local timerNextFrostbite	= mod:NewNextTimer(5, 72098, nil, mod:IsTank())
+local timerFrostbite		= mod:NewTargetTimer(20, 72098, nil, mod:IsHealer() or mod:IsTank())
 local timerWhiteout			= mod:NewNextTimer(38, 72096)
 local timerNextOrb			= mod:NewNextTimer(32, 72095)

trunk/DBM-Ulduar/Algalon.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -25,15 +25,15 @@
 	"UNIT_HEALTH"
 )
 
-local announceBigBang			= mod:NewSpellAnnounce(64584, 3)
+local announceBigBang			= mod:NewSpellAnnounce(64584, 4)
 local warnPhase2				= mod:NewPhaseAnnounce(2)
 local warnPhase2Soon			= mod:NewAnnounce("WarnPhase2Soon", 2)
 local announcePreBigBang		= mod:NewAnnounce("PreWarningBigBang", 3, 64584)
 local announceBlackHole			= mod:NewAnnounce("WarningBlackHole", 2, 65108)
 local announceCosmicSmash		= mod:NewAnnounce("WarningCosmicSmash", 3, 62311)
-local announcePhasePunch		= mod:NewAnnounce("WarningPhasePunch", 4, 65108)
+local announcePhasePunch		= mod:NewAnnounce("WarningPhasePunch", 4, 65108, mod:IsHealer() or mod:IsTank())
 
-local specwarnStarLow			= mod:NewSpecialWarning("warnStarLow", false)
+local specwarnStarLow			= mod:NewSpecialWarning("warnStarLow", mod:IsHealer())
 local specWarnPhasePunch		= mod:NewSpecialWarningStack(64412, nil, 4)
 local specWarnBigBang			= mod:NewSpecialWarningSpell(64584)
 local specWarnCosmicSmash		= mod:NewSpecialWarningSpell(64598)

trunk/DBM-Ulduar/YoggSaron.lua

Action: modified

Old revision: 3725

Old date: 2010-03-01 08:45:51 UTC

@@ -18,18 +18,18 @@
 
 mod:SetUsedIcons(6, 7, 8)
 
-local warnMadness 					= mod:NewCastAnnounce(64059, 1)
-local warnFervorCast 				= mod:NewCastAnnounce(63138, 1)
-local warnSqueeze					= mod:NewTargetAnnounce(64125, 1)
-local warnFervor					= mod:NewTargetAnnounce(63138, 1)
+local warnMadness 					= mod:NewCastAnnounce(64059, 2)
+local warnFervorCast 				= mod:NewCastAnnounce(63138, 3)
+local warnSqueeze					= mod:NewTargetAnnounce(64125, 3)
+local warnFervor					= mod:NewTargetAnnounce(63138, 4)
 local warnDeafeningRoarSoon			= mod:NewPreWarnAnnounce(64189, 5, 3)
 local warnGuardianSpawned 			= mod:NewAnnounce("WarningGuardianSpawned", 3, 62979)
 local warnCrusherTentacleSpawned	= mod:NewAnnounce("WarningCrusherTentacleSpawned", 2)
 local warnP2 						= mod:NewPhaseAnnounce(2, 2)
 local warnP3 						= mod:NewPhaseAnnounce(3, 2)
 local warnSanity 					= mod:NewAnnounce("WarningSanity", 3)
-local warnBrainLink 				= mod:NewTargetAnnounce(63802, 2)
-local warnBrainPortalSoon			= mod:NewAnnounce("WarnBrainPortalSoon", 1)
+local warnBrainLink 				= mod:NewTargetAnnounce(63802, 3)
+local warnBrainPortalSoon			= mod:NewAnnounce("WarnBrainPortalSoon", 2)
 local warnEmpowerSoon				= mod:NewAnnounce("WarnEmpowerSoon", 4)
 
 local specWarnGuardianLow 			= mod:NewSpecialWarning("SpecWarnGuardianLow", false)

r3725 (Omega): This might work a little better for valk icons

Omega — Mon, 01 Mar 2010 08:45:51 GMT

Author: Omega
Date: Mon Mar 01 09:45:51 CET 2010
Revision: 3725

Log:

This might work a little better for valk icons

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3724

Old date: 2010-03-01 07:56:11 UTC

@@ -246,8 +246,10 @@
 				warnSummonValkyr:Show()
 				timerSummonValkyr:Start()
 				lastValk = time()
+				if self.Options.ValkyrIcon then
 				resetValkIconState()
 			end
+			end
 			if self.Options.ValkyrIcon then
 				valkIcons[args.destGUID] = currentIcon
 				currentIcon = currentIcon + 1
@@ -256,7 +258,7 @@
 	end
 	
 	mod:RegisterOnUpdateHandler(function(self)
-		if DBM:GetRaidRank() > 0 and not (iconsSet == 3 and self:IsDifficulty("normal25", "heroic25") or iconsSet == 1 and self:IsDifficulty("normal10", "heroic10")) then
+		if self.Options.ValkyrIcon and (DBM:GetRaidRank() > 0 and not (iconsSet == 3 and self:IsDifficulty("normal25", "heroic25") or iconsSet == 1 and self:IsDifficulty("normal10", "heroic10"))) then
 			for i = 1, GetNumRaidMembers() do
 				local uId = "raid"..i.."target"
 				local guid = UnitGUID(uId)

r3724 (arta): fix for last :p

arta — Mon, 01 Mar 2010 07:56:11 GMT

Author: arta
Date: Mon Mar 01 08:56:11 CET 2010
Revision: 3724

Log:

fix for last :p

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3723

Old date: 2010-03-01 07:54:15 UTC

@@ -241,17 +241,19 @@
 	
 	local lastValk = 0
 	function mod:SPELL_SUMMON(args)
-		if args:IsSpellID(69037) and self.Options.ValkyrIcon then -- Summon Val'kyr
+		if args:IsSpellID(69037) then -- Summon Val'kyr
 			if time() - lastValk > 15 then -- show the warning and timer just once for all three summon events
 				warnSummonValkyr:Show()
 				timerSummonValkyr:Start()
 				lastValk = time()
 				resetValkIconState()
 			end
+			if self.Options.ValkyrIcon then
 			valkIcons[args.destGUID] = currentIcon
 			currentIcon = currentIcon + 1
 		end
 	end
+	end
 	
 	mod:RegisterOnUpdateHandler(function(self)
 		if DBM:GetRaidRank() > 0 and not (iconsSet == 3 and self:IsDifficulty("normal25", "heroic25") or iconsSet == 1 and self:IsDifficulty("normal10", "heroic10")) then

r3723 (arta): Lich King - added option for Valkyr Icons so it can be turned off

arta — Mon, 01 Mar 2010 07:54:15 GMT

Author: arta
Date: Mon Mar 01 08:54:15 CET 2010
Revision: 3723

Log:

Lich King - added option for Valkyr Icons so it can be turned off

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3722

Old date: 2010-03-01 00:59:40 UTC

@@ -74,6 +74,7 @@
 mod:AddBoolOption("TrapIcon")
 mod:AddBoolOption("YellOnDefile", true, "announce")
 mod:AddBoolOption("YellOnTrap", true, "announce")
+mod:AddBoolOption("ValkyrIcon")
 
 local phase	= 0
 local warned_preP2 = false
@@ -240,7 +241,7 @@
 	
 	local lastValk = 0
 	function mod:SPELL_SUMMON(args)
-		if args:IsSpellID(69037) then -- Summon Val'kyr
+		if args:IsSpellID(69037) and self.Options.ValkyrIcon then -- Summon Val'kyr
 			if time() - lastValk > 15 then -- show the warning and timer just once for all three summon events
 				warnSummonValkyr:Show()
 				timerSummonValkyr:Start()

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 3722

Old date: 2010-03-01 00:59:40 UTC

@@ -463,7 +463,8 @@
 	DefileIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
 	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
 	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
-	TrapIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
+	TrapIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539),
+	ValkyrIcon			= "Set icons on Valkyrs"
 }
 
 L:SetMiscLocalization{

r3722 (Omega): #ICC/ALL: More defaults tweaking using new talent checks in my anti spam effort since as late fights get more complex and dbm can be kind of spammy if all options are simply on by default.

Omega — Mon, 01 Mar 2010 00:59:40 GMT

Author: Omega
Date: Mon Mar 01 01:59:40 CET 2010
Revision: 3722

Log:

#ICC/ALL: More defaults tweaking using new talent checks in my anti spam effort since as late fights get more complex and dbm can be kind of spammy if all options are simply on by default.
##DBM/CORE: Added IsRanged to core as well.
#CC/Northrend Beasts: Tweaked priority colors, and some defaults updates using talent checks.

Updated

trunk/DBM-Coliseum/NorthrendBeasts.lua

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Updated

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Updated

trunk/DBM-Icecrown/TheCrimsonHall/BPCouncil.lua

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathwhisper.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

trunk/DBM-Coliseum/NorthrendBeasts.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -19,21 +19,18 @@
 	"UNIT_DIED"
 )
 
-local canTranq = select(2, UnitClass("player")) == "HUNTER"
-              or select(2, UnitClass("player")) == "ROGUE"
-
-local warnImpaleOn			= mod:NewTargetAnnounce(67478, 2)
-local warnFireBomb			= mod:NewSpellAnnounce(66317, 4, nil, false)
+local warnImpaleOn			= mod:NewTargetAnnounce(67478, 2, nil, mod:IsTank() or mod:IsHealer())
+local warnFireBomb			= mod:NewSpellAnnounce(66317, 3, nil, false)
 local warnBreath			= mod:NewSpellAnnounce(67650, 1)
 local warnRage				= mod:NewSpellAnnounce(67657, 3)
-local warnSlimePool			= mod:NewSpellAnnounce(67643, 2)
+local warnSlimePool			= mod:NewSpellAnnounce(67643, 2, nil, mod:IsMelee())
 local warnToxin				= mod:NewTargetAnnounce(66823, 2)
 local warnBile				= mod:NewTargetAnnounce(66869, 3)
-local WarningSnobold		= mod:NewAnnounce("WarningSnobold", 2)
+local WarningSnobold		= mod:NewAnnounce("WarningSnobold", 4)
 local warnEnrageWorm		= mod:NewSpellAnnounce(68335, 3)
 
-local specWarnImpale3		= mod:NewSpecialWarning("SpecialWarningImpale3", false)
-local specWarnAnger3		= mod:NewSpecialWarning("SpecialWarningAnger3", false)
+local specWarnImpale3		= mod:NewSpecialWarning("SpecialWarningImpale3")
+local specWarnAnger3		= mod:NewSpecialWarning("SpecialWarningAnger3", mod:IsTank() or mod:IsHealer())
 local specWarnFireBomb		= mod:NewSpecialWarningMove(66317)
 local specWarnSlimePool		= mod:NewSpecialWarningMove(67640)
 local specWarnToxin			= mod:NewSpecialWarningMove(67620)
@@ -41,7 +38,7 @@
 local specWarnSilence		= mod:NewSpecialWarning("SpecialWarningSilence")
 local specWarnCharge		= mod:NewSpecialWarning("SpecialWarningCharge")
 local specWarnChargeNear	= mod:NewSpecialWarning("SpecialWarningChargeNear")
-local specWarnTranq			= mod:NewSpecialWarning("SpecialWarningTranq", canTranq)
+local specWarnTranq			= mod:NewSpecialWarning("SpecialWarningTranq", mod:CanRemoveEnrage())
 
 local enrageTimer			= mod:NewBerserkTimer(223)
 local timerCombatStart		= mod:NewTimer(23, "TimerCombatStart", 2457)
@@ -51,18 +48,18 @@
 
 local timerBreath			= mod:NewCastTimer(5, 67650)
 local timerNextStomp		= mod:NewNextTimer(20, 66330)
-local timerNextImpale		= mod:NewNextTimer(10, 67477)
-local timerRisingAnger      = mod:NewNextTimer(20.5, 66636)
+local timerNextImpale		= mod:NewNextTimer(10, 67477, nil, mod:IsTank() or mod:IsHealer())
+local timerRisingAnger      = mod:NewNextTimer(20.5, 66636, nil, mod:IsTank() or mod:IsHealer())
 local timerStaggeredDaze	= mod:NewBuffActiveTimer(15, 66758)
 local timerNextCrash		= mod:NewCDTimer(55, 67662)
-local timerSweepCD			= mod:NewCDTimer(17, 66794)
-local timerSlimePoolCD		= mod:NewCDTimer(12, 66883)
+local timerSweepCD			= mod:NewCDTimer(17, 66794, nil, mod:IsMelee())
+local timerSlimePoolCD		= mod:NewCDTimer(12, 66883, nil, mod:IsMelee())
 local timerAcidicSpewCD		= mod:NewCDTimer(21, 66819)
 local timerMoltenSpewCD		= mod:NewCDTimer(21, 66820)
 local timerParalyticSprayCD	= mod:NewCDTimer(21, 66901)
 local timerBurningSprayCD	= mod:NewCDTimer(21, 66902)
-local timerParalyticBiteCD	= mod:NewCDTimer(25, 66824)
-local timerBurningBiteCD	= mod:NewCDTimer(15, 66879)
+local timerParalyticBiteCD	= mod:NewCDTimer(25, 66824, nil, mod:IsTank())
+local timerBurningBiteCD	= mod:NewCDTimer(15, 66879, nil, mod:IsTank())
 
 mod:AddBoolOption("PingCharge")
 mod:AddBoolOption("SetIconOnChargeTarget", true)

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -2386,6 +2386,15 @@
 			or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) >= 51)
 end
 
+function bossModPrototype:isRanged()
+	return select(2, UnitClass("player")) == "MAGE"
+			or select(2, UnitClass("player")) == "HUNTER"
+			or select(2, UnitClass("player")) == "WARLOCK"
+			or (select(2, UnitClass("player")) == "PALADIN" and select(3, GetTalentTabInfo(1)) >= 51)
+     		or (select(2, UnitClass("player")) == "SHAMAN" and select(3, GetTalentTabInfo(2)) < 51)
+			or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) < 51)
+end
+
 function bossModPrototype:IsPhysical()
 	return self:IsMelee() or select(2, UnitClass("player")) == "HUNTER"
 end

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -20,14 +20,14 @@
 local warnAirphase				= mod:NewAnnounce("WarnAirphase", 2)
 local warnGroundphaseSoon		= mod:NewAnnounce("WarnGroundphaseSoon", 2)
 local warnPhase2soon			= mod:NewAnnounce("warnPhase2soon", 1)
-local warnPhase2				= mod:NewPhaseAnnounce(2, 1)
+local warnPhase2				= mod:NewPhaseAnnounce(2, 2)
 local warnInstability			= mod:NewAnnounce("warnInstability", 2, nil, false)
 local warnChilledtotheBone		= mod:NewAnnounce("warnChilledtotheBone", 2, nil, false)
 local warnMysticBuffet			= mod:NewAnnounce("warnMysticBuffet", 2, nil, false)
 local warnFrostBeacon			= mod:NewTargetAnnounce(70126, 4)
 local warnBlisteringCold		= mod:NewSpellAnnounce(70123, 3)
-local warnFrostBreath			= mod:NewSpellAnnounce(71056, 2)
-local warnUnchainedMagic		= mod:NewTargetAnnounce(69762, 2)
+local warnFrostBreath			= mod:NewSpellAnnounce(71056, 2, mod:IsTank() or mod:IsHealer())
+local warnUnchainedMagic		= mod:NewTargetAnnounce(69762, 2, nil, not mod:IsMelee())
 
 local specWarnBlisteringCold	= mod:NewSpecialWarningRun(70123)
 local specWarnUnchainedMagic	= mod:NewSpecialWarningYou(69762)
@@ -38,7 +38,7 @@
 
 local timerNextAirphase			= mod:NewTimer(110, "TimerNextAirphase", 43810)
 local timerNextGroundphase		= mod:NewTimer(45, "TimerNextGroundphase", 43810)
-local timerNextFrostBreath		= mod:NewNextTimer(22, 71056)
+local timerNextFrostBreath		= mod:NewNextTimer(22, 71056, nil, mod:IsTank() or mod:IsHealer())
 local timerNextBlisteringCold	= mod:NewCDTimer(69, 70123)
 local timerBlisteringCold		= mod:NewCastTimer(6, 70123)
 local timerInstability			= mod:NewBuffActiveTimer(8, 69766)

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -17,20 +17,20 @@
 )
 
 local warnCorrosion		= mod:NewAnnounce("warnCorrosion", 2, nil, false)
-local warnGutSpray		= mod:NewTargetAnnounce(71283, 3)
-local warnManaVoid		= mod:NewSpellAnnounce(71741, 2)
+local warnGutSpray		= mod:NewTargetAnnounce(71283, 3, nil, mod:IsTank() or mod:IsHealer())
+local warnManaVoid		= mod:NewSpellAnnounce(71741, 2, nil, not mod:IsMelee())
 local warnSupression	= mod:NewSpellAnnounce(70588, 3)
-local warnPortalSoon	= mod:NewSoonAnnounce(72483, 2)
-local warnPortal		= mod:NewSpellAnnounce(72483, 3)
-local warnPortalOpen	= mod:NewAnnounce("warnPortalOpen", 4)
+local warnPortalSoon	= mod:NewSoonAnnounce(72483, 2, nil, mod:IsHealer())
+local warnPortal		= mod:NewSpellAnnounce(72483, 3, nil, mod:IsHealer())
+local warnPortalOpen	= mod:NewAnnounce("warnPortalOpen", 4, 72483, mod:IsHealer())
 
 local specWarnLayWaste	= mod:NewSpecialWarningSpell(71730)
 
 local timerLayWaste		= mod:NewBuffActiveTimer(12, 69325)
-local timerNextPortal	= mod:NewCDTimer(46, 72483)
-local timerPortalsOpen	= mod:NewBuffActiveTimer(10, 72483)
-local timerGutSpray		= mod:NewTargetTimer(12, 71283)
-local timerCorrosion	= mod:NewTargetTimer(6, 70751)
+local timerNextPortal	= mod:NewCDTimer(46, 72483, nil, mod:IsHealer())
+local timerPortalsOpen	= mod:NewBuffActiveTimer(10, 72483, nil, mod:IsHealer())
+local timerGutSpray		= mod:NewTargetTimer(12, 71283, nil, mod:IsTank() or mod:IsHealer())
+local timerCorrosion	= mod:NewTargetTimer(6, 70751, nil, false)
 
 local berserkTimer		= mod:NewBerserkTimer(420)--Seems to exist just kinda funny, the adds spawn rapid fast.

trunk/DBM-Icecrown/TheCrimsonHall/BPCouncil.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -23,15 +23,15 @@
 	"UNIT_TARGET"
 )
 
-local warnTargetSwitch			= mod:NewAnnounce("WarnTargetSwitch", 3)
-local warnTargetSwitchSoon		= mod:NewAnnounce("WarnTargetSwitchSoon", 2)
+local warnTargetSwitch			= mod:NewAnnounce("WarnTargetSwitch", 2)
+local warnTargetSwitchSoon		= mod:NewAnnounce("WarnTargetSwitchSoon", 1)
 local warnConjureFlames			= mod:NewCastAnnounce(71718, 2)
 local warnEmpoweredFlamesCast	= mod:NewCastAnnounce(72040, 3)
 local warnEmpoweredFlames		= mod:NewTargetAnnounce(72040, 4)
 local warnShockVortex			= mod:NewTargetAnnounce(72037, 3)		-- 1,5sec cast
 local warnEmpoweredShockVortex	= mod:NewCastAnnounce(72039, 4)			-- 4,5sec cast
-local warnKineticBomb			= mod:NewSpellAnnounce(72053, 2)
-local warnDarkNucleus			= mod:NewSpellAnnounce(71943, 1)		-- instant cast
+local warnKineticBomb			= mod:NewSpellAnnounce(72053, 3)
+local warnDarkNucleus			= mod:NewSpellAnnounce(71943, 1, nil, false)	-- instant cast
 
 local specWarnVortex			= mod:NewSpecialWarning("specWarnVortex")
 local specWarnVortexNear		= mod:NewSpecialWarning("specWarnVortexNear")
@@ -40,7 +40,7 @@
 local specWarnShadowPrison		= mod:NewSpecialWarningStack(72999, nil, 10)
 
 local timerTargetSwitch			= mod:NewTimer(47, "TimerTargetSwitch")	-- every 46-47seconds
-local timerDarkNucleusCD		= mod:NewCDTimer(10, 71943)				-- usually every 10 seconds but sometimes more
+local timerDarkNucleusCD		= mod:NewCDTimer(10, 71943, nil, false)	-- usually every 10 seconds but sometimes more
 local timerConjureFlamesCD		= mod:NewCDTimer(20, 71718)				-- every 20-30 seconds but never more often than every 20sec
 local timerShockVortex			= mod:NewCDTimer(16.5, 72037)			-- Seen a range from 16,8 - 21,6
 local timerShadowPrison			= mod:NewBuffActiveTimer(10, 72999)		--Hard mode debuff

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -19,12 +19,12 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warnRemorselessWinter = mod:NewSpellAnnounce(74270, 2) --Phase Transition Start Ability
-local warnQuake				= mod:NewSpellAnnounce(72262, 3) --Phase Transition End Ability
+local warnRemorselessWinter = mod:NewSpellAnnounce(74270, 3) --Phase Transition Start Ability
+local warnQuake				= mod:NewSpellAnnounce(72262, 4) --Phase Transition End Ability
 local warnRagingSpirit		= mod:NewTargetAnnounce(69200, 3) --Transition Add
 local warnShamblingHorror	= mod:NewSpellAnnounce(70372, 3) --Phase 1 Add
 local warnDrudgeGhouls		= mod:NewSpellAnnounce(70358, 2) --Phase 1 Add
-local warnShamblingEnrage	= mod:NewTargetAnnounce(72143, 3) --Phase 1 Add Ability
+local warnShamblingEnrage	= mod:NewTargetAnnounce(72143, 3, nil, mod:IsHealer() or mod:IsTank() or mod:CanRemoveEnrage()) --Phase 1 Add Ability
 local warnNecroticPlague	= mod:NewTargetAnnounce(73912, 4) --Phase 1+ Ability
 local warnInfest			= mod:NewSpellAnnounce(73779, 3, nil, mod:IsHealer()) --Phase 1 & 2 Ability
 local warnPhase2Soon		= mod:NewAnnounce("WarnPhase2Soon", 1)

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -15,38 +15,31 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local isRanged = select(2, UnitClass("player")) == "MAGE"
-				or select(2, UnitClass("player")) == "HUNTER"
-				or select(2, UnitClass("player")) == "WARLOCK"
-				or (select(2, UnitClass("player")) == "PALADIN" and select(3, GetTalentTabInfo(1)) >= 51)
-     			or (select(2, UnitClass("player")) == "SHAMAN" and select(3, GetTalentTabInfo(2)) < 51)
-				or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) < 51)
-
-local warnFrenzySoon		= mod:NewAnnounce("warnFrenzySoon", 1, 72737)
+local warnFrenzySoon		= mod:NewAnnounce("warnFrenzySoon", 1, 72737, mod:IsTank() or mod:IsHealer())
 local warnAddsSoon			= mod:NewPreWarnAnnounce(72173, 10, 3)
-local warnFrenzy			= mod:NewSpellAnnounce(72737, 2)
+local warnFrenzy			= mod:NewSpellAnnounce(72737, 2, nil, mod:IsTank() or mod:IsHealer())
 local warnBloodNova			= mod:NewSpellAnnounce(73058, 2)
 local warnMark				= mod:NewTargetAnnounce(72444, 4)
 local warnBoilingBlood		= mod:NewTargetAnnounce(72441, 2)
-local warnRuneofBlood		= mod:NewTargetAnnounce(72410, 3)
+local warnRuneofBlood		= mod:NewTargetAnnounce(72410, 3, nil, mod:IsTank() or mod:IsHealer())
 
 local specWarnMarkCast		= mod:NewSpecialWarningYou(72444, false)--Experimental
 local specwarnMark			= mod:NewSpecialWarningTarget(72444, false)
-local specwarnRuneofBlood	= mod:NewSpecialWarningTarget(72410, false)
+local specwarnRuneofBlood	= mod:NewSpecialWarningTarget(72410, mod:IsTank())
 
 local timerCombatStart		= mod:NewTimer(48, "TimerCombatStart", 2457)
-local timerRuneofBlood		= mod:NewTargetTimer(20, 72410)
+local timerRuneofBlood		= mod:NewTargetTimer(20, 72410, nil, mod:IsTank())
 local timerBoilingBlood		= mod:NewBuffActiveTimer(15, 72441)
 local timerBloodNova		= mod:NewCDTimer(20, 73058)--20-25sec cooldown?
 local timerCallBloodBeast	= mod:NewNextTimer(40, 72173)
-local timerNextRuneofBlood	= mod:NewCDTimer(25, 72410)
+local timerNextRuneofBlood	= mod:NewCDTimer(25, 72410, nil, mod:IsTank() or mod:IsHealer())
 
 local enrageTimer			= mod:NewBerserkTimer(480)
 
-mod:AddBoolOption("RangeFrame", isRanged)
+mod:AddBoolOption("RangeFrame", mod:isRanged())
 mod:AddBoolOption("RunePowerFrame", true, "misc")
-mod:AddBoolOption("SetIconOnBoilingBlood", true)
-mod:AddBoolOption("SetIconOnMarkCast", true)
+mod:AddBoolOption("SetIconOnBoilingBlood", false)
+mod:AddBoolOption("SetIconOnMarkCast", false)
 mod:RemoveOption("HealthFrame")
 
 local warned_preFrenzy = false

trunk/DBM-Icecrown/TheLowerSpire/Deathwhisper.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -20,8 +20,6 @@
 			or select(2, UnitClass("player")) == "SHAMAN"
 			or select(2, UnitClass("player")) == "PRIEST"
 
-local isMelee = mod:IsMelee()
-
 local warnAddsSoon					= mod:NewAnnounce("WarnAddsSoon", 2)
 local warnDominateMind				= mod:NewTargetAnnounce(71289, 3)
 local warnDeathDecay				= mod:NewSpellAnnounce(72108, 2)
@@ -30,15 +28,15 @@
 local warnDarkEmpowerment			= mod:NewSpellAnnounce(70901, 4)
 local warnPhase2					= mod:NewPhaseAnnounce(2, 1)	
 local warnFrostbolt					= mod:NewCastAnnounce(72007, 2)
-local warnTouchInsignificance		= mod:NewAnnounce("WarnTouchInsignificance", 2)
+local warnTouchInsignificance		= mod:NewAnnounce("WarnTouchInsignificance", 2, nil, mod:IsTank() or mod:IsHealer())
 local warnDarkMartyrdom				= mod:NewSpellAnnounce(72499, 4)
 
 local specWarnVampricMight			= mod:NewSpecialWarningDispel(70674, canPurge)
 local specWarnCurseTorpor			= mod:NewSpecialWarningYou(71237)
 local specWarnDeathDecay			= mod:NewSpecialWarningMove(72108)
 local specWarnTouchInsignificance	= mod:NewSpecialWarningStack(71204, nil, 3)
-local specWarnDarkMartyrdom			= mod:NewSpecialWarningMove(72499, isMelee)
-local specWarnVengefulShade			= mod:NewSpecialWarning("specWarnVengefulShade", false)
+local specWarnDarkMartyrdom			= mod:NewSpecialWarningMove(72499, mod:IsMelee())
+local specWarnVengefulShade			= mod:NewSpecialWarning("specWarnVengefulShade", not mod:IsTank())
 
 local timerAdds						= mod:NewTimer(60, "TimerAdds")
 local timerDominateMind				= mod:NewBuffActiveTimer(12, 71289)

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -12,13 +12,6 @@
 	"SPELL_AURA_APPLIED_DOSE"
 )
 
-local isRanged = select(2, UnitClass("player")) == "MAGE"
-				or select(2, UnitClass("player")) == "HUNTER"
-				or select(2, UnitClass("player")) == "WARLOCK"
-				or (select(2, UnitClass("player")) == "PALADIN" and select(3, GetTalentTabInfo(1)) >= 51)
-     			or (select(2, UnitClass("player")) == "SHAMAN" and select(3, GetTalentTabInfo(2)) < 51)
-				or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) < 51)
-
 local warnInhaledBlight		= mod:NewAnnounce("InhaledBlight", 3)
 local warnGastricBloat		= mod:NewAnnounce("WarnGastricBloat", 2, nil, mod:IsTank() or mod:IsHealer())
 local warnGasSpore			= mod:NewTargetAnnounce(69279, 4)
@@ -32,7 +25,7 @@
 
 local timerGasSpore			= mod:NewBuffActiveTimer(12, 69279)
 local timerVileGas			= mod:NewBuffActiveTimer(6, 71219)
-local timerGasSporeCD		= mod:NewNextTimer(40, 69279)
+local timerGasSporeCD		= mod:NewNextTimer(40, 69279)		-- Every 40 seconds except after 3rd and 6th cast, then it's 50sec CD
 local timerPungentBlight	= mod:NewNextTimer(33, 71219)		-- 33 seconds after 3rd stack of inhaled
 local timerInhaledBlight	= mod:NewNextTimer(34, 71912)		-- 34 seconds'ish
 local timerGastricBloat		= mod:NewTargetTimer(100, 72551, nil, mod:IsTank() or mod:IsHealer())	-- 100 Seconds until expired
@@ -40,7 +33,7 @@
 
 local berserkTimer			= mod:NewBerserkTimer(300)
 
-mod:AddBoolOption("RangeFrame", isRanged)
+mod:AddBoolOption("RangeFrame", mod:isRanged())
 mod:AddBoolOption("SetIconOnGasSpore", true)
 
 local gasSporeTargets	= {}

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -16,7 +16,7 @@
 )
 
 local warnSlimePuddle				= mod:NewSpellAnnounce(70341, 2)
-local warnUnstableExperimentSoon	= mod:NewSoonAnnounce(70351, 2)
+local warnUnstableExperimentSoon	= mod:NewSoonAnnounce(70351, 3)
 local warnUnstableExperiment		= mod:NewSpellAnnounce(70351, 4)
 local warnVolatileOozeAdhesive		= mod:NewTargetAnnounce(70447, 3)
 local warnGaseousBloat				= mod:NewTargetAnnounce(70672, 3)
@@ -26,7 +26,7 @@
 local warnMalleableGoo				= mod:NewSpellAnnounce(72295, 2)		-- Phase 2 ability
 local warnChokingGasBomb			= mod:NewSpellAnnounce(71255, 3)		-- Phase 2 ability
 local warnPhase3Soon				= mod:NewAnnounce("WarnPhase3Soon", 1)
-local warnMutatedPlague				= mod:NewAnnounce("WarnMutatedPlague", 2) -- Phase 3 ability
+local warnMutatedPlague				= mod:NewAnnounce("WarnMutatedPlague", 2, nil, mod:IsTank() or mod:IsHealer()) -- Phase 3 ability
 local warnOozeVariable				= mod:NewTargetAnnounce(70352, 2)			-- Heroic Ability
 local warnGasVariable				= mod:NewTargetAnnounce(70353, 2)			-- Heroic Ability
 
@@ -47,7 +47,6 @@
 local timerChokingGasBombCD			= mod:NewNextTimer(35.5, 71255)
 local timerMalleableGooCD			= mod:NewCDTimer(25, 72295)
 local timerTearGas					= mod:NewBuffActiveTimer(19, 71615)
-local timerMutatedPlague			= mod:NewTargetTimer(60, 72451)			-- 60 Seconds until expired
 local timerMutatedPlagueCD			= mod:NewCDTimer(10, 72451)				-- 10 to 11
 local timerUnboundPlague			= mod:NewBuffActiveTimer(10, 72856)		-- Heroic Ability: we can't keep the debuff 60 seconds, so we have to switch at 10 seconds. Otherwise the debuff does to much damage!
 
@@ -254,7 +253,6 @@
 		timerTearGas:Start()
 	elseif args:IsSpellID(72451, 72463, 72671, 72672) then	-- Mutated Plague
 		warnMutatedPlague:Show(args.spellName, args.destName, args.amount or 1)
-		timerMutatedPlague:Start(args.destName)
 		timerMutatedPlagueCD:Start()
 	elseif args:IsSpellID(70542) then
 		timerMutatedSlash:Show(args.destName)

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 3721

Old date: 2010-02-28 10:03:10 UTC

@@ -21,7 +21,7 @@
 local warnSlimeSpray			= mod:NewSpellAnnounce(69508, 2)
 local warnOozeExplosionCast		= mod:NewCastAnnounce(69839, 3)
 local warnMutatedInfection		= mod:NewTargetAnnounce(71224, 4)
-local warnRadiatingOoze			= mod:NewSpellAnnounce(69760, 2)
+local warnRadiatingOoze			= mod:NewSpellAnnounce(69760, 3)
 local warnOozeSpawn				= mod:NewAnnounce("WarnOozeSpawn", 1)
 local warnStickyOoze			= mod:NewSpellAnnounce(69774, 1)
 local warnUnstableOoze			= mod:NewAnnounce("WarnUnstableOoze", 2)
@@ -40,8 +40,8 @@
 local timerOozeExplosion		= mod:NewCastTimer(4, 69839)
 
 local soundMutatedInfection		= mod:NewSound(71224)
-mod:AddBoolOption("InfectionIcon")
-mod:AddBoolOption("ExplosionIcon")
+mod:AddBoolOption("InfectionIcon", true)
+mod:AddBoolOption("ExplosionIcon", false)
 
 function mod:OnCombatStart(delay)
 	timerWallSlime:Start(25-delay)

r3721 (Omega): #ICC/ALL: Revisited all the mods and set priority colors on all the warnings since i didn't set any when most most of the mods were written and rushed out.

Omega — Sun, 28 Feb 2010 10:03:10 GMT

Author: Omega
Date: Sun Feb 28 11:03:10 CET 2010
Revision: 3721

Log:

#ICC/ALL: Revisited all the mods and set priority colors on all the warnings since i didn't set any when most most of the mods were written and rushed out.
#ICC/Putricide: Fixed a bug where there was a double volatile ooze setting.
#ICC/Putricide: Added a shorter malleable goo cd timer for heroic
#ICC/Festergut: Added experimental spore timers, may not be accurate/need adjusting do to my interesting hack to adjust timer before 4th and 7th casts.
#ICC/Festergut: Changed gastic bloat timers to be defaults only for tanks and healers. Dps don't need this information.
#ICC/Lich King: Fixed all the option default bugs from option defaults being in wrong slot (most were in the icon slot, some were in option name slot and could have been causing the options resetting to defaults every update bug)
#ICC/Gunship: Changed option defaults for Bladestorm and battle fury.

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Updated

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Updated

trunk/DBM-Icecrown/TheCrimsonHall/BPCouncil.lua

Updated

trunk/DBM-Icecrown/TheCrimsonHall/CrimsonHallTrash.lua

Updated

trunk/DBM-Icecrown/TheCrimsonHall/Lanathel.lua

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathwhisper.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/GunshipBattle.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/LordMarrowgar.lua

Updated

trunk/DBM-Icecrown/TheLowerSpire/LowerSpireTrash.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/PlagueworksTrash.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -17,17 +17,17 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warnAirphase				= mod:NewAnnounce("WarnAirphase")
+local warnAirphase				= mod:NewAnnounce("WarnAirphase", 2)
 local warnGroundphaseSoon		= mod:NewAnnounce("WarnGroundphaseSoon", 2)
-local warnPhase2soon			= mod:NewAnnounce("warnPhase2soon")
-local warnPhase2				= mod:NewPhaseAnnounce(2)
+local warnPhase2soon			= mod:NewAnnounce("warnPhase2soon", 1)
+local warnPhase2				= mod:NewPhaseAnnounce(2, 1)
 local warnInstability			= mod:NewAnnounce("warnInstability", 2, nil, false)
 local warnChilledtotheBone		= mod:NewAnnounce("warnChilledtotheBone", 2, nil, false)
 local warnMysticBuffet			= mod:NewAnnounce("warnMysticBuffet", 2, nil, false)
-local warnFrostBeacon			= mod:NewTargetAnnounce(70126)
+local warnFrostBeacon			= mod:NewTargetAnnounce(70126, 4)
 local warnBlisteringCold		= mod:NewSpellAnnounce(70123, 3)
-local warnFrostBreath			= mod:NewSpellAnnounce(71056, 3)
-local warnUnchainedMagic		= mod:NewTargetAnnounce(69762)
+local warnFrostBreath			= mod:NewSpellAnnounce(71056, 2)
+local warnUnchainedMagic		= mod:NewTargetAnnounce(69762, 2)
 
 local specWarnBlisteringCold	= mod:NewSpecialWarningRun(70123)
 local specWarnUnchainedMagic	= mod:NewSpecialWarningYou(69762)

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -17,12 +17,12 @@
 )
 
 local warnCorrosion		= mod:NewAnnounce("warnCorrosion", 2, nil, false)
-local warnGutSpray		= mod:NewTargetAnnounce(71283)
-local warnManaVoid		= mod:NewSpellAnnounce(71741)
-local warnSupression	= mod:NewSpellAnnounce(70588)
-local warnPortalSoon	= mod:NewSoonAnnounce(72483)
-local warnPortal		= mod:NewSpellAnnounce(72483)
-local warnPortalOpen	= mod:NewAnnounce("warnPortalOpen")
+local warnGutSpray		= mod:NewTargetAnnounce(71283, 3)
+local warnManaVoid		= mod:NewSpellAnnounce(71741, 2)
+local warnSupression	= mod:NewSpellAnnounce(70588, 3)
+local warnPortalSoon	= mod:NewSoonAnnounce(72483, 2)
+local warnPortal		= mod:NewSpellAnnounce(72483, 3)
+local warnPortalOpen	= mod:NewAnnounce("warnPortalOpen", 4)
 
 local specWarnLayWaste	= mod:NewSpecialWarningSpell(71730)

trunk/DBM-Icecrown/TheCrimsonHall/BPCouncil.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -25,13 +25,13 @@
 
 local warnTargetSwitch			= mod:NewAnnounce("WarnTargetSwitch", 3)
 local warnTargetSwitchSoon		= mod:NewAnnounce("WarnTargetSwitchSoon", 2)
-local warnConjureFlames			= mod:NewCastAnnounce(71718)
-local warnEmpoweredFlamesCast	= mod:NewCastAnnounce(72040)
-local warnEmpoweredFlames		= mod:NewTargetAnnounce(72040)
-local warnShockVortex			= mod:NewTargetAnnounce(72037)			-- 1,5sec cast
-local warnEmpoweredShockVortex	= mod:NewCastAnnounce(72039)			-- 4,5sec cast
-local warnKineticBomb			= mod:NewSpellAnnounce(72053)
-local warnDarkNucleus			= mod:NewSpellAnnounce(71943)			-- instant cast
+local warnConjureFlames			= mod:NewCastAnnounce(71718, 2)
+local warnEmpoweredFlamesCast	= mod:NewCastAnnounce(72040, 3)
+local warnEmpoweredFlames		= mod:NewTargetAnnounce(72040, 4)
+local warnShockVortex			= mod:NewTargetAnnounce(72037, 3)		-- 1,5sec cast
+local warnEmpoweredShockVortex	= mod:NewCastAnnounce(72039, 4)			-- 4,5sec cast
+local warnKineticBomb			= mod:NewSpellAnnounce(72053, 2)
+local warnDarkNucleus			= mod:NewSpellAnnounce(71943, 1)		-- instant cast
 
 local specWarnVortex			= mod:NewSpecialWarning("specWarnVortex")
 local specWarnVortexNear		= mod:NewSpecialWarning("specWarnVortexNear")

trunk/DBM-Icecrown/TheCrimsonHall/CrimsonHallTrash.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -9,8 +9,8 @@
 	"SPELL_AURA_REMOVED"
 )
 
-local warnBloodMirror		= mod:NewTargetAnnounce(70451)
-local warnBloodSap			= mod:NewTargetAnnounce(70432)
+local warnBloodMirror		= mod:NewTargetAnnounce(70451, 3)
+local warnBloodSap			= mod:NewTargetAnnounce(70432, 4)
 
 local specWarnBloodMirror	= mod:NewSpecialWarningYou(70451)

trunk/DBM-Icecrown/TheCrimsonHall/Lanathel.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -16,14 +16,14 @@
 	"CHAT_MSG_RAID_BOSS_EMOTE"
 )
 
-local warnPactDarkfallen			= mod:NewTargetAnnounce(71340, 3)
+local warnPactDarkfallen			= mod:NewTargetAnnounce(71340, 4)
 local warnBloodMirror				= mod:NewTargetAnnounce(71510, 3)
-local warnSwarmingShadows			= mod:NewTargetAnnounce(71266)
-local warnInciteTerror				= mod:NewSpellAnnounce(73070)
-local warnVampricBite				= mod:NewTargetAnnounce(71727)
-local warnMindControlled			= mod:NewTargetAnnounce(70923)
-local warnBloodthirst				= mod:NewTargetAnnounce(71474, 2, nil, false)
-local warnEssenceoftheBloodQueen	= mod:NewTargetAnnounce(71473, 2, nil, false)
+local warnSwarmingShadows			= mod:NewTargetAnnounce(71266, 4)
+local warnInciteTerror				= mod:NewSpellAnnounce(73070, 3)
+local warnVampricBite				= mod:NewTargetAnnounce(71727, 2)
+local warnMindControlled			= mod:NewTargetAnnounce(70923, 4)
+local warnBloodthirst				= mod:NewTargetAnnounce(71474, 3, nil, false)
+local warnEssenceoftheBloodQueen	= mod:NewTargetAnnounce(71473, 3, nil, false)
 
 local specWarnBloodBolt				= mod:NewSpecialWarningSpell(71772)
 local specWarnPactDarkfallen		= mod:NewSpecialWarningYou(71340)

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -19,23 +19,23 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warnRemorselessWinter = mod:NewSpellAnnounce(74270) --Phase Transition Start Ability
-local warnQuake				= mod:NewSpellAnnounce(72262) --Phase Transition End Ability
-local warnRagingSpirit		= mod:NewTargetAnnounce(69200) --Transition Add
-local warnShamblingHorror	= mod:NewSpellAnnounce(70372) --Phase 1 Add
-local warnDrudgeGhouls		= mod:NewSpellAnnounce(70358) --Phase 1 Add
-local warnShamblingEnrage	= mod:NewTargetAnnounce(72143) --Phase 1 Add Ability
-local warnNecroticPlague	= mod:NewTargetAnnounce(73912) --Phase 1+ Ability
-local warnInfest			= mod:NewSpellAnnounce(73779, mod:IsHealer()) --Phase 1 & 2 Ability
-local warnPhase2Soon		= mod:NewAnnounce("WarnPhase2Soon", 2)
-local warnDefileSoon		= mod:NewSoonAnnounce(73708)	--Phase 2+ Ability
-local warnSoulreaper		= mod:NewSpellAnnounce(73797, mod:IsTank() or mod:IsHealer()) --Phase 2+ Ability
-local warnDefileCast		= mod:NewTargetAnnounce(72762) --Phase 2+ Ability
-local warnSummonValkyr		= mod:NewSpellAnnounce(69037) --Phase 2 Add
-local warnPhase3Soon		= mod:NewAnnounce("WarnPhase3Soon", 2)
-local warnSummonVileSpirit	= mod:NewSpellAnnounce(70498) --Phase 3 Add
-local warnHarvestSoul		= mod:NewTargetAnnounce(74325) --Phase 3 Ability
-local warnTrapCast			= mod:NewTargetAnnounce(73539) --Phase 2+ Ability
+local warnRemorselessWinter = mod:NewSpellAnnounce(74270, 2) --Phase Transition Start Ability
+local warnQuake				= mod:NewSpellAnnounce(72262, 3) --Phase Transition End Ability
+local warnRagingSpirit		= mod:NewTargetAnnounce(69200, 3) --Transition Add
+local warnShamblingHorror	= mod:NewSpellAnnounce(70372, 3) --Phase 1 Add
+local warnDrudgeGhouls		= mod:NewSpellAnnounce(70358, 2) --Phase 1 Add
+local warnShamblingEnrage	= mod:NewTargetAnnounce(72143, 3) --Phase 1 Add Ability
+local warnNecroticPlague	= mod:NewTargetAnnounce(73912, 4) --Phase 1+ Ability
+local warnInfest			= mod:NewSpellAnnounce(73779, 3, nil, mod:IsHealer()) --Phase 1 & 2 Ability
+local warnPhase2Soon		= mod:NewAnnounce("WarnPhase2Soon", 1)
+local warnDefileSoon		= mod:NewSoonAnnounce(73708, 3)	--Phase 2+ Ability
+local warnSoulreaper		= mod:NewSpellAnnounce(73797, 4, nil, mod:IsTank() or mod:IsHealer()) --Phase 2+ Ability
+local warnDefileCast		= mod:NewTargetAnnounce(72762, 4) --Phase 2+ Ability
+local warnSummonValkyr		= mod:NewSpellAnnounce(69037, 3) --Phase 2 Add
+local warnPhase3Soon		= mod:NewAnnounce("WarnPhase3Soon", 1)
+local warnSummonVileSpirit	= mod:NewSpellAnnounce(70498, 2) --Phase 3 Add
+local warnHarvestSoul		= mod:NewTargetAnnounce(74325, 4) --Phase 3 Ability
+local warnTrapCast			= mod:NewTargetAnnounce(73539, 3) --Phase 2+ Ability
 
 local specWarnSoulreaper	= mod:NewSpecialWarningYou(73797) --Phase 1+ Ability
 local specWarnNecroticPlague= mod:NewSpecialWarningYou(73912) --Phase 1+ Ability
@@ -46,16 +46,16 @@
 local specWarnWinter		= mod:NewSpecialWarningMove(73791) --Transition Ability
 local specWarnHarvestSoul	= mod:NewSpecialWarningYou(74325) --Phase 3+ Ability
 local specWarnInfest		= mod:NewSpecialWarningSpell(73779, false) --Phase 1+ Ability
-local specwarnSoulreaper	= mod:NewSpecialWarningTarget(73797, mod:IsTank() or mod:IsHealer()) --phase 2+
+local specwarnSoulreaper	= mod:NewSpecialWarningTarget(73797, false) --phase 2+
 local specWarnTrap			= mod:NewSpecialWarningYou(73539) --Heroic Ability
 
 local timerCombatStart		= mod:NewTimer(54.5, "TimerCombatStart", 2457)
 local timerPhaseTransition	= mod:NewTimer(62, "PhaseTransition")
-local timerSoulreaper	 	= mod:NewTargetTimer(5.1, 73797, mod:IsTank() or mod:IsHealer())
-local timerSoulreaperCD	 	= mod:NewCDTimer(30, 73797, mod:IsTank() or mod:IsHealer())
+local timerSoulreaper	 	= mod:NewTargetTimer(5.1, 73797, nil, mod:IsTank() or mod:IsHealer())
+local timerSoulreaperCD	 	= mod:NewCDTimer(30, 73797, nil, mod:IsTank() or mod:IsHealer())
 local timerHarvestSoul	 	= mod:NewTargetTimer(6, 74325)
 local timerHarvestSoulCD	= mod:NewCDTimer(75, 74325)
-local timerInfestCD			= mod:NewCDTimer(22, 73779, mod:IsHealer())
+local timerInfestCD			= mod:NewCDTimer(22, 73779, nil, mod:IsHealer())
 local timerNecroticPlagueCleanse = mod:NewTimer(5, "TimerNecroticPlagueCleanse", 73912, false)
 local timerNecroticPlagueCD	= mod:NewCDTimer(30, 73912)
 local timerDefileCD			= mod:NewCDTimer(32, 72762)

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -22,13 +22,13 @@
      			or (select(2, UnitClass("player")) == "SHAMAN" and select(3, GetTalentTabInfo(2)) < 51)
 				or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) < 51)
 
-local warnFrenzySoon		= mod:NewAnnounce("warnFrenzySoon", 2, 72737)
+local warnFrenzySoon		= mod:NewAnnounce("warnFrenzySoon", 1, 72737)
 local warnAddsSoon			= mod:NewPreWarnAnnounce(72173, 10, 3)
-local warnFrenzy			= mod:NewSpellAnnounce(72737)
-local warnBloodNova			= mod:NewSpellAnnounce(73058)
-local warnMark				= mod:NewTargetAnnounce(72444)
-local warnBoilingBlood		= mod:NewTargetAnnounce(72441)
-local warnRuneofBlood		= mod:NewTargetAnnounce(72410)
+local warnFrenzy			= mod:NewSpellAnnounce(72737, 2)
+local warnBloodNova			= mod:NewSpellAnnounce(73058, 2)
+local warnMark				= mod:NewTargetAnnounce(72444, 4)
+local warnBoilingBlood		= mod:NewTargetAnnounce(72441, 2)
+local warnRuneofBlood		= mod:NewTargetAnnounce(72410, 3)
 
 local specWarnMarkCast		= mod:NewSpecialWarningYou(72444, false)--Experimental
 local specwarnMark			= mod:NewSpecialWarningTarget(72444, false)

trunk/DBM-Icecrown/TheLowerSpire/Deathwhisper.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -22,16 +22,16 @@
 
 local isMelee = mod:IsMelee()
 
-local warnAddsSoon					= mod:NewAnnounce("WarnAddsSoon", 3)
+local warnAddsSoon					= mod:NewAnnounce("WarnAddsSoon", 2)
 local warnDominateMind				= mod:NewTargetAnnounce(71289, 3)
 local warnDeathDecay				= mod:NewSpellAnnounce(72108, 2)
 local warnReanimating				= mod:NewAnnounce("WarnReanimating", 3)
 local warnDarkTransformation		= mod:NewSpellAnnounce(70900, 4)
 local warnDarkEmpowerment			= mod:NewSpellAnnounce(70901, 4)
-local warnPhase2					= mod:NewPhaseAnnounce(2, 3)	
+local warnPhase2					= mod:NewPhaseAnnounce(2, 1)	
 local warnFrostbolt					= mod:NewCastAnnounce(72007, 2)
-local warnTouchInsignificance		= mod:NewAnnounce("WarnTouchInsignificance", 3)
-local warnDarkMartyrdom				= mod:NewSpellAnnounce(72499, 3)
+local warnTouchInsignificance		= mod:NewAnnounce("WarnTouchInsignificance", 2)
+local warnDarkMartyrdom				= mod:NewSpellAnnounce(72499, 4)
 
 local specWarnVampricMight			= mod:NewSpecialWarningDispel(70674, canPurge)
 local specWarnCurseTorpor			= mod:NewSpecialWarningYou(71237)

trunk/DBM-Icecrown/TheLowerSpire/GunshipBattle.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -21,18 +21,20 @@
 	"SPELL_CAST_SUCCESS"
 )
 
-local warnBelowZero			= mod:NewSpellAnnounce(69705, 3)
+local isMelee = mod:IsMelee()
+
+local warnBelowZero			= mod:NewSpellAnnounce(69705, 4)
 local warnExperienced		= mod:NewTargetAnnounce(71188, 1, nil, false)		-- might be spammy
 local warnVeteran			= mod:NewTargetAnnounce(71193, 2, nil, false)		-- might be spammy
 local warnElite				= mod:NewTargetAnnounce(71195, 3, nil, false)		-- might be spammy
-local warnBattleFury		= mod:NewAnnounce("WarnBattleFury", 3, nil, false)	-- might be spammy
-local warnBladestorm		= mod:NewSpellAnnounce(69652, 2, nil, false)		-- might be spammy
-local warnWoundingStrike	= mod:NewTargetAnnounce(69651, 3)
-local warnAddsSoon			= mod:NewAnnounce("WarnAddsSoon")
+local warnBattleFury		= mod:NewAnnounce("WarnBattleFury", 2, nil, mod:IsTank())
+local warnBladestorm		= mod:NewSpellAnnounce(69652, 3, nil, isMelee)
+local warnWoundingStrike	= mod:NewTargetAnnounce(69651, 2)
+local warnAddsSoon			= mod:NewAnnounce("WarnAddsSoon", 2)
 
 local timerCombatStart		= mod:NewTimer(45, "TimerCombatStart", 2457)
 local timerBelowZeroCD		= mod:NewNextTimer(35, 69705)
-local timerBattleFuryActive	= mod:NewBuffActiveTimer(17, 72306)
+local timerBattleFuryActive	= mod:NewBuffActiveTimer(17, 72306, nil, mod:IsTank() or mod:IsHealer())
 local timerAdds				= mod:NewTimer(60, "TimerAdds")
 
 mod:RemoveOption("HealthFrame")

trunk/DBM-Icecrown/TheLowerSpire/LordMarrowgar.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -15,9 +15,9 @@
 	"SPELL_AURA_REMOVED"
 )
 
-local preWarnWhirlwind   	= mod:NewSoonAnnounce(69076, 2)
-local warnBoneSpike			= mod:NewCastAnnounce(69057)
-local warnImpale			= mod:NewAnnounce("WarnImpale")
+local preWarnWhirlwind   	= mod:NewSoonAnnounce(69076, 3)
+local warnBoneSpike			= mod:NewCastAnnounce(69057, 2)
+local warnImpale			= mod:NewAnnounce("WarnImpale", 4)
 
 local specWarnColdflame		= mod:NewSpecialWarningMove(70825)
 local specWarnWhirlwind		= mod:NewSpecialWarningRun(69076)

trunk/DBM-Icecrown/TheLowerSpire/LowerSpireTrash.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -13,7 +13,7 @@
 
 local warnDisruptingShout		= mod:NewSpellAnnounce(71022, 2)
 local warnDarkReckoning			= mod:NewTargetAnnounce(69483, 3)
-local warnDeathPlague			= mod:NewTargetAnnounce(72865, 3)
+local warnDeathPlague			= mod:NewTargetAnnounce(72865, 4)
 
 local specWarnDisruptingShout	= mod:NewSpecialWarningCast(71022)
 local specWarnDarkReckoning		= mod:NewSpecialWarningMove(69483)

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -19,10 +19,10 @@
      			or (select(2, UnitClass("player")) == "SHAMAN" and select(3, GetTalentTabInfo(2)) < 51)
 				or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) < 51)
 
-local warnInhaledBlight		= mod:NewAnnounce("InhaledBlight")
-local warnGastricBloat		= mod:NewAnnounce("WarnGastricBloat", 3)
-local warnGasSpore			= mod:NewTargetAnnounce(69279)
-local warnVileGas			= mod:NewTargetAnnounce(73020)
+local warnInhaledBlight		= mod:NewAnnounce("InhaledBlight", 3)
+local warnGastricBloat		= mod:NewAnnounce("WarnGastricBloat", 2, nil, mod:IsTank() or mod:IsHealer())
+local warnGasSpore			= mod:NewTargetAnnounce(69279, 4)
+local warnVileGas			= mod:NewTargetAnnounce(73020, 3)
 
 local specWarnPungentBlight	= mod:NewSpecialWarningSpell(71219)
 local specWarnGasSpore		= mod:NewSpecialWarningYou(69279)
@@ -31,11 +31,12 @@
 local specWarnInhaled3		= mod:NewSpecialWarningStack(71912, false, 3)
 
 local timerGasSpore			= mod:NewBuffActiveTimer(12, 69279)
+local timerVileGas			= mod:NewBuffActiveTimer(6, 71219)
+local timerGasSporeCD		= mod:NewNextTimer(40, 69279)
 local timerPungentBlight	= mod:NewNextTimer(33, 71219)		-- 33 seconds after 3rd stack of inhaled
 local timerInhaledBlight	= mod:NewNextTimer(34, 71912)		-- 34 seconds'ish
-local timerVileGas			= mod:NewBuffActiveTimer(6, 71219)
-local timerGastricBloat		= mod:NewTargetTimer(100, 72551)	-- 100 Seconds until expired
-local timerGastricBloatCD	= mod:NewCDTimer(11, 72551) 		-- 10 to 14 seconds
+local timerGastricBloat		= mod:NewTargetTimer(100, 72551, nil, mod:IsTank() or mod:IsHealer())	-- 100 Seconds until expired
+local timerGastricBloatCD	= mod:NewCDTimer(11, 72551, nil, mod:IsTank() or mod:IsHealer()) 		-- 10 to 14 seconds
 
 local berserkTimer			= mod:NewBerserkTimer(300)
 
@@ -45,6 +46,7 @@
 local gasSporeTargets	= {}
 local vileGasTargets	= {}
 local gasSporeIcon 	= 8
+local gasSporeCast 	= 0
 --[[
 local mRange = { }
 local mPoints = { 
@@ -98,8 +100,10 @@
 function mod:OnCombatStart(delay)
 	berserkTimer:Start(-delay)
 	timerInhaledBlight:Start(-delay)
+	timerGasSporeCD:Start(20-delay)--This may need tweaking
 	table.wipe(gasSporeTargets)
 	gasSporeIcon = 8
+	gasSporeCast = 0
 --	noCheck = true
 	if self.Options.RangeFrame then
 		DBM.RangeCheck:Show(8)
@@ -122,6 +126,13 @@
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(69279) then	-- Gas Spore
 		gasSporeTargets[#gasSporeTargets + 1] = args.destName
+		gasSporeCast = gasSporeCast + 1
+		if (gasSporeCast < 9 and (mod:IsDifficulty("normal25") or mod:IsDifficulty("heroic25"))) or (gasSporeCast < 6 and (mod:IsDifficulty("normal10") or mod:IsDifficulty("heroic10"))) then
+			timerGasSporeCD:Start()
+		elseif (gasSporeCast >= 9 and (mod:IsDifficulty("normal25") or mod:IsDifficulty("heroic25"))) or (gasSporeCast >= 6 and (mod:IsDifficulty("normal10") or mod:IsDifficulty("heroic10"))) then
+			timerGasSporeCD:Start(50)--Basically, the third time spores are placed on raid, it'll be an extra 10 seconds before he applies first set of spores again.
+			gasSporeCast = 0
+		end
 		if args:IsPlayer() then
 --			noCheck = false	-- check for distance and show the arrow
 			specWarnGasSpore:Show()

trunk/DBM-Icecrown/ThePlagueworks/PlagueworksTrash.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -12,9 +12,9 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warnZombies		= mod:NewSpellAnnounce(71159)
+local warnZombies		= mod:NewSpellAnnounce(71159, 2)
 local warnMortalWound	= mod:NewAnnounce("warnMortalWound", 2, nil, false)
-local warnDecimateSoon	= mod:NewSoonAnnounce(71123)
+local warnDecimateSoon	= mod:NewSoonAnnounce(71123, 3)
 
 local specWarnDecimate		= mod:NewSpecialWarningSpell(71123)
 local specWarnMortalWound	= mod:NewSpecialWarningStack(71127, nil, 5)

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -15,21 +15,20 @@
 	"UNIT_HEALTH"
 )
 
-local warnSlimePuddle				= mod:NewSpellAnnounce(70341, 3)
-local warnUnstableExperimentSoon	= mod:NewSoonAnnounce(70351, 3)
-local warnUnstableExperiment		= mod:NewSpellAnnounce(70351, 3)
-local warnVolatileOozeAdhesive		= mod:NewTargetAnnounce(70447, 4)
-local warnGaseousBloat				= mod:NewTargetAnnounce(70672, 4)
-local warnPhase2Soon				= mod:NewAnnounce("WarnPhase2Soon", 2)
-local warnTearGas					= mod:NewSpellAnnounce(71617)			-- Phase transition normal
-local warnVolatileExperiment		= mod:NewSpellAnnounce(72840)			-- Phase transition heroic
-local warnMalleableGoo				= mod:NewSpellAnnounce(72295, 3)		-- Phase 2 ability
+local warnSlimePuddle				= mod:NewSpellAnnounce(70341, 2)
+local warnUnstableExperimentSoon	= mod:NewSoonAnnounce(70351, 2)
+local warnUnstableExperiment		= mod:NewSpellAnnounce(70351, 4)
+local warnVolatileOozeAdhesive		= mod:NewTargetAnnounce(70447, 3)
+local warnGaseousBloat				= mod:NewTargetAnnounce(70672, 3)
+local warnPhase2Soon				= mod:NewAnnounce("WarnPhase2Soon", 1)
+local warnTearGas					= mod:NewSpellAnnounce(71617, 2)		-- Phase transition normal
+local warnVolatileExperiment		= mod:NewSpellAnnounce(72840, 4)		-- Phase transition heroic
+local warnMalleableGoo				= mod:NewSpellAnnounce(72295, 2)		-- Phase 2 ability
 local warnChokingGasBomb			= mod:NewSpellAnnounce(71255, 3)		-- Phase 2 ability
-local warnPhase3Soon				= mod:NewAnnounce("WarnPhase3Soon", 2)
-local warnMutatedPlague				= mod:NewAnnounce("WarnMutatedPlague", 3) -- Phase 3 ability
-local warnVolatileOozeAdhesive		= mod:NewTargetAnnounce(70447, 4)
-local warnOozeVariable				= mod:NewTargetAnnounce(70352)			-- Heroic Ability
-local warnGasVariable				= mod:NewTargetAnnounce(70353)			-- Heroic Ability
+local warnPhase3Soon				= mod:NewAnnounce("WarnPhase3Soon", 1)
+local warnMutatedPlague				= mod:NewAnnounce("WarnMutatedPlague", 2) -- Phase 3 ability
+local warnOozeVariable				= mod:NewTargetAnnounce(70352, 2)			-- Heroic Ability
+local warnGasVariable				= mod:NewTargetAnnounce(70353, 2)			-- Heroic Ability
 
 local specWarnVolatileOozeAdhesive	= mod:NewSpecialWarningYou(70447)
 local specWarnGaseousBloat			= mod:NewSpecialWarningYou(70672)
@@ -221,7 +220,11 @@
 		timerChokingGasBombCD:Start()
 	elseif args:IsSpellID(72615, 72295, 74280, 74281) then
 		warnMalleableGoo:Show()
+		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
+			timerMalleableGooCD:Start(20)
+		else
 		timerMalleableGooCD:Start()
+		end
 		self:ScheduleMethod(0.1, "MalleableGooTarget")
 	end
 end

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 3720

Old date: 2010-02-27 20:15:12 UTC

@@ -18,13 +18,13 @@
 
 local InfectionIcon	-- alternating between 2 icons (2 debuffs can be up at the same time in 25man at least)
 
-local warnSlimeSpray			= mod:NewSpellAnnounce(69508)
-local warnOozeExplosionCast		= mod:NewCastAnnounce(69839)
-local warnMutatedInfection		= mod:NewTargetAnnounce(71224)
-local warnRadiatingOoze			= mod:NewSpellAnnounce(69760, false)--Some strats purposely run to this so option is defaulted to off
-local warnOozeSpawn				= mod:NewAnnounce("WarnOozeSpawn")
-local warnStickyOoze			= mod:NewSpellAnnounce(69774)
-local warnUnstableOoze			= mod:NewAnnounce("WarnUnstableOoze")
+local warnSlimeSpray			= mod:NewSpellAnnounce(69508, 2)
+local warnOozeExplosionCast		= mod:NewCastAnnounce(69839, 3)
+local warnMutatedInfection		= mod:NewTargetAnnounce(71224, 4)
+local warnRadiatingOoze			= mod:NewSpellAnnounce(69760, 2)
+local warnOozeSpawn				= mod:NewAnnounce("WarnOozeSpawn", 1)
+local warnStickyOoze			= mod:NewSpellAnnounce(69774, 1)
+local warnUnstableOoze			= mod:NewAnnounce("WarnUnstableOoze", 2)
 
 local specWarnMutatedInfection	= mod:NewSpecialWarningYou(71224)
 local specWarnStickyOoze		= mod:NewSpecialWarningMove(69774)

r3720 (Vampik): ruRU update

Vampik — Sat, 27 Feb 2010 20:15:12 GMT

Author: Vampik
Date: Sat Feb 27 21:15:12 CET 2010
Revision: 3720

Log:

ruRU update

Updated

trunk/DBM-Icecrown/localization.ru.lua

Action: modified

Old revision: 3719

Old date: 2010-02-26 19:11:29 UTC

@@ -164,8 +164,8 @@
 L:SetMiscLocalization{
 	PullAlliance	= "Запускайте двигатели! Летим навстречу судьбе.",
 	KillAlliance	= "Ну не говорите потом, что я не предупреждал. В атаку, братья и сестры!",
-	PullHorde		= "Rise up, sons and daughters of the Horde! Today we battle a hated enemy! LOK'TAR OGAR!",
-	KillHorde		= "The Alliance falter. Onward to the Lich King!"
+	PullHorde		= "Воспряньте, сыны и дочери Орды! Сегодня мы будем биться со смертельным врагом! ЛОК'ТАР ОГАР!",
+	KillHorde		= "Альянс повержен. Вперед, к Королю-личу!"
 }
 
 -----------------------------

r3719 (Vampik): Fix for r3717

Vampik — Fri, 26 Feb 2010 19:11:29 GMT

Author: Vampik
Date: Fri Feb 26 20:11:29 CET 2010
Revision: 3719

Log:

Fix for r3717

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Action: modified

Old revision: 3718

Old date: 2010-02-26 16:44:21 UTC

@@ -68,7 +68,7 @@
 		self:ScheduleMethod(0.5, "CreateBossRPFrame")
 	end
 	timerCallBloodBeast:Start(-delay)
-	warnAddsSoon:Schedule(35-delay)
+	warnAddsSoon:Schedule(30-delay)
 	timerBloodNova:Start(-delay)
 	if mod:IsDifficulty("normal10") or mod:IsDifficulty("normal25") then
 		enrageTimer:Start(-delay)
@@ -137,7 +137,7 @@
 	if args:IsSpellID(72173, 72356, 72357, 72358) then
 		timerCallBloodBeast:Start()
 		if GetTime() - spamBloodBeast > 5 then
-			warnAddsSoon:Schedule(35)
+			warnAddsSoon:Schedule(30)
 			spamBloodBeast = GetTime()
 		end
 	elseif args:IsSpellID(72410) then

r3718 (Azael): zhtw update

Azael — Fri, 26 Feb 2010 16:44:21 GMT

Author: Azael
Date: Fri Feb 26 17:44:21 CET 2010
Revision: 3718

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 3717

Old date: 2010-02-26 09:20:11 UTC

@@ -475,6 +475,6 @@
 	LKPull				= "聖光所謂的正義終於來了嗎？我是否該把霜之哀傷放下，祈求你的寬恕呢，弗丁？",
 	YellDefile			= "我中了汙染!",
 	YellTrap			= "我中了暗影陷阱!",
-	YellKill			= "No questions remain unanswered. No doubts linger. You ARE Azeroth's greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...",
-	LKRoleplay			= "Is it truly righteousness that drives you? I wonder..."
+	YellKill			= "沒有問題尚未解答。沒有任何懷疑。你們就是艾澤拉斯最偉大的勇士。你們克服了每一個我所設下的考驗。我最強大的僕人們都在你們不屈不撓的猛攻中倒下…在你們奔放的怒火之中…",
+	LKRoleplay			= "你們的原動力真的是正義感嗎？我很懷疑……"
 }
\ No newline at end of file

r3717 (Omega): ICC/Deathbringer changed the adds pre warning to 10 seconds to make the paladins happy. But don't be surprised if the other dps classes want the 5 second pre warning back instead.

Omega — Fri, 26 Feb 2010 09:20:11 GMT

Author: Omega
Date: Fri Feb 26 10:20:11 CET 2010
Revision: 3717

Log:

ICC/Deathbringer changed the adds pre warning to 10 seconds to make the paladins happy. But don't be surprised if the other dps classes want the 5 second pre warning back instead.

Updated

trunk/DBM-Icecrown/TheLowerSpire/Deathbringer.lua

Action: modified

Old revision: 3716

Old date: 2010-02-26 04:34:05 UTC

@@ -23,7 +23,7 @@
 				or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) < 51)
 
 local warnFrenzySoon		= mod:NewAnnounce("warnFrenzySoon", 2, 72737)
-local warnAddsSoon			= mod:NewSoonAnnounce(72173, 3)
+local warnAddsSoon			= mod:NewPreWarnAnnounce(72173, 10, 3)
 local warnFrenzy			= mod:NewSpellAnnounce(72737)
 local warnBloodNova			= mod:NewSpellAnnounce(73058)
 local warnMark				= mod:NewTargetAnnounce(72444)

r3716 (Omega): #ICC/Marrowgar -5 seconds of heroic bonestorm timer. it'll be a litlte more accurate now although timer is still subject to variations based on spread distance of your raid.

Omega — Fri, 26 Feb 2010 04:34:05 GMT

Author: Omega
Date: Fri Feb 26 05:34:05 CET 2010
Revision: 3716

Log:

#ICC/Marrowgar -5 seconds of heroic bonestorm timer. it'll be a litlte more accurate now although timer is still subject to variations based on spread distance of your raid.

Updated

trunk/DBM-Icecrown/TheLowerSpire/LordMarrowgar.lua

Action: modified

Old revision: 3715

Old date: 2010-02-25 18:56:13 UTC

@@ -89,9 +89,9 @@
 		timerWhirlwindCD:Start()
 		preWarnWhirlwind:Schedule(85)
 		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
-			timerWhirlwind:Show(35)						-- 35seconds on heroic
+			timerWhirlwind:Show(30)						-- Approx 30seconds on heroic
 		else
-			timerWhirlwind:Show()						-- 20seconds on normal.
+			timerWhirlwind:Show()						-- Approx 20seconds on normal.
 			timerBoneSpike:Cancel()						-- He doesn't do Bone Spike Graveyard during Bone Storm on normal
 		end
 		soundWhirlwind:Play()

r3715 (Vampik): ruRU update

Vampik — Thu, 25 Feb 2010 18:56:13 GMT

Author: Vampik
Date: Thu Feb 25 19:56:13 CET 2010
Revision: 3715

Log:

ruRU update

Updated

trunk/DBM-Icecrown/localization.ru.lua

Action: modified

Old revision: 3714

Old date: 2010-02-25 12:28:20 UTC

@@ -197,7 +197,7 @@
 L:SetMiscLocalization{
 	RunePower			= "Сила крови",
 	PullAlliance		= "Все павшие воины Орды, все дохлые псы Альянса – все пополнят армию Короля-лича. Даже сейчас валь'киры воскрешают ваших покойников, чтобы те стали частью Плети!",
-	PullHorde			= "Kor'kron, move out! Champions, watch your backs! The Scourge have been..."
+	PullHorde			= "Кор'крон, выдвигайтесь! Герои, будьте начеку. Плеть только что..."
 }
 
 -----------------
@@ -473,5 +473,5 @@
 	YellDefile		= "Осквернение на мне!",
 	YellTrap		= "Теневая ловушка на мне!",
 	YellKill		= "Сомнений нет: ВЫ величайшие герои Азерота. Вы преодолели все препятствия, которые я воздвиг перед вами. Сильнейшие из моих слуг пали под вашим натиском… сгорели в пламени вашей ярости...",
-	LKRoleplay		= "Is it truly righteousness that drives you? I wonder..."
+	LKRoleplay		= "Что движет вами?.. Праведность? Не знаю..."	--Need to confirm
 }

r3714 (Azael): zhtw update

Azael — Thu, 25 Feb 2010 12:28:20 GMT

Author: Azael
Date: Thu Feb 25 13:28:20 CET 2010
Revision: 3714

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 3713

Old date: 2010-02-25 09:27:14 UTC

@@ -369,11 +369,13 @@
 }
 
 L:SetWarningLocalization{
-	warnCorrosion			= "%s: >%s< (%s)"
+	warnCorrosion			= "%s: >%s< (%s)",
+	warnPortalOpen			= "傳送門開啟"
 }
 
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton	= "為熾熱骷髏設置標記 (頭顱)",
+	warnPortalOpen			= "當$spell:72483開啟時顯示警告",
 	warnCorrosion			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }

r3713 (Snamor): #ICC/All: esES update

Snamor — Thu, 25 Feb 2010 09:27:14 GMT

Author: Snamor
Date: Thu Feb 25 10:27:14 CET 2010
Revision: 3713

Log:

#ICC/All: esES update

Updated

trunk/DBM-Icecrown/localization.es.lua

Action: modified

Old revision: 3712

Old date: 2010-02-25 05:16:04 UTC

@@ -372,11 +372,13 @@
 }
 
 L:SetWarningLocalization{
-	warnCorrosion	= "%s en >%s< (%s)"
+	warnCorrosion	= "%s en >%s< (%s)",
+	warnPortalOpen	= "Se abren los portales"
 }
 
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton	= "Poner icono en Esqueleto llameante (calavera)",
+	warnPortalOpen				= "Mostrar aviso cuando $spell:72483 se abren",
 	warnCorrosion	= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }

r3712 (Omega): #ICC/Sindragosa changed pull to "combat" so timers are more accurate from pull. Yell was subject to few second variations based on where she was in room. combat is far more accurate. minsync version set

Omega — Thu, 25 Feb 2010 05:16:04 GMT

Author: Omega
Date: Thu Feb 25 06:16:04 CET 2010
Revision: 3712

Log:

#ICC/Sindragosa changed pull to "combat" so timers are more accurate from pull. Yell was subject to few second variations based on where she was in room. combat is far more accurate. minsync version set

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 3711

Old date: 2010-02-24 22:03:27 UTC

@@ -3,8 +3,9 @@
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(36853)
-mod:RegisterCombat("yell", L.YellPull)
+mod:RegisterCombat("combat")
 mod:SetMinCombatTime(25)
+mod:SetMinSyncRevision(3712)
 mod:SetUsedIcons(3, 4, 5, 6, 7, 8)
 
 mod:RegisterEvents(
@@ -61,8 +62,8 @@
 
 function mod:OnCombatStart(delay)
 	berserkTimer:Start(-delay)
-	timerNextAirphase:Start(62-delay)
-	timerNextBlisteringCold:Start(44-delay)
+	timerNextAirphase:Start(50-delay)
+	timerNextBlisteringCold:Start(35-delay)
 	warned_P2 = false
 	table.wipe(beaconTargets)
 	table.wipe(beaconIconTargets)

r3711 (Omega): #ICC/Lich King: Phase change warnings are also important to everyone and they aren't that spammy. twice per fight. there are times i was tanking 2 raging spirits where the quake warning actually saved me from being a numpty.

Omega — Wed, 24 Feb 2010 22:03:27 GMT

Author: Omega
Date: Wed Feb 24 23:03:27 CET 2010
Revision: 3711

Log:

#ICC/Lich King: Phase change warnings are also important to everyone and they aren't that spammy. twice per fight. there are times i was tanking 2 raging spirits where the quake warning actually saved me from being a numpty.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3710

Old date: 2010-02-24 21:56:21 UTC

@@ -19,8 +19,8 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warnRemorselessWinter = mod:NewSpellAnnounce(74270, false) --Phase Transition Start Ability
-local warnQuake				= mod:NewSpellAnnounce(72262, false) --Phase Transition End Ability
+local warnRemorselessWinter = mod:NewSpellAnnounce(74270) --Phase Transition Start Ability
+local warnQuake				= mod:NewSpellAnnounce(72262) --Phase Transition End Ability
 local warnRagingSpirit		= mod:NewTargetAnnounce(69200) --Transition Add
 local warnShamblingHorror	= mod:NewSpellAnnounce(70372) --Phase 1 Add
 local warnDrudgeGhouls		= mod:NewSpellAnnounce(70358) --Phase 1 Add

r3710 (Omega): #ICC/Lich King: Revert some of lich king changes, adds timers are important to EVERYONE, not just tanks, dps need to know to stop aoe abilities on new add spawns so they don't pull aggro. healers need to know when adds enrage too, especialy in 10 man when it's likely you don't have someone to dispel it. Special warnings that are flagged YOU don't need rules for defaults, they are only sent to person it's on and no one else. So what it's defaults are don't matter. But if a dps shanks lich king and happens to get soul reaper, the mod should tell him that even if he's not a tank.

Omega — Wed, 24 Feb 2010 21:56:21 GMT

Author: Omega
Date: Wed Feb 24 22:56:21 CET 2010
Revision: 3710

Log:

#ICC/Lich King: Revert some of lich king changes, adds timers are important to EVERYONE, not just tanks, dps need to know to stop aoe abilities on new add spawns so they don't pull aggro. healers need to know when adds enrage too, especialy in 10 man when it's likely you don't have someone to dispel it. Special warnings that are flagged YOU don't need rules for defaults, they are only sent to person it's on and no one else. So what it's defaults are don't matter. But if a dps shanks lich king and happens to get soul reaper, the mod should tell him that even if he's not a tank.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3709

Old date: 2010-02-24 21:55:02 UTC

@@ -22,9 +22,9 @@
 local warnRemorselessWinter = mod:NewSpellAnnounce(74270, false) --Phase Transition Start Ability
 local warnQuake				= mod:NewSpellAnnounce(72262, false) --Phase Transition End Ability
 local warnRagingSpirit		= mod:NewTargetAnnounce(69200) --Transition Add
-local warnShamblingHorror	= mod:NewSpellAnnounce(70372, mod:IsTank()) --Phase 1 Add
-local warnDrudgeGhouls		= mod:NewSpellAnnounce(70358, mod:IsTank()) --Phase 1 Add
-local warnShamblingEnrage	= mod:NewTargetAnnounce(72143, mod:IsTank() or mod:CanRemoveEnrage()) --Phase 1 Add Ability
+local warnShamblingHorror	= mod:NewSpellAnnounce(70372) --Phase 1 Add
+local warnDrudgeGhouls		= mod:NewSpellAnnounce(70358) --Phase 1 Add
+local warnShamblingEnrage	= mod:NewTargetAnnounce(72143) --Phase 1 Add Ability
 local warnNecroticPlague	= mod:NewTargetAnnounce(73912) --Phase 1+ Ability
 local warnInfest			= mod:NewSpellAnnounce(73779, mod:IsHealer()) --Phase 1 & 2 Ability
 local warnPhase2Soon		= mod:NewAnnounce("WarnPhase2Soon", 2)
@@ -37,7 +37,7 @@
 local warnHarvestSoul		= mod:NewTargetAnnounce(74325) --Phase 3 Ability
 local warnTrapCast			= mod:NewTargetAnnounce(73539) --Phase 2+ Ability
 
-local specWarnSoulreaper	= mod:NewSpecialWarningYou(73797, mod:IsTank()) --Phase 1+ Ability
+local specWarnSoulreaper	= mod:NewSpecialWarningYou(73797) --Phase 1+ Ability
 local specWarnNecroticPlague= mod:NewSpecialWarningYou(73912) --Phase 1+ Ability
 local specWarnRagingSpirit	= mod:NewSpecialWarningYou(69200, false) --Transition Add
 local specWarnDefileCast	= mod:NewSpecialWarning("specWarnDefileCast") --Phase 2+ Ability
@@ -59,8 +59,8 @@
 local timerNecroticPlagueCleanse = mod:NewTimer(5, "TimerNecroticPlagueCleanse", 73912, false)
 local timerNecroticPlagueCD	= mod:NewCDTimer(30, 73912)
 local timerDefileCD			= mod:NewCDTimer(32, 72762)
-local timerShamblingHorror 	= mod:NewNextTimer(60, 70372, mod:IsTank())
-local timerDrudgeGhouls 	= mod:NewNextTimer(20, 70358, mod:IsTank())
+local timerShamblingHorror 	= mod:NewNextTimer(60, 70372)
+local timerDrudgeGhouls 	= mod:NewNextTimer(20, 70358)
 local timerSummonValkyr 	= mod:NewCDTimer(45, 69037)
 local timerVileSpirit 		= mod:NewNextTimer(30, 70498)
 local timerTrapCD		 	= mod:NewCDTimer(16, 73539)

r3709 (Vampik): #ICC/Putricide: Added missing spellids for Mutated Plague (25 normal and both heroic)

Vampik — Wed, 24 Feb 2010 21:55:02 GMT

Author: Vampik
Date: Wed Feb 24 22:55:02 CET 2010
Revision: 3709

Log:

#ICC/Putricide: Added missing spellids for Mutated Plague (25 normal and both heroic)

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3708

Old date: 2010-02-24 21:53:53 UTC

@@ -249,7 +249,7 @@
 		end
 	elseif args:IsSpellID(71615, 71618) then	--71615 used in 10 and 25 normal, 71618?
 		timerTearGas:Start()
-	elseif args:IsSpellID(72451) then	-- Mutated Plague
+	elseif args:IsSpellID(72451, 72463, 72671, 72672) then	-- Mutated Plague
 		warnMutatedPlague:Show(args.spellName, args.destName, args.amount or 1)
 		timerMutatedPlague:Start(args.destName)
 		timerMutatedPlagueCD:Start()

r3708 (Vampik): ruRU update

Vampik — Wed, 24 Feb 2010 21:53:53 GMT

Author: Vampik
Date: Wed Feb 24 22:53:53 CET 2010
Revision: 3708

Log:

ruRU update

Updated

trunk/DBM-Icecrown/localization.ru.lua

Action: modified

Old revision: 3707

Old date: 2010-02-24 21:47:01 UTC

@@ -366,11 +366,13 @@
 }
 
 L:SetWarningLocalization{
-	warnCorrosion	= "%s на |3-5(>%s<) (%s)"		-- Corrosion on >args.destName< (args.amount)
+	warnCorrosion	= "%s на |3-5(>%s<) (%s)",		-- Corrosion on >args.destName< (args.amount)
+	warnPortalOpen	= "Открытие порталов"
 }
 
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton		= "Устанавливать метку на Исторгающего пламя скелета (череп)",
+	warnPortalOpen				= "Предупреждение об открытии порталов",
 	warnCorrosion	= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }

r3707 (Nalumis): deDE update

Nalumis — Wed, 24 Feb 2010 21:47:01 GMT

Author: Nalumis
Date: Wed Feb 24 22:47:01 CET 2010
Revision: 3707

Log:

deDE update

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3706

Old date: 2010-02-24 21:44:07 UTC

@@ -370,11 +370,13 @@
 }
 
 L:SetWarningLocalization{
-	warnCorrosion	= "%s auf >%s< (%s)"		-- Corrosion on >args.destName< (args.amount)
+	warnCorrosion	= "%s auf >%s< (%s)",		-- Corrosion on >args.destName< (args.amount)
+	warnPortalOpen	= "Portale offen"
 }
 
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton		= "Setze Zeichen auf Loderndes Skelett (Totenkopf)",
+	warnPortalOpen				= "Zeige Warnung bei $spell:72483",
 	warnCorrosion	= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }

r3706 (Nalumis): Reduce information overflow on Lich King encounter. Now we need a button to manually reset settings to default after a DBM update or a respec. ;)

Nalumis — Wed, 24 Feb 2010 21:44:07 GMT

Author: Nalumis
Date: Wed Feb 24 22:44:07 CET 2010
Revision: 3706

Log:

Reduce information overflow on Lich King encounter. Now we need a button to manually reset settings to default after a DBM update or a respec. ;)

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 3705

Old date: 2010-02-24 21:44:04 UTC

@@ -2364,6 +2364,19 @@
 	end
 end
 
+local function getTalentpointsSpent(spellID)
+	local spellName = GetSpellInfo(spellID)
+	for tabIndex=1, GetNumTalentTabs() do
+		for talentID=1, GetNumTalents(tabIndex) do
+			local name, _, _, _, spent = GetTalentInfo(tabIndex, talentID)
+			if(name == spellName) then
+				return spent
+			end
+		end
+	end
+	return 0
+end
+
 function bossModPrototype:IsMelee()
 	return select(2, UnitClass("player")) == "ROGUE"
 			or select(2, UnitClass("player")) == "WARRIOR"
@@ -2377,7 +2390,42 @@
 	return self:IsMelee() or select(2, UnitClass("player")) == "HUNTER"
 end
 
+function bossModPrototype:CanRemoveEnrage()
+	return select(2, UnitClass("player")) == "HUNTER" or select(2, UnitClass("player")) == "ROGUE"
+end
 
+local function IsDeathKnightTank()
+	-- idea taken from addon 'ElitistJerks'
+	local tankTalents = (getTalentpointsSpent(16271) >= 5 and 1 or 0) +		-- Anticipation
+	                    (getTalentpointsSpent(49042) >= 5 and 1 or 0) +		-- Toughness
+						(getTalentpointsSpent(55225) >= 5 and 1 or 0)		-- Blade Barrier
+	return tankTalents >= 3
+end
+
+local function IsDruidTank()
+	-- idea taken from addon 'ElitistJerks'
+	local tankTalents = (getTalentpointsSpent(57881) >= 2 and 1 or 0) +		-- Natural Reaction
+	                    (getTalentpointsSpent(16929) >= 3 and 1 or 0) +		-- Thick Hide
+						(getTalentpointsSpent(61336) >= 1 and 1 or 0) +		-- Survival Instincts
+						(getTalentpointsSpent(57877) >= 3 and 1 or 0)		-- Protector of the Pack
+	return tankTalents >= 3
+end
+
+function bossModPrototype:IsTank()
+	return (select(2, UnitClass("player")) == "WARRIOR" and select(3, GetTalentTabInfo(3)) >= 51)
+     		or (select(2, UnitClass("player")) == "DEATHKNIGHT" and IsDeathKnightTank())
+			or (select(2, UnitClass("player")) == "PALADIN" and select(3, GetTalentTabInfo(2)) >= 51)
+			or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(2)) >= 51 and IsDruidTank())
+end
+
+function bossModPrototype:IsHealer()
+	return (select(2, UnitClass("player")) == "PALADIN" and select(3, GetTalentTabInfo(1)) >= 51)
+     		or (select(2, UnitClass("player")) == "SHAMAN" and select(3, GetTalentTabInfo(3)) >= 51)
+			or (select(2, UnitClass("player")) == "DRUID" and select(3, GetTalentTabInfo(3)) >= 51)
+			or (select(2, UnitClass("player")) == "PRIEST" and select(3, GetTalentTabInfo(3)) < 51)
+end
+
+
 -------------------------
 --  Boss Health Frame  --
 -------------------------

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 3705

Old date: 2010-02-24 21:44:04 UTC

@@ -19,17 +19,17 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warnRemorselessWinter = mod:NewSpellAnnounce(74270) --Phase Transition Start Ability
-local warnQuake				= mod:NewSpellAnnounce(72262) --Phase Transition End Ability
+local warnRemorselessWinter = mod:NewSpellAnnounce(74270, false) --Phase Transition Start Ability
+local warnQuake				= mod:NewSpellAnnounce(72262, false) --Phase Transition End Ability
 local warnRagingSpirit		= mod:NewTargetAnnounce(69200) --Transition Add
-local warnShamblingHorror	= mod:NewSpellAnnounce(70372) --Phase 1 Add
-local warnDrudgeGhouls		= mod:NewSpellAnnounce(70358) --Phase 1 Add
-local warnShamblingEnrage	= mod:NewTargetAnnounce(72143) --Phase 1 Add Ability
+local warnShamblingHorror	= mod:NewSpellAnnounce(70372, mod:IsTank()) --Phase 1 Add
+local warnDrudgeGhouls		= mod:NewSpellAnnounce(70358, mod:IsTank()) --Phase 1 Add
+local warnShamblingEnrage	= mod:NewTargetAnnounce(72143, mod:IsTank() or mod:CanRemoveEnrage()) --Phase 1 Add Ability
 local warnNecroticPlague	= mod:NewTargetAnnounce(73912) --Phase 1+ Ability
-local warnInfest			= mod:NewSpellAnnounce(73779) --Phase 1 & 2 Ability
+local warnInfest			= mod:NewSpellAnnounce(73779, mod:IsHealer()) --Phase 1 & 2 Ability
 local warnPhase2Soon		= mod:NewAnnounce("WarnPhase2Soon", 2)
 local warnDefileSoon		= mod:NewSoonAnnounce(73708)	--Phase 2+ Ability
-local warnSoulreaper		= mod:NewSpellAnnounce(73797) --Phase 2+ Ability
+local warnSoulreaper		= mod:NewSpellAnnounce(73797, mod:IsTank() or mod:IsHealer()) --Phase 2+ Ability
 local warnDefileCast		= mod:NewTargetAnnounce(72762) --Phase 2+ Ability
 local warnSummonValkyr		= mod:NewSpellAnnounce(69037) --Phase 2 Add
 local warnPhase3Soon		= mod:NewAnnounce("WarnPhase3Soon", 2)
@@ -37,30 +37,30 @@
 local warnHarvestSoul		= mod:NewTargetAnnounce(74325) --Phase 3 Ability
 local warnTrapCast			= mod:NewTargetAnnounce(73539) --Phase 2+ Ability
 
-local specWarnSoulreaper	= mod:NewSpecialWarningYou(73797) --Phase 1+ Ability
+local specWarnSoulreaper	= mod:NewSpecialWarningYou(73797, mod:IsTank()) --Phase 1+ Ability
 local specWarnNecroticPlague= mod:NewSpecialWarningYou(73912) --Phase 1+ Ability
-local specWarnRagingSpirit	= mod:NewSpecialWarningYou(69200) --Transition Add
+local specWarnRagingSpirit	= mod:NewSpecialWarningYou(69200, false) --Transition Add
 local specWarnDefileCast	= mod:NewSpecialWarning("specWarnDefileCast") --Phase 2+ Ability
 local specWarnDefileNear	= mod:NewSpecialWarning("specWarnDefileNear", false) --Phase 2+ Ability
 local specWarnDefile		= mod:NewSpecialWarningMove(73708) --Phase 2+ Ability
 local specWarnWinter		= mod:NewSpecialWarningMove(73791) --Transition Ability
 local specWarnHarvestSoul	= mod:NewSpecialWarningYou(74325) --Phase 3+ Ability
 local specWarnInfest		= mod:NewSpecialWarningSpell(73779, false) --Phase 1+ Ability
-local specwarnSoulreaper	= mod:NewSpecialWarningTarget(73797, false) --phase 2+
+local specwarnSoulreaper	= mod:NewSpecialWarningTarget(73797, mod:IsTank() or mod:IsHealer()) --phase 2+
 local specWarnTrap			= mod:NewSpecialWarningYou(73539) --Heroic Ability
 
 local timerCombatStart		= mod:NewTimer(54.5, "TimerCombatStart", 2457)
 local timerPhaseTransition	= mod:NewTimer(62, "PhaseTransition")
-local timerSoulreaper	 	= mod:NewTargetTimer(5.1, 73797)
-local timerSoulreaperCD	 	= mod:NewCDTimer(30, 73797)
+local timerSoulreaper	 	= mod:NewTargetTimer(5.1, 73797, mod:IsTank() or mod:IsHealer())
+local timerSoulreaperCD	 	= mod:NewCDTimer(30, 73797, mod:IsTank() or mod:IsHealer())
 local timerHarvestSoul	 	= mod:NewTargetTimer(6, 74325)
 local timerHarvestSoulCD	= mod:NewCDTimer(75, 74325)
-local timerInfestCD			= mod:NewCDTimer(22, 73779)
+local timerInfestCD			= mod:NewCDTimer(22, 73779, mod:IsHealer())
 local timerNecroticPlagueCleanse = mod:NewTimer(5, "TimerNecroticPlagueCleanse", 73912, false)
 local timerNecroticPlagueCD	= mod:NewCDTimer(30, 73912)
 local timerDefileCD			= mod:NewCDTimer(32, 72762)
-local timerShamblingHorror 	= mod:NewNextTimer(60, 70372)
-local timerDrudgeGhouls 	= mod:NewNextTimer(20, 70358)
+local timerShamblingHorror 	= mod:NewNextTimer(60, 70372, mod:IsTank())
+local timerDrudgeGhouls 	= mod:NewNextTimer(20, 70358, mod:IsTank())
 local timerSummonValkyr 	= mod:NewCDTimer(45, 69037)
 local timerVileSpirit 		= mod:NewNextTimer(30, 70498)
 local timerTrapCD		 	= mod:NewCDTimer(16, 73539)

r3705 (bluenyx): koKR update

bluenyx — Wed, 24 Feb 2010 21:44:04 GMT

Author: bluenyx
Date: Wed Feb 24 22:44:04 CET 2010
Revision: 3705

Log:

koKR update

Updated

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 3704

Old date: 2010-02-24 21:41:50 UTC

@@ -368,11 +368,13 @@
 }
 
 L:SetWarningLocalization{
-	warnCorrosion				= "%s : >%s< (%s)"		-- Corrosion on >args.destName< (args.amount)
+	warnCorrosion				= "%s : >%s< (%s)",		-- Corrosion on >args.destName< (args.amount)
+	warnPortalOpen				= "포탈 열림"	
 }
 
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton	= "타오르는 해골에게 공격대 아이콘 설정(해골)",
+	warnPortalOpen				= "$spell:72483 열림 경고 보기",	
 	warnCorrosion				= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "알 수 없음")
 }

r3704 (Nalumis): deDE update (Lord Jaraxxus)

Nalumis — Wed, 24 Feb 2010 21:41:50 GMT

Author: Nalumis
Date: Wed Feb 24 22:41:50 CET 2010
Revision: 3704

Log:

deDE update (Lord Jaraxxus)

Updated

trunk/DBM-Coliseum/localization.de.lua

Action: modified

Old revision: 3703

Old date: 2010-02-24 21:28:12 UTC

@@ -2,7 +2,6 @@
 
 -- fehlende Übersetzungen:
 --
--- Lord Jaraxxus
 -- Fraktionschampions
 -- Zwillingsval'kyr
 
@@ -106,7 +105,7 @@
 }
 
 L:SetMiscLocalization{
-	FirstPull	= "Grand Warlock Wilfred Fizzlebang will summon forth your next challenge. Stand by for his entry."	-- to be translated
+	FirstPull	= "Großhexenmeister Wilfred Zischknall wird Eure nächste Herausforderung beschwören. Harrt seiner Ankunft."
 }
 
 -------------------------

r3703 (Omega): #ICC/Valithria: Added improved normal mode portal announces/timers. Heroic still needs chat/combatlog, maybe a transcriptor log if possible

Omega — Wed, 24 Feb 2010 21:28:12 GMT

Author: Omega
Date: Wed Feb 24 22:28:12 CET 2010
Revision: 3703

Log:

#ICC/Valithria: Added improved normal mode portal announces/timers. Heroic still needs chat/combatlog, maybe a transcriptor log if possible

Updated

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Action: modified

Old revision: 3702

Old date: 2010-02-23 16:36:40 UTC

@@ -22,15 +22,17 @@
 local warnSupression	= mod:NewSpellAnnounce(70588)
 local warnPortalSoon	= mod:NewSoonAnnounce(72483)
 local warnPortal		= mod:NewSpellAnnounce(72483)
+local warnPortalOpen	= mod:NewAnnounce("warnPortalOpen")
 
 local specWarnLayWaste	= mod:NewSpecialWarningSpell(71730)
 
 local timerLayWaste		= mod:NewBuffActiveTimer(12, 69325)
 local timerNextPortal	= mod:NewCDTimer(46, 72483)
+local timerPortalsOpen	= mod:NewBuffActiveTimer(10, 72483)
 local timerGutSpray		= mod:NewTargetTimer(12, 71283)
 local timerCorrosion	= mod:NewTargetTimer(6, 70751)
 
-local berserkTimer	= mod:NewBerserkTimer(420)--Seems to exist just kinda funny, the adds just blow you up, not her
+local berserkTimer		= mod:NewBerserkTimer(420)--Seems to exist just kinda funny, the adds spawn rapid fast.
 
 mod:AddBoolOption("SetIconOnBlazingSkeleton", true)
 
@@ -121,6 +123,8 @@
 function mod:OnSync(msg, arg)
 	if msg == "NightmarePortal" then
 		warnPortal:Show()
+		warnPortalOpen:Schedule(15)
+		timerPortalsOpen:Schedule(15)
 		warnPortalSoon:Schedule(41)
 		timerNextPortal:Start()
 	end

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 3702

Old date: 2010-02-23 16:36:40 UTC

@@ -364,11 +364,13 @@
 }
 
 L:SetWarningLocalization{
-	warnCorrosion	= "%s on >%s< (%s)"		-- Corrosion on >args.destName< (args.amount)
+	warnCorrosion	= "%s on >%s< (%s)",		-- Corrosion on >args.destName< (args.amount)
+	warnPortalOpen	= "Portals open"
 }
 
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton		= "Set icon on Blazing Skeleton (skull)",
+	warnPortalOpen				= "Show warning when $spell:72483 are opened up",
 	warnCorrosion	= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }

r3702 (Azael): zhtw update

Azael — Tue, 23 Feb 2010 16:36:40 GMT

Author: Azael
Date: Tue Feb 23 17:36:40 CET 2010
Revision: 3702

Log:

zhtw update

Updated

trunk/DBM-Core/localization.tw.lua

Updated

trunk/DBM-Icecrown/localization.tw.lua

trunk/DBM-Core/localization.tw.lua

Action: modified

Old revision: 3701

Old date: 2010-02-23 11:01:21 UTC

@@ -3,11 +3,11 @@
 DBM_CORE_LOAD_MOD_SUCCESS			= "成功載入%s模組!"
 DBM_CORE_LOAD_GUI_ERROR				= "無法載入圖形介面：%s"
 
-DBM_CORE_COMBAT_STARTED				= "%s開戰. 祝好運與盡興! :)";
-DBM_CORE_BOSS_DOWN				= "%s 倒地, 經過 %s!"
-DBM_CORE_BOSS_DOWN_LONG				= "%s倒地!本次經過%s，上次經過%s，最快紀錄%s。"
-DBM_CORE_BOSS_DOWN_NEW_RECORD			= "%s倒地! 經過	%s，這是一個新記錄!（舊紀錄為%s）"
-DBM_CORE_COMBAT_ENDED				= "%s 的戰鬥經過 %s 結束."
+DBM_CORE_COMBAT_STARTED				= "%s開戰。祝好運與盡興! :)";
+DBM_CORE_BOSS_DOWN				= "擊敗%s，經過%s!"
+DBM_CORE_BOSS_DOWN_LONG				= "擊敗%s!本次經過%s，上次經過%s，最快紀錄%s。"
+DBM_CORE_BOSS_DOWN_NEW_RECORD			= "擊敗%s!經過%s，這是一個新記錄!（舊紀錄為%s）"
+DBM_CORE_COMBAT_ENDED				= "%s的戰鬥經過%s結束。"
 
 DBM_CORE_TIMER_FORMAT_SECS			= "%d秒"
 DBM_CORE_TIMER_FORMAT_MINS			= "%d分鐘"
@@ -25,15 +25,15 @@
 DBM_CORE_OPTION_TIMER_BERSERK			= "為$spell:26662顯示計時器"
 DBM_CORE_OPTION_HEALTH_FRAME			= "顯示首領血量框架"
 
-DBM_CORE_OPTION_CATEGORY_TIMERS			= "計時條"
+DBM_CORE_OPTION_CATEGORY_TIMERS			= "計時器"
 DBM_CORE_OPTION_CATEGORY_WARNINGS		= "提示"
 DBM_CORE_OPTION_CATEGORY_MISC			= "其它"
 
-DBM_CORE_AUTO_RESPONDED				= "已自動回復密語。"
-DBM_CORE_STATUS_WHISPER				= "%s：%s，%d/%d存活"
-DBM_CORE_AUTO_RESPOND_WHISPER			= "%s正在與%s交戰，（當前%s，%d/%d存活）"
+DBM_CORE_AUTO_RESPONDED				= "已自動回覆密語。"
+DBM_CORE_STATUS_WHISPER				= "%s：%s，%d/%d存活。"
+DBM_CORE_AUTO_RESPOND_WHISPER			= "%s正在與%s交戰（當前%s，%d/%d存活）"
 DBM_CORE_WHISPER_COMBAT_END_KILL		= "%s已經擊敗 %s!"
-DBM_CORE_WHISPER_COMBAT_END_WIPE		= "%s在 %s 戰鬥中滅團。"
+DBM_CORE_WHISPER_COMBAT_END_WIPE		= "%s在%s的戰鬥中滅團了。"
 
 DBM_CORE_VERSIONCHECK_HEADER			= "Deadly Boss Mods - 版本檢測"
 DBM_CORE_VERSIONCHECK_ENTRY			= "%s：%s(r%d)"
@@ -41,20 +41,20 @@
 DBM_CORE_VERSIONCHECK_FOOTER			= "團隊中有%d名成員正在使用Deadly Boss Mods"
 DBM_CORE_YOUR_VERSION_OUTDATED      		= "你的 Deadly Boss Mod 已經過期! 請到 www.deadlybossmods.com 下載最新版本。"
 
-DBM_CORE_UPDATEREMINDER_HEADER			= "你的 Deadly Boss Mod 已經過期! \n你可以在以下位址下載到新版本%s(r%d)："
-DBM_CORE_UPDATEREMINDER_FOOTER			= "Ctrl-C：複製下載地址到剪貼簿。"
+DBM_CORE_UPDATEREMINDER_HEADER			= "你的 Deadly Boss Mod 已經過期!\n你可以在此網址下載到新版本%s(r%d)："
+DBM_CORE_UPDATEREMINDER_FOOTER			= "Ctrl-C：複製下載網址到剪貼簿。"
 DBM_CORE_UPDATEREMINDER_NOTAGAIN		= "當有新版本時顯示彈出提示"
 
 DBM_CORE_MOVABLE_BAR				= "拖動我!"
 
-DBM_PIZZA_SYNC_INFO				= "|Hplayer:%1$s|h[%1$s]|h向你發送了一個倒計時：'%2$s'\n|HDBM:cancel:%2$s:nil|h|cff3588ff[取消該計時]|r|h  |HDBM:ignore:%2$s:%1$s|h|cff3588ff[忽略來自%1$s的計時]|r|h"
-DBM_PIZZA_CONFIRM_IGNORE			= "是否要在該次遊戲連接中忽略來自%s的計時？"
+DBM_PIZZA_SYNC_INFO				= "|Hplayer:%1$s|h[%1$s]|h向你發送了一個倒數計時：'%2$s'\n|HDBM:cancel:%2$s:nil|h|cff3588ff[取消該計時]|r|h  |HDBM:ignore:%2$s:%1$s|h|cff3588ff[忽略來自%1$s的計時]|r|h"
+DBM_PIZZA_CONFIRM_IGNORE			= "是否要在該次遊戲連結中忽略來自%s的計時？"
 DBM_PIZZA_ERROR_USAGE				= "命令：/dbm [broadcast] timer <時間（秒）> <文字>"
 
-DBM_CORE_ERROR_DBMV3_LOADED			= "目前有2個版本的Deadly Boss Mods正在運行：DBMv3和DBMv4。\n按一下“確定”按鈕可將DBMv3關閉並重載使用者介面。\n我們建議將外掛程式目錄下的DBMv3刪除。"
+DBM_CORE_ERROR_DBMV3_LOADED			= "目前有2個版本的Deadly Boss Mods正在運行：DBMv3和DBMv4。\n按一下“確定”按鈕可將DBMv3關閉並重載插件。\n我們建議將插件目錄下的DBMv3刪除。"
 
 DBM_CORE_MINIMAP_TOOLTIP_HEADER			= "Deadly Boss Mods"
-DBM_CORE_MINIMAP_TOOLTIP_FOOTER			= "Shift+按一下或右鍵點擊即可移動"
+DBM_CORE_MINIMAP_TOOLTIP_FOOTER			= "Shift+左鍵或右鍵點擊即可移動"
 
 DBM_CORE_RANGECHECK_HEADER			= "距離監視（%d碼）"
 DBM_CORE_RANGECHECK_SETRANGE			= "設置距離"
@@ -68,19 +68,19 @@
 DBM_CORE_RANGECHECK_SETRANGE_TO			= "%d碼"
 DBM_CORE_RANGECHECK_LOCK			= "鎖定框架"
 
-DBM_LFG_INVITE					= "尋求組隊邀請"
+DBM_LFG_INVITE					= "地城準備確認"
 
 DBM_CORE_SLASHCMD_HELP				= {
 	"可用命令：",
-	"/dbm version：進行團隊範圍內的版本檢測（也可使用：ver）",
-	"/dbm unlock：顯示一個可移動的計時條，可通過對它來移動所有DBM計時條的位置（也可使用：move）",
-	"/dbm timer  <文本>：開始一個以<文本>為名稱的時間為秒的倒計時",
-	"/dbm broadcast timer  <文本>：向團隊廣播一個以<文本>為名稱的時間為秒的倒計時（需要團隊隊長或助理權限）",
-	"/dbm break <分鐘>: 開始休息分鐘。向所有團隊成員發送一個DBM休息計時條。",
-	"/dbm help：顯示可用命令描述",
+	"/dbm version：進行團隊範圍內的版本檢測（也可使用：ver）。",
+	"/dbm unlock：顯示一個可移動的計時器（也可使用：move）。",
+	"/dbm timer  <文字>：開始一個以<文字>為名稱的時間為秒的計時器。",
+	"/dbm broadcast timer  <文字>：向團隊廣播一個以<文字>為名稱，時間為秒的計時器（需要團隊隊長或助理權限）。",
+	"/dbm break <分鐘>: 開始休息計時器<分鐘>。向所有團隊成員發送一個DBM休息計時器（需要團隊隊長或助理權限）。",
+	"/dbm help：顯示可用命令的說明。",
 }
 
-DBM_ERROR_NO_PERMISSION				= "無權進行該操作。"
+DBM_ERROR_NO_PERMISSION				= "無權進行此操作。"
 
 DBM_CORE_BOSSHEALTH_HIDE_FRAME			= "關閉血量框架"
 
@@ -92,8 +92,8 @@
 DBM_CORE_BREAK_START				= "現在開始休息-你有%s分鐘!"
 DBM_CORE_BREAK_MIN				= "%s分鐘後休息時間結束!"
 DBM_CORE_BREAK_SEC				= "%s秒後休息時間結束!"
-DBM_CORE_BREAK_TIME				= "休息時間!"
-DBM_CORE_BREAK_OVER				= "休息時間已經結束"
+DBM_CORE_TIMER_BREAK				= "休息時間!"
+DBM_CORE_ANNOUNCE_BREAK_OVER			= "休息時間已經結束"
 
 DBM_CORE_TIMER_PULL				= "戰鬥準備"
 DBM_CORE_ANNOUNCE_PULL				= "%d秒後拉怪"
@@ -127,7 +127,7 @@
 	cast 					= "施放 %s: %.1f 秒",
 	soon 					= "%s 即將到來",
 	prewarn 				= "%s 在 %s",
-	phase 					= "第%d階段",
+	phase					= "第%d階段"
 }
 
 local prewarnOption 				= "為|cff71d5ff|Hspell:%d|h%s|h|r顯示預先警告"
@@ -137,21 +137,21 @@
 	cast 					= "當|cff71d5ff|Hspell:%d|h%s|h|r施放時顯示警告",
 	soon 					= prewarnOption,
 	prewarn 				= prewarnOption,
-	phase 					= "提示第%d階段",
+	phase					= "提示第%d階段"
 }
 
 -- Auto-generated Special Warning Localizations
 DBM_CORE_AUTO_SPEC_WARN_OPTIONS = {
 	spell 					= "為$spell:%d顯示特別警告",
-	dispel 					= "需要驅散/竊取$spell:%d時顯示特別警告",
-	interupt				= "需要斷法$spell:%d時顯示特別警告",
+	dispel					= "需對$spell:%d驅散/竊取時顯示特別警告",
+	interupt				= "需對$spell:%d斷法時顯示特別警告",
 	you 					= "當你中了$spell:%d時顯示特別警告",
-	target 					= "為中了$spell:%d的人顯示特別警告",
-	close 					= "當中了$spell:%d的人在你附近時顯示特別警告",
+	target					= "當有人中了$spell:%d時顯示特別警告",
+	close					= "當你附近有人中了$spell:%d時顯示特別警告",
 	move 					= "當你中了$spell:%d時顯示特別警告",
 	run 					= "為$spell:%d顯示特別警告",
-	cast 					= "當$spell:%d施放時顯示特別警告",
-	stack 					= "為$spell:%2$d(>=%1$d層)顯示特別警告"
+	cast					= "為$spell:%d施放時顯示特別警告",
+	stack					= "為>=%d層$spell:%d時顯示特別警告"
 }
 
 DBM_CORE_AUTO_SPEC_WARN_TEXTS = {
@@ -183,5 +183,5 @@
 	"/dbm arrow    建立一個箭頭在特定的位置(0 < x/y < 100)",
 	"/dbm arrow <玩家>  建立並箭頭指向你的隊伍或團隊中特定的玩家",
 	"/dbm arrow hide  隱藏箭頭",
-	"/dbm arrow move  制造可移動箭頭",
+	"/dbm arrow move  可移動箭頭",
 }
\ No newline at end of file

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 3701

Old date: 2010-02-23 11:01:21 UTC

@@ -187,7 +187,7 @@
 
 L:SetOptionLocalization{
 	TimerCombatStart		= "為戰鬥開始顯示計時器",
-	warnFrenzySoon			= "為狂亂顯然預先警告 (大約33%)",
+	warnFrenzySoon			= "為狂亂顯示預先警告 (大約33%)",
 	SetIconOnBoilingBlood		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72441),
 	SetIconOnMarkCast		= "為施放$spell:72444時的目標設置標記\n(試驗中，可能會錯誤地標記坦克)",
 	RangeFrame			= "顯示距離框 (12碼)",
@@ -419,7 +419,7 @@
 	AnnounceFrostBeaconIcons	= "公佈$spell:70126目標設置的標記到團隊頻道\n(需要團隊隊長或助理權限)",
 	SetIconOnFrostBeacon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(70126),
 	SetIconOnUnchainedMagic		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69762),
-	ClearIconsOnAirphase		= "空中階段前消除所有標記"
+	ClearIconsOnAirphase		= "空中階段前清除所有標記"
 }
 
 L:SetMiscLocalization{
@@ -455,20 +455,24 @@
 L:SetOptionLocalization{
 	TimerCombatStart		= "為戰鬥開始顯示計時器",
 	TimerRoleplay			= "為角色扮演事件顯示計時器",
-	TimerNecroticPlagueCleanse	= "為淨化第一次疊加前的亡域瘟疫顯示計時器",
+	TimerNecroticPlagueCleanse	= "為淨化第一次堆疊前的亡域瘟疫顯示計時器",
 	PhaseTransition			= "為轉換階段顯示計時器",
 	WarnPhase2Soon			= "為轉換第2階段顯示預先警告 (大約73%)",
 	WarnPhase3Soon			= "為轉換第3階段顯示預先警告 (大約43%)",
 	specWarnDefileCast		= "當你中了$spell:72762時顯示特別警告",
 	specWarnDefileNear		= "當你附近的人中了$spell:72762時顯示特別警告",
 	YellOnDefile			= "當你中了$spell:72762時大喊",
+	YellOnTrap			= "當你中了$spell:73539時大喊",
 	DefileIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
-	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912)
+	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
+	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
+	TrapIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
 }
 
 L:SetMiscLocalization{
 	LKPull				= "聖光所謂的正義終於來了嗎？我是否該把霜之哀傷放下，祈求你的寬恕呢，弗丁？",
 	YellDefile			= "我中了汙染!",
+	YellTrap			= "我中了暗影陷阱!",
 	YellKill			= "No questions remain unanswered. No doubts linger. You ARE Azeroth's greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...",
 	LKRoleplay			= "Is it truly righteousness that drives you? I wonder..."
 }
\ No newline at end of file

r3701 (Snamor): #Party/All: esES update #Icecrown/All: esES update #Core: esEs update #ChamberOfAspects/All: esEs update

Snamor — Tue, 23 Feb 2010 11:01:21 GMT

Author: Snamor
Date: Tue Feb 23 12:01:21 CET 2010
Revision: 3701

Log:

#Party/All: esES update
#Icecrown/All: esES update
#Core: esEs update
#ChamberOfAspects/All: esEs update

Updated

trunk/DBM-ChamberOfAspects/localization.es.lua

Updated

trunk/DBM-Core/localization.es.lua

Updated

trunk/DBM-Icecrown/localization.es.lua

Updated

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

trunk/DBM-ChamberOfAspects/localization.es.lua

Action: modified

Old revision: 3700

Old date: 2010-02-23 09:23:29 UTC

@@ -84,4 +84,23 @@
 	FireWalls		= "Muro de Fuego fallos (esta raid): %s"
 })
 
+------------------------
+--  The Ruby Sanctum  --
+------------------------
+--  General Zarithrian  --
+--------------------------
+L = DBM:GetModLocalization("Zarithrian")
 
+L:SetGeneralLocalization({
+	name = "General Zarithrian"
+})
+
+-------------------------------------
+--  Halion the Twilight Destroyer  --
+-------------------------------------
+L = DBM:GetModLocalization("Halion")
+
+L:SetGeneralLocalization({
+	name = "Halion el Destructor Crepuscular"
+})
+

trunk/DBM-Core/localization.es.lua

Action: modified

Old revision: 3700

Old date: 2010-02-23 09:23:29 UTC

@@ -90,9 +90,11 @@
 
 DBM_CORE_UNKNOWN					= "desconocido"
 
-DBM_CORE_BREAK_START				= "El descanso empieza ahora -- tienes %s minuto(s)!"
-DBM_CORE_BREAK_MIN					= "El descanso acaba en %s minuto(s)!"
-DBM_CORE_BREAK_SEC					= "El descanso acaba en %s segundos!"
+DBM_CORE_BREAK_START				= "¡El descanso empieza ahora -- tienes %s minuto(s)!"
+DBM_CORE_BREAK_MIN					= "¡El descanso acaba en %s minuto(s)!"
+DBM_CORE_BREAK_SEC					= "¡El descanso acaba en %s segundos!"
+DBM_CORE_TIMER_BREAK				= "¡Descanso!"
+DBM_CORE_ANNOUNCE_BREAK_OVER		= "El descanso terminó"
 
 DBM_CORE_TIMER_PULL					= "Pull en"
 DBM_CORE_ANNOUNCE_PULL				= "Pull en %d seg"

trunk/DBM-Icecrown/localization.es.lua

Action: modified

Old revision: 3700

Old date: 2010-02-23 09:23:29 UTC

@@ -465,14 +465,17 @@
 	specWarnDefileCast		= "Mostrar aviso especial para $spell:72762 en ti",
 	specWarnDefileNear		= "Mostrar aviso especial para $spell:72762 cerca de ti",
 	YellOnDefile			= "Gritar cuando tengas $spell:72762",
+	YellOnTrap				= "Gritar cuando tengas $spell:73539",
 	DefileIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
 	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
-	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200)
+	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
+	TrapIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
 }
 
 L:SetMiscLocalization{
 	LKPull		= "So the Light's vaunted justice has finally arrived? Shall I lay down Frostmourne and throw myself at your mercy, Fordring?",--translate
-	YellDefile		= "Profanar en mi!",
+	YellDefile		= "¡Profanar en mi!",
+	YellTrap		= "¡Trampa de sombras en mi!",
 	YellKill		= "No questions remain unanswered. No doubts linger. You ARE Azeroth's greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...",--translate
 	LKRoleplay		= "Is it truly righteousness that drives you? I wonder..."--translate
 }

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

Action: modified

Old revision: 3700

Old date: 2010-02-23 09:23:29 UTC

@@ -1443,7 +1443,7 @@
 
 L:SetMiscLocalization({
 	CombatStart					= "¡Ay! Valientes aventureros, vuestra intromisión ha llegado a su fin. ¿Oís el ruido de huesos y acero acercándose por ese túnel? Es el sonido de vuestra inminente muerte.", --Cannot promise just yet if this is right emote, it may be the second emote after this, will need to do more testing.
-	HoarfrostTarget				= "¡La vermis de escarcha Dientrefrío mira a % y prepara un helado ataque!",
+	HoarfrostTarget				= "¡La vermis de escarcha Dientrefrío mira a (%S+) y prepara un helado ataque!",
 	YellCombatEnd				= "Imposible... Dientefrío... Avisa..."
 })
 ---------------------

r3700 (Omega): #ICC/Rotface: Some missing heroic spell ids

Omega — Tue, 23 Feb 2010 09:23:29 GMT

Author: Omega
Date: Tue Feb 23 10:23:29 CET 2010
Revision: 3700

Log:

#ICC/Rotface: Some missing heroic spell ids

Updated

trunk/DBM-Icecrown/TheCrimsonHall/Lanathel.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

trunk/DBM-Icecrown/TheCrimsonHall/Lanathel.lua

Action: modified

Old revision: 3699

Old date: 2010-02-23 09:01:17 UTC

@@ -80,7 +80,7 @@
 			specWarnPactDarkfallen:Show()
 		end
 		if self.Options.SetIconOnDarkFallen then--Debuff doesn't actually last 30 seconds
-			self:SetIcon(args.destName, pactIcons, 30)--it lasts forever, but if you still have it after 30 seconds
+			self:SetIcon(args.destName, pactIcons, 28)--it lasts forever, but if you still have it after 28 seconds
 			pactIcons = pactIcons - 1--then you're probably dead anyways
 		end
 		self:Unschedule(warnPactTargets)

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 3699

Old date: 2010-02-23 09:01:17 UTC

@@ -103,7 +103,7 @@
 end
 
 function mod:SPELL_AURA_REMOVED(args)
-	if args:IsSpellID(69674, 71224) then
+	if args:IsSpellID(69674, 71224, 73022, 73023) then
 		timerMutatedInfection:Cancel(args.destName)
 		warnOozeSpawn:Show()
 		if self.Options.InfectionIcon then
@@ -113,7 +113,7 @@
 end
 
 function mod:SPELL_DAMAGE(args)
-	if args:IsSpellID(69761, 71212) and args:IsPlayer() then
+	if args:IsSpellID(69761, 71212, 73026, 73027) and args:IsPlayer() then
 		specWarnRadiatingOoze:Show()
 	end
 end

r3699 (Omega): #ICC/Putricide: Also added missing red slime spellid for heroic.

Omega — Tue, 23 Feb 2010 09:01:17 GMT

Author: Omega
Date: Tue Feb 23 10:01:17 CET 2010
Revision: 3699

Log:

#ICC/Putricide: Also added missing red slime spellid for heroic.

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3698

Old date: 2010-02-23 08:51:44 UTC

@@ -236,7 +236,7 @@
 		if self.Options.OozeAdhesiveIcon then
 			self:SetIcon(args.destName, 8, 8)
 		end
-	elseif args:IsSpellID(70672, 72455, 72833) then	--Red Slime
+	elseif args:IsSpellID(70672, 72455, 72832, 72833) then	--Red Slime
 		warnGaseousBloat:Show(args.destName)
 		specWarnGaseousBloatOther:Show(args.destName)
 		timerGaseousBloat:Start(args.destName)
@@ -247,7 +247,7 @@
 		if self.Options.GaseousBloatIcon then
 			self:SetIcon(args.destName, 7, 20)
 		end
-	elseif args:IsSpellID(71615, 71618) then	--71615 used in 10 and 25 normal, 71618 heroic ID maybe?(this id doesn't make immune, only stuns)
+	elseif args:IsSpellID(71615, 71618) then	--71615 used in 10 and 25 normal, 71618?
 		timerTearGas:Start()
 	elseif args:IsSpellID(72451) then	-- Mutated Plague
 		warnMutatedPlague:Show(args.spellName, args.destName, args.amount or 1)

r3698 (Omega): #ICC/Putricide: Redid spellids for malleable goo, heroic ids were missing and too many were being used for normal.

Omega — Tue, 23 Feb 2010 08:51:44 GMT

Author: Omega
Date: Tue Feb 23 09:51:44 CET 2010
Revision: 3698

Log:

#ICC/Putricide: Redid spellids for malleable goo, heroic ids were missing and too many were being used for normal.

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3697

Old date: 2010-02-23 04:25:40 UTC

@@ -219,7 +219,7 @@
 	elseif args:IsSpellID(71255) then
 		warnChokingGasBomb:Show()
 		timerChokingGasBombCD:Start()
-	elseif args:IsSpellID(72295, 72615, 72295, 72296) then
+	elseif args:IsSpellID(72615, 72295, 74280, 74281) then
 		warnMalleableGoo:Show()
 		timerMalleableGooCD:Start()
 		self:ScheduleMethod(0.1, "MalleableGooTarget")

r3697 (bluenyx): koKR update

bluenyx — Tue, 23 Feb 2010 04:25:40 GMT

Author: bluenyx
Date: Tue Feb 23 05:25:40 CET 2010
Revision: 3697

Log:

koKR update

Updated

trunk/DBM-Core/localization.kr.lua

Action: modified

Old revision: 3696

Old date: 2010-02-23 04:14:33 UTC

@@ -177,6 +177,8 @@
 	"/dbm arrow   당신이 속한 파티 또는 공격대의 특정 플레이어를 가르키는 화살표를 만듭니다.",
 	"/dbm arrow hide  화살표를 숨깁니다.",
 	"/dbm arrow move  화살표를 움직이도록 합니다.",
+	"/dbm arrow target 대상을 가르키는 화살표를 만듭니다.",
+	"/dbm arrow focus  주시대상을 가르키는 화살표를 만듭니다.",
 }
 
 end

r3696 (bluenyx): koKR update

bluenyx — Tue, 23 Feb 2010 04:14:33 GMT

Author: bluenyx
Date: Tue Feb 23 05:14:33 CET 2010
Revision: 3696

Log:

koKR update

Updated

trunk/DBM-ChamberOfAspects/localization.kr.lua

Updated

trunk/DBM-Core/localization.kr.lua

Updated

trunk/DBM-Icecrown/localization.kr.lua

trunk/DBM-ChamberOfAspects/localization.kr.lua

Action: modified

Old revision: 3695

Old date: 2010-02-22 23:53:04 UTC

@@ -101,7 +101,7 @@
 L = DBM:GetModLocalization("Zarithrian")
 
 L:SetGeneralLocalization({
-	name = "General Zarithrian"
+	name = "장군 자리스리안"
 })
 
 -------------------------------------
@@ -110,5 +110,5 @@
 L = DBM:GetModLocalization("Halion")
 
 L:SetGeneralLocalization({
-	name = "Halion the Twilight Destroyer"
+	name = "황혼의 파괴자 할리온"
 })

trunk/DBM-Core/localization.kr.lua

Action: modified

Old revision: 3695

Old date: 2010-02-22 23:53:04 UTC

@@ -93,6 +93,8 @@
 DBM_CORE_BREAK_START				= "쉬는 시간 시작 -- %s 분 남았습니다!"
 DBM_CORE_BREAK_MIN					= "%s 분 후 쉬는 시간이 끝납니다!"
 DBM_CORE_BREAK_SEC					= "%s 초 후 쉬는 시간이 끝납니다!"
+DBM_CORE_TIMER_BREAK				= "쉬는 시간!"
+DBM_CORE_ANNOUNCE_BREAK_OVER		= "쉬는 시간이 종료되었습니다."
 
 DBM_CORE_TIMER_PULL					= "풀링 중 입니다."
 DBM_CORE_ANNOUNCE_PULL				= "%d 초 뒤 풀링 합니다."
@@ -121,14 +123,14 @@
 DBM_CORE_AUTO_ANNOUNCE_TEXTS.cast 		= "주문시전 %s : %.1f 초"
 DBM_CORE_AUTO_ANNOUNCE_TEXTS.soon 		= "곧 %s"
 DBM_CORE_AUTO_ANNOUNCE_TEXTS.prewarn	= "%s : %s"
-DBM_CORE_AUTO_ANNOUNCE_TEXTS.phase 		= "페이즈 %d"
+DBM_CORE_AUTO_ANNOUNCE_TEXTS.phase 		= "%d 단계"
 
 DBM_CORE_AUTO_ANNOUNCE_OPTIONS.target	= "|cff71d5ff|Hspell:%d|h%s|h|r 대상 알리기"
 DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell 	= "|cff71d5ff|Hspell:%d|h%s|h|r 경고 보기"
 DBM_CORE_AUTO_ANNOUNCE_OPTIONS.cast 	= "|cff71d5ff|Hspell:%d|h%s|h|r 시전을 시작할 경우 경고 보기"
 DBM_CORE_AUTO_ANNOUNCE_OPTIONS.soon 	= "|cff71d5ff|Hspell:%d|h%s|h|r의 사전 경고 보기(soon)"
 DBM_CORE_AUTO_ANNOUNCE_OPTIONS.prewarn	= "|cff71d5ff|Hspell:%d|h%s|h|r의 사전 경고 보기(prewarn)"
-DBM_CORE_AUTO_ANNOUNCE_OPTIONS.phase 	= "페이즈 %d 의 경고 보기"
+DBM_CORE_AUTO_ANNOUNCE_OPTIONS.phase 	= "%d 단계 경고 보기"
 
 
 -- Auto-generated Special Warning Localizations
@@ -142,9 +144,7 @@
 	move 		= "$spell:%d의 영향을 받을 경우 특수 경고 보기(이동)",
 	run 		= "$spell:%d의 특수 경고 보기(빠른이동)",
 	cast 		= "$spell:%d의 시전 특수 경고 보기",
---	stack 		= "Show special warning when you have >=%d stacks of \n $spell:%d"
---	stack 		= "$spell:%d의 중첩이 %d 이상 쌓일 경우 특수 경고 보기"
-	stack 		= "%d 중첩 이상 쌓일 경우 $spell:%d의 특수 경고 보기"
+	stack 		= "%d 중첩 이상 쌓일 경우 $spell:%d의 특수 경고 보기"--	stack 		= "Show special warning when you have >=%d stacks of \n $spell:%d"
 }
 
 DBM_CORE_AUTO_SPEC_WARN_TEXTS = {

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 3695

Old date: 2010-02-22 23:53:04 UTC

@@ -462,13 +462,16 @@
 	specWarnDefileCast			= "당신에게 $spell:72762이 시전된 경우 특수 경고 보기",
 	specWarnDefileNear			= "당신 주변에 $spell:72762이 시전된 경우 특수 경고 보기",
 	YellOnDefile				= "$spell:72762의 대상이 됐을 때 외치기",	
+	YellOnTrap					= "$spell:73539 외치기",	
 	DefileIcon					= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
 	NecroticPlagueIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
-	RagingSpiritIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200)	
+	RagingSpiritIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
+	TrapIcon					= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
 }
 L:SetMiscLocalization{
 	LKPull					= "그러니까 성스러운 빛이 자랑하던 정의가 마침내 왔다 이건가? 폴드링, 서리한을 내려놓고 자비라도 애걸하라는 건가?",
 	YellDefile				= "저에게 파멸!!!",
-	YellKill				= "No questions remain unanswered. No doubts linger. You ARE Azeroth's greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...",
-	LKRoleplay				= "Is it truly righteousness that drives you? I wonder..."	
+	YellTrap				= "나에게 암흑의 덫!!!",	
+	YellKill				= "어떤 의문도 남지 않았다. 어떤 의심도 없다. 너희는 아제로스의 가장 위대한 용사들이다. 너희 앞에 놓아둔 모든 도전을 극복해 내었다. 가장 강력한 종들이 너희의 무자비한 살육 앞에 쓰러졌지... 너희가 억눌렀던 분노 앞에 말이다...",
+	LKRoleplay				= "진정으로 정의에 이끌렸단 말이냐? 궁금하구나..."
 }
\ No newline at end of file

r3695 (Omega): Update set revision flags on several mods that weren't flagged right

Omega — Mon, 22 Feb 2010 23:53:04 GMT

Author: Omega
Date: Tue Feb 23 00:53:04 CET 2010
Revision: 3695

Log:

Update set revision flags on several mods that weren't flagged right

Updated

U trunk/DBM-ChamberOfAspects/Obsidian/Sartharion.lua

Updated

U trunk/DBM-ChamberOfAspects/Obsidian/Shadron.lua

Updated

U trunk/DBM-ChamberOfAspects/Obsidian/Tenebron.lua

Updated

U trunk/DBM-ChamberOfAspects/Obsidian/Vesperon.lua

Updated

U trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Updated

U trunk/DBM-ChamberOfAspects/Ruby/Zarithrian.lua

Updated

U trunk/DBM-Icecrown/TheCrimsonHall/CrimsonHallTrash.lua

Updated

U trunk/DBM-PvP/VaultofArchavon/Archavon.lua

Updated

U trunk/DBM-PvP/VaultofArchavon/Emalon.lua

Updated

U trunk/DBM-PvP/VaultofArchavon/Koralon.lua

Updated

U trunk/DBM-PvP/VaultofArchavon/Toravon.lua

trunk/DBM-ChamberOfAspects/Obsidian/Sartharion.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Sartharion", "DBM-ChamberOfAspects", 1)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2317 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(28860)
 mod:SetZone()

trunk/DBM-ChamberOfAspects/Obsidian/Sartharion.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-ChamberOfAspects/Obsidian/Shadron.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Shadron", "DBM-ChamberOfAspects", 1)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2317 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(30451)
 mod:SetZone()

trunk/DBM-ChamberOfAspects/Obsidian/Shadron.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-ChamberOfAspects/Obsidian/Tenebron.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Tenebron", "DBM-ChamberOfAspects", 1)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2317 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(30452)
 mod:SetZone()

trunk/DBM-ChamberOfAspects/Obsidian/Tenebron.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-ChamberOfAspects/Obsidian/Vesperon.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Vesperon", "DBM-ChamberOfAspects", 1)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2317 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(30449)
 mod:SetZone()

trunk/DBM-ChamberOfAspects/Obsidian/Vesperon.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Halion", "DBM-ChamberOfAspects", 2)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2317 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID()
 
 mod:RegisterCombat("combat")

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-ChamberOfAspects/Ruby/Zarithrian.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Zarithrian", "DBM-ChamberOfAspects", 2)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2317 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID()
 
 mod:RegisterCombat("combat")

trunk/DBM-ChamberOfAspects/Ruby/Zarithrian.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-Icecrown/TheCrimsonHall/CrimsonHallTrash.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("CrimsonHallTrash", "DBM-Icecrown", 3)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 3185 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetUsedIcons(1, 2)
 
 mod:RegisterEvents(

trunk/DBM-Icecrown/TheCrimsonHall/CrimsonHallTrash.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-PvP/VaultofArchavon/Archavon.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Archavon", "DBM-PvP", 3)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2523 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(31125)
 
 mod:RegisterCombat("combat")

trunk/DBM-PvP/VaultofArchavon/Archavon.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-PvP/VaultofArchavon/Emalon.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Emalon", "DBM-PvP", 3)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2524 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(33993)
 mod:SetUsedIcons(8)

trunk/DBM-PvP/VaultofArchavon/Emalon.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-PvP/VaultofArchavon/Koralon.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Koralon", "DBM-PvP", 3)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2521 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(35013)
 
 mod:RegisterCombat("combat")

trunk/DBM-PvP/VaultofArchavon/Koralon.lua

Action: changed properties

Added: svn:keywords
   + Revision

trunk/DBM-PvP/VaultofArchavon/Toravon.lua

Action: modified

Old revision: 3694

Old date: 2010-02-22 23:01:22 UTC

@@ -1,7 +1,7 @@
 local mod	= DBM:NewMod("Toravon", "DBM-PvP", 3)
 local L		= mod:GetLocalizedStrings()
 
-mod:SetRevision(("$Revision: 2521 $"):sub(12, -3))
+mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(38433)
 
 mod:RegisterCombat("combat")

trunk/DBM-PvP/VaultofArchavon/Toravon.lua

Action: changed properties

Added: svn:keywords
   + Revision

r3694 (Vampik): ruRU update

Vampik — Mon, 22 Feb 2010 23:01:22 GMT

Author: Vampik
Date: Tue Feb 23 00:01:22 CET 2010
Revision: 3694

Log:

ruRU update

Updated

trunk/DBM-Core/localization.ru.lua

Action: modified

Old revision: 3693

Old date: 2010-02-22 22:39:27 UTC

@@ -90,9 +90,11 @@
 
 DBM_CORE_UNKNOWN					= "неизвестно"
 
-DBM_CORE_BREAK_START				= "Отдых начинается -- у вас есть %s мин.!"
-DBM_CORE_BREAK_MIN					= "Отдых заканчивается через %s мин.!"
-DBM_CORE_BREAK_SEC					= "Отдых заканчивается через %s сек.!"
+DBM_CORE_BREAK_START				= "Перерыв начинается -- у вас есть %s мин.!"
+DBM_CORE_BREAK_MIN					= "Перерыв заканчивается через %s мин.!"
+DBM_CORE_BREAK_SEC					= "Перерыв заканчивается через %s сек.!"
+DBM_CORE_TIMER_BREAK				= "Перерыв!"
+DBM_CORE_ANNOUNCE_BREAK_OVER		= "Перерыв закончился"
 
 DBM_CORE_TIMER_PULL					= "Атака"
 DBM_CORE_ANNOUNCE_PULL				= "Атака через %d сек."

r3693 (Nalumis): deDE update

Nalumis — Mon, 22 Feb 2010 22:39:27 GMT

Author: Nalumis
Date: Mon Feb 22 23:39:27 CET 2010
Revision: 3693

Log:

deDE update

Updated

trunk/DBM-Icecrown/localization.de.lua

Action: modified

Old revision: 3692

Old date: 2010-02-22 22:34:19 UTC

@@ -37,7 +37,7 @@
 L = DBM:GetModLocalization("PlagueworksTrash")
 
 L:SetGeneralLocalization{
-	name = "Schatz & Stinki"
+	name = "Trash der Seuchenwerke"
 }
 
 L:SetWarningLocalization{
@@ -463,14 +463,17 @@
 	specWarnDefileCast		= "Zeige Spezialwarnung für $spell:72762 auf dir",
 	specWarnDefileNear		= "Zeige Spezialwarnung für $spell:72762 in deiner Nähe",
 	YellOnDefile			= "Schreie bei $spell:72762",
+	YellOnTrap				= "Schreie bei $spell:73539",
 	DefileIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
 	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
-	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200)
+	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
+	TrapIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
 }
 
 L:SetMiscLocalization{
 	LKPull					= "Der vielgerühmte Streiter des Lichts ist endlich hier? Soll ich Frostgram niederlegen und mich Eurer Gnade ausliefern, Fordring?",
 	YellDefile				= "Entweihen auf mir!",
+	YellTrap				= "Schattenfalle auf mir!",
 	YellKill				= "No questions remain unanswered. No doubts linger. You ARE Azeroth's greatest champions. You overcame every challenge I laid before you. My mightiest servants have fallen before your relentless onslaught... your unbridled fury...",	-- to be translated
 	LKRoleplay				= "Is it truly righteousness that drives you? I wonder..."	-- to be translated
 }

r3692 (Nalumis): break timer localization

Nalumis — Mon, 22 Feb 2010 22:34:19 GMT

Author: Nalumis
Date: Mon Feb 22 23:34:19 CET 2010
Revision: 3692

Log:

break timer localization

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-Core/localization.de.lua

Updated

trunk/DBM-Core/localization.en.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 3691

Old date: 2010-02-22 21:45:02 UTC

@@ -705,14 +705,14 @@
 		local timer = tonumber(cmd:sub(6)) or 5
 		local timer = timer * 60
 		local channel = ((GetNumRaidMembers() == 0) and "PARTY") or "RAID_WARNING"
-		DBM:CreatePizzaTimer(timer, "Break time!", true)
+		DBM:CreatePizzaTimer(timer, DBM_CORE_TIMER_BREAK, true)
 		DBM:Unschedule(SendChatMessage)
 		SendChatMessage(DBM_CORE_BREAK_START:format(timer/60), channel)
 		if timer/60 > 5 then DBM:Schedule(timer - 5*60, SendChatMessage, DBM_CORE_BREAK_MIN:format(5), channel) end
 		if timer/60 > 2 then DBM:Schedule(timer - 2*60, SendChatMessage, DBM_CORE_BREAK_MIN:format(2), channel) end
 		if timer/60 > 1 then DBM:Schedule(timer - 1*60, SendChatMessage, DBM_CORE_BREAK_MIN:format(1), channel) end
 		if timer > 30 then DBM:Schedule(timer - 30, SendChatMessage, DBM_CORE_BREAK_SEC:format(30), channel) end
-		DBM:Schedule(timer, SendChatMessage, "Break time is over", channel)
+		DBM:Schedule(timer, SendChatMessage, DBM_CORE_ANNOUNCE_BREAK_OVER, channel)
 	elseif cmd:sub(1, 4) == "pull" then
 		if DBM:GetRaidRank() == 0 then
 			return DBM:AddMsg(DBM_ERROR_NO_PERMISSION)

trunk/DBM-Core/localization.de.lua

Action: modified

Old revision: 3691

Old date: 2010-02-22 21:45:02 UTC

@@ -91,6 +91,8 @@
 DBM_CORE_BREAK_START				= "Pause startet jetzt -- du hast %s Minute(n)!"
 DBM_CORE_BREAK_MIN					= "Pause endet in %s Minute(n)!"
 DBM_CORE_BREAK_SEC					= "Pause endet in %s Sekunden!"
+DBM_CORE_TIMER_BREAK				= "Pause"
+DBM_CORE_ANNOUNCE_BREAK_OVER		= "Pause vorbei"
 
 DBM_CORE_TIMER_PULL					= "Pull in"
 DBM_CORE_ANNOUNCE_PULL				= "Pull in %d Sek"

trunk/DBM-Core/localization.en.lua

Action: modified

Old revision: 3691

Old date: 2010-02-22 21:45:02 UTC

@@ -91,6 +91,8 @@
 DBM_CORE_BREAK_START				= "Break starting now -- you have %s minute(s)!"
 DBM_CORE_BREAK_MIN					= "Break ends in %s minute(s)!"
 DBM_CORE_BREAK_SEC					= "Break ends in %s seconds!"
+DBM_CORE_TIMER_BREAK				= "Break time!"
+DBM_CORE_ANNOUNCE_BREAK_OVER		= "Break time is over"
 
 DBM_CORE_TIMER_PULL					= "Pull in"
 DBM_CORE_ANNOUNCE_PULL				= "Pull in %d sec"

r3691 (tandanu): incremented version number

tandanu — Mon, 22 Feb 2010 21:45:02 GMT

Author: tandanu
Date: Mon Feb 22 22:45:02 CET 2010
Revision: 3691

Log:

incremented version number

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 3690

Old date: 2010-02-22 21:40:42 UTC

@@ -43,9 +43,9 @@
 -------------------------------
 DBM = {
 	Revision = ("$Revision$"):sub(12, -3),
-	Version = "4.40",
-	DisplayVersion = "4.41 alpha", -- the string that is shown as version
-	ReleaseRevision = 3317 -- the revision of the latest stable version that is available (for /dbm ver2)
+	Version = "4.42",
+	DisplayVersion = "4.43 alpha", -- the string that is shown as version
+	ReleaseRevision = 3689 -- the revision of the latest stable version that is available (for /dbm ver2)
 }
 
 DBM_SavedOptions = {}

r3690 (Vampik): ruRU update

Vampik — Mon, 22 Feb 2010 21:40:42 GMT

Author: Vampik
Date: Mon Feb 22 22:40:42 CET 2010
Revision: 3690

Log:

ruRU update

Updated

trunk/DBM-Icecrown/localization.ru.lua

Action: modified

Old revision: 3689

Old date: 2010-02-22 21:35:40 UTC

@@ -33,7 +33,7 @@
 L = DBM:GetModLocalization("PlagueworksTrash")
 
 L:SetGeneralLocalization{
-	name = "Прелесть & Вонючка"
+	name = "Треш-мобы Чумодельни"
 }
 
 L:SetWarningLocalization{
@@ -459,14 +459,17 @@
 	specWarnDefileCast		= "Спец-предупреждение, когда $spell:72762 на вас",
 	specWarnDefileNear		= "Спец-предупреждение, когда $spell:72762 около вас",
 	YellOnDefile			= "Кричать, когда $spell:72762 на вас",
+	YellOnTrap				= "Кричать, когда $spell:73539 на вас",
 	DefileIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
 	NecroticPlagueIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73912),
-	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200)
+	RagingSpiritIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69200),
+	TrapIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539)
 }
 
 L:SetMiscLocalization{
 	LKPull			= "Неужели прибыли наконец хваленые силы Света? Мне бросить Ледяную Скорбь и сдаться на твою милость, Фордринг?",
 	YellDefile		= "Осквернение на мне!",
+	YellTrap		= "Теневая ловушка на мне!",
 	YellKill		= "Сомнений нет: ВЫ величайшие герои Азерота. Вы преодолели все препятствия, которые я воздвиг перед вами. Сильнейшие из моих слуг пали под вашим натиском… сгорели в пламени вашей ярости...",
 	LKRoleplay		= "Is it truly righteousness that drives you? I wonder..."
 }

r3689 (Omega): plagueworks trash renamed to plagueworks trash, it used to only be the mini bosses but it has traps and blight bomb now so it's trash again :)

Omega — Mon, 22 Feb 2010 21:35:40 GMT

Author: Omega
Date: Mon Feb 22 22:35:40 CET 2010
Revision: 3689

Log:

plagueworks trash renamed to plagueworks trash, it used to only be the mini bosses but it has traps and blight bomb now so it's trash again :)

Updated

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 3688

Old date: 2010-02-22 21:08:14 UTC

@@ -31,7 +31,7 @@
 L = DBM:GetModLocalization("PlagueworksTrash")
 
 L:SetGeneralLocalization{
-	name = "Precious & Stinky"
+	name = "Plagueworks Trash"
 }
 
 L:SetWarningLocalization{

r3688 (tandanu): fixed the arrow slash command

tandanu — Mon, 22 Feb 2010 21:08:14 GMT

Author: tandanu
Date: Mon Feb 22 22:08:14 CET 2010
Revision: 3688

Log:

fixed the arrow slash command

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 3687

Old date: 2010-02-22 21:04:02 UTC

@@ -742,12 +742,15 @@
 			elseif subCmd:upper() == "MOVE" then
 				DBM.Arrow:Move()
 				success = true
-			elseif subCmd == "target" or subCmd == "focus" or DBM:GetRaidUnitId(DBM:Capitalize(subCmd)) ~= "none" then
-				DBM.Arrow:ShowRunTo(DBM:Capitalize(subCmd), 0)
+			elseif subCmd:upper() == "TARGET" then
+				DBM.Arrow:ShowRunTo("target")
 				success = true
-			elseif subCmd:upper() == "TARGET" and UnitName("target") then
-				DBM.Arrow:ShowRunTo(UnitName("target"), 0)
+			elseif subCmd:upper() == "FOCUS" then
+				DBM.Arrow:ShowRunTo("focus")
 				success = true
+			elseif DBM:GetRaidUnitId(DBM:Capitalize(subCmd)) ~= "none" then
+				DBM.Arrow:ShowRunTo(DBM:Capitalize(subCmd))
+				success = true
 			end
 		end
 		if not success then

r3687 (Omega): #ICC/Putricide: Completely redone phase changer that should now appropriately detect phase changes and adjust timers on normal and heroic modes. also warns for volatile experiment on heroic.

Omega — Mon, 22 Feb 2010 21:04:02 GMT

Author: Omega
Date: Mon Feb 22 22:04:02 CET 2010
Revision: 3687

Log:

#ICC/Putricide: Completely redone phase changer that should now appropriately detect phase changes and adjust timers on normal and heroic modes. also warns for volatile experiment on heroic.

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 3686

Old date: 2010-02-22 21:01:19 UTC

@@ -21,12 +21,11 @@
 local warnVolatileOozeAdhesive		= mod:NewTargetAnnounce(70447, 4)
 local warnGaseousBloat				= mod:NewTargetAnnounce(70672, 4)
 local warnPhase2Soon				= mod:NewAnnounce("WarnPhase2Soon", 2)
-local warnTearGas					= mod:NewSpellAnnounce(71617)
-local warnPhase2					= mod:NewPhaseAnnounce(2)
+local warnTearGas					= mod:NewSpellAnnounce(71617)			-- Phase transition normal
+local warnVolatileExperiment		= mod:NewSpellAnnounce(72840)			-- Phase transition heroic
 local warnMalleableGoo				= mod:NewSpellAnnounce(72295, 3)		-- Phase 2 ability
 local warnChokingGasBomb			= mod:NewSpellAnnounce(71255, 3)		-- Phase 2 ability
 local warnPhase3Soon				= mod:NewAnnounce("WarnPhase3Soon", 2)
-local warnPhase3					= mod:NewPhaseAnnounce(3)
 local warnMutatedPlague				= mod:NewAnnounce("WarnMutatedPlague", 3) -- Phase 3 ability
 local warnVolatileOozeAdhesive		= mod:NewTargetAnnounce(70447, 4)
 local warnOozeVariable				= mod:NewTargetAnnounce(70352)			-- Heroic Ability
@@ -178,31 +177,39 @@
 		warnUnstableExperiment:Show()
 		timerUnstableExperimentCD:Start()
 		warnUnstableExperimentSoon:Schedule(33)
-	elseif args:IsSpellID(71617) then
+	elseif args:IsSpellID(71617) then	--Tear Gas, normal phase change trigger
 		warnTearGas:Show()
-		if phase == 1 then
+		timerUnstableExperimentCD:Cancel()
 			warnUnstableExperimentSoon:Cancel()
+		self:NextPhase()
+	elseif args:IsSpellID(72840, 72841, 72842, 72843) then	--Volatile Experiment, heroic phase change trigger
+		warnVolatileExperiment:Show()
+		timerUnstableExperimentCD:Cancel()
+		warnUnstableExperimentSoon:Cancel()
+		self:ScheduleMethod(22, "NextPhase")	--May need slight tweaking +- a second or two
+	end
+end
+
+function mod:NextPhase()
+	phase = phase + 1
+	if phase == 2 then
 			timerUnstableExperimentCD:Start(43)--Casting tear gas also resets experiment cooldown
 			timerSlimePuddleCD:Start()--Casting tear gas resets slime puddle CD too
 			warnUnstableExperimentSoon:Schedule(38)
 			if mod:IsDifficulty("normal25") or mod:IsDifficulty("heroic25") then
-				timerChokingGasBombCD:Start()--normal 35-36 seconds
+			timerChokingGasBombCD:Start()--35-36 seconds on 25 man normal
 			else
-				timerChokingGasBombCD:Start(37)--37 seconds on 10 man
+			timerChokingGasBombCD:Start(37)--37 seconds on 10 man normal
 			end
-		end
-		if phase == 2 then
-			timerUnstableExperimentCD:Cancel()--Casting tear gas second time before phase 3 which means no more experiments
-			warnUnstableExperimentSoon:Cancel()
+	elseif phase == 3 then
 			timerSlimePuddleCD:Start()
 			if mod:IsDifficulty("normal25") or mod:IsDifficulty("heroic25") then
-				timerChokingGasBombCD:Start(40)--40 seconds after second tear gas on 25 man
+			timerChokingGasBombCD:Start(40)--40 seconds after second tear gas on 25 man normal
 			else
-				timerChokingGasBombCD:Start(30)--30 seconds after second tear gas on 10 man
+			timerChokingGasBombCD:Start(30)--30 seconds after second tear gas on 10 man normal
 			end
 		end
 	end
-end
 
 function mod:SPELL_CAST_SUCCESS(args)
 	if args:IsSpellID(70341) and GetTime() - spamPuddle > 5 then
@@ -242,8 +249,6 @@
 		end
 	elseif args:IsSpellID(71615, 71618) then	--71615 used in 10 and 25 normal, 71618 heroic ID maybe?(this id doesn't make immune, only stuns)
 		timerTearGas:Start()
-	elseif args:IsSpellID(71603) then	-- Mutated Strength
-		warnPhase3:Show()
 	elseif args:IsSpellID(72451) then	-- Mutated Plague
 		warnMutatedPlague:Show(args.spellName, args.destName, args.amount or 1)
 		timerMutatedPlague:Start(args.destName)
@@ -290,9 +295,6 @@
 		if self.Options.GaseousBloatIcon then
 			mod:SetIcon(args.destName, 0)
 		end
-	elseif args:IsSpellID(71615, 71618) and phase == 1 then	-- only show one time
-		phase = 2
-		warnPhase2:Show()
 	elseif args:IsSpellID(72855, 72856) then 						-- Unbound Plague
 		timerUnboundPlague:Stop(args.destName)
 		if args:IsPlayer() then