Deadly Boss Mods

r4379 (arta): #GUI/Core: Fixed a function that could error when using an invalid spellId in a Special Warning (ie PTR/Beta)

arta — Wed, 28 Jul 2010 16:06:35 GMT

Author: arta
Date: Wed Jul 28 18:06:35 CEST 2010
Revision: 4379

Log:

#GUI/Core: Fixed a function that could error when using an invalid spellId in a Special Warning (ie PTR/Beta)

Updated

trunk/DBM-GUI/DBM-GUI.lua

Action: modified

Old revision: 4378

Old date: 2010-07-27 12:39:46 UTC

@@ -275,7 +275,7 @@
 	
 	local function replaceSpellLinks(id)
 		local spellId = tonumber(id)
-		local spellName = GetSpellInfo(spellId)
+		local spellName = GetSpellInfo(spellId) or "unknown"
 		return ("|cff71d5ff|Hspell:%d|h%s|h|r"):format(spellId, spellName)
 	end

r4378 (arta): #Core: Updated testmod so if you press the button twice, it wont spam announces.

arta — Tue, 27 Jul 2010 12:39:46 GMT

Author: arta
Date: Tue Jul 27 14:39:46 CEST 2010
Revision: 4378

Log:

#Core: Updated testmod so if you press the button twice, it wont spam announces.

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 4377

Old date: 2010-07-27 12:33:03 UTC

@@ -2232,6 +2232,10 @@
 		testTimer:UpdateIcon("Interface\\Icons\\Spell_Shadow_ShadesOfDarkness", "Evil Spell")
 		testTimer:Start(60, "Boom!")
 		testTimer:UpdateIcon("Interface\\Icons\\Spell_Fire_SelfDestruct", "Boom!")
+		testWarning1:Cancel()
+		testWarning2:Cancel()
+		testWarning3:Cancel()
+		testSpecialWarning:Cancel()
 		testWarning1:Show("Test-mode started...")
 		testWarning1:Schedule(62, "Test-mode finished!")
 		testWarning3:Schedule(50, "Boom in 10 sec!")

r4377 (arta): #Core: temporary fix for TestBars not working

arta — Tue, 27 Jul 2010 12:33:03 GMT

Author: arta
Date: Tue Jul 27 14:33:03 CEST 2010
Revision: 4377

Log:

#Core: temporary fix for TestBars not working

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 4376

Old date: 2010-07-26 04:36:42 UTC

@@ -2217,7 +2217,7 @@
 	local testSpecialWarning
 	function DBM:DemoMode()
 		if not testMod then
-			testMod = DBM:NewMod("TestMod")
+			testMod = DBM:NewMod("TestMod", "DBM-PvP")	-- temp fix, as it requires a modId
 			testWarning1 = testMod:NewAnnounce("%s", 1, "Interface\\Icons\\Spell_Nature_WispSplode")
 			testWarning2 = testMod:NewAnnounce("%s", 2, "Interface\\Icons\\Spell_Shadow_ShadesOfDarkness")
 			testWarning3 = testMod:NewAnnounce("%s", 3, "Interface\\Icons\\Spell_Fire_SelfDestruct")

r4376 (Omega): Sync phase 3 yell, in case you stay above and don't get it, that way you still get timers if you stayed above during phase 2

Omega — Mon, 26 Jul 2010 04:36:42 GMT

Author: Omega
Date: Mon Jul 26 06:36:42 CEST 2010
Revision: 4376

Log:

Sync phase 3 yell, in case you stay above and don't get it, that way you still get timers if you stayed above during phase 2

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4375

Old date: 2010-07-26 04:13:57 UTC

@@ -15,9 +15,6 @@
 	"SPELL_AURA_APPLIED",
 	"SPELL_AURA_REMOVED",
 	"SPELL_DAMAGE",
-	"SPELL_MISSED",
-	"SWING_DAMAGE",
-	"SWING_MISSED",
 	"CHAT_MSG_MONSTER_YELL",
 	"CHAT_MSG_RAID_BOSS_EMOTE",
 	"UNIT_HEALTH"
@@ -61,13 +58,9 @@
 local warned_preP2 = false
 local warned_preP3 = false
 local phase2Started = 0
-local physicalAggro = false
-local twilightAggro = false
 local lastflame = 0
 
 function mod:OnCombatStart(delay)--These may still need retuning too, log i had didn't have pull time though.
-	physicalAggro = true
-	twilightAggro = false
 	warned_preP2 = false
 	warned_preP3 = false
 	phase2Started = 0
@@ -90,24 +83,20 @@
 
 function mod:SPELL_CAST_SUCCESS(args)--We use spell cast success for debuff timers in case it gets resisted by a player we still get CD timer for next one
 	if args:IsSpellID(74792) then
-		if not self.Options.AnnounceAlternatePhase then
 			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
 				timerShadowConsumptionCD:Start(20)
 			else
 				timerShadowConsumptionCD:Start()
 			end
-		end
 		if mod:LatencyCheck() then
 			self:SendSync("ShadowCD")
 		end
 	elseif args:IsSpellID(74562) then
-		if not self.Options.AnnounceAlternatePhase then
 			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
 				timerFieryConsumptionCD:Start(20)
 			else
 				timerFieryConsumptionCD:Start()
 			end
-		end
 		if mod:LatencyCheck() then
 			self:SendSync("FieryCD")
 		end
@@ -170,67 +159,12 @@
 	end
 end
 
---Begin Phase aggro detection
 function mod:SPELL_DAMAGE(args)
 	if (args:IsSpellID(75952, 75951, 75950, 75949) or args:IsSpellID(75948, 75947)) and args:IsPlayer() and time() - lastflame > 2 then
 		specWarnMeteorStrike:Show() --Standing in meteor, not part of aggro detection.
-		lastflame = time()
-	elseif args:GetDestCreatureID() == 39863 then
-		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
-			physicalAggro = true
-			self:SendSync("PhysicalAggro")--We do now.
 		end
-	elseif args:GetDestCreatureID() == 40141 then
-		if not twilightAggro then --We don't have aggro on him yet.
-			twilightAggro = true
-			self:SendSync("twilightAggro")--We do now.
 		end
-	end
-end
 
-function mod:SPELL_MISSED(args)
-	if args:GetDestCreatureID() == 39863 then
-		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
-			physicalAggro = true
-			self:SendSync("PhysicalAggro")--We do now.
-		end
-	elseif args:GetDestCreatureID() == 40141 then
-		if not twilightAggro then --We don't have aggro on him yet.
-			twilightAggro = true
-			self:SendSync("twilightAggro")--We do now.
-		end
-	end
-end
-
-function mod:SWING_DAMAGE(args)
-	if args:GetDestCreatureID() == 39863 then
-		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
-			physicalAggro = true
-			self:SendSync("PhysicalAggro")--We do now.
-		end
-	elseif args:GetDestCreatureID() == 40141 then
-		if not twilightAggro then --We don't have aggro on him yet.
-			twilightAggro = true
-			self:SendSync("twilightAggro")--We do now.
-		end
-	end
-end
-
-function mod:SWING_MISSED(args)
-	if args:GetDestCreatureID() == 39863 then
-		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
-			physicalAggro = true
-			self:SendSync("PhysicalAggro")--We do now.
-		end
-	elseif args:GetDestCreatureID() == 40141 then
-		if not twilightAggro then --We don't have aggro on him yet.
-			twilightAggro = true
-			self:SendSync("twilightAggro")--We do now.
-		end
-	end
-end
---End Phase aggro detection
-
 function mod:UNIT_HEALTH(uId)
 	if not warned_preP2 and self:GetUnitCreatureId(uId) == 39863 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.79 then
 		warned_preP2 = true
@@ -249,15 +183,14 @@
 		timerFieryConsumptionCD:Cancel()
 		warnPhase2:Show()
 		timerShadowBreathCD:Start(25)
+		timerShadowConsumptionCD:Start(20)--not exact, 15 seconds from tank aggro, but easier to add 5 seconds to it as a estimate timer than trying to detect this
 		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then --These i'm not sure if they start regardless of drake aggro, or if it should be moved too.
 			timerTwilightCutterCD:Start(30)
 		else
 			timerTwilightCutterCD:Start(35)
 		end
-		physicalAggro = false
 	elseif msg:find(L.Phase3) then
-		warnPhase3:Show()
-		timerMeteorCD:Start(30) --These i'm not sure if they start regardless of drake aggro, or if it should be moved too.
+		self:SendSync("Phase3")
 	elseif msg:find(L.MeteorCast) then--There is no CLEU cast trigger for meteor, only yell
 		if not self.Options.AnnounceAlternatePhase then
 			warningMeteor:Show()
@@ -329,11 +262,9 @@
 				timerFieryConsumptionCD:Start()
 			end
 		end
-	elseif msg == "PhysicalAggro" then
-		physicalAggro = true
-		timerFieryConsumptionCD:Start(15)--Timer doesn't start again until aggroed again in phase 3. Timer value itself may need adjusting now that it's starting in right place
-	elseif msg == "twilightAggro" then
-		twilightAggro = true
-		timerShadowConsumptionCD:Start(15)--Timer doesn't start until actual twilight form is aggroed. Timer value itself may need adjusting now that it's starting in right place
+	elseif msg == "Phase3" then
+		warnPhase3:Show()
+		timerMeteorCD:Start(30) --These i'm not sure if they start regardless of drake aggro, or if it should be moved too.
+		timerFieryConsumptionCD:Start(20)--not exact, 15 seconds from tank aggro, but easier to add 5 seconds to it as a estimate timer than trying to detect this
 	end
 end

r4375 (Omega): some lich king fixes i messed up in previous commits

Omega — Mon, 26 Jul 2010 04:13:57 GMT

Author: Omega
Date: Mon Jul 26 06:13:57 CEST 2010
Revision: 4375

Log:

some lich king fixes i messed up in previous commits

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4374

Old date: 2010-07-26 01:52:04 UTC

@@ -366,7 +366,7 @@
 			specWarnHarvestSoul:Show()
 		end
 		if self.Options.HarvestSoulIcon then
-			self:SetIcon(args.destName, 5, 6)
+			self:SetIcon(args.destName, 6, 6)
 		end
 	elseif args:IsSpellID(73654, 74295, 74296, 74297) then -- Harvest Souls (Heroic)
 		specWarnHarvestSouls:Show()
@@ -532,7 +532,7 @@
 end
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
-	if msg:find(L.LKPull) then
+	if msg == L.LKPull or msg:find(L.LKPull) then
 		timerCombatStart:Start()
 	end
 end

r4374 (Omega): revert double sync method having two methods doesn't work, merged back into one and awaiting tandanu for proper fix

Omega — Mon, 26 Jul 2010 01:52:04 GMT

Author: Omega
Date: Mon Jul 26 03:52:04 CEST 2010
Revision: 4374

Log:

revert double sync method having two methods doesn't work, merged back into one and awaiting tandanu for proper fix

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4373

Old date: 2010-07-25 22:46:38 UTC

@@ -557,20 +557,28 @@
 	end
 end
 
-function mod:OnSync(msg, victim)--Lets try two onsync handlers with a diff arg name to maybe work around the trap bug if 2 syncs sent at same time
-	if msg == "TrapOn" then
+function mod:OnSync(msg, target)
+	if msg == "PALGrabbed" then--Does this function fail to alert second healer if 2 different paladins are grabbed within < 2.5 seconds?
+		if self.Options.specWarnHealerGrabbed then
+			specWarnPALGrabbed:Show(target)
+		end
+	elseif msg == "PRIGrabbed" then--Does this function fail to alert second healer if 2 different priests are grabbed within < 2.5 seconds?
+		if self.Options.specWarnHealerGrabbed then
+			specWarnPRIGrabbed:Show(target)
+		end
+	elseif msg == "TrapOn" then
 		if not self.Options.BypassLatencyCheck then
-			warnTrapCast:Show(victim)
+			warnTrapCast:Show(target)
 			if self.Options.TrapIcon then
 				self:SetIcon(player, 8, 10)
 			end
-			if victim == UnitName("player") then
+			if target == UnitName("player") then
 				specWarnTrap:Show()
 				if self.Options.YellOnTrap then
 					SendChatMessage(L.YellTrap, "SAY")
 				end
 			end
-			local uId = DBM:GetRaidUnitId(victim)
+			local uId = DBM:GetRaidUnitId(target)
 			if uId ~= "none" then
 				local inRange = CheckInteractDistance(uId, 2)
 				local x, y = GetPlayerMapPosition(uId)
@@ -586,18 +594,6 @@
 				end
 			end
 		end
-	end
-end
-
-function mod:OnSync(msg, target)
-	if msg == "PALGrabbed" then--Does this function fail to alert second healer if 2 different paladins are grabbed within < 2.5 seconds?
-		if self.Options.specWarnHealerGrabbed then
-			specWarnPALGrabbed:Show(target)
-		end
-	elseif msg == "PRIGrabbed" then--Does this function fail to alert second healer if 2 different priests are grabbed within < 2.5 seconds?
-		if self.Options.specWarnHealerGrabbed then
-			specWarnPRIGrabbed:Show(target)
-		end
 	elseif msg == "DefileOn" then
 		if not self.Options.BypassLatencyCheck then
 			warnDefileCast:Show(target)

r4373 (Omega): #Party/Tyrannus: fixed a bug where it wasn't announcing hoarfrost target (local was declared but function never used).

Omega — Sun, 25 Jul 2010 22:46:38 GMT

Author: Omega
Date: Mon Jul 26 00:46:38 CEST 2010
Revision: 4373

Log:

#Party/Tyrannus: fixed a bug where it wasn't announcing hoarfrost target (local was declared but function never used).
#Party/Toc: Changed mod name in actual toc file from "Party" to "Party-WotLK" with cata around corner

Updated

trunk/DBM-Party-WotLK/DBM-Party-WotLK.toc

Updated

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

trunk/DBM-Party-WotLK/DBM-Party-WotLK.toc

Action: modified

Old revision: 4372

Old date: 2010-07-25 03:11:38 UTC

@@ -1,5 +1,5 @@
 ## Interface: 30300
-## Title:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Party|r
+## Title:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Party-WotLK|r
 ## Title-frFR:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Groupe|r
 ## Title-deDE:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Gruppe|r
 ## Title-zhTW:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0隊伍|r
@@ -19,7 +19,7 @@
 ## X-DBM-Mod-SubCategories-koKR: 안카헤트: 고대 왕국,아졸네룹,시간의 동굴: 옛 스트라솔름,드락타론 성채,군드락,번개의 전당,돌의 전당,마력의 탑,마력의 눈,우트가드 성채,우트가드 첨탑,보랏빛 요새,용사의 시험장,영혼의 제련소,사론의 구덩이,투영의 전당
 ## X-DBM-Mod-SubCategories-esES: Ahn'Kahlet,Azjol-Nerub,CoT: La Matanza de Stratholme,Fortaleza de Drak'Tharon,Gundrak,Cámaras de Relámpagos,Camaras de Piedra,El Nexo,El Oculus,Fortaleza de Utgarde,Pinaculo de Utgarde,Bastion Violeta,Prueba del Campeón,La Forja de Almas,Foso de Saron,Cámaras de Reflexión
 ## X-DBM-Mod-SubCategories-esMX: Ahn'Kahlet,Azjol-Nerub,CoT: La Matanza de Stratholme,Fortaleza de Drak'Tharon,Gundrak,Cámaras de Relámpagos,Camaras de Piedra,El Nexo,El Oculus,Fortaleza de Utgarde,Pinaculo de Utgarde,Bastion Violeta,Prueba del Campeón,La Forja de Almas,Foso de Saron,Cámaras de Reflexión
-## X-DBM-Mod-Name: Party
+## X-DBM-Mod-Name: Party-WotLK
 ## X-DBM-Mod-Name-frFR: Groupe
 ## X-DBM-Mod-Name-deDE: Gruppe
 ## X-DBM-Mod-Name-ruRU: Групповые подземелья

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

Action: modified

Old revision: 4372

Old date: 2010-07-25 03:11:38 UTC

@@ -13,7 +13,6 @@
 	"SPELL_CAST_START",
 	"SPELL_CAST_SUCCESS",
 	"SPELL_AURA_APPLIED",
-	"CHAT_MSG_MONSTER_YELL",
 	"CHAT_MSG_RAID_BOSS_EMOTE",
 	"SPELL_PERIODIC_DAMAGE"
 )
@@ -21,7 +20,7 @@
 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 warnHoarfrost				= mod:NewTargetAnnounce(69246, 2)
 
 local specWarnHoarfrost			= mod:NewSpecialWarning("specWarnHoarfrost")
 local specWarnHoarfrostNear		= mod:NewSpecialWarning("specWarnHoarfrostNear")
@@ -77,6 +76,7 @@
 function mod:CHAT_MSG_RAID_BOSS_EMOTE(msg)
 	local target = msg and msg:match(L.HoarfrostTarget)
 	if target then
+		warnHoarfrost:Show(target)
 		if target == UnitName("player") then
 			specWarnHoarfrost:Show()
 		elseif target then

r4372 (Omega): tweak to experimental abom timer, maybe it'll be a little closer now?

Omega — Sun, 25 Jul 2010 03:11:38 GMT

Author: Omega
Date: Sun Jul 25 05:11:38 CEST 2010
Revision: 4372

Log:

tweak to experimental abom timer, maybe it'll be a little closer now?

Updated

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Action: modified

Old revision: 4371

Old date: 2010-07-24 12:11:01 UTC

@@ -63,7 +63,7 @@
 	if AbomTimer >= 60 then--Keep it from dropping below 50
 		timerAbom:Start(AbomTimer)
 		self:ScheduleMethod(AbomTimer, "StartAbomTimer")
-		AbomTimer = AbomTimer - 10
+		AbomTimer = AbomTimer - 5
 	else
 		timerAbom:Start(AbomTimer)
 		self:ScheduleMethod(AbomTimer, "StartAbomTimer")

r4371 (bluenyx): koKR update

bluenyx — Sat, 24 Jul 2010 12:11:01 GMT

Author: bluenyx
Date: Sat Jul 24 14:11:01 CEST 2010
Revision: 4371

Log:

koKR update

Updated

trunk/DBM-ChamberOfAspects/localization.kr.lua

Updated

trunk/DBM-Icecrown/localization.kr.lua

trunk/DBM-ChamberOfAspects/localization.kr.lua

Action: modified

Old revision: 4370

Old date: 2010-07-23 21:16:17 UTC

@@ -189,7 +189,8 @@
 	AnnounceAlternatePhase	= "해당 위치에 없을 경우에도 모든 단계의 경고/타이머 보기",
 	SoundOnConsumption		= "$spell:74562 또는 $spell:74792 소리 재생",--We use localized text for these functions
 	SetIconOnConsumption	= "$spell:74562 또는 $spell:74792 대상 공격대 아이콘 설정",--So we can use single functions for both versions of spell.
-	YellOnConsumption		= "$spell:74562 또는 $spell:74792 외치기"	
+	YellOnConsumption		= "$spell:74562 또는 $spell:74792 외치기",
+	WhisperOnConsumption	= "$spell:74562 또는 $spell:74792의 대상에게 귓속말 보내기"	
 })
 
 L:SetMiscLocalization({
@@ -198,6 +199,8 @@
 	Phase3					= "나는 빛이자 어둠이다! 필멸자들어, 데스윙의 사자 앞에 무릎 꿇어라!",
 	twilightcutter			= "주위를 회전하는 구슬들이 고동치며 어둠의 기운을 내뿜습니다!",
 	YellCombustion			= "나에게 맹렬한 발화!",
+	WhisperCombustion		= "당신에게 맹렬한 발화! 외곽으로 뛰셈!",	
 	YellConsumption			= "나에게 영혼 소진!",
+	WhisperConsumption		= "당신에게 영혼 소진! 외곽으로 뛰셈!",	
 	Kill					= "필멸자들아, 승리를 만끽해라. 그것이 마지막일 테니. 주인님이 돌아오시면 이 세상은 불타버리리라!"
 })

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 4370

Old date: 2010-07-23 21:16:17 UTC

@@ -418,7 +418,8 @@
 
 L:SetTimerLocalization{
 	timerPortalsOpen			= "차원문 열림",
-	TimerBlazingSkeleton		= "타오르는 해골"
+	TimerBlazingSkeleton		= "다음 타오르는 해골",
+	timerAbom					= "Next Abomination?"
 }
 
 L:SetOptionLocalization{
@@ -426,6 +427,7 @@
 	warnPortalOpen				= "$spell:72483 열림 경고 보기",	
 	timerPortalsOpen			= "악몽의 차원문이 열릴 때 타이머 보기",
 	TimerBlazingSkeleton		= "타오르는 해골 다음 생성 타이머 보기",	
+	timerAbom					= "Show timer for next Gluttonous Abomination spawn (Experimental)",	
 	warnCorrosion				= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "알 수 없음")
 }
 
@@ -523,13 +525,14 @@
 	WarnPhase3Soon				= "3 단계 전환 사전 경고 보기(43% 이하)",
 	ValkyrWarning				= "발키리에게 붙잡힌 사람 알리기",
 	specWarnYouAreValkd			= "발키리에게 붙잡혔을 때 특수 경고 보기",	
+	specWarnHealerGrabbed		= "성기사 또는 사제(힐러)가 발키리에게 붙잡히게 될 경우 특수 경고 보기\n(힐러가 DBM을 사용할 경우)",	
 	specWarnDefileCast			= "당신에게 $spell:72762이 시전된 경우 특수 경고 보기",
 	specWarnDefileNear			= "당신 주변에 $spell:72762이 시전된 경우 특수 경고 보기",
 	specWarnTrapNear			= "주변에 $spell:73539을 하면 특수 경고 보기",	
 	YellOnDefile				= "$spell:72762의 대상이 됐을 때 말하기",
 	YellOnTrap					= "$spell:73539 말하기",
-	YellOnValk					= "$spell:69037 외치기",	
 	DefileIcon					= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72762),
+	HarvestSoulIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(74327),	
 	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),

r4370 (Omega): no real mod changes, just a bunch of comment updates to lich king mod so when other authors look at it, some of code makes more sense.

Omega — Fri, 23 Jul 2010 21:16:17 GMT

Author: Omega
Date: Fri Jul 23 23:16:17 CEST 2010
Revision: 4370

Log:

no real mod changes, just a bunch of comment updates to lich king mod so when other authors look at it, some of code makes more sense.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4369

Old date: 2010-07-22 08:05:50 UTC

@@ -81,7 +81,7 @@
 local timerVileSpirit 		= mod:NewNextTimer(30.5, 70498)
 local timerTrapCD		 	= mod:NewCDTimer(15.5, 73539)
 local timerRestoreSoul 		= mod:NewCastTimer(40, 73650)
-local timerRoleplay			= mod:NewTimer(160, "TimerRoleplay", 72350)
+local timerRoleplay			= mod:NewTimer(162, "TimerRoleplay", 72350)
 
 local berserkTimer			= mod:NewBerserkTimer(900)
 
@@ -426,20 +426,20 @@
 					valkyrTargets[i] = true          -- this person has been announced
 					if UnitName("raid"..i) == UnitName("player") then
 						specWarnYouAreValkd:Show()
-						if mod:IsHealer() then
+						if mod:IsHealer() then--Is player that's grabbed a healer
 							if isPAL then
-								mod:SendSync("PALGrabbed", UnitName("player"))
+								mod:SendSync("PALGrabbed", UnitName("player"))--They are a holy paladin
 							elseif isPRI then
-								mod:SendSync("PRIGrabbed", UnitName("player"))
+								mod:SendSync("PRIGrabbed", UnitName("player"))--They are a disc/holy priest
 							end
 						end
 					end
 					if mod.Options.AnnounceValkGrabs and DBM:GetRaidRank() > 0 then
 						if mod.Options.ValkyrIcon then
-							SendChatMessage(L.ValkGrabbedIcon:format(grabIcon, UnitName("raid"..i)), "RAID")--Untested, not sure if the icon timing will line up since i grab icon from a different function.
+							SendChatMessage(L.ValkGrabbedIcon:format(grabIcon, UnitName("raid"..i)), "RAID")
 							grabIcon = grabIcon + 1
 						else
-							SendChatMessage(L.ValkGrabbed:format(UnitName("raid"..i)), "RAID")--Untested, not sure if the icon timing will line up since i grab icon from a different function.
+							SendChatMessage(L.ValkGrabbed:format(UnitName("raid"..i)), "RAID")
 						end
 					end
 				end
@@ -532,14 +532,14 @@
 end
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
-	if msg == L.LKPull or msg:find(L.LKPull) then
+	if msg:find(L.LKPull) then
 		timerCombatStart:Start()
 	end
 end
 
-function mod:CHAT_MSG_RAID_BOSS_WHISPER(msg)
-	if msg:find(L.PlagueWhisper) and self:IsInCombat() then
-		if GetTime() - lastPlagueCast > 1 then
+function mod:CHAT_MSG_RAID_BOSS_WHISPER(msg)--We get this whisper for all plagues, ones cast by lich king and ones from dispel jumps.
+	if msg:find(L.PlagueWhisper) and self:IsInCombat() then--We do a combat check with lich king since rotface uses the same whisper message and we only want this to work on lich king.
+		if GetTime() - lastPlagueCast > 1 then--We don't want to send sync if it came from a spell cast though, so we ignore whisper unless it was at least 1 second after a cast.
 			self:SendSync("PlagueOn", UnitName("player"))
 		end
 	end
@@ -557,7 +557,7 @@
 	end
 end
 
-function mod:OnSync(msg, victim)--Lets try two onsync handlers with a diff arg name to maybe work around the trap bug?
+function mod:OnSync(msg, victim)--Lets try two onsync handlers with a diff arg name to maybe work around the trap bug if 2 syncs sent at same time
 	if msg == "TrapOn" then
 		if not self.Options.BypassLatencyCheck then
 			warnTrapCast:Show(victim)
@@ -590,11 +590,11 @@
 end
 
 function mod:OnSync(msg, target)
-	if msg == "PALGrabbed" then
+	if msg == "PALGrabbed" then--Does this function fail to alert second healer if 2 different paladins are grabbed within < 2.5 seconds?
 		if self.Options.specWarnHealerGrabbed then
 			specWarnPALGrabbed:Show(target)
 		end
-	elseif msg == "PRIGrabbed" then
+	elseif msg == "PRIGrabbed" then--Does this function fail to alert second healer if 2 different priests are grabbed within < 2.5 seconds?
 		if self.Options.specWarnHealerGrabbed then
 			specWarnPRIGrabbed:Show(target)
 		end
@@ -629,8 +629,8 @@
 			end
 		end
 	elseif msg == "PlagueOn" and self:IsInCombat() then
-		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.
+		if GetTime() - lastPlagueCast > 1 then --We also do same 1 second check here
+			warnNecroticPlagueJump:Show(target)
 			timerNecroticPlagueCleanse:Start()
 			if target == UnitName("player") then
 				specWarnNecroticPlague:Show()

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

Snamor — Thu, 22 Jul 2010 08:05:50 GMT

Author: Snamor
Date: Thu Jul 22 10:05:50 CEST 2010
Revision: 4369

Log:

#ICC/All: esES update

Updated

trunk/DBM-Icecrown/localization.es.lua

Action: modified

Old revision: 4368

Old date: 2010-07-22 04:49:01 UTC

@@ -529,17 +529,17 @@
 	WarnPhase3Soon			= "Mostrar pre-aviso para transición a la Fase 3 (al ~43%)",
 	ValkyrWarning			= "Anunciar quien ha sido agarrado por las Valkyr",
 	specWarnYouAreValkd		= "Mostrar aviso especial cuando seas agarrado por una Valkyr",
-	specWarnHealerGrabbed	= "Mostrar un aviso especial cuando un healer paladín o sacerdote es agarrado",
+	specWarnHealerGrabbed	= "Mostrar un aviso especial cuando un healer paladín o sacerdote es agarrado\n(Es necesario que ese healer esté usando DBM)",
 	specWarnDefileCast		= "Mostrar aviso especial para $spell:72762 en ti",
 	specWarnDefileNear		= "Mostrar aviso especial para $spell:72762 cerca de ti",
 	specWarnTrapNear		= "Mostrar aviso especial para $spell:73539 cerca de ti",
 	YellOnDefile			= "Gritar cuando tengas $spell:72762",
 	YellOnTrap				= "Gritar cuando tengas $spell:73539",
-	YellOnValk				= "Gritar cuando te agarre $spell:69037",
 	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),
+	HarvestSoulIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(74327),
 	ValkyrIcon				= "Poner iconos en las Valkyr",
 	DefileArrow				= "Mostrar flecha cuando $spell:72762 está cerca de ti",
 	TrapArrow				= "Mostrar flecha cuando $spell:73539 está cerca de ti",

r4368 (Omega): just playing with sync changes to try and fix trap sync bug

Omega — Thu, 22 Jul 2010 04:49:01 GMT

Author: Omega
Date: Thu Jul 22 06:49:01 CEST 2010
Revision: 4368

Log:

just playing with sync changes to try and fix trap sync bug

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4367

Old date: 2010-07-22 04:19:04 UTC

@@ -557,6 +557,38 @@
 	end
 end
 
+function mod:OnSync(msg, victim)--Lets try two onsync handlers with a diff arg name to maybe work around the trap bug?
+	if msg == "TrapOn" then
+		if not self.Options.BypassLatencyCheck then
+			warnTrapCast:Show(victim)
+			if self.Options.TrapIcon then
+				self:SetIcon(player, 8, 10)
+			end
+			if victim == UnitName("player") then
+				specWarnTrap:Show()
+				if self.Options.YellOnTrap then
+					SendChatMessage(L.YellTrap, "SAY")
+				end
+			end
+			local uId = DBM:GetRaidUnitId(victim)
+			if uId ~= "none" then
+				local inRange = CheckInteractDistance(uId, 2)
+				local x, y = GetPlayerMapPosition(uId)
+				if x == 0 and y == 0 then
+					SetMapToCurrentZone()
+					x, y = GetPlayerMapPosition(uId)
+				end
+				if inRange then
+					specWarnTrapNear:Show()
+					if self.Options.TrapArrow then
+						DBM.Arrow:ShowRunAway(x, y, 10, 5)
+					end
+				end
+			end
+		end
+	end
+end
+
 function mod:OnSync(msg, target)
 	if msg == "PALGrabbed" then
 		if self.Options.specWarnHealerGrabbed then
@@ -596,34 +628,6 @@
 				end
 			end
 		end
-	elseif msg == "TrapOn" then
-		if not self.Options.BypassLatencyCheck then
-			warnTrapCast:Show(target)
-			if self.Options.TrapIcon then
-				self:SetIcon(target, 8, 10)
-			end
-			if target == UnitName("player") then
-				specWarnTrap:Show()
-				if self.Options.YellOnTrap then
-					SendChatMessage(L.YellTrap, "SAY")
-				end
-			end
-			local uId = DBM:GetRaidUnitId(target)
-			if uId ~= "none" then
-				local inRange = CheckInteractDistance(uId, 2)
-				local x, y = GetPlayerMapPosition(uId)
-				if x == 0 and y == 0 then
-					SetMapToCurrentZone()
-					x, y = GetPlayerMapPosition(uId)
-				end
-				if inRange then
-					specWarnTrapNear:Show()
-					if self.Options.TrapArrow then
-						DBM.Arrow:ShowRunAway(x, y, 10, 5)
-					end
-				end
-			end
-		end
 	elseif msg == "PlagueOn" and self:IsInCombat() then
 		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.

r4367 (Omega): revert all lich king changes (except icon changes). removing necrotic plague syncing does not fix trap. currently this cannot be fixed in lich king mod it's gonna take a core fix in how sync protocol handles two syncs at same time. use the old trap scan method in options til this is fixed

Omega — Thu, 22 Jul 2010 04:19:04 GMT

Author: Omega
Date: Thu Jul 22 06:19:04 CEST 2010
Revision: 4367

Log:

revert all lich king changes (except icon changes). removing necrotic plague syncing does not fix trap. currently this cannot be fixed in lich king mod it's gonna take a core fix in how sync protocol handles two syncs at same time. use the old trap scan method in options til this is fixed

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4366

Old date: 2010-07-22 02:25:11 UTC

@@ -4,7 +4,7 @@
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(36597)
 mod:RegisterCombat("combat")
-mod:SetMinSyncRevision(4362)
+mod:SetMinSyncRevision(3913)
 mod:SetUsedIcons(2, 3, 4, 5, 6, 7, 8)
 
 mod:RegisterEvents(
@@ -32,7 +32,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 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 ValkyrWarning			= mod:NewAnnounce("ValkyrWarning", 3, 71844)--Phase 2 Ability
@@ -331,6 +331,9 @@
 		timerNecroticPlagueCD:Start()
 		timerNecroticPlagueCleanse:Start()
 		lastPlagueCast = GetTime()
+		if args:IsPlayer() then
+			specWarnNecroticPlague:Show()
+		end
 		if self.Options.NecroticPlagueIcon then
 			self:SetIcon(args.destName, 5, 5)
 		end
@@ -536,10 +539,11 @@
 
 function mod:CHAT_MSG_RAID_BOSS_WHISPER(msg)
 	if msg:find(L.PlagueWhisper) and self:IsInCombat() then
-		specWarnNecroticPlague:Show()
---		self:SendSync("PlagueOn", UnitName("player"))
+		if GetTime() - lastPlagueCast > 1 then
+			self:SendSync("PlagueOn", UnitName("player"))
 	end
 end
+end
 
 function mod:SWING_DAMAGE(args)
 	if args:GetSrcCreatureID() == 36597 then--Lich king Tank
@@ -596,7 +600,7 @@
 		if not self.Options.BypassLatencyCheck then
 			warnTrapCast:Show(target)
 			if self.Options.TrapIcon then
-				self:SetIcon(target, 6, 10)
+				self:SetIcon(target, 8, 10)
 			end
 			if target == UnitName("player") then
 				specWarnTrap:Show()
@@ -620,13 +624,16 @@
 				end
 			end
 		end
-	--[[elseif msg == "PlagueOn" and self:IsInCombat() then
+	elseif msg == "PlagueOn" and self:IsInCombat() then
 		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
+				specWarnNecroticPlague:Show()
+			end 
 			if self.Options.NecroticPlagueIcon then
-				self:SetIcon(target, 7, 5)
+				self:SetIcon(target, 5, 5)
 			end
-		end--]]
 	end
 end
+end

r4366 (Omega): fix error in last

Omega — Thu, 22 Jul 2010 02:25:11 GMT

Author: Omega
Date: Thu Jul 22 04:25:11 CEST 2010
Revision: 4366

Log:

fix error in last

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4365

Old date: 2010-07-21 23:44:32 UTC

@@ -536,9 +536,7 @@
 
 function mod:CHAT_MSG_RAID_BOSS_WHISPER(msg)
 	if msg:find(L.PlagueWhisper) and self:IsInCombat() then
-		if args:IsPlayer() then
 			specWarnNecroticPlague:Show()
-		end
 --		self:SendSync("PlagueOn", UnitName("player"))
 	end
 end

r4365 (Omega): #ICC/Lich King: Changed icons around to make a little more sense. skull on trap target, moon on plague, X on raging spirits. This is also done to reduce mod conflict with DXE, now both mods use same icons so raid assists using both mods in same raid will no longer use conflicting icons.

Omega — Wed, 21 Jul 2010 23:44:32 GMT

Author: Omega
Date: Thu Jul 22 01:44:32 CEST 2010
Revision: 4365

Log:

#ICC/Lich King: Changed icons around to make a little more sense. skull on trap target, moon on plague, X on raging spirits. This is also done to reduce mod conflict with DXE, now both mods use same icons so raid assists using both mods in same raid will no longer use conflicting icons.
#ICC/Putricide: Changed plague icon to moon for same reason as above.
#ICC/Rotface: Since skull is no longer used for oozes blowing up, changed icons for infection to skull and x.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4364

Old date: 2010-07-21 23:22:54 UTC

@@ -5,7 +5,7 @@
 mod:SetCreatureID(36597)
 mod:RegisterCombat("combat")
 mod:SetMinSyncRevision(4362)
-mod:SetUsedIcons(2, 3, 4, 6, 7, 8)
+mod:SetUsedIcons(2, 3, 4, 5, 6, 7, 8)
 
 mod:RegisterEvents(
 	"SPELL_CAST_START",
@@ -93,6 +93,7 @@
 mod:AddBoolOption("RagingSpiritIcon")
 mod:AddBoolOption("TrapIcon")
 mod:AddBoolOption("ValkyrIcon")
+mod:AddBoolOption("HarvestSoulIcon")
 mod:AddBoolOption("YellOnDefile", true, "announce")
 mod:AddBoolOption("YellOnTrap", true, "announce")
 mod:AddBoolOption("AnnounceValkGrabs", false)
@@ -180,7 +181,7 @@
 function mod:OldTankTrap()
 	warnTrapCast:Show(LKTank)
 	if self.Options.TrapIcon then
-		self:SetIcon(LKTank, 6, 10)
+		self:SetIcon(LKTank, 8, 10)
 	end
 	if LKTank == UnitName("player") then
 		specWarnTrap:Show()
@@ -213,7 +214,7 @@
 		self:UnscheduleMethod("OldTankTrap")--Also unschedule tanktrap since we got a scan that returned a non tank.
 		warnTrapCast:Show(targetname)
 		if self.Options.TrapIcon then
-			self:SetIcon(targetname, 6, 10)
+			self:SetIcon(targetname, 8, 10)
 		end
 		if targetname == UnitName("player") then
 			specWarnTrap:Show()
@@ -331,7 +332,7 @@
 		timerNecroticPlagueCleanse:Start()
 		lastPlagueCast = GetTime()
 		if self.Options.NecroticPlagueIcon then
-			self:SetIcon(args.destName, 7, 5)
+			self:SetIcon(args.destName, 5, 5)
 		end
 	elseif args:IsSpellID(69409, 73797, 73798, 73799) then -- Soul reaper (MT debuff)
 		warnSoulreaper:Show(args.destName)
@@ -352,7 +353,7 @@
 			timerRagingSpiritCD:Start(17)
 		end
 		if self.Options.RagingSpiritIcon then
-			self:SetIcon(args.destName, 8, 5)
+			self:SetIcon(args.destName, 7, 5)
 		end
 	elseif args:IsSpellID(68980, 74325, 74326, 74327) then -- Harvest Soul
 		warnHarvestSoul:Show(args.destName)
@@ -361,6 +362,9 @@
 		if args:IsPlayer() then
 			specWarnHarvestSoul:Show()
 		end
+		if self.Options.HarvestSoulIcon then
+			self:SetIcon(args.destName, 5, 6)
+		end
 	elseif args:IsSpellID(73654, 74295, 74296, 74297) then -- Harvest Souls (Heroic)
 		specWarnHarvestSouls:Show()
 		timerVileSpirit:Cancel()

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 4364

Old date: 2010-07-21 23:22:54 UTC

@@ -5,7 +5,7 @@
 mod:SetCreatureID(36678)
 mod:RegisterCombat("yell", L.YellPull)
 mod:SetMinSyncRevision(3860)
-mod:SetUsedIcons(1, 2, 6, 7, 8)
+mod:SetUsedIcons(5, 6, 7, 8)
 
 mod:RegisterEvents(
 	"SPELL_CAST_START",
@@ -250,7 +250,7 @@
 	elseif args:IsSpellID(72855, 72856, 70911) then	 -- Unbound Plague
 		warnUnboundPlague:Show(args.destName)
 		if self.Options.UnboundPlagueIcon then
-			self:SetIcon(args.destName, 2, 20)
+			self:SetIcon(args.destName, 5, 20)
 		end
 		if args:IsPlayer() then
 			specWarnUnboundPlague:Show()

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 4364

Old date: 2010-07-21 23:22:54 UTC

@@ -3,7 +3,7 @@
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(36627)
-mod:SetUsedIcons(6, 7)
+mod:SetUsedIcons(7, 8)
 mod:RegisterCombat("combat")
 
 mod:RegisterEvents(
@@ -62,7 +62,7 @@
 function mod:OnCombatStart(delay)
 	timerWallSlime:Start(25-delay)
 	self:ScheduleMethod(25-delay, "WallSlime")
-	InfectionIcon = 7
+	InfectionIcon = 8
 	spamOoze = 0
 	if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
 		timerVileGasCD:Start(22-delay)
@@ -122,10 +122,10 @@
 		end
 		if self.Options.InfectionIcon then
 			self:SetIcon(args.destName, InfectionIcon, 12)
-			if InfectionIcon == 7 then	-- After ~3mins there is a chance 2 ppl will have the debuff, so we are alternating between 2 icons
-				InfectionIcon = 6
+			if InfectionIcon == 8 then	-- After ~3mins there is a chance 2 ppl will have the debuff, so we are alternating between 2 icons
+				InfectionIcon = 7
 			else
-				InfectionIcon = 7
+				InfectionIcon = 8
 			end
 		end
 	elseif args:IsSpellID(72272, 72273) and args:IsDestTypePlayer() then	-- Vile Gas(Heroic Rotface only, 25 man spellid the same as 10?)

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4364

Old date: 2010-07-21 23:22:54 UTC

@@ -528,6 +528,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),
+	HarvestSoulIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(74327),
 	ValkyrIcon				= "Set icons on Valkyrs",
 	DefileArrow				= "Show DBM arrow when $spell:72762 is near you",
 	TrapArrow				= "Show DBM arrow when $spell:73539 is near you",

r4364 (Omega): remove yell on valk, it's just annoying and not useful in any way. i more or less used it for debugging when testing the grab code but now it's just useless fluff.

Omega — Wed, 21 Jul 2010 23:22:54 GMT

Author: Omega
Date: Thu Jul 22 01:22:54 CEST 2010
Revision: 4364

Log:

remove yell on valk, it's just annoying and not useful in any way. i more or less used it for debugging when testing the grab code but now it's just useless fluff.
added clarification to locals on healer grabs noting that they require those healers to be running DBM for the sync.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4363

Old date: 2010-07-21 18:30:24 UTC

@@ -95,7 +95,6 @@
 mod:AddBoolOption("ValkyrIcon")
 mod:AddBoolOption("YellOnDefile", true, "announce")
 mod:AddBoolOption("YellOnTrap", true, "announce")
-mod:AddBoolOption("YellOnValk", false, "announce")
 mod:AddBoolOption("AnnounceValkGrabs", false)
 --mod:AddBoolOption("DefileArrow")
 mod:AddBoolOption("TrapArrow")
@@ -420,9 +419,6 @@
 					valkyrTargets[i] = true          -- this person has been announced
 					if UnitName("raid"..i) == UnitName("player") then
 						specWarnYouAreValkd:Show()
-						if mod.Options.YellOnValk then
-							SendChatMessage(L.YellValk, "SAY")
-						end
 						if mod:IsHealer() then
 							if isPAL then
 								mod:SendSync("PALGrabbed", UnitName("player"))

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4363

Old date: 2010-07-21 18:30:24 UTC

@@ -518,13 +518,12 @@
 	WarnPhase3Soon			= "Show pre-warning for Phase 3 transition (at ~43%)",
 	ValkyrWarning			= "Announce who has been grabbed by Val'kyr Shadowguards",
 	specWarnYouAreValkd		= "Show special warning when you have been grabbed by a Val'kyr Shadowguard",--npc36609
-	specWarnHealerGrabbed	= "Show special warning when a paladin or priest healer has been grabbed",
+	specWarnHealerGrabbed	= "Show special warning when a paladin or priest healer has been grabbed\n(requires that healer to be running DBM)",
 	specWarnDefileCast		= "Show special warning for $spell:72762 on you",
 	specWarnDefileNear		= "Show special warning for $spell:72762 near you",
 	specWarnTrapNear		= "Show special warning for $spell:73539 near you",
 	YellOnDefile			= "Yell on $spell:72762",
 	YellOnTrap				= "Yell on $spell:73539",
-	YellOnValk				= "Yell on $spell:69037",
 	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),

r4363 (Omega): make it so you at very least get a special warning if a plague jumps to you even if other stuff is disabled such as syncing.

Omega — Wed, 21 Jul 2010 18:30:24 GMT

Author: Omega
Date: Wed Jul 21 20:30:24 CEST 2010
Revision: 4363

Log:

make it so you at very least get a special warning if a plague jumps to you even if other stuff is disabled such as syncing.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4362

Old date: 2010-07-21 04:32:03 UTC

@@ -16,7 +16,7 @@
 	"SPELL_DAMAGE",
 	"UNIT_HEALTH",
 	"CHAT_MSG_MONSTER_YELL",
---	"CHAT_MSG_RAID_BOSS_WHISPER",
+	"CHAT_MSG_RAID_BOSS_WHISPER",
 	"SWING_DAMAGE",
 	"SWING_MISSED"
 )
@@ -334,9 +334,6 @@
 		if self.Options.NecroticPlagueIcon then
 			self:SetIcon(args.destName, 7, 5)
 		end
-		if args:IsPlayer() then
-			specWarnNecroticPlague:Show()
-		end
 	elseif args:IsSpellID(69409, 73797, 73798, 73799) then -- Soul reaper (MT debuff)
 		warnSoulreaper:Show(args.destName)
 		specwarnSoulreaper:Show(args.destName)
@@ -537,11 +534,14 @@
 	end
 end
 
---[[function mod:CHAT_MSG_RAID_BOSS_WHISPER(msg)
+function mod:CHAT_MSG_RAID_BOSS_WHISPER(msg)
 	if msg:find(L.PlagueWhisper) and self:IsInCombat() then
-		self:SendSync("PlagueOn", UnitName("player"))
+		if args:IsPlayer() then
+			specWarnNecroticPlague:Show()
 	end
-end--]]
+--		self:SendSync("PlagueOn", UnitName("player"))
+	end
+end
 
 function mod:SWING_DAMAGE(args)
 	if args:GetSrcCreatureID() == 36597 then--Lich king Tank

r4362 (Omega): #ICC/Lich King: Removed necrotic plague jump detection, it doesn't get along with shadow trap syncs. apparently a dbm core limitation prevents you from using more than one type of target sync at same time. surprised this hasn't caused problems on halion yet. or i just haven't noticed yet. this will fix isses with traps being announced on plague targets. However this will make users unhappy since they will no longer get raid icon, special warning, or any kind of warning for that matter if plague jumps to another player unless someone can write a unit aura scan method

Omega — Wed, 21 Jul 2010 04:32:03 GMT

Author: Omega
Date: Wed Jul 21 06:32:03 CEST 2010
Revision: 4362

Log:

#ICC/Lich King: Removed necrotic plague jump detection, it doesn't get along with shadow trap syncs. apparently a dbm core limitation prevents you from using more than one type of target sync at same time. surprised this hasn't caused problems on halion yet. or i just haven't noticed yet. this will fix isses with traps being announced on plague targets. However this will make users unhappy since they will no longer get raid icon, special warning, or any kind of warning for that matter if plague jumps to another player unless someone can write a unit aura scan method

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4361

Old date: 2010-07-20 11:44:20 UTC

@@ -4,7 +4,7 @@
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(36597)
 mod:RegisterCombat("combat")
-mod:SetMinSyncRevision(3913)
+mod:SetMinSyncRevision(4362)
 mod:SetUsedIcons(2, 3, 4, 6, 7, 8)
 
 mod:RegisterEvents(
@@ -16,7 +16,7 @@
 	"SPELL_DAMAGE",
 	"UNIT_HEALTH",
 	"CHAT_MSG_MONSTER_YELL",
-	"CHAT_MSG_RAID_BOSS_WHISPER",
+--	"CHAT_MSG_RAID_BOSS_WHISPER",
 	"SWING_DAMAGE",
 	"SWING_MISSED"
 )
@@ -32,7 +32,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 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 ValkyrWarning			= mod:NewAnnounce("ValkyrWarning", 3, 71844)--Phase 2 Ability
@@ -537,11 +537,11 @@
 	end
 end
 
-function mod:CHAT_MSG_RAID_BOSS_WHISPER(msg)
+--[[function mod:CHAT_MSG_RAID_BOSS_WHISPER(msg)
 	if msg:find(L.PlagueWhisper) and self:IsInCombat() then
 		self:SendSync("PlagueOn", UnitName("player"))
 	end
-end
+end--]]
 
 function mod:SWING_DAMAGE(args)
 	if args:GetSrcCreatureID() == 36597 then--Lich king Tank
@@ -556,18 +556,7 @@
 end
 
 function mod:OnSync(msg, target)
-	if msg == "PlagueOn" and self:IsInCombat() then
-		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
-				specWarnNecroticPlague:Show()
-			end 
-			if self.Options.NecroticPlagueIcon then
-				self:SetIcon(target, 7, 5)
-			end
-		end
-	elseif msg == "PALGrabbed" then
+	if msg == "PALGrabbed" then
 		if self.Options.specWarnHealerGrabbed then
 			specWarnPALGrabbed:Show(target)
 		end
@@ -633,5 +622,13 @@
 				end
 			end
 		end
+	--[[elseif msg == "PlagueOn" and self:IsInCombat() then
+		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 self.Options.NecroticPlagueIcon then
+				self:SetIcon(target, 7, 5)
 	end
+		end--]]
 end
+end

r4361 (Azael): zhtw update

Azael — Tue, 20 Jul 2010 11:44:20 GMT

Author: Azael
Date: Tue Jul 20 13:44:20 CEST 2010
Revision: 4361

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Updated

trunk/DBM-Ulduar/localization.tw.lua

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 4360

Old date: 2010-07-20 05:31:43 UTC

@@ -323,7 +323,7 @@
 	YellOnUnbound			= "當你中了$spell:72856時大喊",
 	specWarnUnboundPlague		= "為$spell:72856的轉移顯示特別警告",
 	specWarnNextPlageSelf		= "當你是下一個$spell:72856的目標時顯示特別警告",
-	BypassLatencyCheck		= "不對$spell:72295使用同步\n(只有出現問題時才使用這個)"
+	BypassLatencyCheck		= "不對$spell:72295使用同步延遲查詢\n(只有出現問題時才使用這個)"
 	
 
 }
@@ -363,7 +363,7 @@
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "設置標記在強力的親王身上 (頭顱)",
 	RangeFrame			= "顯示距離框 (12碼)",
-	BypassLatencyCheck		= "不對$spell:72037使用同步查詢\n(只有出現問題時才使用這個)"
+	BypassLatencyCheck		= "不對$spell:72037使用同步延遲查詢\n(只有出現問題時才使用這個)"
 }
 
 L:SetMiscLocalization{
@@ -417,14 +417,16 @@
 
 L:SetTimerLocalization{
 	timerPortalsOpen		= "傳送門開啟",
-	TimerBlazingSkeleton		= "熾熱骷髏"
+	TimerBlazingSkeleton		= "下一次 熾熱骷髏",
+	timerAbom			= "下一次 憎惡體?"
 }
 
 L:SetOptionLocalization{
 	SetIconOnBlazingSkeleton	= "為熾熱骷髏設置標記 (頭顱)",
 	warnPortalOpen			= "當夢魘之門開啟時顯示警告",
 	timerPortalsOpen		= "當夢魘之門開啟時顯示計時器",
-	TimerBlazingSkeleton		= "為熾熱骷髏出現顯示計時器",
+	TimerBlazingSkeleton		= "為下一次熾熱骷髏出現顯示計時器",
+	timerAbom			= "為下一次貪吃的憎惡體出現顯示計時器 (測試中)",
 	warnCorrosion			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }
 
@@ -535,7 +537,7 @@
 	ValkyrIcon			= "為華爾琪影衛設置標記",
 	DefileArrow			= "當你附近的人中了$spell:72762時顯示DBM箭頭",
 	TrapArrow			= "當你附近的人中了$spell:73539時顯示DBM箭頭",
-	BypassLatencyCheck		= "不對汙染/暗影陷阱使用同步\n(只有出現問題時才使用這個)",
+	BypassLatencyCheck		= "不對汙染/暗影陷阱使用同步延遲查詢\n(只有出現問題時才使用這個)",
 	AnnounceValkGrabs		= "提示誰被華爾琪影衛抓住到團隊頻道\n(需開啟團隊廣播及助理權限)"
 }

trunk/DBM-Ulduar/localization.tw.lua

Action: modified

Old revision: 4360

Old date: 2010-07-20 05:31:43 UTC

@@ -439,7 +439,7 @@
 	YellOnShadowCrash		= "當你中了$spell:62660時大喊",
 	hardmodeSpawn			= "為薩倫聚惡體出現顯示計時器 (困難模式)",
 	CrashArrow			= "當你附近的人中了$spell:62660時顯示DBM箭頭",
-	BypassLatencyCheck		= "不對$spell:62660使用同步\n(只有出現問題時才使用這個)"
+	BypassLatencyCheck		= "不對$spell:62660使用同步延遲查詢\n(只有出現問題時才使用這個)"
 }
 
 L:SetMiscLocalization{

r4360 (Omega): local update to fix text going off screen

Omega — Tue, 20 Jul 2010 05:31:43 GMT

Author: Omega
Date: Tue Jul 20 07:31:43 CEST 2010
Revision: 4360

Log:

local update to fix text going off screen

Updated

trunk/DBM-ChamberOfAspects/localization.en.lua

Action: modified

Old revision: 4359

Old date: 2010-07-20 05:29:22 UTC

@@ -178,7 +178,7 @@
 	SoundOnConsumption		= "Play sound on $spell:74562 or $spell:74792",--We use localized text for these functions
 	SetIconOnConsumption	= "Set icons on $spell:74562 or $spell:74792 targets",--So we can use single functions for both versions of spell.
 	YellOnConsumption		= "Yell on $spell:74562 or $spell:74792",
-	WhisperOnConsumption	= "Send whisper to $spell:74562 or $spell:74792 targets"
+	WhisperOnConsumption	= "Send whisper to $spell:74562 or $spell:74792\ntargets"
 })
 
 L:SetMiscLocalization({

r4359 (Omega): update minsync again

Omega — Tue, 20 Jul 2010 05:29:22 GMT

Author: Omega
Date: Tue Jul 20 07:29:22 CEST 2010
Revision: 4359

Log:

update minsync again

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4358

Old date: 2010-07-20 05:28:35 UTC

@@ -3,7 +3,7 @@
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(39863)--40141 (twilight form)
-mod:SetMinSyncRevision(4352)
+mod:SetMinSyncRevision(4358)
 mod:SetUsedIcons(7, 8)
 
 mod:RegisterCombat("combat")

r4358 (Omega): another fix to halion synced aggro detection. hopefully now it's working as intended.

Omega — Tue, 20 Jul 2010 05:28:35 GMT

Author: Omega
Date: Tue Jul 20 07:28:35 CEST 2010
Revision: 4358

Log:

another fix to halion synced aggro detection. hopefully now it's working as intended.

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4357

Old date: 2010-07-18 08:37:13 UTC

@@ -178,73 +178,57 @@
 	elseif args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
 			end
-		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			twilightAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("twilightAggro")--We do now.
 			end
 		end
 	end
-end
 
 function mod:SPELL_MISSED(args)
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
 			end
-		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			twilightAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("twilightAggro")--We do now.
 			end
 		end
 	end
-end
 
 function mod:SWING_DAMAGE(args)
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
 			end
-		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			twilightAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("twilightAggro")--We do now.
 			end
 		end
 	end
-end
 
 function mod:SWING_MISSED(args)
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
 			end
-		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			twilightAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("twilightAggro")--We do now.
 			end
 		end
 	end
-end
 --End Phase aggro detection
 
 function mod:UNIT_HEALTH(uId)
@@ -346,8 +330,10 @@
 			end
 		end
 	elseif msg == "PhysicalAggro" then
+		physicalAggro = true
 		timerFieryConsumptionCD:Start(15)--Timer doesn't start again until aggroed again in phase 3. Timer value itself may need adjusting now that it's starting in right place
 	elseif msg == "twilightAggro" then
+		twilightAggro = true
 		timerShadowConsumptionCD:Start(15)--Timer doesn't start until actual twilight form is aggroed. Timer value itself may need adjusting now that it's starting in right place
 	end
 end

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

Snamor — Sun, 18 Jul 2010 08:37:13 GMT

Author: Snamor
Date: Sun Jul 18 10:37:13 CEST 2010
Revision: 4357

Log:

#ICC/All: esES update

Updated

trunk/DBM-Icecrown/localization.es.lua

Action: modified

Old revision: 4356

Old date: 2010-07-18 08:33:25 UTC

@@ -423,7 +423,8 @@
 
 L:SetTimerLocalization{
 	timerPortalsOpen	= "Se abren los portales",
-	TimerBlazingSkeleton	= "Esqueleto llameante"
+	TimerBlazingSkeleton	= "Siguiente Esqueleto llameante",
+	timerAbom				= "Siguiente Abominación?"
 }
 
 L:SetOptionLocalization{
@@ -431,6 +432,7 @@
 	warnPortalOpen				= "Mostrar aviso cuando $spell:72483 se abren",
 	timerPortalsOpen			= "Mostrar tiempo para la apertura de Portal Pesadilla",
 	TimerBlazingSkeleton			= "Mostrar tiempo para la próxima salida de Esqueleto llameante",
+	timerAbom					= "Mostrar tiempo para siguiente Abominación glotona (Experimental)",
 	warnCorrosion	= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }

r4356 (Omega): #ICC/Valithria: Experimental abom timers. needs more work. not tested yet.

Omega — Sun, 18 Jul 2010 08:33:25 GMT

Author: Omega
Date: Sun Jul 18 10:33:25 CEST 2010
Revision: 4356

Log:

#ICC/Valithria: Experimental abom timers. needs more work. not tested yet.

Updated

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Action: modified

Old revision: 4355

Old date: 2010-07-18 04:36:25 UTC

@@ -35,6 +35,7 @@
 local timerGutSpray		= mod:NewTargetTimer(12, 71283, nil, mod:IsTank() or mod:IsHealer())
 local timerCorrosion	= mod:NewTargetTimer(6, 70751, nil, false)
 local timerBlazingSkeleton	= mod:NewTimer(50, "TimerBlazingSkeleton", 17204)
+local timerAbom				= mod:NewTimer(25, "timerAbom", 43392)--Experimental
 
 local berserkTimer		= mod:NewBerserkTimer(420)
 
@@ -43,6 +44,7 @@
 local GutSprayTargets = {}
 local spamSupression = 0
 local BlazingSkeletonTimer = 60
+local AbomTimer = 60
 
 local function warnGutSprayTargets()
 	warnGutSpray:Show(table.concat(GutSprayTargets, "<, >"))
@@ -50,23 +52,37 @@
 end
 
 function mod:StartBlazingSkeletonTimer()
-	if BlazingSkeletonTimer >= 5 then--Keep it from dropping below 5, once it's at 5 disable reschedule
+	if BlazingSkeletonTimer >= 5 then--Keep it from dropping below 5
 		timerBlazingSkeleton:Start(BlazingSkeletonTimer)
 		self:ScheduleMethod(BlazingSkeletonTimer, "StartBlazingSkeletonTimer")
 	end
 	BlazingSkeletonTimer = BlazingSkeletonTimer - 5
 end
 
+function mod:StartAbomTimer()
+	if AbomTimer >= 60 then--Keep it from dropping below 50
+		timerAbom:Start(AbomTimer)
+		self:ScheduleMethod(AbomTimer, "StartAbomTimer")
+		AbomTimer = AbomTimer - 10
+	else
+		timerAbom:Start(AbomTimer)
+		self:ScheduleMethod(AbomTimer, "StartAbomTimer")
+	end
+end
+
 function mod:OnCombatStart(delay)
 	if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
 		berserkTimer:Start(-delay)
 	end
 	timerNextPortal:Start()
 	warnPortalSoon:Schedule(41)
-	self:ScheduleMethod(46.5, "Portals")
+	self:ScheduleMethod(46.5, "Portals")--This will never be perfect, since it's never same. 45-48sec variations
 	BlazingSkeletonTimer = 60
+	AbomTimer = 60
 	self:ScheduleMethod(50-delay, "StartBlazingSkeletonTimer")
+	self:ScheduleMethod(25-delay, "StartAbomTimer")
 	timerBlazingSkeleton:Start(-delay)
+	timerAbom:Start(-delay)
 	table.wipe(GutSprayTargets)
 end
 
@@ -80,7 +96,7 @@
 	warnPortalSoon:Schedule(41)
 	timerNextPortal:Start()
 	self:UnscheduleMethod("Portals")
-	self:ScheduleMethod(46.5, "Portals")
+	self:ScheduleMethod(46.5, "Portals")--This will never be perfect, since it's never same. 45-48sec variations
 end
 --[[
 function mod:SPELL_CAST_START(args)

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4355

Old date: 2010-07-18 04:36:25 UTC

@@ -412,7 +412,8 @@
 
 L:SetTimerLocalization{
 	timerPortalsOpen	= "Portals open",
-	TimerBlazingSkeleton	= "Blazing Skeleton"
+	TimerBlazingSkeleton	= "Next Blazing Skeleton",
+	timerAbom				= "Next Abomination?"
 }
 
 L:SetOptionLocalization{
@@ -420,6 +421,7 @@
 	warnPortalOpen				= "Show warning when Nightmare Portals are opened up",
 	timerPortalsOpen			= "Show timer when Nightmare Portals are opened up",
 	TimerBlazingSkeleton		= "Show timer for next Blazing Skeleton spawn",
+	timerAbom					= "Show timer for next Gluttonous Abomination spawn (Experimental)",
 	warnCorrosion				= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(70751, GetSpellInfo(70751) or "unknown")
 }

r4355 (Omega): small tweak to halion phase 2 timestamp

Omega — Sun, 18 Jul 2010 04:36:25 GMT

Author: Omega
Date: Sun Jul 18 06:36:25 CEST 2010
Revision: 4355

Log:

small tweak to halion phase 2 timestamp

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4354

Old date: 2010-07-18 04:18:50 UTC

@@ -176,7 +176,7 @@
 		specWarnMeteorStrike:Show() --Standing in meteor, not part of aggro detection.
 		lastflame = time()
 	elseif args:GetDestCreatureID() == 39863 then
-		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
 			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
@@ -194,7 +194,7 @@
 
 function mod:SPELL_MISSED(args)
 	if args:GetDestCreatureID() == 39863 then
-		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
 			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
@@ -212,7 +212,7 @@
 
 function mod:SWING_DAMAGE(args)
 	if args:GetDestCreatureID() == 39863 then
-		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
 			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
@@ -230,7 +230,7 @@
 
 function mod:SWING_MISSED(args)
 	if args:GetDestCreatureID() == 39863 then
-		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
 			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.

r4354 (Omega): #Ruby/Halion: special warning for twilight cutter now on by default, but changed to ONLY show if you're in twilight realm.

Omega — Sun, 18 Jul 2010 04:18:50 GMT

Author: Omega
Date: Sun Jul 18 06:18:50 CEST 2010
Revision: 4354

Log:

#Ruby/Halion: special warning for twilight cutter now on by default, but changed to ONLY show if you're in twilight realm.
#Ruby/Halion: Icons changed in last revision but i forgot to note it. skull is now set on fire debuff and x on shadow. since x was hard to see with meteor on ground.

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4353

Old date: 2010-07-18 02:13:57 UTC

@@ -37,7 +37,7 @@
 local specWarnShadowConsumption		= mod:NewSpecialWarningRun(74792)
 local specWarnFieryConsumption		= mod:NewSpecialWarningRun(74562)
 local specWarnMeteorStrike			= mod:NewSpecialWarningMove(75952)
-local specWarnTwilightCutter		= mod:NewSpecialWarningSpell(77844, false)
+local specWarnTwilightCutter		= mod:NewSpecialWarningSpell(77844)
 
 local timerShadowConsumptionCD		= mod:NewNextTimer(25, 74792)
 local timerFieryConsumptionCD		= mod:NewNextTimer(25, 74562)
@@ -288,10 +288,10 @@
 
 function mod:CHAT_MSG_RAID_BOSS_EMOTE(msg)
 	if msg:find(L.twilightcutter) then
+			specWarnTwilightCutter:Schedule(5)
 		if not self.Options.AnnounceAlternatePhase then
 			warningTwilightCutter:Show()
 			timerTwilightCutterCast:Start()
-			specWarnTwilightCutter:Schedule(5)
 			timerTwilightCutter:Schedule(5)--Delay it since it happens 5 seconds after the emote
 			timerTwilightCutterCD:Schedule(15)
 		end
@@ -306,7 +306,6 @@
 		if self.Options.AnnounceAlternatePhase then
 			warningTwilightCutter:Show()
 			timerTwilightCutterCast:Start()
-			specWarnTwilightCutter:Schedule(5)
 			timerTwilightCutter:Schedule(5)--Delay it since it happens 5 seconds after the emote
 			timerTwilightCutterCD:Schedule(15)
 		end

r4353 (Omega): update minsync again

Omega — Sun, 18 Jul 2010 02:13:57 GMT

Author: Omega
Date: Sun Jul 18 04:13:57 CEST 2010
Revision: 4353

Log:

update minsync again

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4352

Old date: 2010-07-18 02:08:45 UTC

@@ -3,7 +3,7 @@
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(39863)--40141 (twilight form)
-mod:SetMinSyncRevision(4351)
+mod:SetMinSyncRevision(4352)
 mod:SetUsedIcons(7, 8)
 
 mod:RegisterCombat("combat")

r4352 (Omega): more fixes. hopefully now the phase aggro detection works correctly

Omega — Sun, 18 Jul 2010 02:08:45 GMT

Author: Omega
Date: Sun Jul 18 04:08:45 CEST 2010
Revision: 4352

Log:

more fixes. hopefully now the phase aggro detection works correctly

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4351

Old date: 2010-07-18 01:42:46 UTC

@@ -3,6 +3,7 @@
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(39863)--40141 (twilight form)
+mod:SetMinSyncRevision(4351)
 mod:SetUsedIcons(7, 8)
 
 mod:RegisterCombat("combat")
@@ -65,16 +66,16 @@
 local lastflame = 0
 
 function mod:OnCombatStart(delay)--These may still need retuning too, log i had didn't have pull time though.
+	physicalAggro = true
+	twilightAggro = false
+	warned_preP2 = false
+	warned_preP3 = false
+	phase2Started = 0
+	lastflame = 0
 	berserkTimer:Start(-delay)
 		timerMeteorCD:Start(20-delay)
 		timerFieryConsumptionCD:Start(15-delay)
 		timerFieryBreathCD:Start(10-delay)
-	warned_preP2 = false
-	warned_preP3 = false
-	phase2Started = 0
-	physicalAggro = true
-	twilightAggro = false
-	lastflame = 0
 end
 
 function mod:SPELL_CAST_START(args)
@@ -132,7 +133,7 @@
 			end
 		end
 		if self.Options.SetIconOnConsumption then
-			self:SetIcon(args.destName, 8)
+			self:SetIcon(args.destName, 7)
 		end
 	elseif args:IsSpellID(74562) then
 		if not self.Options.AnnounceAlternatePhase then
@@ -152,7 +153,7 @@
 			end
 		end
 		if self.Options.SetIconOnConsumption then
-			self:SetIcon(args.destName, 7)
+			self:SetIcon(args.destName, 8)
 		end
 	end
 end
@@ -176,58 +177,74 @@
 		lastflame = time()
 	elseif args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+			physicalAggro = true
+			if mod:LatencyCheck() then
 			self:SendSync("PhysicalAggro")--We do now.
-			physicalAggro = true
 		end
+		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
+			twilightAggro = true
+			if mod:LatencyCheck() then
 			self:SendSync("twilightAggro")--We do now.
-			twilightAggro = true
 		end
 	end
 end
+end
 
 function mod:SPELL_MISSED(args)
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+			physicalAggro = true
+			if mod:LatencyCheck() then
 			self:SendSync("PhysicalAggro")--We do now.
-			physicalAggro = true
 		end
+		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
+			twilightAggro = true
+			if mod:LatencyCheck() then
 			self:SendSync("twilightAggro")--We do now.
-			twilightAggro = true
 		end
 	end
 end
+end
 
 function mod:SWING_DAMAGE(args)
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+			physicalAggro = true
+			if mod:LatencyCheck() then
 			self:SendSync("PhysicalAggro")--We do now.
-			physicalAggro = true
 		end
+		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
+			twilightAggro = true
+			if mod:LatencyCheck() then
 			self:SendSync("twilightAggro")--We do now.
-			twilightAggro = true
 		end
 	end
 end
+end
 
 function mod:SWING_MISSED(args)
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+			physicalAggro = true
+			if mod:LatencyCheck() then
 			self:SendSync("PhysicalAggro")--We do now.
-			physicalAggro = true
 		end
+		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
+			twilightAggro = true
+			if mod:LatencyCheck() then
 			self:SendSync("twilightAggro")--We do now.
-			twilightAggro = true
 		end
 	end
 end
+end
 --End Phase aggro detection
 
 function mod:UNIT_HEALTH(uId)
@@ -242,6 +259,7 @@
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg:find(L.Phase2) then
+		phase2Started = GetTime()
 		timerFieryBreathCD:Cancel()
 		timerMeteorCD:Cancel()
 		timerFieryConsumptionCD:Cancel()
@@ -253,7 +271,6 @@
 			timerTwilightCutterCD:Start(35)
 		end
 		physicalAggro = false
-		phase2Started = GetTime()
 	elseif msg:find(L.Phase3) then
 		warnPhase3:Show()
 		timerMeteorCD:Start(30) --These i'm not sure if they start regardless of drake aggro, or if it should be moved too.

r4351 (Omega): fix stuff i broke

Omega — Sun, 18 Jul 2010 01:42:46 GMT

Author: Omega
Date: Sun Jul 18 03:42:46 CEST 2010
Revision: 4351

Log:

fix stuff i broke

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4350

Old date: 2010-07-17 22:20:51 UTC

@@ -177,10 +177,12 @@
 	elseif args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
 			self:SendSync("PhysicalAggro")--We do now.
+			physicalAggro = true
 		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			self:SendSync("twilightAggro")--We do now.
+			twilightAggro = true
 		end
 	end
 end
@@ -189,10 +191,12 @@
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
 			self:SendSync("PhysicalAggro")--We do now.
+			physicalAggro = true
 		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			self:SendSync("twilightAggro")--We do now.
+			twilightAggro = true
 		end
 	end
 end
@@ -201,10 +205,12 @@
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
 			self:SendSync("PhysicalAggro")--We do now.
+			physicalAggro = true
 		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			self:SendSync("twilightAggro")--We do now.
+			twilightAggro = true
 		end
 	end
 end
@@ -213,10 +219,12 @@
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
 			self:SendSync("PhysicalAggro")--We do now.
+			physicalAggro = true
 		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			self:SendSync("twilightAggro")--We do now.
+			twilightAggro = true
 		end
 	end
 end

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 4350

Old date: 2010-07-17 22:20:51 UTC

@@ -41,20 +41,18 @@
 local specWarnMalleableGooCast		= mod:NewSpecialWarningSpell(72295, false)
 local specWarnOozeVariable			= mod:NewSpecialWarningYou(70352)		-- Heroic Ability
 local specWarnGasVariable			= mod:NewSpecialWarningYou(70353)		-- Heroic Ability
-local specWarnUnboundPlague			= mod:NewSpecialWarningYou(72856)--automation feature refuses to work so put generic crap in for this
---local specWarnUnboundPlague			= mod:NewSpecialWarning("specWarnUnboundPlague") -- you have to drop the debuff by staying very close to an other player
---local specWarnNextUnboundPlageSelf	= mod:NewSpecialWarning("specWarnNextPlageSelf", false) -- you are the acquired target for the Plague, prepare yourself!
+local specWarnUnboundPlague			= mod:NewSpecialWarningYou(72856)		-- Heroic Ability
 
 local timerGaseousBloat				= mod:NewTargetTimer(20, 70672)			-- Duration of debuff
 local timerSlimePuddleCD			= mod:NewCDTimer(35, 70341)				-- Approx
-local timerUnstableExperimentCD		= mod:NewNextTimer(38, 70351)			-- Used every 38 seconds exactly except after tear gas, it resets then it's 42-44seconds later (so using 43sec timer for there)
+local timerUnstableExperimentCD		= mod:NewNextTimer(38, 70351)			-- Used every 38 seconds exactly except after phase changes
 local timerChokingGasBombCD			= mod:NewNextTimer(35.5, 71255)
 local timerMalleableGooCD			= mod:NewCDTimer(25, 72295)
 local timerTearGas					= mod:NewBuffActiveTimer(16, 71615)
 local timerPotions					= mod:NewBuffActiveTimer(30, 73122)
 local timerMutatedPlagueCD			= mod:NewCDTimer(10, 72451)				-- 10 to 11
 local timerUnboundPlagueCD			= mod:NewNextTimer(60, 72856)
-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!
+local timerUnboundPlague			= mod:NewBuffActiveTimer(12, 72856)		-- Heroic Ability: we can't keep the debuff 60 seconds, so we have to switch at 12-15 seconds. Otherwise the debuff does to much damage!
 
 -- buffs from "Drink Me"
 local timerMutatedSlash				= mod:NewTargetTimer(20, 70542)

r4350 (Snamor): #Ruby Sanctum/All: esES update

Snamor — Sat, 17 Jul 2010 22:20:51 GMT

Author: Snamor
Date: Sun Jul 18 00:20:51 CEST 2010
Revision: 4350

Log:

#Ruby Sanctum/All: esES update

Updated

trunk/DBM-ChamberOfAspects/localization.es.lua

Action: modified

Old revision: 4349

Old date: 2010-07-17 19:04:06 UTC

@@ -184,7 +184,8 @@
 	AnnounceAlternatePhase	= "Mostrar también avisos/tiempos de la fase en la que no estás",
 	SoundOnConsumption		= "Reproducir sonido en $spell:74562 y $spell:74792",
 	SetIconOnConsumption	= "Poner iconos en los objetivos de $spell:74562 y $spell:74792",
-	YellOnConsumption		= "Gritar cuando tengas $spell:74562 o $spell:74792"
+	YellOnConsumption		= "Gritar cuando tengas $spell:74562 o $spell:74792",
+	WhisperOnConsumption	= "Enviar susurro a los objetivos de $spell:74562 o $spell:74792"
 })
 
 L:SetMiscLocalization({
@@ -193,6 +194,8 @@
 	Phase3					= "¡Yo soy la luz y la oscuridad! ¡Temed, mortales, la llegada de Alamuerte!",
 	twilightcutter			= "¡Las esferas que orbitan emiten energía oscura!",
 	YellCombustion			= "¡Combustión en mi!",
+	WhisperCombustion		= "¡Combustion en ti! ¡Corre a la pared!",
 	YellConsumption			= "¡Consumo en mi!",
+	WhisperConsumption		= "¡Consumo en ti! ¡Corre a la pared!",
 	Kill					= "Disfrutad la victoria, mortales, porque será la última. ¡Este mundo arderá cuando vuelva el maestro!"
 })
\ No newline at end of file

r4349 (Omega): #Ruby/Halion: Added whisper (OFF by default) option for debuffs. #Ruby/Halion: Experimental aggro detection for phase switches to improve accuracy of first conbustion/consumption timer on a phase change. (not yet tested, requires at minimum tanks running this revision or later to sync their pulls)

Omega — Sat, 17 Jul 2010 19:04:06 GMT

Author: Omega
Date: Sat Jul 17 21:04:06 CEST 2010
Revision: 4349

Log:

#Ruby/Halion: Added whisper (OFF by default) option for debuffs.
#Ruby/Halion: Experimental aggro detection for phase switches to improve accuracy of first conbustion/consumption timer on a phase change. (not yet tested, requires at minimum tanks running this revision or later to sync their pulls)

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Updated

trunk/DBM-ChamberOfAspects/localization.en.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4348

Old date: 2010-07-17 10:17:23 UTC

@@ -14,6 +14,9 @@
 	"SPELL_AURA_APPLIED",
 	"SPELL_AURA_REMOVED",
 	"SPELL_DAMAGE",
+	"SPELL_MISSED",
+	"SWING_DAMAGE",
+	"SWING_MISSED",
 	"CHAT_MSG_MONSTER_YELL",
 	"CHAT_MSG_RAID_BOSS_EMOTE",
 	"UNIT_HEALTH"
@@ -51,10 +54,15 @@
 
 mod:AddBoolOption("YellOnConsumption", true, "announce")
 mod:AddBoolOption("AnnounceAlternatePhase", true, "announce")
+mod:AddBoolOption("WhisperOnConsumption", false, "announce")
 mod:AddBoolOption("SetIconOnConsumption", true)
 
 local warned_preP2 = false
 local warned_preP3 = false
+local phase2Started = 0
+local physicalAggro = false
+local twilightAggro = false
+local lastflame = 0
 
 function mod:OnCombatStart(delay)--These may still need retuning too, log i had didn't have pull time though.
 	berserkTimer:Start(-delay)
@@ -63,6 +71,10 @@
 		timerFieryBreathCD:Start(10-delay)
 	warned_preP2 = false
 	warned_preP3 = false
+	phase2Started = 0
+	physicalAggro = true
+	twilightAggro = false
+	lastflame = 0
 end
 
 function mod:SPELL_CAST_START(args)
@@ -105,7 +117,10 @@
 	if args:IsSpellID(74792) then
 		if not self.Options.AnnounceAlternatePhase then
 			warningShadowConsumption:Show(args.destName)
+			if DBM:GetRaidRank() >= 1 and self.Options.WhisperOnConsumption then
+				SendChatMessage(L.WhisperConsumption, "WHISPER", "COMMON", args.destName)
 		end
+		end
 		if mod:LatencyCheck() then
 			self:SendSync("ShadowTarget", args.destName)
 		end
@@ -122,7 +137,10 @@
 	elseif args:IsSpellID(74562) then
 		if not self.Options.AnnounceAlternatePhase then
 			warningFieryConsumption:Show(args.destName)
+			if DBM:GetRaidRank() >= 1 and self.Options.WhisperOnConsumption then
+				SendChatMessage(L.WhisperCombustion, "WHISPER", "COMMON", args.destName)
 		end
+		end
 		if mod:LatencyCheck() then
 			self:SendSync("FieryTarget", args.destName)
 		end
@@ -151,16 +169,59 @@
 	end
 end
 
-do 
-	local lastflame = 0
+--Begin Phase aggro detection
 	function mod:SPELL_DAMAGE(args)
 		if (args:IsSpellID(75952, 75951, 75950, 75949) or args:IsSpellID(75948, 75947)) and args:IsPlayer() and time() - lastflame > 2 then
-			specWarnMeteorStrike:Show()
+		specWarnMeteorStrike:Show() --Standing in meteor, not part of aggro detection.
 			lastflame = time()
+	elseif args:GetDestCreatureID() == 39863 then
+		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+			self:SendSync("PhysicalAggro")--We do now.
 		end
+	elseif args:GetDestCreatureID() == 40141 then
+		if not twilightAggro then --We don't have aggro on him yet.
+			self:SendSync("twilightAggro")--We do now.
 	end
 end
+end
 
+function mod:SPELL_MISSED(args)
+	if args:GetDestCreatureID() == 39863 then
+		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+			self:SendSync("PhysicalAggro")--We do now.
+		end
+	elseif args:GetDestCreatureID() == 40141 then
+		if not twilightAggro then --We don't have aggro on him yet.
+			self:SendSync("twilightAggro")--We do now.
+		end
+	end
+end
+
+function mod:SWING_DAMAGE(args)
+	if args:GetDestCreatureID() == 39863 then
+		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+			self:SendSync("PhysicalAggro")--We do now.
+		end
+	elseif args:GetDestCreatureID() == 40141 then
+		if not twilightAggro then --We don't have aggro on him yet.
+			self:SendSync("twilightAggro")--We do now.
+		end
+	end
+end
+
+function mod:SWING_MISSED(args)
+	if args:GetDestCreatureID() == 39863 then
+		if not physicalAggro and GetTime() - phase2Started > 10 then --We don't have phase 3 aggro on him yet.
+			self:SendSync("PhysicalAggro")--We do now.
+		end
+	elseif args:GetDestCreatureID() == 40141 then
+		if not twilightAggro then --We don't have aggro on him yet.
+			self:SendSync("twilightAggro")--We do now.
+		end
+	end
+end
+--End Phase aggro detection
+
 function mod:UNIT_HEALTH(uId)
 	if not warned_preP2 and self:GetUnitCreatureId(uId) == 39863 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.79 then
 		warned_preP2 = true
@@ -176,18 +237,18 @@
 		timerFieryBreathCD:Cancel()
 		timerMeteorCD:Cancel()
 		timerFieryConsumptionCD:Cancel()
---		timerMeteorCast:Cancel()--This one i'm not sure if it cancels or not.
 		warnPhase2:Show()
 		timerShadowBreathCD:Start(25)
---		timerShadowConsumptionCD:Start(20)--Don't know it yet need more logs, it's not showing consistency. 20-25 on normal.
-		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
+		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then --These i'm not sure if they start regardless of drake aggro, or if it should be moved too.
 			timerTwilightCutterCD:Start(30)
 		else
 			timerTwilightCutterCD:Start(35)
 		end
+		physicalAggro = false
+		phase2Started = GetTime()
 	elseif msg:find(L.Phase3) then
 		warnPhase3:Show()
-		timerMeteorCD:Start(30)
+		timerMeteorCD:Start(30) --These i'm not sure if they start regardless of drake aggro, or if it should be moved too.
 	elseif msg:find(L.MeteorCast) then--There is no CLEU cast trigger for meteor, only yell
 		if not self.Options.AnnounceAlternatePhase then
 			warningMeteor:Show()
@@ -233,11 +294,17 @@
 	elseif msg == "ShadowTarget" then
 		if self.Options.AnnounceAlternatePhase then
 			warningShadowConsumption:Show(target)
+			if DBM:GetRaidRank() >= 1 and self.Options.WhisperOnConsumption then
+				SendChatMessage(L.WhisperConsumption, "WHISPER", "COMMON", target)
 		end
+		end
 	elseif msg == "FieryTarget" then
 		if self.Options.AnnounceAlternatePhase then
 			warningFieryConsumption:Show(target)
+			if DBM:GetRaidRank() >= 1 and self.Options.WhisperOnConsumption then
+				SendChatMessage(L.WhisperCombustion, "WHISPER", "COMMON", target)
 		end
+		end
 	elseif msg == "ShadowCD" then
 		if self.Options.AnnounceAlternatePhase then
 			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
@@ -254,5 +321,9 @@
 				timerFieryConsumptionCD:Start()
 			end
 		end
+	elseif msg == "PhysicalAggro" then
+		timerFieryConsumptionCD:Start(15)--Timer doesn't start again until aggroed again in phase 3. Timer value itself may need adjusting now that it's starting in right place
+	elseif msg == "twilightAggro" then
+		timerShadowConsumptionCD:Start(15)--Timer doesn't start until actual twilight form is aggroed. Timer value itself may need adjusting now that it's starting in right place
 	end
 end

trunk/DBM-ChamberOfAspects/localization.en.lua

Action: modified

Old revision: 4348

Old date: 2010-07-17 10:17:23 UTC

@@ -177,7 +177,8 @@
 	AnnounceAlternatePhase	= "Show warnings/timers for phase you aren't in as well",
 	SoundOnConsumption		= "Play sound on $spell:74562 or $spell:74792",--We use localized text for these functions
 	SetIconOnConsumption	= "Set icons on $spell:74562 or $spell:74792 targets",--So we can use single functions for both versions of spell.
-	YellOnConsumption		= "Yell on $spell:74562 or $spell:74792"
+	YellOnConsumption		= "Yell on $spell:74562 or $spell:74792",
+	WhisperOnConsumption	= "Send whisper to $spell:74562 or $spell:74792 targets"
 })
 
 L:SetMiscLocalization({
@@ -186,6 +187,8 @@
 	Phase3					= "I am the light and the darkness! Cower, mortals, before the herald of Deathwing!",
 	twilightcutter			= "The orbiting spheres pulse with dark energy!",
 	YellCombustion			= "Combustion on me!",
+	WhisperCombustion		= "Combustion on you! Run to the wall!",
 	YellConsumption			= "Consumption on me!",
+	WhisperConsumption		= "Consumption on you! Run to the wall!",
 	Kill					= "Relish this victory, mortals, for it will be your last. This world will burn with the master's return!"
 })
\ No newline at end of file

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 4348

Old date: 2010-07-17 10:17:23 UTC

@@ -159,7 +159,7 @@
 function mod:SPELL_DAMAGE(args)
 	if args:IsSpellID(69761, 71212, 73026, 73027) and args:IsPlayer() then
 		specWarnRadiatingOoze:Show()
-	elseif args:GetDestCreatureID() == 36899 and args:IsSrcTypePlayer() == UnitName("player") then
+	elseif args:GetDestCreatureID() == 36899 and args:IsSrcTypePlayer() then
 		if isKiter then --Tank/Hunter attacking big ooze
 			self:SendSync("OozeKiter", UnitName("player"))
 		end
@@ -169,7 +169,7 @@
 function mod:SWING_DAMAGE(args)
 	if args:IsPlayer() and args:GetSrcCreatureID() == 36897 then --Little ooze hitting you
 		specWarnLittleOoze:Show()
-	elseif args:GetDestCreatureID() == 36899 and args:IsSrcTypePlayer() == UnitName("player") then
+	elseif args:GetDestCreatureID() == 36899 and args:IsSrcTypePlayer() then
 		if isKiter then --Tank/Hunter attacking big ooze
 			self:SendSync("OozeKiter", UnitName("player"))
 		end

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

Snamor — Sat, 17 Jul 2010 10:17:23 GMT

Author: Snamor
Date: Sat Jul 17 12:17:23 CEST 2010
Revision: 4348

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: 4347

Old date: 2010-07-17 05:31:02 UTC

@@ -331,7 +331,7 @@
 	YellOnUnbound				= "Gritar cuando tengas $spell:72856",	
 	specWarnUnboundPlague		= "Mostrar aviso especial para transferencia de $spell:72856",
 	specWarnNextPlageSelf		= "Mostrar aviso especial cuando seas el próximo objetivo de $spell:72856",
-	BypassLatencyCheck			= "No usar sincronización para $spell:72295\n(sólo usar esta opción si tienes problemas de otro modo)"
+	BypassLatencyCheck			= "No usar la comprobación de sincronización basada en latencia para $spell:72295\n(sólo usar esta opción si tienes problemas de otro modo)"
 }
 
 L:SetMiscLocalization{
@@ -369,7 +369,7 @@
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "Poner un icono en el príncipe con Invocación (Cruz)",
 	RangeFrame				= "Mostrar distancia (12 yardas)",
-	BypassLatencyCheck		= "No usar sincronización para $spell:72037\n(sólo usar esta opción si tienes problemas de otro modo)"
+	BypassLatencyCheck		= "No usar la comprobación de sincronización basada en latencia para $spell:72037\n(sólo usar esta opción si tienes problemas de otro modo)"
 }
 
 L:SetMiscLocalization{
@@ -541,7 +541,7 @@
 	ValkyrIcon				= "Poner iconos en las Valkyr",
 	DefileArrow				= "Mostrar flecha cuando $spell:72762 está cerca de ti",
 	TrapArrow				= "Mostrar flecha cuando $spell:73539 está cerca de ti",
-	BypassLatencyCheck		= "No usar sincronización para profanar/trampa de las sombras\n(sólo usar esta opción si tienes problemas de otro modo)",
+	BypassLatencyCheck		= "No usar la comprobación de sincronización basada en latencia para profanar/trampa de las sombras\n(sólo usar esta opción si tienes problemas de otro modo)",
 	AnnounceValkGrabs		= "Aunciar el objetivo de Guardia de las Sombras Val'kyr en el chat de raid\n(requires 'anunciar' activado y líder/ayudante)"
 }

trunk/DBM-Ulduar/localization.es.lua

Action: modified

Old revision: 4347

Old date: 2010-07-17 05:31:02 UTC

@@ -452,7 +452,7 @@
 	YellOnShadowCrash				= "Gritar si eres objetivo de $spell:62660",
 	hardmodeSpawn					= "Mostrar tiempo para salida de Animus de saronita (Modo Difícil)",
 	CrashArrow						= "Mostrar una flecha cuando $spell:62660 va a caer cerca de ti",
-	BypassLatencyCheck				= "No usar sincronización para $spell:62660\n(sólo usar esta opción si tienes problemas de otro modo)"
+	BypassLatencyCheck				= "No usar la comprobación de sincronización basada en latencia para $spell:62660\n(sólo usar esta opción si tienes problemas de otro modo)"
 }
 
 L:SetMiscLocalization{

r4347 (Omega): missed the spell aura refresh part of anub code, changed there a well.

Omega — Sat, 17 Jul 2010 05:31:02 GMT

Author: Omega
Date: Sat Jul 17 07:31:02 CEST 2010
Revision: 4347

Log:

missed the spell aura refresh part of anub code, changed there a well.

Updated

trunk/DBM-Coliseum/Anub'arak.lua

Action: modified

Old revision: 4346

Old date: 2010-07-17 05:29:27 UTC

@@ -129,9 +129,10 @@
 		end
 		if self.Options.SetIconsOnPCold then
 			table.insert(PColdTargets, DBM:GetRaidUnitId(args.destName))
-			self:UnscheduleMethod("SetPcoldIcons")
-			mod:ScheduleMethod(0.1, "SetPcoldIcons")	-- this might cause problems when client is below 10 Fps but don't know for sure (and longer time will be bad too)
+			if ((mod:IsDifficulty("normal25") or mod:IsDifficulty("heroic25")) and #PColdTargets >= 5) or ((mod:IsDifficulty("normal10") or mod:IsDifficulty("heroic10")) and #PColdTargets >= 2) then
+				self:SetPcoldIcons()--Sort and fire as early as possible once we have all targets.
 		end
+		end
 		timerPCold:Show() 
 	end
 end

r4346 (Omega): removed useless stuff from jaraxxus, i doubt blizz will be un-nerfing fight and adding touch back. #ICC/Festergut: Applied same icon fixes to this mod as were put in sindragosa, it is a better method.

Omega — Sat, 17 Jul 2010 05:29:27 GMT

Author: Omega
Date: Sat Jul 17 07:29:27 CEST 2010
Revision: 4346

Log:

removed useless stuff from jaraxxus, i doubt blizz will be un-nerfing fight and adding touch back.
#ICC/Festergut: Applied same icon fixes to this mod as were put in sindragosa, it is a better method.
#ToC/Anub: same as festergut.

Updated

trunk/DBM-Coliseum/Anub'arak.lua

Updated

trunk/DBM-Coliseum/Jaraxxus.lua

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

trunk/DBM-Coliseum/Anub'arak.lua

Action: modified

Old revision: 4345

Old date: 2010-07-16 22:52:38 UTC

@@ -154,9 +154,10 @@
 		end
 		if self.Options.SetIconsOnPCold then
 			table.insert(PColdTargets, DBM:GetRaidUnitId(args.destName))
-			self:UnscheduleMethod("SetPcoldIcons")
-			mod:ScheduleMethod(0.1, "SetPcoldIcons")
+			if ((mod:IsDifficulty("normal25") or mod:IsDifficulty("heroic25")) and #PColdTargets >= 5) or ((mod:IsDifficulty("normal10") or mod:IsDifficulty("heroic10")) and #PColdTargets >= 2) then
+				self:SetPcoldIcons()--Sort and fire as early as possible once we have all targets.
 		end
+		end
 		timerPCold:Show() 
 	elseif args:IsSpellID(66012) then							-- Freezing Slash
 		warnFreezingSlash:Show(args.destName)

trunk/DBM-Coliseum/Jaraxxus.lua

Action: modified

Old revision: 4345

Old date: 2010-07-16 22:52:38 UTC

@@ -31,13 +31,10 @@
 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, 67009)
 
 local specWarnFlame				= mod:NewSpecialWarningRun(67072)
 local specWarnFlesh				= mod:NewSpecialWarningYou(66237)
---local specWarnTouch			= mod:NewSpecialWarning("SpecWarnTouch")
---local specWarnTouchNear		= mod:NewSpecialWarning("SpecWarnTouchNear", false)
 local specWarnKiss				= mod:NewSpecialWarningYou(67907, false)
 local specWarnNetherPower		= mod:NewSpecialWarning("SpecWarnNetherPower", isDispeller)
 local specWarnFelInferno		= mod:NewSpecialWarningMove(68718)
@@ -53,13 +50,11 @@
 local timerFleshCD				= mod:NewCDTimer(23, 67051) 
 local timerPortalCD				= mod:NewCDTimer(120, 67900)
 local timerVolcanoCD			= mod:NewCDTimer(120, 67901)
---local timerTouchCD			= mod:NewCDTimer(999, 12345)	-- cooldown?
 
 mod:AddBoolOption("LegionFlameWhisper", false, "announce")
 mod:AddBoolOption("LegionFlameRunSound", true)
 mod:AddBoolOption("LegionFlameIcon", true)
 mod:AddBoolOption("IncinerateFleshIcon", true)
---mod:AddBoolOption("TouchJaraxxusIcon", true)
 
 mod:RemoveOption("HealthFrame")
 mod:AddBoolOption("IncinerateShieldFrame", true, "misc")
@@ -168,24 +163,6 @@
 		if DBM:GetRaidRank() >= 1 and self.Options.LegionFlameWhisper then
 			self:SendWhisper(L.WhisperFlame, targetname)
 		end
-
---[[	elseif args:IsSpellID(66209) then					-- Touch of Jaraxxus		causes Curse of the Nether ID:66210
-		-- timerTouchCD:Start()
-		warnTouch:Show(args.destName)
-		local uId = DBM:GetRaidUnitId(args.destName)
-		if args:IsPlayer() then
-			specWarnTouch:Show()
-		end
-		if self.Options.TouchJaraxxusIcon then
-			self:SetIcon(args.destName, 6, 12)
-		end
-		if uId then 
-			local inRange = CheckInteractDistance(uId, 2) 
-			if inRange then 
-				specWarnTouchNear:Show(args.destName) 
-			end 
-		end--]]
-
 	elseif args:IsSpellID(66334, 67905, 67906, 67907) and args:IsPlayer() then
 		specWarnKiss:Show()

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 4345

Old date: 2010-07-16 22:52:38 UTC

@@ -78,7 +78,7 @@
 				if self.Options.AnnounceFrostBeaconIcons then
 					SendChatMessage(L.BeaconIconSet:format(beaconIcons, UnitName(v)), "RAID")
 				end
-				self:SetIcon(UnitName(v), beaconIcons, 8)
+				self:SetIcon(UnitName(v), beaconIcons)
 				beaconIcons = beaconIcons - 1
 			end
 			table.wipe(beaconIconTargets)

trunk/DBM-Icecrown/ThePlagueworks/Festergut.lua

Action: modified

Old revision: 4345

Old date: 2010-07-16 22:52:38 UTC

@@ -186,11 +186,8 @@
 		end
 		if self.Options.SetIconOnGasSpore then
 			table.insert(gasSporeIconTargets, DBM:GetRaidUnitId(args.destName))
-			self:UnscheduleMethod("SetSporeIcons")
 			if ((mod:IsDifficulty("normal25") or mod:IsDifficulty("heroic25")) and #gasSporeIconTargets >= 3) or ((mod:IsDifficulty("normal10") or mod:IsDifficulty("heroic10")) and #gasSporeIconTargets >= 2) then
-				self:SetSporeIcons()
-			else
-				self:ScheduleMethod(0.2, "SetSporeIcons")
+				self:SetSporeIcons()--Sort and fire as early as possible once we have all targets.
 			end
 		end
 		self:Unschedule(warnGasSporeTargets)

r4345 (Omega): shortest CoS wave timer for wave 6

Omega — Fri, 16 Jul 2010 22:52:38 GMT

Author: Omega
Date: Sat Jul 17 00:52:38 CEST 2010
Revision: 4345

Log:

shortest CoS wave timer for wave 6

Updated

trunk/DBM-Party-WotLK/OldStratholme/OldStratholmeWaves.lua

Action: modified

Old revision: 4344

Old date: 2010-07-16 18:32:25 UTC

@@ -10,7 +10,7 @@
 )
 
 local warningWaveNow	= mod:NewAnnounce("WarningWaveNow", 3)
-local timerWaveIn		= mod:NewTimer(25, "TimerWaveIn")
+local timerWaveIn		= mod:NewTimer(20, "TimerWaveIn")
 local timerRoleplay		= mod:NewTimer(162, "TimerRoleplay")
 
 local wavesNormal = {

r4344 (Omega): remove that unschedule since it won't be needed in new method

Omega — Fri, 16 Jul 2010 18:32:25 GMT

Author: Omega
Date: Fri Jul 16 20:32:25 CEST 2010
Revision: 4344

Log:

remove that unschedule since it won't be needed in new method

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 4343

Old date: 2010-07-16 16:24:43 UTC

@@ -139,7 +139,6 @@
 		end
 		if phase == 1 and self.Options.SetIconOnFrostBeacon then
 			table.insert(beaconIconTargets, DBM:GetRaidUnitId(args.destName))
-			self:UnscheduleMethod("SetBeaconIcons")
 			if (mod:IsDifficulty("normal25") and #beaconIconTargets >= 5) or (mod:IsDifficulty("heroic25") and #beaconIconTargets >= 6) or ((mod:IsDifficulty("normal10") or mod:IsDifficulty("heroic10")) and #beaconIconTargets >= 2) then
 				self:SetBeaconIcons()--Sort and fire as early as possible once we have all targets.
 			end

r4343 (Omega): reworded the latency sync stuff agian since i removed the rest of the latency checks, the option is now completely unchecked and simply fires old method with no restricgtions

Omega — Fri, 16 Jul 2010 16:24:43 GMT

Author: Omega
Date: Fri Jul 16 18:24:43 CEST 2010
Revision: 4343

Log:

reworded the latency sync stuff agian since i removed the rest of the latency checks, the option is now completely unchecked and simply fires old method with no restricgtions

Updated

trunk/DBM-Icecrown/localization.en.lua

Updated

trunk/DBM-Ulduar/localization.en.lua

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4342

Old date: 2010-07-16 16:20:05 UTC

@@ -320,7 +320,7 @@
 	YellOnUnbound				= "Yell on $spell:72856",
 	specWarnUnboundPlague		= "Show special warning for $spell:72856 transfer",
 	specWarnNextPlageSelf		= "Show special warning when you are the next $spell:72856 target",
-	BypassLatencyCheck			= "Don't use syncing for $spell:72295\n(only use this if you're having problems otherwise)"
+	BypassLatencyCheck			= "Don't use latency based sync check for $spell:72295\n(only use this if you're having problems otherwise)"
 }
 
 L:SetMiscLocalization{
@@ -358,7 +358,7 @@
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "Set icon on the empowered Prince (skull)",
 	RangeFrame				= "Show range frame (12 yards)",
-	BypassLatencyCheck		= "Don't use syncing for $spell:72037\n(only use this if you're having problems otherwise)"
+	BypassLatencyCheck		= "Don't use latency based sync check for $spell:72037\n(only use this if you're having problems otherwise)"
 }
 
 L:SetMiscLocalization{
@@ -530,7 +530,7 @@
 	ValkyrIcon				= "Set icons on Valkyrs",
 	DefileArrow				= "Show DBM arrow when $spell:72762 is near you",
 	TrapArrow				= "Show DBM arrow when $spell:73539 is near you",
-	BypassLatencyCheck		= "Don't use syncing for defile/shadow trap\n(only use this if you're having problems otherwise)",
+	BypassLatencyCheck		= "Don't use latency based sync check for defile/shadow trap\n(only use this if you're having problems otherwise)",
 	AnnounceValkGrabs		= "Announce Val'kyr Shadowguard grab targets to raid chat\n(requires announce to be enabled and promoted status)"
 }

trunk/DBM-Ulduar/localization.en.lua

Action: modified

Old revision: 4342

Old date: 2010-07-16 16:20:05 UTC

@@ -444,7 +444,7 @@
 	YellOnShadowCrash				= "Yell on $spell:62660",
 	hardmodeSpawn					= "Show timer for Saronite Animus spawn (hard mode)",
 	CrashArrow						= "Show DBM arrow when $spell:62660 is near you",
-	BypassLatencyCheck				= "Don't use syncing for $spell:62660\n(only use this if you're having problems otherwise)"
+	BypassLatencyCheck				= "Don't use latency based sync check for $spell:62660\n(only use this if you're having problems otherwise)"
 }
 
 L:SetMiscLocalization{

r4342 (Omega): #ICC/Sindragosa: Changed icon setting method for beacons to not use a timer at all, instead use a count. once you have enough targets set them immediately. No scheduling timers used (to prevent it being schedule 2 or 5 or 6 times then bugging out in super rare cases if the unschedule method doesn't actually stop the extra runs.

Omega — Fri, 16 Jul 2010 16:20:05 GMT

Author: Omega
Date: Fri Jul 16 18:20:05 CEST 2010
Revision: 4342

Log:

#ICC/Sindragosa: Changed icon setting method for beacons to not use a timer at all, instead use a count. once you have enough targets set them immediately. No scheduling timers used (to prevent it being schedule 2 or 5 or 6 times then bugging out in super rare cases if the unschedule method doesn't actually stop the extra runs.
#Party/Halls of Reflection: Fixed a bug where it would say "boss incoming" for wave 6 after a wipe. (it remembers if falric is dead now so it doesn't announce wave 5 again since world states in this zone are funny.
#Party/Falric: Added timer/announce for Falric's fear
#Party/Falric: Added timer/announce for Falric's fear
#Party/Ymiron: Added missing spellid for heroic bane, added bane timer, added warning/timer for his stun as well.

Updated

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Updated

trunk/DBM-Party-WotLK/HallsofReflection/Falric.lua

Updated

trunk/DBM-Party-WotLK/HallsofReflection/LichKingEvent.lua

Updated

trunk/DBM-Party-WotLK/HallsofReflection/WaveTimers.lua

Updated

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

Updated

trunk/DBM-Party-WotLK/UtgardePinnacle/Ymiron.lua

trunk/DBM-Icecrown/FrostwingHalls/Sindragosa.lua

Action: modified

Old revision: 4341

Old date: 2010-07-16 13:16:49 UTC

@@ -140,9 +140,11 @@
 		if phase == 1 and self.Options.SetIconOnFrostBeacon then
 			table.insert(beaconIconTargets, DBM:GetRaidUnitId(args.destName))
 			self:UnscheduleMethod("SetBeaconIcons")
-			self:ScheduleMethod(0.1, "SetBeaconIcons")
+			if (mod:IsDifficulty("normal25") and #beaconIconTargets >= 5) or (mod:IsDifficulty("heroic25") and #beaconIconTargets >= 6) or ((mod:IsDifficulty("normal10") or mod:IsDifficulty("heroic10")) and #beaconIconTargets >= 2) then
+				self:SetBeaconIcons()--Sort and fire as early as possible once we have all targets.
 		end
-		if phase == 2 then
+		end
+		if phase == 2 then--Phase 2 there is only one icon/beacon, don't use sorting method if we don't have to.
 			timerNextBeacon:Start()
 			if self.Options.SetIconOnFrostBeacon then
 				self:SetIcon(args.destName, 8)

trunk/DBM-Party-WotLK/HallsofReflection/Falric.lua

Action: modified

Old revision: 4341

Old date: 2010-07-16 13:16:49 UTC

@@ -11,20 +11,25 @@
 	"SPELL_AURA_REMOVED"
 )
 
+local warnFear					= mod:NewSpellAnnounce(72452, 3)
 local warnImpendingDespair		= mod:NewTargetAnnounce(72426, 3)
 local warnQuiveringStrike		= mod:NewTargetAnnounce(72453, 3)
 
+local timerFear					= mod:NewBuffActiveTimer(4, 72452)
 local timerImpendingDespair		= mod:NewTargetTimer(6, 72426)
 local timerQuiveringStrike		= mod:NewTargetTimer(5, 72453)
 
 
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(72422, 72453) then
-		timerQuiveringStrike:Show(args.destName)
+		timerQuiveringStrike:Start(args.destName)
 		warnQuiveringStrike:Show(args.destName)
 	elseif args:IsSpellID(72426) then
-		timerImpendingDespair:Show(args.destName)
+		timerImpendingDespair:Start(args.destName)
 		warnImpendingDespair:Show(args.destName)
+	elseif args:IsSpellID(72452, 72435) then
+		warnFear:Show()
+		timerFear:Start()
 	end
 end

trunk/DBM-Party-WotLK/HallsofReflection/LichKingEvent.lua

Action: modified

Old revision: 4341

Old date: 2010-07-16 13:16:49 UTC

@@ -2,18 +2,6 @@
 local L = mod:GetLocalizedStrings()
 
 mod:SetRevision(("$Revision: 2153 $"):sub(12, -3))
---mod:SetCreatureID(37226, 36954)--Both creature Ids used in Halls of Reflection
-
---[[if UnitFactionGroup("player") == "Alliance" then
-	mod:RegisterCombat("yell", L.ACombatStart)
-else
-	mod:RegisterCombat("yell", L.HCombatStart)
-end
-
-mod:RegisterKill("yell", L.YellCombatEnd)--Combat does not end for another 8 or so seconds after this yell (for achievement credit). Not sure how to go about fixing this yet.
-
-mod:SetMinCombatTime(120)--Dirty Hack to engage mod after a wipe on zonein and keep it engaged. if you wipe, pull yell happens as soon as you zone back in despite the event not actually being started until you tell jaina/sylvanas you're ready to try again. This is only way to hack around this so mod doesn't wipe you for not being in combat after yell.
---]]
 mod:RegisterEvents(
 	"SPELL_AURA_REMOVED",
 	"CHAT_MSG_MONSTER_YELL"

trunk/DBM-Party-WotLK/HallsofReflection/WaveTimers.lua

Action: modified

Old revision: 4341

Old date: 2010-07-16 13:16:49 UTC

@@ -20,6 +20,7 @@
 mod:RemoveOption("HealthFrame")
 
 local lastWave = 0
+local FalricDead = false
 
 function mod:UPDATE_WORLD_STATES(args)
 	local text = select(3, GetWorldStateUIInfo(1))
@@ -36,9 +37,12 @@
 	if wave > lastWave then
 		warnNewWaveSoon:Cancel()
 		timerNextWave:Cancel()
-		if wave == 5 or wave == 10 then
+		if (wave == 5 and not FalricDead) or wave == 10 then
 			warnNewWave:Show("Boss")
 		elseif wave > 0 then
+			if wave < 5 then
+				FalricDead = false
+			end
 			if self.Options.ShowAllWaveWarnings then
 				warnNewWave:Show("Wave")
 			end
@@ -58,5 +62,6 @@
 	if args.sourceName == L.Falric then
 		timerNextWave:Start(60)
 		warnNewWaveSoon:Schedule(50)
+		FalricDead = true
 	end
 end
\ No newline at end of file

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

Action: modified

Old revision: 4341

Old date: 2010-07-16 13:16:49 UTC

@@ -53,7 +53,7 @@
 do 
 	local lasttoxic = 0
 	function mod:SPELL_PERIODIC_DAMAGE(args)
-		if args:IsSpellID(69024, 70436) and args:IsPlayer() and time() - lasttoxic > 2 then		-- Toxic Waste, MOVE!
+		if args:IsSpellID(69024, 70436) and args:IsPlayer() and time() - lasttoxic > 2 then
 			specWarnToxic:Show()
 			lasttoxic = time()
 		end

trunk/DBM-Party-WotLK/UtgardePinnacle/Ymiron.lua

Action: modified

Old revision: 4341

Old date: 2010-07-16 13:16:49 UTC

@@ -12,9 +12,17 @@
 )
 
 local warningBane	= mod:NewSpellAnnounce(48294, 3)
+local warningScreams	= mod:NewSpellAnnounce(51750, 2)
 
+local timerBane			= mod:NewBuffActiveTimer(5, 48294)
+local timerScreams		= mod:NewBuffActiveTimer(8, 51750)
+
 function mod:APELL_AURA_APPLIED(args)
-	if args:IsSpellID(48294) then
+	if args:IsSpellID(48294, 59301) then
 		warningBane:Show()
+		timerBane:Start()
+	elseif args:IsSpellID(51750) then
+		warningScreams:Show()
+		timerScreams:Start()
 	end
 end
\ No newline at end of file

r4341 (bluenyx): koKR update

bluenyx — Fri, 16 Jul 2010 13:16:49 GMT

Author: bluenyx
Date: Fri Jul 16 15:16:49 CEST 2010
Revision: 4341

Log:

koKR update

Updated

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 4340

Old date: 2010-07-15 13:16:13 UTC

@@ -501,7 +501,9 @@
 	specWarnDefileCast			= "당신에게 파멸! - 이동!",
 	specWarnDefileNear			= "당신 주변에 파멸! - 이동!",
 	specWarnTrapNear			= "당신 주변에 암흑의 덫 - 확인!",
-	warnNecroticPlagueJump		= "괴저 역병 전이 : >%s<"
+	warnNecroticPlagueJump		= "괴저 역병 전이 : >%s<",
+	specWarnPALGrabbed			= "발키리가 신기 납치 : %s",
+	specWarnPRIGrabbed			= "발키리가 사제 납치 : %s"
 }
 
 L:SetTimerLocalization{

r4340 (Azael): zhtw update

Azael — Thu, 15 Jul 2010 13:16:13 GMT

Author: Azael
Date: Thu Jul 15 15:16:13 CEST 2010
Revision: 4340

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 4339

Old date: 2010-07-15 10:56:43 UTC

@@ -499,7 +499,9 @@
 	specWarnDefileCast		= "你中了汙染 - 快離開",
 	specWarnDefileNear		= "你附近的人中了汙染 - 小心",
 	specWarnTrapNear		= "你附近的人中了暗影陷阱 - 小心",
-	warnNecroticPlagueJump		= "亡域瘟疫跳到>%s<身上"
+	warnNecroticPlagueJump		= "亡域瘟疫跳到>%s<身上",
+	specWarnPALGrabbed		= "補騎 %s 給抓住了",
+	specWarnPRIGrabbed		= "補牧 %s 給抓住了"
 }
 
 L:SetTimerLocalization{
@@ -519,6 +521,7 @@
 	WarnPhase3Soon			= "為轉換第3階段顯示預先警告 (大約43%)",
 	ValkyrWarning			= "提示誰給華爾琪影衛抓住了",
 	specWarnYouAreValkd		= "當你給華爾琪影衛抓住時顯示特別警告",
+	specWarnHealerGrabbed		= "當補騎或補牧給華爾琪影衛抓住時時顯示特別警告",
 	specWarnDefileCast		= "當你中了$spell:72762時顯示特別警告",
 	specWarnDefileNear		= "當你附近的人中了$spell:72762時顯示特別警告",
 	specWarnTrapNear		= "當你附近的人中了$spell:73539時顯示特別警告",

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

Snamor — Thu, 15 Jul 2010 10:56:43 GMT

Author: Snamor
Date: Thu Jul 15 12:56:43 CEST 2010
Revision: 4339

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: 4338

Old date: 2010-07-15 03:17:03 UTC

@@ -505,7 +505,9 @@
 	specWarnDefileCast		= "Profanar en ti ¡Muévete!",
 	specWarnDefileNear		= "Profanar cerca de ti ¡Ten cuidado!",
 	specWarnTrapNear		= "Trampa de las Sombras cerca de ti ¡Ten cuidado!",
-	warnNecroticPlagueJump	= "Peste necrótica saltó a >%s<"
+	warnNecroticPlagueJump	= "Peste necrótica saltó a >%s<",
+	specWarnPALGrabbed		= "Paladin Healer %s ha sido agarrado",
+	specWarnPRIGrabbed		= "Sacerdote Healer %s ha sido agarrado"
 }
 
 L:SetTimerLocalization{
@@ -525,6 +527,7 @@
 	WarnPhase3Soon			= "Mostrar pre-aviso para transición a la Fase 3 (al ~43%)",
 	ValkyrWarning			= "Anunciar quien ha sido agarrado por las Valkyr",
 	specWarnYouAreValkd		= "Mostrar aviso especial cuando seas agarrado por una Valkyr",
+	specWarnHealerGrabbed	= "Mostrar un aviso especial cuando un healer paladín o sacerdote es agarrado",
 	specWarnDefileCast		= "Mostrar aviso especial para $spell:72762 en ti",
 	specWarnDefileNear		= "Mostrar aviso especial para $spell:72762 cerca de ti",
 	specWarnTrapNear		= "Mostrar aviso especial para $spell:73539 cerca de ti",
@@ -538,6 +541,7 @@
 	ValkyrIcon				= "Poner iconos en las Valkyr",
 	DefileArrow				= "Mostrar flecha cuando $spell:72762 está cerca de ti",
 	TrapArrow				= "Mostrar flecha cuando $spell:73539 está cerca de ti",
+	BypassLatencyCheck		= "No usar sincronización para profanar/trampa de las sombras\n(sólo usar esta opción si tienes problemas de otro modo)",
 	AnnounceValkGrabs		= "Aunciar el objetivo de Guardia de las Sombras Val'kyr en el chat de raid\n(requires 'anunciar' activado y líder/ayudante)"
 }

trunk/DBM-Ulduar/localization.es.lua

Action: modified

Old revision: 4338

Old date: 2010-07-15 03:17:03 UTC

@@ -416,7 +416,7 @@
 	MobPhase2		= "VX-001",
 	MobPhase3		= "Unidad de mando aérea",
 	YellPull		= "¡No tenemos mucho tiempo, amigos! Vais a ayudarme a probar mi última y mayor creación. Ahora, antes de que cambiéis de parecer, recordad que en cierta forma, me lo debéis después del desastre que causasteis con el XA-002.",
-	YellHardPull	= "Veamos, ¿cómo se os ocurre hacer algo así? ¿No habéis visto la señal que dice \"NO PULSAR ESTE BOTÓN\"? ¿Cómo vamos a acabar la prueba con el mecanismo de autodestrucción activado?",
+	YellHardPull	= "Secuencia de autodestrucción iniciada",
 	YellPhase2		= "¡Contemplad el cañón de asalto antipersonal VX-001! Puede que queráis poneros a cubierto.",
 	YellPhase3		= "¡Gracias amigos! ¡Vuestros esfuerzos me han proporcionado unos datos fantásticos! Veamos, ¿dónde puse?...ah, ahí está.",
 	YellPhase4		= "Fase de prueba preliminar completada. ¡Ahora comienza la verdadera prueba!",

r4338 (Omega): Some yogg updates, a fervor target timer. Mimiron was also flakey using second yell for pull, changed to first yell since second yell had variations in timers, sometime dead on, sometimes +1-2 seconds sometimes -1-2 seconds. hopefully this solves that.

Omega — Thu, 15 Jul 2010 03:17:03 GMT

Author: Omega
Date: Thu Jul 15 05:17:03 CEST 2010
Revision: 4338

Log:

Some yogg updates, a fervor target timer. Mimiron was also flakey using second yell for pull, changed to first yell since second yell had variations in timers, sometime dead on, sometimes +1-2 seconds sometimes -1-2 seconds. hopefully this solves that.

Updated

trunk/DBM-Ulduar/Mimiron.lua

Updated

trunk/DBM-Ulduar/YoggSaron.lua

Updated

trunk/DBM-Ulduar/localization.en.lua

trunk/DBM-Ulduar/Mimiron.lua

Action: modified

Old revision: 4337

Old date: 2010-07-14 09:04:57 UTC

@@ -31,7 +31,7 @@
 local warnDarkGlare				= mod:NewSpecialWarningSpell(63293)
 
 local enrage 					= mod:NewBerserkTimer(900)
-local timerHardmode				= mod:NewTimer(607, "TimerHardmode", 64582)
+local timerHardmode				= mod:NewTimer(610, "TimerHardmode", 64582)
 local timerP1toP2				= mod:NewTimer(43, "TimeToPhase2")
 local timerP2toP3				= mod:NewTimer(32, "TimeToPhase3")
 local timerP3toP4				= mod:NewTimer(25, "TimeToPhase4")
@@ -43,9 +43,9 @@
 local timerNextShockblast		= mod:NewNextTimer(34, 63631)
 local timerPlasmaBlastCD		= mod:NewCDTimer(30, 64529)
 local timerShell				= mod:NewBuffActiveTimer(6, 63666)
-local timerFlameSuppressant		= mod:NewCastTimer(59, 64570)
+local timerFlameSuppressant		= mod:NewCastTimer(60, 64570)
 local timerNextFlameSuppressant	= mod:NewNextTimer(10, 65192)
-local timerNextFlames			= mod:NewNextTimer(27.6, 64566)
+local timerNextFlames			= mod:NewNextTimer(27.5, 64566)
 local timerNextFrostBomb        = mod:NewNextTimer(30, 64623)
 local timerBombExplosion		= mod:NewCastTimer(15, 65333)
 
@@ -110,7 +110,7 @@
 		self:ScheduleMethod(18, "Flames")
 	else
 		timerNextFlames:Start()
-		self:ScheduleMethod(27.6, "Flames")
+		self:ScheduleMethod(27.5, "Flames")
 	end
 end
 
@@ -302,13 +302,13 @@
 		--DBM:AddMsg("ALPHA: yell detect phase3, syncing to clients")
 		self:SendSync("Phase4") -- SPELL_AURA_REMOVED detection might fail in phase 3...there are simply not enough debuffs on him
 
-	elseif msg == L.YellHardPull or msg:find(L.YellHardPull) then
+	elseif msg:find(L.YellHardPull) then
 		timerHardmode:Start()
 		timerFlameSuppressant:Start()
 		enrage:Stop()
 		hardmode = true
-		timerNextFlames:Start(3)
-		self:ScheduleMethod(3, "Flames")
+		timerNextFlames:Start(6.5)
+		self:ScheduleMethod(6.5, "Flames")
 	end
 end

trunk/DBM-Ulduar/YoggSaron.lua

Action: modified

Old revision: 4337

Old date: 2010-07-14 09:04:57 UTC

@@ -45,6 +45,7 @@
 mod:AddBoolOption("WarningSqueeze", true, "announce")
 
 local enrageTimer					= mod:NewBerserkTimer(900)
+local timerFervor					= mod:NewTargetTimer(15, 63138)
 local brainportal					= mod:NewTimer(20, "NextPortal")
 local timerLunaricGaze				= mod:NewCastTimer(4, 64163)
 local timerNextLunaricGaze			= mod:NewCDTimer(8.5, 64163)
@@ -86,7 +87,7 @@
 	local targetname = self:GetBossTarget(33134)
 	if not targetname then return end
 	if targetname == UnitName("player") then
-		specWarnFervorCast:Show(targetname)
+		specWarnFervorCast:Show()
 	end
 end
 
@@ -166,8 +167,9 @@
 		end	
 	elseif args:IsSpellID(63138) then	-- Sara's Fervor
 		warnFervor:Show(args.destName)
+		timerFervor:Start(args.destName)
 		if self.Options.SetIconOnFervorTarget then
-			self:SetIcon(args.destName, 7, 30)
+			self:SetIcon(args.destName, 7, 15)
 		end
 		if args:IsPlayer() then 
 			specWarnFervor:Show()

trunk/DBM-Ulduar/localization.en.lua

Action: modified

Old revision: 4337

Old date: 2010-07-14 09:04:57 UTC

@@ -408,7 +408,7 @@
 	MobPhase2		= "VX-001",
 	MobPhase3		= "Aerial Command Unit",
 	YellPull		= "We haven't much time, friends! You're going to help me test out my latest and greatest creation. Now, before you change your minds, remember that you kind of owe it to me after the mess you made with the XT-002.",	
-	YellHardPull	= "Now, why would you go and do something like that? Didn't you see the sign that said, \"DO NOT PUSH THIS BUTTON!\"? How will we finish testing with the self-destruct mechanism active?",
+	YellHardPull	= "Self-destruct sequence initiated",
 	YellPhase2		= "WONDERFUL! Positively marvelous results! Hull integrity at 98.9 percent! Barely a dent! Moving right along.",
 	YellPhase3		= "Thank you, friends! Your efforts have yielded some fantastic data! Now, where did I put-- oh, there it is.",
 	YellPhase4		= "Preliminary testing phase complete. Now comes the true test!",

r4337 (Omega): ##Core: Latency slider now goes from 50-750 (up from 50-500). Mainly for australia players who simply get crap latency whether they play EU or US, realms still oceans away.

Omega — Wed, 14 Jul 2010 09:04:57 GMT

Author: Omega
Date: Wed Jul 14 11:04:57 CEST 2010
Revision: 4337

Log:

##Core: Latency slider now goes from 50-750 (up from 50-500). Mainly for australia players who simply get crap latency whether they play EU or US, realms still oceans away.

Updated

trunk/DBM-GUI/DBM-GUI.lua

Action: modified

Old revision: 4336

Old date: 2010-07-14 04:28:56 UTC

@@ -1224,7 +1224,7 @@
 		bmtestmode:SetPoint('TOPLEFT', bmrange, "TOPRIGHT", 0, 0)
 		bmtestmode:SetScript("OnClick", function(self) DBM:DemoMode() end)
 
-		local latencySlider = generaloptions:CreateSlider(L.Latency_Text, 50, 500, 5, 210)   -- (text , min_value , max_value , step , width)
+		local latencySlider = generaloptions:CreateSlider(L.Latency_Text, 50, 750, 5, 210)   -- (text , min_value , max_value , step , width)
      	latencySlider:SetPoint('BOTTOMLEFT', bmrange, "BOTTOMLEFT", 10, -35)
      	latencySlider:HookScript("OnShow", function(self) self:SetValue(DBM.Options.LatencyThreshold) end)
 		latencySlider:HookScript("OnValueChanged", function(self) DBM.Options.LatencyThreshold = self:GetValue() end)

r4336 (Omega): make the bypass method for target scanning just work the way it did before 4.50, no latency check what so ever, even if it's wrong target.

Omega — Wed, 14 Jul 2010 04:28:56 GMT

Author: Omega
Date: Wed Jul 14 06:28:56 CEST 2010
Revision: 4336

Log:

make the bypass method for target scanning just work the way it did before 4.50, no latency check what so ever, even if it's wrong target.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Updated

trunk/DBM-Ulduar/GeneralVezax.lua

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4335

Old date: 2010-07-13 19:48:39 UTC

@@ -150,13 +150,13 @@
 	local targetname = self:GetBossTarget(36597)
 	if not targetname then return end
 		warnDefileCast:Show(targetname)
-		if self.Options.DefileIcon and mod:LatencyCheck() then
+		if self.Options.DefileIcon then
 			self:SetIcon(targetname, 8, 10)
 		end
 	if targetname == UnitName("player") then
 		specWarnDefileCast:Show()
 		soundDefile:Play()
-		if self.Options.YellOnDefile and mod:LatencyCheck() then
+		if self.Options.YellOnDefile then
 			SendChatMessage(L.YellDefile, "SAY")
 		end
 	elseif targetname then
@@ -180,12 +180,12 @@
 
 function mod:OldTankTrap()
 	warnTrapCast:Show(LKTank)
-	if self.Options.TrapIcon and mod:LatencyCheck() then
+	if self.Options.TrapIcon then
 		self:SetIcon(LKTank, 6, 10)
 	end
 	if LKTank == UnitName("player") then
 		specWarnTrap:Show()
-		if self.Options.YellOnTrap and mod:LatencyCheck() then
+		if self.Options.YellOnTrap then
 			SendChatMessage(L.YellTrap, "SAY")
 		end
 	end

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 4335

Old date: 2010-07-13 19:48:39 UTC

@@ -102,12 +102,12 @@
 function mod:OldMalleableGooTarget()
 	local targetname = self:GetBossTarget(36678)
 	if not targetname then return end
-		if self.Options.MalleableGooIcon and mod:LatencyCheck() then
+		if self.Options.MalleableGooIcon then
 			self:SetIcon(targetname, 6, 10)
 		end
 	if targetname == UnitName("player") then
 		specWarnMalleableGoo:Show()
-		if self.Options.YellOnMalleableGoo and mod:LatencyCheck() then
+		if self.Options.YellOnMalleableGoo then
 			SendChatMessage(L.YellMalleable, "SAY")
 		end
 	elseif targetname then

trunk/DBM-Ulduar/GeneralVezax.lua

Action: modified

Old revision: 4335

Old date: 2010-07-13 19:48:39 UTC

@@ -85,13 +85,13 @@
 function mod:OldShadowCrashTarget()
 	local targetname = self:GetBossTarget()
 	if not targetname then return end
-	if self.Options.SetIconOnShadowCrash and mod:LatencyCheck() then
+	if self.Options.SetIconOnShadowCrash then
 		self:SetIcon(targetname, 8, 10)
 	end
 	warnShadowCrash:Show(targetname)
 	if targetname == UnitName("player") then
 		specWarnShadowCrash:Show(targetname)
-		if self.Options.YellOnShadowCrash and mod:LatencyCheck()  then
+		if self.Options.YellOnShadowCrash then
 			SendChatMessage(L.YellCrash, "SAY")
 		end
 	elseif targetname then

r4335 (Omega): #ICC/Lich King: Redid last to use syncing instead do to talent check limitations. also made similar change to rotface kiting

Omega — Tue, 13 Jul 2010 19:48:39 GMT

Author: Omega
Date: Tue Jul 13 21:48:39 CEST 2010
Revision: 4335

Log:

#ICC/Lich King: Redid last to use syncing instead do to talent check limitations. also made similar change to rotface kiting

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4334

Old date: 2010-07-13 18:58:54 UTC

@@ -426,12 +426,12 @@
 						if mod.Options.YellOnValk then
 							SendChatMessage(L.YellValk, "SAY")
 						end
+						if mod:IsHealer() then
+							if isPAL then
+								mod:SendSync("PALGrabbed", UnitName("player"))
+							elseif isPRI then
+								mod:SendSync("PRIGrabbed", UnitName("player"))
 					end
-					if UnitName("raid"..i) == mod:IsHealer() then
-						if isPAL and self.Options.specWarnHealerGrabbed then
-							specWarnPALGrabbed:Show(UnitName("raid"..i))
-						elseif isPRI and self.Options.specWarnHealerGrabbed then
-							specWarnPRIGrabbed:Show(UnitName("raid"..i))
 						end
 					end
 					if mod.Options.AnnounceValkGrabs and DBM:GetRaidRank() > 0 then
@@ -567,6 +567,14 @@
 				self:SetIcon(target, 7, 5)
 			end
 		end
+	elseif msg == "PALGrabbed" then
+		if self.Options.specWarnHealerGrabbed then
+			specWarnPALGrabbed:Show(target)
+		end
+	elseif msg == "PRIGrabbed" then
+		if self.Options.specWarnHealerGrabbed then
+			specWarnPRIGrabbed:Show(target)
+		end
 	elseif msg == "DefileOn" then
 		if not self.Options.BypassLatencyCheck then
 			warnDefileCast:Show(target)

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 4334

Old date: 2010-07-13 18:58:54 UTC

@@ -159,29 +159,33 @@
 function mod:SPELL_DAMAGE(args)
 	if args:IsSpellID(69761, 71212, 73026, 73027) and args:IsPlayer() then
 		specWarnRadiatingOoze:Show()
-	elseif args:GetDestCreatureID() == 36899 and args:IsSrcTypePlayer() == isKiter then --Tank/Hunter attacking big ooze
-		if not args:IsPlayer() then
-			if self.Options.TankArrow then
-				DBM.Arrow:ShowRunTo(args.sourceName, 0, 0)
+	elseif args:GetDestCreatureID() == 36899 and args:IsSrcTypePlayer() == UnitName("player") then
+		if isKiter then --Tank/Hunter attacking big ooze
+			self:SendSync("OozeKiter", UnitName("player"))
 			end
 		end
 	end
-end
 
 function mod:SWING_DAMAGE(args)
 	if args:IsPlayer() and args:GetSrcCreatureID() == 36897 then --Little ooze hitting you
 		specWarnLittleOoze:Show()
-	elseif args:GetDestCreatureID() == 36899 and args:IsSrcTypePlayer() == isKiter then --Tank/Hunter attacking big ooze
-		if not args:IsPlayer() then
-			if self.Options.TankArrow then
-				DBM.Arrow:ShowRunTo(args.sourceName, 0, 0)
+	elseif args:GetDestCreatureID() == 36899 and args:IsSrcTypePlayer() == UnitName("player") then
+		if isKiter then --Tank/Hunter attacking big ooze
+			self:SendSync("OozeKiter", UnitName("player"))
 			end
 		end
 	end
-end
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
 	if msg:find(L.YellSlimePipes1) or msg:find(L.YellSlimePipes2) then
 		self:WallSlime()
 	end
 end
+
+function mod:OnSync(msg, target)
+	if msg == "OozeKiter" then
+		if self.Options.TankArrow then
+			DBM.Arrow:ShowRunTo(target, 0, 0)
+		end
+	end
+end
\ No newline at end of file

r4334 (Omega): #ICC/Lich King: Added special warning if a priest or paladin healer get grabbed by a valk (untested)

Omega — Tue, 13 Jul 2010 18:58:54 GMT

Author: Omega
Date: Tue Jul 13 20:58:54 CEST 2010
Revision: 4334

Log:

#ICC/Lich King: Added special warning if a priest or paladin healer get grabbed by a valk (untested)

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4333

Old date: 2010-07-13 13:20:24 UTC

@@ -21,6 +21,9 @@
 	"SWING_MISSED"
 )
 
+local isPAL = select(2, UnitClass("player")) == "PALADIN"
+local isPRI = select(2, UnitClass("player")) == "PRIEST"
+
 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
@@ -47,6 +50,8 @@
 local specWarnNecroticPlague= mod:NewSpecialWarningYou(73912) --Phase 1+ Ability
 local specWarnRagingSpirit	= mod:NewSpecialWarningYou(69200) --Transition Add
 local specWarnYouAreValkd	= mod:NewSpecialWarning("specWarnYouAreValkd") --Phase 2+ Ability
+local specWarnPALGrabbed	= mod:NewSpecialWarning("specWarnPALGrabbed", nil, false) --Phase 2+ Ability
+local specWarnPRIGrabbed	= mod:NewSpecialWarning("specWarnPRIGrabbed", nil, false) --Phase 2+ Ability
 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
@@ -82,6 +87,7 @@
 
 local soundDefile			= mod:NewSound(72762)
 
+mod:AddBoolOption("specWarnHealerGrabbed", mod:IsTank() or mod:IsHealer(), "announce")
 mod:AddBoolOption("DefileIcon")
 mod:AddBoolOption("NecroticPlagueIcon")
 mod:AddBoolOption("RagingSpiritIcon")
@@ -421,6 +427,13 @@
 							SendChatMessage(L.YellValk, "SAY")
 						end
 					end
+					if UnitName("raid"..i) == mod:IsHealer() then
+						if isPAL and self.Options.specWarnHealerGrabbed then
+							specWarnPALGrabbed:Show(UnitName("raid"..i))
+						elseif isPRI and self.Options.specWarnHealerGrabbed then
+							specWarnPRIGrabbed:Show(UnitName("raid"..i))
+						end
+					end
 					if mod.Options.AnnounceValkGrabs and DBM:GetRaidRank() > 0 then
 						if mod.Options.ValkyrIcon then
 							SendChatMessage(L.ValkGrabbedIcon:format(grabIcon, UnitName("raid"..i)), "RAID")--Untested, not sure if the icon timing will line up since i grab icon from a different function.

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4333

Old date: 2010-07-13 13:20:24 UTC

@@ -494,7 +494,9 @@
 	specWarnDefileCast		= "Defile on you - Move away",
 	specWarnDefileNear		= "Defile near you - Watch out",
 	specWarnTrapNear		= "Shadow Trap near you - Watch out",
-	warnNecroticPlagueJump	= "Necrotic Plague jumped to >%s<"
+	warnNecroticPlagueJump	= "Necrotic Plague jumped to >%s<",
+	specWarnPALGrabbed		= "Paladin Healer %s has been grabbed",
+	specWarnPRIGrabbed		= "Priest Healer %s has been grabbed"
 }
 
 L:SetTimerLocalization{
@@ -514,6 +516,7 @@
 	WarnPhase3Soon			= "Show pre-warning for Phase 3 transition (at ~43%)",
 	ValkyrWarning			= "Announce who has been grabbed by Val'kyr Shadowguards",
 	specWarnYouAreValkd		= "Show special warning when you have been grabbed by a Val'kyr Shadowguard",--npc36609
+	specWarnHealerGrabbed	= "Show special warning when a paladin or priest healer has been grabbed",
 	specWarnDefileCast		= "Show special warning for $spell:72762 on you",
 	specWarnDefileNear		= "Show special warning for $spell:72762 near you",
 	specWarnTrapNear		= "Show special warning for $spell:73539 near you",

r4333 (Azael): zhtw update

Azael — Tue, 13 Jul 2010 13:20:24 GMT

Author: Azael
Date: Tue Jul 13 15:20:24 CEST 2010
Revision: 4333

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Updated

trunk/DBM-Ulduar/localization.tw.lua

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 4332

Old date: 2010-07-11 16:44:17 UTC

@@ -323,7 +323,7 @@
 	YellOnUnbound			= "當你中了$spell:72856時大喊",
 	specWarnUnboundPlague		= "為$spell:72856的轉移顯示特別警告",
 	specWarnNextPlageSelf		= "當你是下一個$spell:72856的目標時顯示特別警告",
-	BypassLatencyCheck		= "不對$spell:72295使用同步或延遲查詢\n(只有出現問題時才使用這個)"
+	BypassLatencyCheck		= "不對$spell:72295使用同步\n(只有出現問題時才使用這個)"
 	
 
 }
@@ -363,7 +363,7 @@
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "設置標記在強力的親王身上 (頭顱)",
 	RangeFrame			= "顯示距離框 (12碼)",
-	BypassLatencyCheck		= "不對$spell:72037使用同步或延遲查詢\n(只有出現問題時才使用這個)"
+	BypassLatencyCheck		= "不對$spell:72037使用同步查詢\n(只有出現問題時才使用這個)"
 }
 
 L:SetMiscLocalization{
@@ -532,7 +532,7 @@
 	ValkyrIcon			= "為華爾琪影衛設置標記",
 	DefileArrow			= "當你附近的人中了$spell:72762時顯示DBM箭頭",
 	TrapArrow			= "當你附近的人中了$spell:73539時顯示DBM箭頭",
-	BypassLatencyCheck		= "不對汙染/暗影陷阱使用同步或延遲查詢\n(只有出現問題時才使用這個)",
+	BypassLatencyCheck		= "不對汙染/暗影陷阱使用同步\n(只有出現問題時才使用這個)",
 	AnnounceValkGrabs		= "提示誰被華爾琪影衛抓住到團隊頻道\n(需開啟團隊廣播及助理權限)"
 }

trunk/DBM-Ulduar/localization.tw.lua

Action: modified

Old revision: 4332

Old date: 2010-07-11 16:44:17 UTC

@@ -439,7 +439,7 @@
 	YellOnShadowCrash		= "當你中了$spell:62660時大喊",
 	hardmodeSpawn			= "為薩倫聚惡體出現顯示計時器 (困難模式)",
 	CrashArrow			= "當你附近的人中了$spell:62660時顯示DBM箭頭",
-	BypassLatencyCheck		= "不對$spell:62660使用同步或延遲查詢\n(只有出現問題時才使用這個)"
+	BypassLatencyCheck		= "不對$spell:62660使用同步\n(只有出現問題時才使用這個)"
 }
 
 L:SetMiscLocalization{

r4332 (Omega): added toc area ids, apparently although they use same map, they do have distinct area ids

Omega — Sun, 11 Jul 2010 16:44:17 GMT

Author: Omega
Date: Sun Jul 11 18:44:17 CEST 2010
Revision: 4332

Log:

added toc area ids, apparently although they use same map, they do have distinct area ids

Updated

trunk/DBM-Coliseum/DBM-Coliseum.toc

Updated

trunk/DBM-Party-WotLK/DBM-Party-WotLK.toc

trunk/DBM-Coliseum/DBM-Coliseum.toc

Action: modified

Old revision: 4331

Old date: 2010-07-10 15:32:19 UTC

@@ -23,6 +23,7 @@
 ## X-DBM-Mod-Name-esMX: Coliseo de los Cruzados
 ## X-DBM-Mod-Sort: 2
 --We do not use areaID for this map because otherwise this mod would load in trial of champion 5 man as well.
+--## X-DBM-Mod-LoadZoneID: 544
 ## X-DBM-Mod-LoadZone: Trial of the Crusader
 ## X-DBM-Mod-LoadZone-koKR: 십자군의 시험장
 ## X-DBM-Mod-LoadZone-deDE: Prüfung des Kreuzfahrers

trunk/DBM-Party-WotLK/DBM-Party-WotLK.toc

Action: modified

Old revision: 4331

Old date: 2010-07-10 15:32:19 UTC

@@ -28,7 +28,7 @@
 ## X-DBM-Mod-Name-koKR: 5인 던전 모드
 ## X-DBM-Mod-Name-esMX: Mazmorras
 ## X-DBM-Mod-Sort: 100
---## X-DBM-Mod-LoadZoneID: 523,534,522,535,531,526,527,521,529,524,525,537,603,602,604
+--## X-DBM-Mod-LoadZoneID: 523,534,522,535,531,526,527,521,529,524,525,537,603,602,604,543
 --Trial of champion will be only zone that uses localized text when areaid is working (since it shares same map with trial of crusader and we don't want to load party mods in the raid and vica versa)
 ## X-DBM-Mod-LoadZone: Ahn'kahet: The Old Kingdom,Azjol-Nerub,The Culling of Stratholme,Drak'Tharon Keep,Gundrak,Halls of Lightning,Halls of Stone,The Nexus,The Oculus,Utgarde Keep,Utgarde Pinnacle,The Violet Hold,Trial of the Champion,Pit of Saron,The Forge of Souls,Halls of Reflection
 ## X-DBM-Mod-LoadZone-frFR: Ahn'kahet : l'Ancien royaume,Azjol -Nérub,L'Épuration de Stratholme,Donjon de Drak'Tharon,Gundrak,Les salles de Foudre,Les salles de Pierre,Le Nexus,L'Oculus,Donjon d'Utgarde,Cime d'Utgarde,Le fort Pourpre,L'épreuve du champion,Fosse de Saron,La Forge des âmes,Salles des Reflets

r4331 (bluenyx): koKR update

bluenyx — Sat, 10 Jul 2010 15:32:19 GMT

Author: bluenyx
Date: Sat Jul 10 17:32:19 CEST 2010
Revision: 4331

Log:

koKR update

Updated

trunk/DBM-WorldEvents/DBM-WorldEvents.toc

Action: modified

Old revision: 4330

Old date: 2010-07-10 15:21:54 UTC

@@ -12,6 +12,7 @@
 ## X-DBM-Mod-Name-esES: Eventos del Mundo
 ## X-DBM-Mod-Name-ruRU: Игровые события
 ## X-DBM-Mod-Name-zhTW: 世界事件
+## X-DBM-Mod-Name-koKR: 월드 이벤트
 ## X-DBM-Mod-Sort: 150
 ## X-DBM-Mod-LoadZone: Blackrock Depths,Scarlet Monastery,Shadowfang Keep,The Slave Pens
 ## X-DBM-Mod-LoadZone-frFR: Profondeurs de Rochenoire,Monastère écarlate,Donjon d'Ombrecroc,Les enclos aux esclaves

r4330 (Vampik): #Ruby/Halion: Add 8 minutes berserk timer.

Vampik — Sat, 10 Jul 2010 15:21:54 GMT

Author: Vampik
Date: Sat Jul 10 17:21:54 CEST 2010
Revision: 4330

Log:

#Ruby/Halion: Add 8 minutes berserk timer.

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4329

Old date: 2010-07-10 10:50:25 UTC

@@ -45,6 +45,8 @@
 local timerShadowBreathCD			= mod:NewCDTimer(19, 75954, nil, mod:IsTank() or mod:IsHealer())--Same as debuff timers, same CD, can be merged into 1.
 local timerFieryBreathCD			= mod:NewCDTimer(19, 74526, nil, mod:IsTank() or mod:IsHealer())--But unique icons are nice pertaining to phase you're in ;)
 
+local berserkTimer					= mod:NewBerserkTimer(480)
+
 local soundConsumption 				= mod:NewSound(74562, "SoundOnConsumption")
 
 mod:AddBoolOption("YellOnConsumption", true, "announce")
@@ -55,6 +57,7 @@
 local warned_preP3 = false
 
 function mod:OnCombatStart(delay)--These may still need retuning too, log i had didn't have pull time though.
+	berserkTimer:Start(-delay)
 		timerMeteorCD:Start(20-delay)
 		timerFieryConsumptionCD:Start(15-delay)
 		timerFieryBreathCD:Start(10-delay)

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

Snamor — Sat, 10 Jul 2010 10:50:25 GMT

Author: Snamor
Date: Sat Jul 10 12:50:25 CEST 2010
Revision: 4329

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: 4328

Old date: 2010-07-10 08:19:44 UTC

@@ -331,7 +331,7 @@
 	YellOnUnbound				= "Gritar cuando tengas $spell:72856",	
 	specWarnUnboundPlague		= "Mostrar aviso especial para transferencia de $spell:72856",
 	specWarnNextPlageSelf		= "Mostrar aviso especial cuando seas el próximo objetivo de $spell:72856",
-	BypassLatencyCheck			= "No usar sincronización o comprobación de latencia para $spell:72295\n(sólo usar esta opción si tienes problemas de otro modo)"
+	BypassLatencyCheck			= "No usar sincronización para $spell:72295\n(sólo usar esta opción si tienes problemas de otro modo)"
 }
 
 L:SetMiscLocalization{
@@ -369,7 +369,7 @@
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "Poner un icono en el príncipe con Invocación (Cruz)",
 	RangeFrame				= "Mostrar distancia (12 yardas)",
-	BypassLatencyCheck		= "No usar sincronización o comprobación de latencia para $spell:72037\n(sólo usar esta opción si tienes problemas de otro modo)"
+	BypassLatencyCheck		= "No usar sincronización para $spell:72037\n(sólo usar esta opción si tienes problemas de otro modo)"
 }
 
 L:SetMiscLocalization{

trunk/DBM-Ulduar/localization.es.lua

Action: modified

Old revision: 4328

Old date: 2010-07-10 08:19:44 UTC

@@ -452,7 +452,7 @@
 	YellOnShadowCrash				= "Gritar si eres objetivo de $spell:62660",
 	hardmodeSpawn					= "Mostrar tiempo para salida de Animus de saronita (Modo Difícil)",
 	CrashArrow						= "Mostrar una flecha cuando $spell:62660 va a caer cerca de ti",
-	BypassLatencyCheck				= "No usar sincronización o comprobación de latencia para $spell:62660\n(sólo usar esta opción si tienes problemas de otro modo)"
+	BypassLatencyCheck				= "No usar sincronización para $spell:62660\n(sólo usar esta opción si tienes problemas de otro modo)"
 }
 
 L:SetMiscLocalization{

r4328 (Vampik): ruRU update

Vampik — Sat, 10 Jul 2010 08:19:44 GMT

Author: Vampik
Date: Sat Jul 10 10:19:44 CEST 2010
Revision: 4328

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: 4327

Old date: 2010-07-10 07:31:16 UTC

@@ -322,7 +322,7 @@
 	YellOnUnbound				= "Кричать, когда на вас $spell:72856",
 	specWarnUnboundPlague		= "Спец-предупреждение для передачи заклинания $spell:72856",
 	specWarnNextPlageSelf		= "Спец-предупреждение, когда вы являетесь следующей целью\nзаклинания $spell:72856",
-	BypassLatencyCheck			= "Отключить синхр-цию и проверку задержки для $spell:72295\n(используйте только в случае возникновения проблем)"
+	BypassLatencyCheck			= "Отключить синхр-цию для $spell:72295\n(используйте только в случае возникновения проблем)"
 }
 
 L:SetMiscLocalization{
@@ -360,7 +360,7 @@
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "Устанавливать метку на наполненного силой Принца (череп)",
 	RangeFrame				= "Показывать окно проверки дистанции (12 м)",
-	BypassLatencyCheck		= "Отключить синхр-цию и проверку задержки для $spell:72037\n(используйте только в случае возникновения проблем)"
+	BypassLatencyCheck		= "Отключить синхр-цию для $spell:72037\n(используйте только в случае возникновения проблем)"
 }
 
 L:SetMiscLocalization{
@@ -529,7 +529,7 @@
 	ValkyrIcon				= "Устанавливать метки на Валь'кир",
 	DefileArrow				= "Показывать стрелку, когда $spell:72762 около вас",
 	TrapArrow				= "Показывать стрелку, когда $spell:73539 около вас",
-	BypassLatencyCheck		= "Отключить синхр-цию и проверку задержки для Осквернения и Теневой ловушки\n(используйте только в случае возникновения проблем)",
+	BypassLatencyCheck		= "Отключить синхр-цию для Осквернения и Теневой ловушки\n(используйте только в случае возникновения проблем)",
 	AnnounceValkGrabs		= "Объявлять игроков, схваченных Валь'кирами, в рейд-чат\n(требуются права помощника)"
 }

trunk/DBM-Ulduar/localization.ru.lua

Action: modified

Old revision: 4327

Old date: 2010-07-10 07:31:16 UTC

@@ -446,7 +446,7 @@
 	YellOnShadowCrash				= "Кричать, когда на вас $spell:62660",
 	hardmodeSpawn					= "Отсчет времени до появления Саронитового врага (сложный режим)",
 	CrashArrow						= "Показывать стрелку, когда $spell:62660 около вас",
-	BypassLatencyCheck				= "Отключить синхр-цию и проверку задержки для $spell:62660\n(используйте только в случае возникновения проблем)"
+	BypassLatencyCheck				= "Отключить синхр-цию для $spell:62660\n(используйте только в случае возникновения проблем)"
 }
 
 L:SetMiscLocalization{

r4327 (Omega): reword some locals

Omega — Sat, 10 Jul 2010 07:31:16 GMT

Author: Omega
Date: Sat Jul 10 09:31:16 CEST 2010
Revision: 4327

Log:

reword some locals

Updated

trunk/DBM-Icecrown/localization.en.lua

Updated

trunk/DBM-Ulduar/localization.en.lua

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4326

Old date: 2010-07-10 07:20:54 UTC

@@ -320,7 +320,7 @@
 	YellOnUnbound				= "Yell on $spell:72856",
 	specWarnUnboundPlague		= "Show special warning for $spell:72856 transfer",
 	specWarnNextPlageSelf		= "Show special warning when you are the next $spell:72856 target",
-	BypassLatencyCheck			= "Don't use syncing or latency check for $spell:72295\n(only use this if you're having problems otherwise)"
+	BypassLatencyCheck			= "Don't use syncing for $spell:72295\n(only use this if you're having problems otherwise)"
 }
 
 L:SetMiscLocalization{
@@ -358,7 +358,7 @@
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "Set icon on the empowered Prince (skull)",
 	RangeFrame				= "Show range frame (12 yards)",
-	BypassLatencyCheck		= "Don't use syncing or latency check for $spell:72037\n(only use this if you're having problems otherwise)"
+	BypassLatencyCheck		= "Don't use syncing for $spell:72037\n(only use this if you're having problems otherwise)"
 }
 
 L:SetMiscLocalization{
@@ -527,7 +527,7 @@
 	ValkyrIcon				= "Set icons on Valkyrs",
 	DefileArrow				= "Show DBM arrow when $spell:72762 is near you",
 	TrapArrow				= "Show DBM arrow when $spell:73539 is near you",
-	BypassLatencyCheck		= "Don't use syncing or latency check for defile/shadow trap\n(only use this if you're having problems otherwise)",
+	BypassLatencyCheck		= "Don't use syncing for defile/shadow trap\n(only use this if you're having problems otherwise)",
 	AnnounceValkGrabs		= "Announce Val'kyr Shadowguard grab targets to raid chat\n(requires announce to be enabled and promoted status)"
 }

trunk/DBM-Ulduar/localization.en.lua

Action: modified

Old revision: 4326

Old date: 2010-07-10 07:20:54 UTC

@@ -444,7 +444,7 @@
 	YellOnShadowCrash				= "Yell on $spell:62660",
 	hardmodeSpawn					= "Show timer for Saronite Animus spawn (hard mode)",
 	CrashArrow						= "Show DBM arrow when $spell:62660 is near you",
-	BypassLatencyCheck				= "Don't use syncing or latency check for $spell:62660\n(only use this if you're having problems otherwise)"
+	BypassLatencyCheck				= "Don't use syncing for $spell:62660\n(only use this if you're having problems otherwise)"
 }
 
 L:SetMiscLocalization{

r4326 (Vampik): ruRU update

Vampik — Sat, 10 Jul 2010 07:20:54 GMT

Author: Vampik
Date: Sat Jul 10 09:20:54 CEST 2010
Revision: 4326

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: 4325

Old date: 2010-07-10 06:41:46 UTC

@@ -322,6 +322,7 @@
 	YellOnUnbound				= "Кричать, когда на вас $spell:72856",
 	specWarnUnboundPlague		= "Спец-предупреждение для передачи заклинания $spell:72856",
 	specWarnNextPlageSelf		= "Спец-предупреждение, когда вы являетесь следующей целью\nзаклинания $spell:72856",
+	BypassLatencyCheck			= "Отключить синхр-цию и проверку задержки для $spell:72295\n(используйте только в случае возникновения проблем)"
 }
 
 L:SetMiscLocalization{
@@ -358,7 +359,8 @@
 	specWarnVortexNear		= "Спец-предупреждение, когда $spell:72037 около вас",
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "Устанавливать метку на наполненного силой Принца (череп)",
-	RangeFrame				= "Показывать окно проверки дистанции (12 м)"
+	RangeFrame				= "Показывать окно проверки дистанции (12 м)",
+	BypassLatencyCheck		= "Отключить синхр-цию и проверку задержки для $spell:72037\n(используйте только в случае возникновения проблем)"
 }
 
 L:SetMiscLocalization{
@@ -527,6 +529,7 @@
 	ValkyrIcon				= "Устанавливать метки на Валь'кир",
 	DefileArrow				= "Показывать стрелку, когда $spell:72762 около вас",
 	TrapArrow				= "Показывать стрелку, когда $spell:73539 около вас",
+	BypassLatencyCheck		= "Отключить синхр-цию и проверку задержки для Осквернения и Теневой ловушки\n(используйте только в случае возникновения проблем)",
 	AnnounceValkGrabs		= "Объявлять игроков, схваченных Валь'кирами, в рейд-чат\n(требуются права помощника)"
 }

trunk/DBM-Ulduar/localization.ru.lua

Action: modified

Old revision: 4325

Old date: 2010-07-10 06:41:46 UTC

@@ -445,7 +445,8 @@
 	YellOnLifeLeech					= "Кричать, когда на вас $spell:63276",
 	YellOnShadowCrash				= "Кричать, когда на вас $spell:62660",
 	hardmodeSpawn					= "Отсчет времени до появления Саронитового врага (сложный режим)",
-	CrashArrow						= "Показывать стрелку, когда $spell:62660 около вас"
+	CrashArrow						= "Показывать стрелку, когда $spell:62660 около вас",
+	BypassLatencyCheck				= "Отключить синхр-цию и проверку задержки для $spell:62660\n(используйте только в случае возникновения проблем)"
 }
 
 L:SetMiscLocalization{

r4325 (Vampik): Fix for r4322

Vampik — Sat, 10 Jul 2010 06:41:46 GMT

Author: Vampik
Date: Sat Jul 10 08:41:46 CEST 2010
Revision: 4325

Log:

Fix for r4322

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 4324

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

@@ -1885,12 +1885,8 @@
 			local msg
 			for k, v in pairs(autoRespondSpam) do
 				msg = msg or chatPrefixShort..DBM_CORE_WHISPER_COMBAT_END_KILL:format(UnitName("player"), (mod.combatInfo.name or ""))
-				if type(k) == "string" then
-					SendChatMessage(msg, "WHISPER", nil, k)
-				elseif type(k) == "number" then
-					BNSendWhisper(k, msg)
+				sendWhisper(k, msg)
 				end
-			end
 			fireEvent("kill", mod)
 		end
 		table.wipe(autoRespondSpam)

r4324 (Omega): added all the areaIDs for current zones (commented out since areaid isn't working quite right yet)

Omega — Fri, 09 Jul 2010 21:30:03 GMT

Author: Omega
Date: Fri Jul 09 23:30:03 CEST 2010
Revision: 4324

Log:

added all the areaIDs for current zones (commented out since areaid isn't working quite right yet)

Updated

trunk/DBM-ChamberOfAspects/DBM-ChamberOfAspects.toc

Updated

trunk/DBM-Coliseum/DBM-Coliseum.toc

Updated

trunk/DBM-EyeOfEternity/DBM-EyeOfEternity.toc

Updated

trunk/DBM-Icecrown/DBM-Icecrown.toc

Updated

trunk/DBM-Naxx/DBM-Naxx.toc

Updated

trunk/DBM-Party-WotLK/DBM-Party-WotLK.toc

Updated

trunk/DBM-PvP/DBM-PvP.toc

Updated

trunk/DBM-Ulduar/DBM-Ulduar.toc

Updated

trunk/DBM-VoA/DBM-VoA.toc

trunk/DBM-ChamberOfAspects/DBM-ChamberOfAspects.toc

Action: modified

Old revision: 4323

Old date: 2010-07-09 20:09:39 UTC

@@ -29,6 +29,7 @@
 ## X-DBM-Mod-Name-esES: Cámara de los Aspectos
 ## X-DBM-Mod-Name-esMX: Cámara de los Aspectos
 ## X-DBM-Mod-Sort: 1
+--## X-DBM-Mod-LoadZoneID: 532,610
 ## X-DBM-Mod-LoadZone: The Obsidian Sanctum,The Ruby Sanctum
 ## X-DBM-Mod-LoadZone-deDE: Das Obsidiansanktum,Das Rubinsanktum
 ## X-DBM-Mod-LoadZone-ruRU: Обсидиановое святилище,Рубиновое святилище

trunk/DBM-Coliseum/DBM-Coliseum.toc

Action: modified

Old revision: 4323

Old date: 2010-07-09 20:09:39 UTC

@@ -22,6 +22,7 @@
 ## X-DBM-Mod-Name-esES: Coliseo de los Cruzados
 ## X-DBM-Mod-Name-esMX: Coliseo de los Cruzados
 ## X-DBM-Mod-Sort: 2
+--We do not use areaID for this map because otherwise this mod would load in trial of champion 5 man as well.
 ## X-DBM-Mod-LoadZone: Trial of the Crusader
 ## X-DBM-Mod-LoadZone-koKR: 십자군의 시험장
 ## X-DBM-Mod-LoadZone-deDE: Prüfung des Kreuzfahrers

trunk/DBM-EyeOfEternity/DBM-EyeOfEternity.toc

Action: modified

Old revision: 4323

Old date: 2010-07-09 20:09:39 UTC

@@ -22,6 +22,7 @@
 ## X-DBM-Mod-Name-esES: El Ojo de la Eternidad
 ## X-DBM-Mod-Name-esMXS: El Ojo de la Eternidad
 ## X-DBM-Mod-Sort: 5
+--## X-DBM-Mod-LoadZoneID: 528
 ## X-DBM-Mod-LoadZone: The Eye of Eternity
 ## X-DBM-Mod-LoadZone-frFR: L'Œil de l'éternité
 ## X-DBM-Mod-LoadZone-deDE: Das Auge der Ewigkeit

trunk/DBM-Icecrown/DBM-Icecrown.toc

Action: modified

Old revision: 4323

Old date: 2010-07-09 20:09:39 UTC

@@ -31,6 +31,7 @@
 ## X-DBM-Mod-Name-esES: Ciudadela de la Corona de Hielo
 ## X-DBM-Mod-Name-esMX: Ciudadela de la Corona de Hielo
 ## X-DBM-Mod-Sort: 0
+--## X-DBM-Mod-LoadZoneID: 605
 ## X-DBM-Mod-LoadZone: Icecrown Citadel
 ## X-DBM-Mod-LoadZone-deDE: Eiskronenzitadelle
 ## X-DBM-Mod-LoadZone-frFR: Citadelle de la Couronne de glace

trunk/DBM-Naxx/DBM-Naxx.toc

Action: modified

Old revision: 4323

Old date: 2010-07-09 20:09:39 UTC

@@ -27,6 +27,7 @@
 ## X-DBM-Mod-Name-koKR: 낙스라마스
 ## X-DBM-Mod-Name-esES: Naxxramas
 ## X-DBM-Mod-Sort: 6
+--## X-DBM-Mod-LoadZoneID: 536
 ## X-DBM-Mod-LoadZone: Naxxramas
 ## X-DBM-Mod-LoadZone-frFR: Naxxramas
 ## X-DBM-Mod-LoadZone-deDE: Naxxramas

trunk/DBM-Party-WotLK/DBM-Party-WotLK.toc

Action: modified

Old revision: 4323

Old date: 2010-07-09 20:09:39 UTC

@@ -28,6 +28,8 @@
 ## X-DBM-Mod-Name-koKR: 5인 던전 모드
 ## X-DBM-Mod-Name-esMX: Mazmorras
 ## X-DBM-Mod-Sort: 100
+--## X-DBM-Mod-LoadZoneID: 523,534,522,535,531,526,527,521,529,524,525,537,603,602,604
+--Trial of champion will be only zone that uses localized text when areaid is working (since it shares same map with trial of crusader and we don't want to load party mods in the raid and vica versa)
 ## X-DBM-Mod-LoadZone: Ahn'kahet: The Old Kingdom,Azjol-Nerub,The Culling of Stratholme,Drak'Tharon Keep,Gundrak,Halls of Lightning,Halls of Stone,The Nexus,The Oculus,Utgarde Keep,Utgarde Pinnacle,The Violet Hold,Trial of the Champion,Pit of Saron,The Forge of Souls,Halls of Reflection
 ## X-DBM-Mod-LoadZone-frFR: Ahn'kahet : l'Ancien royaume,Azjol -Nérub,L'Épuration de Stratholme,Donjon de Drak'Tharon,Gundrak,Les salles de Foudre,Les salles de Pierre,Le Nexus,L'Oculus,Donjon d'Utgarde,Cime d'Utgarde,Le fort Pourpre,L'épreuve du champion,Fosse de Saron,La Forge des âmes,Salles des Reflets
 ## X-DBM-Mod-LoadZone-deDE: Ahn'kahet: Das Alte Königreich,Azjol-Nerub,Das Ausmerzen von Stratholme,Feste Drak'Tharon,Gundrak,Die Hallen der Blitze,Die Hallen des Steins,Der Nexus,Das Oculus,Burg Utgarde,Turm Utgarde,Die Violette Festung,Prüfung des Champions,Die Seelenschmiede,Grube von Saron,Hallen der Reflexion

trunk/DBM-PvP/DBM-PvP.toc

Action: modified

Old revision: 4323

Old date: 2010-07-09 20:09:39 UTC

@@ -29,6 +29,7 @@
 ## X-DBM-Mod-Name-esES: Campos de Batallas
 ## X-DBM-Mod-Name-esMX: Campos de Batallas
 ## X-DBM-Mod-Sort: 200
+--## X-DBM-Mod-LoadZoneID: 462,444,402,541,483
 ## X-DBM-Mod-LoadZone: Arathi Basin,Warsong Gulch,Alterac Valley,Eye of the Storm,Isle of Conquest
 ## X-DBM-Mod-LoadZone-deDE: Arathibecken,Kriegshymnenschlucht,Alteractal,Auge des Sturms,Insel der Eroberung
 ## X-DBM-Mod-LoadZone-frFR: Bassin d'Arathi,Goulet des Chanteguerres,Vallée d'Alterac,L'Œil du cyclone,Rivage des anciens,Île des Conquérants

trunk/DBM-Ulduar/DBM-Ulduar.toc

Action: modified

Old revision: 4323

Old date: 2010-07-09 20:09:39 UTC

@@ -17,6 +17,7 @@
 ## X-DBM-Mod-Name-zhCN: 奥杜尔
 ## X-DBM-Mod-Name-esES: Ulduar
 ## X-DBM-Mod-Sort: 4
+--## X-DBM-Mod-LoadZoneID: 530
 ## X-DBM-Mod-LoadZone: Ulduar
 ## X-DBM-Mod-LoadZone-frFR: Ulduar
 ## X-DBM-Mod-LoadZone-ruRU: Ульдуар

trunk/DBM-VoA/DBM-VoA.toc

Action: modified

Old revision: 4323

Old date: 2010-07-09 20:09:39 UTC

@@ -22,6 +22,7 @@
 ## X-DBM-Mod-Name-esES: La Cámara de Archavon
 ## X-DBM-Mod-Name-esMX: La Cámara de Archavon
 ## X-DBM-Mod-Sort: 7
+--## X-DBM-Mod-LoadZoneID: 533
 ## X-DBM-Mod-LoadZone: Vault of Archavon
 ## X-DBM-Mod-LoadZone-deDE: Archavons Kammer
 ## X-DBM-Mod-LoadZone-frFR: Caveau d'Archavon

r4323 (tandanu): add support for MapId-based LoD

tandanu — Fri, 09 Jul 2010 20:09:39 GMT

Author: tandanu
Date: Fri Jul 09 22:09:39 CEST 2010
Revision: 4323

Log:

add support for MapId-based LoD

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 4322

Old date: 2010-07-09 19:10:22 UTC

@@ -307,7 +307,7 @@
 	local function handleEvent(self, event, ...)
 		if not registeredEvents[event] or DBM.Options and not DBM.Options.Enabled then return end
 		for i, v in ipairs(registeredEvents[event]) do
-			if type(v[event]) == "function" and (not v.zones or checkEntry(v.zones, GetRealZoneText())) and (not v.Options or v.Options.Enabled) then
+			if type(v[event]) == "function" and (not v.zones or checkEntry(v.zones, GetRealZoneText()) or checkEntry(v.zones, GetCurrentMapAreaID())) and (not v.Options or v.Options.Enabled) then
 				v[event](v, ...)
 			end
 		end
@@ -622,7 +622,7 @@
 		
 		-- execute OnUpdate handlers of all modules
 		for i, v in pairs(updateFunctions) do
-			if i.Options.Enabled and (not i.zones or checkEntry(i.zones, GetRealZoneText())) then
+			if i.Options.Enabled and (not i.zones or checkEntry(i.zones, GetRealZoneText()) or checkEntry(i.zones, GetCurrentMapAreaID())) then
 				i.elapsed = (i.elapsed or 0) + elapsed
 				if i.elapsed >= (i.updateInterval or 0) then
 					v(i, i.elapsed)
@@ -1288,6 +1288,7 @@
 						category	= GetAddOnMetadata(i, "X-DBM-Mod-Category") or "Other",
 						name		= GetAddOnMetadata(i, "X-DBM-Mod-Name") or "",
 						zone		= {strsplit(",", GetAddOnMetadata(i, "X-DBM-Mod-LoadZone") or "")},
+						zoneId		= {strsplit(",", GetAddOnMetadata(i, "X-DBM-Mod-LoadZoneID") or "")},
 						subTabs		= GetAddOnMetadata(i, "X-DBM-Mod-SubCategories") and {strsplit(",", GetAddOnMetadata(i, "X-DBM-Mod-SubCategories"))},
 						hasHeroic	= tonumber(GetAddOnMetadata(i, "X-DBM-Mod-Has-Heroic-Mode") or 1) == 1,
 						modId		= GetAddOnInfo(i),
@@ -1295,6 +1296,14 @@
 					for k, v in ipairs(self.AddOns[#self.AddOns].zone) do
 						self.AddOns[#self.AddOns].zone[k] = (self.AddOns[#self.AddOns].zone[k]):trim()
 					end
+					for i = #self.AddOns[#self.AddOns].zoneId, 1, -1 do
+						local id = tonumber(self.AddOns[#self.AddOns].zoneId[i])
+						if id then
+							self.AddOns[#self.AddOns].zoneId[i] = id
+						else
+							table.remove(self.AddOns[#self.AddOns].zoneId, i)
+						end
+					end
 					if self.AddOns[#self.AddOns].subTabs then
 						for k, v in ipairs(self.AddOns[#self.AddOns].subTabs) do
 							self.AddOns[#self.AddOns].subTabs[k] = (self.AddOns[#self.AddOns].subTabs[k]):trim()
@@ -1352,9 +1361,13 @@
 --  Load Boss Mods on Demand  --
 --------------------------------
 function DBM:ZONE_CHANGED_NEW_AREA()
+	local zoneName = GetRealZoneText()
+	local zoneId = GetCurrentMapAreaID()
 	for i, v in ipairs(self.AddOns) do
-		if checkEntry(v.zone, GetRealZoneText()) and not IsAddOnLoaded(v.modId) then
-			DBM:Unschedule(DBM.LoadMod, DBM, v) -- srsly, wtf? LoadAddOn doesn't work properly on ZONE_CHANGED_NEW_AREA when reloading the UI
+		if not IsAddOnLoaded(v.modId) and (checkEntry(v.zone, zoneName) or checkEntry(v.zoneId, zoneId)) then
+			-- srsly, wtf? LoadAddOn doesn't work properly on ZONE_CHANGED_NEW_AREA when reloading the UI
+			-- TODO: is this still necessary? this was a WotLK beta bug
+			DBM:Unschedule(DBM.LoadMod, DBM, v)
 			DBM:Schedule(3, DBM.LoadMod, DBM, v)
 		end
 	end
@@ -1446,7 +1459,7 @@
 		delay = tonumber(delay or 0) or 0
 		revision = tonumber(revision or 0) or 0
 		mod = DBM:GetModByName(mod or "")
-		if mod and delay and (not mod.zones or #mod.zones == 0 or checkEntry(mod.zones, GetRealZoneText())) and (not mod.minSyncRevision or revision >= mod.minSyncRevision) then
+		if mod and delay and (not mod.zones or #mod.zones == 0 or checkEntry(mod.zones, GetRealZoneText()) or checkEntry(mod.zones, GetCurrentMapAreaID())) and (not mod.minSyncRevision or revision >= mod.minSyncRevision) then
 			DBM:StartCombat(mod, delay + lag, true)
 		end
 	end
@@ -1659,8 +1672,9 @@
 
 	function DBM:PLAYER_REGEN_DISABLED()
 		if not combatInitialized then return end
+		if combatInfo[GetRealZoneText()] or combatInfo[GetCurrentMapAreaID()] then
+			buildTargetList()
 		if combatInfo[GetRealZoneText()] then
-			buildTargetList()
 			for i, v in ipairs(combatInfo[GetRealZoneText()]) do
 				if v.type == "combat" then
 					if v.multiMobPullDetection then
@@ -1674,6 +1688,23 @@
 					end
 				end
 			end
+			end
+			-- copy & paste, lol
+			if combatInfo[GetCurrentMapAreaID()] then
+				for i, v in ipairs(combatInfo[GetCurrentMapAreaID()]) do
+					if v.type == "combat" then
+						if v.multiMobPullDetection then
+							for _, mob in ipairs(v.multiMobPullDetection) do
+								if checkForPull(mob, v) then
+									break
+								end
+							end
+						else
+							checkForPull(v.mob, v)
+						end
+					end
+				end
+			end
 			clearTargetList()
 		end
 	end
@@ -1690,6 +1721,14 @@
 				end
 			end
 		end
+		-- copy & paste, lol
+		if combatInfo[GetCurrentMapAreaID()] then
+			for i, v in ipairs(combatInfo[GetCurrentMapAreaID()]) do
+				if v.type == type and checkEntry(v.msgs, msg) then
+					DBM:StartCombat(v.mod, 0)
+				end
+			end
+		end
 		-- kill detection (wipe detection would also be nice to have)
 		-- todo: add sync
 		for i = #inCombat, 1, -1 do
@@ -1970,6 +2009,7 @@
 	if IsActiveBattlefieldArena() then
 		mod = self:GetModByName("Arenas")		
 	else
+		-- FIXME: this doesn't work for non-english clients
 		local zone = GetRealZoneText():gsub(" ", "")
 		mod = self:GetModByName(zone)
 	end
@@ -2313,7 +2353,17 @@
 
 function bossModPrototype:SetZone(...)
 	if select("#", ...) == 0 then
-		self.zones = (self.addon and self.addon.zone) or {}
+		if self.addon.zone and #self.addon.zone > 0 and self.addon.zoneId and #self.addon.zoneId > 0 then
+			self.zones = {}
+			for i, v in ipairs(self.addon.zone) do
+				self.zones[#self.zones + 1] = v
+			end
+			for i, v in ipairs(self.addon.zoneId) do
+				self.zones[#self.zones + 1] = v
+			end
+		else
+			self.zones = self.addon.zone and #self.addon.zone > 0 and self.addon.zone or self.addon.zoneId and #self.addon.zoneId > 0 and self.addon.zoneId or {}
+		end
 	elseif select(1, ...) ~= DBM_DISABLE_ZONE_DETECTION then
 		self.zones = {...}
 	else -- disable zone detection

r4322 (tandanu): * encapsulate BNSendWhisper/SendChatMessage stuff in the local function sendWhisper * sendWhisper prevents DBM from sending real ID messages to yourself, this could currently happen if you send a realID message to yourself during a boss fight resulting in an auto-response from DBM to yourself which might be detected as privacy issue by some addons trying to protect you

tandanu — Fri, 09 Jul 2010 19:10:22 GMT

Author: tandanu
Date: Fri Jul 09 21:10:22 CEST 2010
Revision: 4322

Log:

* encapsulate BNSendWhisper/SendChatMessage stuff in the local function sendWhisper
* sendWhisper prevents DBM from sending real ID messages to yourself, this could currently happen if you send a realID message to yourself during a boss fight resulting in an auto-response from DBM to yourself which might be detected as privacy issue by some addons trying to protect you
* mod:SendWhisper(msg, target) now accepts b.net presence IDs as target

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 4321

Old date: 2010-07-09 14:08:59 UTC

@@ -220,9 +220,9 @@
 local pformat
 do
 	-- fail-safe format, replaces missing arguments with unknown
-	-- note: doesn't handle cases like %%%s correct at the moment (should become %unknown, but becomes %%s)
+	-- note: doesn't handle cases like %%%s correctly at the moment (should become %unknown, but becomes %%s)
 	-- also, the end of the format directive is not detected in all cases, but handles everything that occurs in our boss mods ;)
-	--> not suitable for general-purpose use, just for our warnings and timers (where an argument like a spell-target might be nil due to missing target information)
+	--> not suitable for general-purpose use, just for our warnings and timers (where an argument like a spell-target might be nil due to missing target information from unreliable detection methods)
 	
 	local function replace(cap1, cap2)
 		return cap1 == "%" and DBM_CORE_UNKNOWN
@@ -234,7 +234,23 @@
 	end
 end
 
+-- sends a whisper to a player by his or her character name or BNet presence id
+-- returns true if the message was sent, nil otherwise
+local function sendWhisper(target, msg)
+	if type(target) == "number" then
+		if not BNIsSelf(target) then -- never send BNet whispers to ourselves
+			BNSendWhisper(target, msg)
+			return true
+		end
+	elseif type(target) == "string" then
+		-- whispering to ourselves here is okay and somewhat useful for whisper-warnings
+		SendChatMessage(msg, "WHISPER", nil, target)
+		return true
+	end
+end
+local BNSendWhisper = sendWhisper
 
+
 --------------
 --  Events  --
 --------------
@@ -1804,12 +1820,8 @@
 			local msg
 			for k, v in pairs(autoRespondSpam) do
 				msg = msg or chatPrefixShort..DBM_CORE_WHISPER_COMBAT_END_WIPE:format(UnitName("player"), (mod.combatInfo.name or ""))
-				if type(k) == "string" then
-					SendChatMessage(msg, "WHISPER", nil, k)
-				elseif type(k) == "number" then
-					BNSendWhisper(k, msg)
+				sendWhisper(k, msg)
 				end
-			end
 			fireEvent("wipe", mod)
 		else
 			local thisTime = GetTime() - mod.combatInfo.pull
@@ -2045,12 +2057,7 @@
 				mod = not v.isCustomMod and v
 			end
 			mod = mod or inCombat[1]
-			local msg = chatPrefix..DBM_CORE_STATUS_WHISPER:format((mod.combatInfo.name or ""), mod:GetHP() or "unknown", getNumAlivePlayers(), math.max(GetNumRaidMembers(), GetNumPartyMembers() + 1))
-			if isRealIdMessage then
-				BNSendWhisper(sender, msg)
-			else
-				SendChatMessage(msg, "WHISPER", nil, sender)
-			end
+			sendWhisper(sender, chatPrefix..DBM_CORE_STATUS_WHISPER:format((mod.combatInfo.name or ""), mod:GetHP() or "unknown", getNumAlivePlayers(), math.max(GetNumRaidMembers(), GetNumPartyMembers() + 1)))
 		elseif #inCombat > 0 and DBM.Options.AutoRespond and
 		(isRealIdMessage and (not isOnSameServer(sender) or DBM:GetRaidUnitId((select(4, BNGetFriendInfoByID(sender)))) == "none") or not isRealIdMessage and DBM:GetRaidUnitId(sender) == "none") then
 			local mod
@@ -2059,12 +2066,7 @@
 			end
 			mod = mod or inCombat[1]
 			if not autoRespondSpam[sender] then
-				local msg = chatPrefix..DBM_CORE_AUTO_RESPOND_WHISPER:format(UnitName("player"), mod.combatInfo.name or "", mod:GetHP() or "unknown", getNumAlivePlayers(), math.max(GetNumRaidMembers(), GetNumPartyMembers() + 1))
-				if isRealIdMessage then
-					BNSendWhisper(sender, msg)
-				else
-					SendChatMessage(msg, "WHISPER", nil, sender)
-				end
+				sendWhisper(sender, chatPrefix..DBM_CORE_AUTO_RESPOND_WHISPER:format(UnitName("player"), mod.combatInfo.name or "", mod:GetHP() or "unknown", getNumAlivePlayers(), math.max(GetNumRaidMembers(), GetNumPartyMembers() + 1)))
 				DBM:AddMsg(DBM_CORE_AUTO_RESPONDED)
 			end
 			autoRespondSpam[sender] = true
@@ -2358,12 +2360,8 @@
 end
 
 function bossModPrototype:SendWhisper(msg, target)
-	if not DBM.Options.DontSendBossWhispers then
-		return SendChatMessage(chatPrefixShort..msg, "WHISPER", nil, target)
-	else
-		return nil
+	return not DBM.Options.DontSendBossWhispers and sendWhisper(target, chatPrefixShort..msg)
 	end
-end
 
 function bossModPrototype:GetUnitCreatureId(uId)
 	local guid = UnitGUID(uId)

r4321 (bluenyx): koKR update

bluenyx — Fri, 09 Jul 2010 14:08:59 GMT

Author: bluenyx
Date: Fri Jul 09 16:08:59 CEST 2010
Revision: 4321

Log:

koKR update

Updated

trunk/DBM-Icecrown/localization.kr.lua

Updated

trunk/DBM-Ulduar/localization.kr.lua

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 4320

Old date: 2010-07-09 13:36:17 UTC

@@ -323,6 +323,7 @@
 	YellOnUnbound				= "$spell:72856 말하기",	
 	specWarnUnboundPlague		= "$spell:72856 전달자 특수 경고 보기",
 	specWarnNextPlageSelf		= "당신이 다음 $spell:72856 대상이 될 때 특수 경고 보기",	
+	BypassLatencyCheck			= "$spell:72295의 동기화를 사용하지 않거나 네트워크 체크를 하지 않습니다.\n(만약 DBM 사용에 문제가 생기면 사용하세요.)"	
 }
 
 L:SetMiscLocalization{
@@ -359,9 +360,11 @@
 	specWarnVortexNear			= "당신 주변에 $spell:72037가 있을 경우 특수 경고 보기",	
 	EmpoweredFlameIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon			= "활성화 된 공작에게 공격대 징표 설정하기 (해골)",
-	RangeFrame					= "거리 창 보기 (12 m)"
+	RangeFrame					= "거리 창 보기 (12 m)",
+	BypassLatencyCheck			= "$spell:72037의 동기화를 사용하지 않거나 네트워크 체크를 하지 않습니다.\n(만약 DBM 사용에 문제가 생기면 사용하세요.)"	
 }
 
+
 L:SetMiscLocalization{
 	Keleseth					= "공작 켈레세스",
 	Taldaram					= "공작 탈다람",
@@ -531,6 +534,7 @@
 	ValkyrIcon					= "발키리에 공격대 징표 설정",
 	DefileArrow					= "$spell:72762이 당신 주변에 생성되면 DBM 화살표 보기",
 	TrapArrow					= "주변에 $spell:73539을 할 경우 DBM 화살표 보기",
+	BypassLatencyCheck			= "$spell:73539 또는 $spell:72762의 동기화를 사용하지 않거나 네트워크 체크를 하지 않습니다.\n(만약 DBM 사용에 문제가 생기면 사용하세요.)",	
 	AnnounceValkGrabs			= "발키리가 납치할 때 대상과 대상 공격대 아이콘으로 채팅 알리기\n(알림 권한이 있을 경우)"	
 }
 L:SetMiscLocalization{

trunk/DBM-Ulduar/localization.kr.lua

Action: modified

Old revision: 4320

Old date: 2010-07-09 13:36:17 UTC

@@ -510,7 +510,8 @@
 	YellOnShadowCrash				= "어둠 붕괴일 때 외치기",
 	WarningLeechLife				= "생명력 흡수 시전 경고 보기",		
 	hardmodeSpawn					= "사로나이드 원혼 생성 타이머 보기(하드모드)",
-	CrashArrow						= "$spell:62660의 방향을 DBM Arrow로 표시하기(당신 주변일 경우)"
+	CrashArrow						= "$spell:62660의 방향을 DBM Arrow로 표시하기(당신 주변일 경우)",
+	BypassLatencyCheck				= "$spell:62660의 동기화를 사용하지 않거나 네트워크 체크를 하지 않습니다.\n(만약 DBM 사용에 문제가 생기면 사용하세요.)",	
 }
 
 L:SetMiscLocalization{

r4320 (Azael): zhtw update

Azael — Fri, 09 Jul 2010 13:36:17 GMT

Author: Azael
Date: Fri Jul 09 15:36:17 CEST 2010
Revision: 4320

Log:

zhtw update

Updated

trunk/DBM-WorldEvents/DBM-WorldEvents.toc

Action: modified

Old revision: 4319

Old date: 2010-07-09 11:51:12 UTC

@@ -11,6 +11,7 @@
 ## X-DBM-Mod-Name: World Events
 ## X-DBM-Mod-Name-esES: Eventos del Mundo
 ## X-DBM-Mod-Name-ruRU: Игровые события
+## X-DBM-Mod-Name-zhTW: 世界事件
 ## X-DBM-Mod-Sort: 150
 ## X-DBM-Mod-LoadZone: Blackrock Depths,Scarlet Monastery,Shadowfang Keep,The Slave Pens
 ## X-DBM-Mod-LoadZone-frFR: Profondeurs de Rochenoire,Monastère écarlate,Donjon d'Ombrecroc,Les enclos aux esclaves

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

Snamor — Fri, 09 Jul 2010 11:51:12 GMT

Author: Snamor
Date: Fri Jul 09 13:51:12 CEST 2010
Revision: 4319

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: 4318

Old date: 2010-07-07 12:50:21 UTC

@@ -331,6 +331,7 @@
 	YellOnUnbound				= "Gritar cuando tengas $spell:72856",	
 	specWarnUnboundPlague		= "Mostrar aviso especial para transferencia de $spell:72856",
 	specWarnNextPlageSelf		= "Mostrar aviso especial cuando seas el próximo objetivo de $spell:72856",
+	BypassLatencyCheck			= "No usar sincronización o comprobación de latencia para $spell:72295\n(sólo usar esta opción si tienes problemas de otro modo)"
 }
 
 L:SetMiscLocalization{
@@ -367,7 +368,8 @@
 	specWarnVortexNear		= "Mostrar aviso especial para $spell:72037 cerca de ti",
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "Poner un icono en el príncipe con Invocación (Cruz)",
-	RangeFrame				= "Mostrar distancia (12 yardas)"
+	RangeFrame				= "Mostrar distancia (12 yardas)",
+	BypassLatencyCheck		= "No usar sincronización o comprobación de latencia para $spell:72037\n(sólo usar esta opción si tienes problemas de otro modo)"
 }
 
 L:SetMiscLocalization{

trunk/DBM-Ulduar/localization.es.lua

Action: modified

Old revision: 4318

Old date: 2010-07-07 12:50:21 UTC

@@ -451,7 +451,8 @@
 	YellOnLifeLeech					= "Gritar si tienes $spell:63276",
 	YellOnShadowCrash				= "Gritar si eres objetivo de $spell:62660",
 	hardmodeSpawn					= "Mostrar tiempo para salida de Animus de saronita (Modo Difícil)",
-	CrashArrow						= "Mostrar una flecha cuando $spell:62660 va a caer cerca de ti"
+	CrashArrow						= "Mostrar una flecha cuando $spell:62660 va a caer cerca de ti",
+	BypassLatencyCheck				= "No usar sincronización o comprobación de latencia para $spell:62660\n(sólo usar esta opción si tienes problemas de otro modo)"
 }
 
 L:SetMiscLocalization{

r4318 (Azael): zhtw update

Azael — Wed, 07 Jul 2010 12:50:21 GMT

Author: Azael
Date: Wed Jul 07 14:50:21 CEST 2010
Revision: 4318

Log:

zhtw update

Updated

trunk/DBM-ChamberOfAspects/localization.tw.lua

Action: modified

Old revision: 4317

Old date: 2010-07-07 06:54:06 UTC

@@ -190,5 +190,5 @@
 	twilightcutter		= "這些環繞的球體散發著黑暗能量!",
 	YellCombustion		= "我中了熾熱燃灼!",
 	YellConsumption		= "我中了靈魂耗損!",
-	Kill			= "Relish this victory, mortals, for it will be your last. This world will burn with the master's return!"
+	Kill			= "享受這場勝利吧，凡人們，因為這是你們最後一次的勝利。這世界將會在主人回歸時化為火海!"
 })
\ No newline at end of file

r4317 (Omega): #Ruby/Halion: Redid debuffs to be smarter. Only warn target of debuff on spell aura applied, however, still use spell_cast_success for the CD timers, that way if a player does resist one we still get a timer for next one.

Omega — Wed, 07 Jul 2010 06:54:06 GMT

Author: Omega
Date: Wed Jul 07 08:54:06 CEST 2010
Revision: 4317

Log:

#Ruby/Halion: Redid debuffs to be smarter. Only warn target of debuff on spell aura applied, however, still use spell_cast_success for the CD timers, that way if a player does resist one we still get a timer for next one.

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4316

Old date: 2010-07-07 05:16:30 UTC

@@ -11,6 +11,7 @@
 mod:RegisterEvents(
 	"SPELL_CAST_START",
 	"SPELL_CAST_SUCCESS",
+	"SPELL_AURA_APPLIED",
 	"SPELL_AURA_REMOVED",
 	"SPELL_DAMAGE",
 	"CHAT_MSG_MONSTER_YELL",
@@ -71,18 +72,9 @@
 	end
 end
 
-function mod:SPELL_CAST_SUCCESS(args)
---[[	if args:IsSpellID(74648, 75877, 75878, 75879) then--Meteor Strike Landed
-		if not self.Options.AnnounceAlternatePhase then
-			warningMeteor:Show()
-			timerMeteorCD:Start()
-		end
-		if mod:LatencyCheck() then
-			self:SendSync("Meteor")
-		end--]]
+function mod:SPELL_CAST_SUCCESS(args)--We use spell cast success for debuff timers in case it gets resisted by a player we still get CD timer for next one
 	if args:IsSpellID(74792) then
 		if not self.Options.AnnounceAlternatePhase then
-			warningShadowConsumption:Show(args.destName)
 			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
 				timerShadowConsumptionCD:Start(20)
 			else
@@ -90,6 +82,28 @@
 			end
 		end
 		if mod:LatencyCheck() then
+			self:SendSync("ShadowCD")
+		end
+	elseif args:IsSpellID(74562) then
+		if not self.Options.AnnounceAlternatePhase then
+			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
+				timerFieryConsumptionCD:Start(20)
+			else
+				timerFieryConsumptionCD:Start()
+			end
+		end
+		if mod:LatencyCheck() then
+			self:SendSync("FieryCD")
+		end
+	end
+end
+
+function mod:SPELL_AURA_APPLIED(args)--We don't use spell cast success for actual debuff on >player< warnings since it has a chance to be resisted.
+	if args:IsSpellID(74792) then
+		if not self.Options.AnnounceAlternatePhase then
+			warningShadowConsumption:Show(args.destName)
+		end
+		if mod:LatencyCheck() then
 			self:SendSync("ShadowTarget", args.destName)
 		end
 		if args:IsPlayer() then
@@ -105,12 +119,7 @@
 	elseif args:IsSpellID(74562) then
 		if not self.Options.AnnounceAlternatePhase then
 			warningFieryConsumption:Show(args.destName)
-			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
-				timerFieryConsumptionCD:Start(20)
-			else
-				timerFieryConsumptionCD:Start()
 			end
-		end
 		if mod:LatencyCheck() then
 			self:SendSync("FieryTarget", args.destName)
 		end
@@ -166,9 +175,13 @@
 		timerFieryConsumptionCD:Cancel()
 --		timerMeteorCast:Cancel()--This one i'm not sure if it cancels or not.
 		warnPhase2:Show()
+		timerShadowBreathCD:Start(25)
+--		timerShadowConsumptionCD:Start(20)--Don't know it yet need more logs, it's not showing consistency. 20-25 on normal.
+		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
+			timerTwilightCutterCD:Start(30)
+		else
 		timerTwilightCutterCD:Start(35)
-		timerShadowBreathCD:Start(25)
---		timerShadowConsumptionCD:Start(5)--Don't know it yet need to study logs
+		end
 	elseif msg:find(L.Phase3) then
 		warnPhase3:Show()
 		timerMeteorCD:Start(30)
@@ -217,15 +230,21 @@
 	elseif msg == "ShadowTarget" then
 		if self.Options.AnnounceAlternatePhase then
 			warningShadowConsumption:Show(target)
+		end
+	elseif msg == "FieryTarget" then
+		if self.Options.AnnounceAlternatePhase then
+			warningFieryConsumption:Show(target)
+		end
+	elseif msg == "ShadowCD" then
+		if self.Options.AnnounceAlternatePhase then
 			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
 				timerShadowConsumptionCD:Start(20)
 			else
 				timerShadowConsumptionCD:Start()
 			end
 		end
-	elseif msg == "FieryTarget" then
+	elseif msg == "FieryCD" then
 		if self.Options.AnnounceAlternatePhase then
-			warningFieryConsumption:Show(target)
 			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
 				timerFieryConsumptionCD:Start(20)
 			else

r4316 (Omega): #Ulduar/General Vezax: Don't play run away sound for surge of darkness, no tank i know of kites this.

Omega — Wed, 07 Jul 2010 05:16:30 GMT

Author: Omega
Date: Wed Jul 07 07:16:30 CEST 2010
Revision: 4316

Log:

#Ulduar/General Vezax: Don't play run away sound for surge of darkness, no tank i know of kites this.
#Ulduar/Yogg Saron: using syncing for phase 3 trigger, so people in brain room can still get timers if shadow barrior drops before they portal up.

Updated

trunk/DBM-Ulduar/GeneralVezax.lua

Updated

trunk/DBM-Ulduar/YoggSaron.lua

trunk/DBM-Ulduar/GeneralVezax.lua

Action: modified

Old revision: 4315

Old date: 2010-07-07 05:06:58 UTC

@@ -53,11 +53,8 @@
 	elseif args:IsSpellID(62662) then 
 		specWarnSurgeDarkness:Show()
 		timerNextSurgeofDarkness:Start()
-		if self.Options.SpecialWarningSurgeDarkness then
-			PlaySoundFile("Sound\\Creature\\HoodWolf\\HoodWolfTransformPlayer01.wav")
 		end
 	end
-end
 
 function mod:SPELL_INTERRUPT(args)
 	if args:IsSpellID(62661) then

trunk/DBM-Ulduar/YoggSaron.lua

Action: modified

Old revision: 4315

Old date: 2010-07-07 05:06:58 UTC

@@ -195,14 +195,9 @@
 
 function mod:SPELL_AURA_REMOVED(args)
 	if args:IsSpellID(63894) then		-- Shadowy Barrier removed from Yogg-Saron (start p3)
-		warnP3:Show()
-		phase = 3
-		brainportal:Stop()
-        timerEmpower:Start()
-        warnEmpowerSoon:Schedule(40)	
-		warnBrainPortalSoon:Cancel()
-		timerNextDeafeningRoar:Start(30)
-		warnDeafeningRoarSoon:Schedule(25)
+		if mod:LatencyCheck() then
+			self:SendSync("Phase3")			-- Sync this because you don't get it in your combat log if you are in brain room.
+		end
 	elseif args:IsSpellID(64167, 64163) then	-- Lunatic Gaze
 		timerNextLunaricGaze:Start()
 	end
@@ -224,4 +219,17 @@
 		targetWarningsShown[UnitGUID(uId)] = true
 		specWarnGuardianLow:Show()
 	end
+end
+
+function mod:OnSync(msg)
+	if msg == "Phase3" then
+		warnP3:Show()
+		phase = 3
+		brainportal:Stop()
+        timerEmpower:Start()
+        warnEmpowerSoon:Schedule(40)	
+		warnBrainPortalSoon:Cancel()
+		timerNextDeafeningRoar:Start(30)
+		warnDeafeningRoarSoon:Schedule(25)
+	end
 end
\ No newline at end of file

r4315 (Omega): revert 4314, can't load a file that doesn't exist.

Omega — Wed, 07 Jul 2010 05:06:58 GMT

Author: Omega
Date: Wed Jul 07 07:06:58 CEST 2010
Revision: 4315

Log:

revert 4314, can't load a file that doesn't exist.

Updated

trunk/DBM-ChamberOfAspects/DBM-ChamberOfAspects.toc

Action: modified

Old revision: 4314

Old date: 2010-07-07 03:27:53 UTC

@@ -45,7 +45,6 @@
 localization.kr.lua
 localization.fr.lua
 localization.es.lua
-localization.mx.lua
 Obsidian\MapSizes.lua
 Obsidian\Shadron.lua
 Obsidian\Tenebron.lua

r4314 (Neptune): included text from boss

Neptune — Wed, 07 Jul 2010 03:27:53 GMT

Author: Neptune
Date: Wed Jul 07 05:27:53 CEST 2010
Revision: 4314

Log:

included text from boss

Updated

trunk/DBM-ChamberOfAspects/DBM-ChamberOfAspects.toc

Action: modified

Old revision: 4313

Old date: 2010-07-07 01:04:11 UTC

@@ -45,6 +45,7 @@
 localization.kr.lua
 localization.fr.lua
 localization.es.lua
+localization.mx.lua
 Obsidian\MapSizes.lua
 Obsidian\Shadron.lua
 Obsidian\Tenebron.lua

r4313 (Omega): Cancel combustion timer on phase 2 start

Omega — Wed, 07 Jul 2010 01:04:11 GMT

Author: Omega
Date: Wed Jul 07 03:04:11 CEST 2010
Revision: 4313

Log:

Cancel combustion timer on phase 2 start

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4312

Old date: 2010-07-06 14:56:49 UTC

@@ -163,10 +163,12 @@
 	if msg:find(L.Phase2) then
 		timerFieryBreathCD:Cancel()
 		timerMeteorCD:Cancel()
+		timerFieryConsumptionCD:Cancel()
 --		timerMeteorCast:Cancel()--This one i'm not sure if it cancels or not.
 		warnPhase2:Show()
 		timerTwilightCutterCD:Start(35)
 		timerShadowBreathCD:Start(25)
+--		timerShadowConsumptionCD:Start(5)--Don't know it yet need to study logs
 	elseif msg:find(L.Phase3) then
 		warnPhase3:Show()
 		timerMeteorCD:Start(30)

r4312 (Azael): zhtw update

Azael — Tue, 06 Jul 2010 14:56:49 GMT

Author: Azael
Date: Tue Jul 06 16:56:49 CEST 2010
Revision: 4312

Log:

zhtw update

Updated

trunk/DBM-Icecrown/localization.tw.lua

Updated

trunk/DBM-Ulduar/localization.tw.lua

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 4311

Old date: 2010-07-06 06:33:12 UTC

@@ -323,6 +323,7 @@
 	YellOnUnbound			= "當你中了$spell:72856時大喊",
 	specWarnUnboundPlague		= "為$spell:72856的轉移顯示特別警告",
 	specWarnNextPlageSelf		= "當你是下一個$spell:72856的目標時顯示特別警告",
+	BypassLatencyCheck		= "不對$spell:72295使用同步或延遲查詢\n(只有出現問題時才使用這個)"
 	
 
 }
@@ -361,7 +362,8 @@
 	specWarnVortexNear		= "當你附近的人中了$spell:72037時顯示特別警告",
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "設置標記在強力的親王身上 (頭顱)",
-	RangeFrame			= "顯示距離框 (12碼)"
+	RangeFrame			= "顯示距離框 (12碼)",
+	BypassLatencyCheck		= "不對$spell:72037使用同步或延遲查詢\n(只有出現問題時才使用這個)"
 }
 
 L:SetMiscLocalization{
@@ -530,6 +532,7 @@
 	ValkyrIcon			= "為華爾琪影衛設置標記",
 	DefileArrow			= "當你附近的人中了$spell:72762時顯示DBM箭頭",
 	TrapArrow			= "當你附近的人中了$spell:73539時顯示DBM箭頭",
+	BypassLatencyCheck		= "不對汙染/暗影陷阱使用同步或延遲查詢\n(只有出現問題時才使用這個)",
 	AnnounceValkGrabs		= "提示誰被華爾琪影衛抓住到團隊頻道\n(需開啟團隊廣播及助理權限)"
 }

trunk/DBM-Ulduar/localization.tw.lua

Action: modified

Old revision: 4311

Old date: 2010-07-06 06:33:12 UTC

@@ -438,7 +438,8 @@
 	YellOnLifeLeech			= "當你中了$spell:63276時大喊",
 	YellOnShadowCrash		= "當你中了$spell:62660時大喊",
 	hardmodeSpawn			= "為薩倫聚惡體出現顯示計時器 (困難模式)",
-	CrashArrow			= "當你附近的人中了$spell:62660時顯示DBM箭頭"
+	CrashArrow			= "當你附近的人中了$spell:62660時顯示DBM箭頭",
+	BypassLatencyCheck		= "不對$spell:62660使用同步或延遲查詢\n(只有出現問題時才使用這個)"
 }
 
 L:SetMiscLocalization{

r4311 (Omega): Change default max latency to 250, this may cause shadow traps to become inaccurate again but it's better than masses of people who don't know how to configure dbm complaining it's not working.

Omega — Tue, 06 Jul 2010 06:33:12 GMT

Author: Omega
Date: Tue Jul 06 08:33:12 CEST 2010
Revision: 4311

Log:

Change default max latency to 250, this may cause shadow traps to become inaccurate again but it's better than masses of people who don't know how to configure dbm complaining it's not working.

Updated

trunk/DBM-Core/DBM-Core.lua

Updated

trunk/DBM-GUI/DBM-GUI.lua

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 4310

Old date: 2010-07-06 03:17:45 UTC

@@ -107,7 +107,7 @@
 	DontSendBossAnnounces = false,
 	DontSendBossWhispers = false,
 	DontSetIcons = false,
-	MaxLatency = 150,
+	LatencyThreshold = 250,
 	BigBrotherAnnounceToRaid = false,
 --	HelpMessageShown = false,
 }
@@ -2435,7 +2435,7 @@
 end
 
 function bossModPrototype:LatencyCheck()
-	return select(3, GetNetStats()) < DBM.Options.MaxLatency
+	return select(3, GetNetStats()) < DBM.Options.LatencyThreshold
 end
 
 local function getTalentpointsSpent(spellID)

trunk/DBM-GUI/DBM-GUI.lua

Action: modified

Old revision: 4310

Old date: 2010-07-06 03:17:45 UTC

@@ -1226,8 +1226,8 @@
 
 		local latencySlider = generaloptions:CreateSlider(L.Latency_Text, 50, 500, 5, 210)   -- (text , min_value , max_value , step , width)
      	latencySlider:SetPoint('BOTTOMLEFT', bmrange, "BOTTOMLEFT", 10, -35)
-     	latencySlider:HookScript("OnShow", function(self) self:SetValue(DBM.Options.MaxLatency) end)
-		latencySlider:HookScript("OnValueChanged", function(self) DBM.Options.MaxLatency = self:GetValue() end)
+     	latencySlider:HookScript("OnShow", function(self) self:SetValue(DBM.Options.LatencyThreshold) end)
+		latencySlider:HookScript("OnValueChanged", function(self) DBM.Options.LatencyThreshold = self:GetValue() end)
 
 		-- Pizza Timer (create your own timer menu)
 		local pizzaarea = DBM_GUI_Frame:CreateArea(L.PizzaTimer_Headline, nil, 85)

r4310 (Omega): added bypasses for rest of target scans too. all off by default as i do not encourage using these unless you are A, only DBM user in raid on 4.50+ (like maybe what will happen when running it at level 85). or b. your entire raid has higher than 500ms latency (this is unrealistic, if anyone is under 500ms then adjusting latency check should make the sync method work)

Omega — Tue, 06 Jul 2010 03:17:45 GMT

Author: Omega
Date: Tue Jul 06 05:17:45 CEST 2010
Revision: 4310

Log:

added bypasses for rest of target scans too. all off by default as i do not encourage using these unless you are A, only DBM user in raid on 4.50+ (like maybe what will happen when running it at level 85). or b. your entire raid has higher than 500ms latency (this is unrealistic, if anyone is under 500ms then adjusting latency check should make the sync method work)

Updated

trunk/DBM-Icecrown/TheCrimsonHall/BPCouncil.lua

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

Updated

trunk/DBM-Ulduar/GeneralVezax.lua

Updated

trunk/DBM-Ulduar/localization.en.lua

trunk/DBM-Icecrown/TheCrimsonHall/BPCouncil.lua

Action: modified

Old revision: 4309

Old date: 2010-07-06 02:54:37 UTC

@@ -54,6 +54,7 @@
 mod:AddBoolOption("EmpoweredFlameIcon", true)
 mod:AddBoolOption("ActivePrinceIcon", false)
 mod:AddBoolOption("RangeFrame", true)
+mod:AddBoolOption("BypassLatencyCheck", false)--Use old scan method without syncing or latency check (less reliable but not dependant on other DBM users in raid)
 
 local activePrince
 local glitteringSparksTargets	= {}
@@ -89,6 +90,23 @@
 	end
 end
 
+function mod:OldShockVortexTarget()
+	local targetname = self:GetBossTarget(37970)
+	if not targetname then return end
+		warnShockVortex:Show(targetname)
+	if targetname == UnitName("player") then
+		specWarnVortex:Show()
+	elseif targetname then
+		local uId = DBM:GetRaidUnitId(targetname)
+		if uId then
+			local inRange = CheckInteractDistance(uId, 2)
+			if inRange then
+				specWarnVortexNear:Show()
+			end
+		end
+	end
+end
+
 function mod:HideRange()
 	DBM.RangeCheck:Hide()
 end
@@ -109,8 +127,12 @@
 
 function mod:SPELL_CAST_START(args)
 	if args:IsSpellID(72037) then		-- Shock Vortex
+		timerShockVortex:Start()
+		if self.Options.BypassLatencyCheck then
+			self:ScheduleMethod(0.1, "OldShockVortexTarget")
+		else
 		self:ScheduleMethod(0.1, "ShockVortexTarget")
-		timerShockVortex:Start()
+		end
 	elseif args:IsSpellID(72039, 73037, 73038, 73039) then	-- Empowered Shock Vortex(73037, 73038, 73039 drycoded from wowhead)
 		warnEmpoweredShockVortex:Show()
 		specWarnEmpoweredShockV:Show()
@@ -206,6 +228,7 @@
 			timerKineticBombCD:Start()
 		end
 	elseif msg == "ShockVortex" then
+		if not self.Options.BypassLatencyCheck then
 		warnShockVortex:Show(target)
 		if target == UnitName("player") then
 			specWarnVortex:Show()
@@ -220,3 +243,4 @@
 		end
 	end
 end
+end

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4309

Old date: 2010-07-06 02:54:37 UTC

@@ -93,7 +93,7 @@
 mod:AddBoolOption("AnnounceValkGrabs", false)
 --mod:AddBoolOption("DefileArrow")
 mod:AddBoolOption("TrapArrow")
-mod:AddBoolOption("BypassLatencyCheck", false)--More so for debugging than anything. To prove the problem isn't scans it's just latency check failing for some raids that simply have no one running good ping
+mod:AddBoolOption("BypassLatencyCheck", false)--Use old scan method without syncing or latency check (less reliable but not dependant on other DBM users in raid)
 
 local phase	= 0
 local lastPlagueCast = 0

trunk/DBM-Icecrown/ThePlagueworks/Putricide.lua

Action: modified

Old revision: 4309

Old date: 2010-07-06 02:54:37 UTC

@@ -67,11 +67,10 @@
 mod:AddBoolOption("OozeAdhesiveIcon")
 mod:AddBoolOption("GaseousBloatIcon")
 mod:AddBoolOption("MalleableGooIcon")
-
 mod:AddBoolOption("UnboundPlagueIcon")					-- icon on the player with active buff
-
 mod:AddBoolOption("YellOnMalleableGoo", true, "announce")
 mod:AddBoolOption("YellOnUnbound", true, "announce")
+mod:AddBoolOption("BypassLatencyCheck", false)--Use old scan method without syncing or latency check (less reliable but not dependant on other DBM users in raid)
 
 local warned_preP2 = false
 local warned_preP3 = false
@@ -92,7 +91,7 @@
 	end
 end
 
-function mod:MalleableGooTarget()--. Great for 10 man, but only marks/warns 1 of the 2/3 people in 25 man
+function mod:MalleableGooTarget()
 	local targetname = self:GetBossTarget(36678)
 	if not targetname then return end
 	if mod:LatencyCheck() then--Only send sync if you have low latency.
@@ -100,6 +99,28 @@
 	end
 end
 
+function mod:OldMalleableGooTarget()
+	local targetname = self:GetBossTarget(36678)
+	if not targetname then return end
+		if self.Options.MalleableGooIcon and mod:LatencyCheck() then
+			self:SetIcon(targetname, 6, 10)
+		end
+	if targetname == UnitName("player") then
+		specWarnMalleableGoo:Show()
+		if self.Options.YellOnMalleableGoo and mod:LatencyCheck() then
+			SendChatMessage(L.YellMalleable, "SAY")
+		end
+	elseif targetname then
+		local uId = DBM:GetRaidUnitId(targetname)
+		if uId then
+			local inRange = CheckInteractDistance(uId, 2)
+			if inRange then
+				specWarnMalleableGooNear:Show()
+			end
+		end
+	end
+end
+
 function mod:SPELL_CAST_START(args)
 	if args:IsSpellID(70351, 71966, 71967, 71968) then
 		warnUnstableExperimentSoon:Cancel()
@@ -182,9 +203,13 @@
 		else
 			timerMalleableGooCD:Start()
 		end
+		if self.Options.BypassLatencyCheck then
+			self:ScheduleMethod(0.1, "OldMalleableGooTarget")
+		else
 		self:ScheduleMethod(0.1, "MalleableGooTarget")
 	end
 end
+end
 
 function mod:SPELL_AURA_APPLIED(args)
 	if args:IsSpellID(70447, 72836, 72837, 72838) then--Green Slime
@@ -294,6 +319,7 @@
 
 function mod:OnSync(msg, target)
 	if msg == "GooOn" then
+		if not self.Options.BypassLatencyCheck then
 		if self.Options.MalleableGooIcon then
 			self:SetIcon(target, 6, 10)
 		end
@@ -312,4 +338,5 @@
 			end
 		end
 	end
+	end
 end
\ No newline at end of file

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4309

Old date: 2010-07-06 02:54:37 UTC

@@ -320,6 +320,7 @@
 	YellOnUnbound				= "Yell on $spell:72856",
 	specWarnUnboundPlague		= "Show special warning for $spell:72856 transfer",
 	specWarnNextPlageSelf		= "Show special warning when you are the next $spell:72856 target",
+	BypassLatencyCheck			= "Don't use syncing or latency check for $spell:72295\n(only use this if you're having problems otherwise)"
 }
 
 L:SetMiscLocalization{
@@ -356,7 +357,8 @@
 	specWarnVortexNear		= "Show special warning for $spell:72037 near you",
 	EmpoweredFlameIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72040),
 	ActivePrinceIcon		= "Set icon on the empowered Prince (skull)",
-	RangeFrame				= "Show range frame (12 yards)"
+	RangeFrame				= "Show range frame (12 yards)",
+	BypassLatencyCheck		= "Don't use syncing or latency check for $spell:72037\n(only use this if you're having problems otherwise)"
 }
 
 L:SetMiscLocalization{

trunk/DBM-Ulduar/GeneralVezax.lua

Action: modified

Old revision: 4309

Old date: 2010-07-06 02:54:37 UTC

@@ -38,6 +38,7 @@
 mod:AddBoolOption("SetIconOnShadowCrash", true)
 mod:AddBoolOption("SetIconOnLifeLeach", true)
 mod:AddBoolOption("CrashArrow")
+mod:AddBoolOption("BypassLatencyCheck", false)--Use old scan method without syncing or latency check (less reliable but not dependant on other DBM users in raid)
 
 
 function mod:OnCombatStart(delay)
@@ -84,9 +85,45 @@
 	end
 end
 
+function mod:OldShadowCrashTarget()
+	local targetname = self:GetBossTarget()
+	if not targetname then return end
+	if self.Options.SetIconOnShadowCrash and mod:LatencyCheck() then
+		self:SetIcon(targetname, 8, 10)
+	end
+	warnShadowCrash:Show(targetname)
+	if targetname == UnitName("player") then
+		specWarnShadowCrash:Show(targetname)
+		if self.Options.YellOnShadowCrash and mod:LatencyCheck()  then
+			SendChatMessage(L.YellCrash, "SAY")
+		end
+	elseif targetname then
+		local uId = DBM:GetRaidUnitId(targetname)
+		if uId then
+			local inRange = CheckInteractDistance(uId, 2)
+			local x, y = GetPlayerMapPosition(uId)
+			if x == 0 and y == 0 then
+				SetMapToCurrentZone()
+				x, y = GetPlayerMapPosition(uId)
+			end
+			if inRange then
+				specWarnShadowCrashNear:Show()
+				if self.Options.CrashArrow then
+					DBM.Arrow:ShowRunAway(x, y, 15, 5)
+				end
+			end
+		end
+	end
+end
+
+
 function mod:SPELL_CAST_SUCCESS(args)
 	if args:IsSpellID(62660) then		-- Shadow Crash
+		if self.Options.BypassLatencyCheck then
+			self:ScheduleMethod(0.1, "OldShadowCrashTarget")
+		else
 		self:ScheduleMethod(0.1, "ShadowCrashTarget")
+		end
 	elseif args:IsSpellID(63276) then	-- Mark of the Faceless
 		if self.Options.SetIconOnLifeLeach then
 			self:SetIcon(args.destName, 7, 10)
@@ -118,6 +155,7 @@
 
 function mod:OnSync(msg, target)
 	if msg == "CrashOn" then
+		if not self.Options.BypassLatencyCheck then
 		warnShadowCrash:Show(target)
 		if self.Options.SetIconOnShadowCrash then
 			self:SetIcon(target, 8, 10)
@@ -145,4 +183,5 @@
 			end
 		end
 	end
+	end
 end
\ No newline at end of file

trunk/DBM-Ulduar/localization.en.lua

Action: modified

Old revision: 4309

Old date: 2010-07-06 02:54:37 UTC

@@ -443,7 +443,8 @@
 	YellOnLifeLeech					= "Yell on $spell:63276",
 	YellOnShadowCrash				= "Yell on $spell:62660",
 	hardmodeSpawn					= "Show timer for Saronite Animus spawn (hard mode)",
-	CrashArrow						= "Show DBM arrow when $spell:62660 is near you"
+	CrashArrow						= "Show DBM arrow when $spell:62660 is near you",
+	BypassLatencyCheck				= "Don't use syncing or latency check for $spell:62660\n(only use this if you're having problems otherwise)"
 }
 
 L:SetMiscLocalization{

r4309 (Omega): fix a small local bug

Omega — Tue, 06 Jul 2010 02:54:37 GMT

Author: Omega
Date: Tue Jul 06 04:54:37 CEST 2010
Revision: 4309

Log:

fix a small local bug

Updated

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4308

Old date: 2010-07-06 02:53:21 UTC

@@ -525,7 +525,7 @@
 	ValkyrIcon				= "Set icons on Valkyrs",
 	DefileArrow				= "Show DBM arrow when $spell:72762 is near you",
 	TrapArrow				= "Show DBM arrow when $spell:73539 is near you",
-	BypassLatencyCheck		= "Don't use syncing or latency check for defile/shadow trap/n(only use this if you're having problems otherwise)",
+	BypassLatencyCheck		= "Don't use syncing or latency check for defile/shadow trap\n(only use this if you're having problems otherwise)",
 	AnnounceValkGrabs		= "Announce Val'kyr Shadowguard grab targets to raid chat\n(requires announce to be enabled and promoted status)"
 }

r4308 (Omega): add to last, still block icon setting and chat /say if you fail latency check though. if you bypass latency check still don't want your icons or says to mess up rest of raid if they are wrong.

Omega — Tue, 06 Jul 2010 02:53:21 GMT

Author: Omega
Date: Tue Jul 06 04:53:21 CEST 2010
Revision: 4308

Log:

add to last, still block icon setting and chat /say if you fail latency check though. if you bypass latency check still don't want your icons or says to mess up rest of raid if they are wrong.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4307

Old date: 2010-07-06 02:51:04 UTC

@@ -150,7 +150,7 @@
 	if targetname == UnitName("player") then
 		specWarnDefileCast:Show()
 		soundDefile:Play()
-		if self.Options.YellOnDefile then
+		if self.Options.YellOnDefile and mod:LatencyCheck() then
 			SendChatMessage(L.YellDefile, "SAY")
 		end
 	elseif targetname then
@@ -174,12 +174,12 @@
 
 function mod:OldTankTrap()
 	warnTrapCast:Show(LKTank)
-	if self.Options.TrapIcon then
+	if self.Options.TrapIcon and mod:LatencyCheck() then
 		self:SetIcon(LKTank, 6, 10)
 	end
 	if LKTank == UnitName("player") then
 		specWarnTrap:Show()
-		if self.Options.YellOnTrap then
+		if self.Options.YellOnTrap and mod:LatencyCheck() then
 			SendChatMessage(L.YellTrap, "SAY")
 		end
 	end

r4307 (Omega): added option to bypass latency and sync based target scanning on lich king mod, mostly for users that can't figure out latency feature or for users who simply might be only dbm user in raid full of other mod users whom don't have the option to rely on syncing.

Omega — Tue, 06 Jul 2010 02:51:04 GMT

Author: Omega
Date: Tue Jul 06 04:51:04 CEST 2010
Revision: 4307

Log:

added option to bypass latency and sync based target scanning on lich king mod, mostly for users that can't figure out latency feature or for users who simply might be only dbm user in raid full of other mod users whom don't have the option to rely on syncing.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4306

Old date: 2010-07-05 19:35:24 UTC

@@ -93,6 +93,7 @@
 mod:AddBoolOption("AnnounceValkGrabs", false)
 --mod:AddBoolOption("DefileArrow")
 mod:AddBoolOption("TrapArrow")
+mod:AddBoolOption("BypassLatencyCheck", false)--More so for debugging than anything. To prove the problem isn't scans it's just latency check failing for some raids that simply have no one running good ping
 
 local phase	= 0
 local lastPlagueCast = 0
@@ -138,10 +139,42 @@
 	end
 end
 
---In case new method doesn't work well with the unique trap scanning methods used, non sync method can still be uncommented and used.
---[[function mod:TankTrap()
+--for those that want to avoid latency check.
+function mod:OldDefileTarget()
+	local targetname = self:GetBossTarget(36597)
+	if not targetname then return end
+		warnDefileCast:Show(targetname)
+		if self.Options.DefileIcon and mod:LatencyCheck() then
+			self:SetIcon(targetname, 8, 10)
+		end
+	if targetname == UnitName("player") then
+		specWarnDefileCast:Show()
+		soundDefile:Play()
+		if self.Options.YellOnDefile then
+			SendChatMessage(L.YellDefile, "SAY")
+		end
+	elseif targetname then
+		local uId = DBM:GetRaidUnitId(targetname)
+		if uId then
+			local inRange = CheckInteractDistance(uId, 2)
+			local x, y = GetPlayerMapPosition(uId)
+			if x == 0 and y == 0 then
+				SetMapToCurrentZone()
+				x, y = GetPlayerMapPosition(uId)
+			end
+			if inRange then
+				specWarnDefileNear:Show()
+--				if self.Options.DefileArrow then
+--					DBM.Arrow:ShowRunAway(x, y, 15, 5)
+--				end
+			end
+		end
+	end
+end
+
+function mod:OldTankTrap()
 	warnTrapCast:Show(LKTank)
-	if self.Options.TrapIcon and mod:LatencyCheck() then
+	if self.Options.TrapIcon then
 		self:SetIcon(LKTank, 6, 10)
 	end
 	if LKTank == UnitName("player") then
@@ -167,12 +200,12 @@
 	end
 end
 
-function mod:TrapTarget()
+function mod:OldTrapTarget()
 	local targetname = self:GetBossTarget(36597)
 	if not targetname then return end
 	if targetname ~= LKTank then--If scan doesn't return tank abort other scans and do other warnings.
-		self:UnscheduleMethod("TrapTarget")
-		self:UnscheduleMethod("TankTrap")--Also unschedule tanktrap since we got a scan that returned a non tank.
+		self:UnscheduleMethod("OldTrapTarget")
+		self:UnscheduleMethod("OldTankTrap")--Also unschedule tanktrap since we got a scan that returned a non tank.
 		warnTrapCast:Show(targetname)
 		if self.Options.TrapIcon then
 			self:SetIcon(targetname, 6, 10)
@@ -199,10 +232,10 @@
 			end
 		end
 	else
-		self:UnscheduleMethod("TankTrap")
-		self:ScheduleMethod(1, "TankTrap") --If scan returns tank schedule warnings for tank after all other scans have completed. If none of those scans return another player this will be allowed to fire.
+		self:UnscheduleMethod("OldTankTrap")
+		self:ScheduleMethod(1, "OldTankTrap") --If scan returns tank schedule warnings for tank after all other scans have completed. If none of those scans return another player this will be allowed to fire.
 	end
-end--]]
+end
 
 function mod:SPELL_CAST_START(args)
 	if args:IsSpellID(68981, 74270, 74271, 74272) or args:IsSpellID(72259, 74273, 74274, 74275) then -- Remorseless Winter (phase transition start)
@@ -238,11 +271,28 @@
 		specWarnInfest:Show()
 		timerInfestCD:Start()
 	elseif args:IsSpellID(72762) then -- Defile
+		if self.Options.BypassLatencyCheck then
+			self:ScheduleMethod(0.1, "OldDefileTarget")
+		else
 		self:ScheduleMethod(0.1, "DefileTarget")
+		end
 		warnDefileSoon:Cancel()
 		warnDefileSoon:Schedule(27)
 		timerDefileCD:Start()
 	elseif args:IsSpellID(73539) then -- Shadow Trap (Heroic)
+		timerTrapCD:Start()
+		if self.Options.BypassLatencyCheck then
+			self:ScheduleMethod(0.01, "OldTrapTarget")
+			self:ScheduleMethod(0.02, "OldTrapTarget")
+			self:ScheduleMethod(0.03, "OldTrapTarget")
+			self:ScheduleMethod(0.04, "OldTrapTarget")
+			self:ScheduleMethod(0.05, "OldTrapTarget")
+			self:ScheduleMethod(0.06, "OldTrapTarget")
+			self:ScheduleMethod(0.07, "OldTrapTarget")
+			self:ScheduleMethod(0.08, "OldTrapTarget")
+			self:ScheduleMethod(0.09, "OldTrapTarget")
+			self:ScheduleMethod(0.1, "OldTrapTarget")
+		else
 		self:ScheduleMethod(0.01, "TrapTarget")
 		self:ScheduleMethod(0.02, "TrapTarget")
 		self:ScheduleMethod(0.03, "TrapTarget")
@@ -253,7 +303,7 @@
 		self:ScheduleMethod(0.08, "TrapTarget")
 		self:ScheduleMethod(0.09, "TrapTarget")
 		self:ScheduleMethod(0.1, "TrapTarget")
-		timerTrapCD:Start()
+		end
 	elseif args:IsSpellID(73650) then -- Restore Soul (Heroic)
 		warnRestoreSoul:Show()
 		timerRestoreSoul:Start()
@@ -505,6 +555,7 @@
 			end
 		end
 	elseif msg == "DefileOn" then
+		if not self.Options.BypassLatencyCheck then
 		warnDefileCast:Show(target)
 		if self.Options.DefileIcon then
 			self:SetIcon(target, 8, 10)
@@ -532,7 +583,9 @@
 				end
 			end
 		end
+		end
 	elseif msg == "TrapOn" then
+		if not self.Options.BypassLatencyCheck then
 		warnTrapCast:Show(target)
 		if self.Options.TrapIcon then
 			self:SetIcon(target, 6, 10)
@@ -560,3 +613,4 @@
 		end
 	end
 end
+end

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4306

Old date: 2010-07-05 19:35:24 UTC

@@ -525,6 +525,7 @@
 	ValkyrIcon				= "Set icons on Valkyrs",
 	DefileArrow				= "Show DBM arrow when $spell:72762 is near you",
 	TrapArrow				= "Show DBM arrow when $spell:73539 is near you",
+	BypassLatencyCheck		= "Don't use syncing or latency check for defile/shadow trap/n(only use this if you're having problems otherwise)",
 	AnnounceValkGrabs		= "Announce Val'kyr Shadowguard grab targets to raid chat\n(requires announce to be enabled and promoted status)"
 }

r4306 (Omega): another fr update

Omega — Mon, 05 Jul 2010 19:35:24 GMT

Author: Omega
Date: Mon Jul 05 21:35:24 CEST 2010
Revision: 4306

Log:

another fr update

Updated

trunk/DBM-ChamberOfAspects/localization.fr.lua

Action: modified

Old revision: 4305

Old date: 2010-07-05 19:21:16 UTC

@@ -183,7 +183,7 @@
 L:SetMiscLocalization({
 	MeteorCast				= "Les cieux s'embrasent !",
 	Phase2					= "Vous ne trouverez que souffrance au royaume du crépuscule ! Entrez si vous l'osez !",
-	Phase3					= "I am the light and the darkness! Cower, mortals, before the herald of Deathwing!",--needs translation
+	Phase3					= "Je suis la lumière et l'ombre ! Tremblez, mortels, devant le héraut d'Aile-de-mort !",--needs Verification
 	twilightcutter			= "Les sphères volantes rayonnent d'énergie noire !",
 	YellCombustion			= "Combustion on me!",--needs translation
 	YellConsumption			= "Consumption on me!",--needs translation

r4305 (Omega): Some de and fr local updates to help make halion mod work better on both. fr still needs phase 3 trigger text.

Omega — Mon, 05 Jul 2010 19:21:16 GMT

Author: Omega
Date: Mon Jul 05 21:21:16 CEST 2010
Revision: 4305

Log:

Some de and fr local updates to help make halion mod work better on both. fr still needs phase 3 trigger text.

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Updated

trunk/DBM-ChamberOfAspects/localization.de.lua

Updated

trunk/DBM-ChamberOfAspects/localization.fr.lua

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4304

Old date: 2010-07-05 13:44:46 UTC

@@ -160,17 +160,17 @@
 end
 
 function mod:CHAT_MSG_MONSTER_YELL(msg)
-	if msg:match(L.Phase2) then
+	if msg:find(L.Phase2) then
 		timerFieryBreathCD:Cancel()
 		timerMeteorCD:Cancel()
 --		timerMeteorCast:Cancel()--This one i'm not sure if it cancels or not.
 		warnPhase2:Show()
 		timerTwilightCutterCD:Start(35)
 		timerShadowBreathCD:Start(25)
-	elseif msg:match(L.Phase3) then
+	elseif msg:find(L.Phase3) then
 		warnPhase3:Show()
 		timerMeteorCD:Start(30)
-	elseif msg:match(L.MeteorCast) then--There is no CLEU cast trigger for meteor, only yell
+	elseif msg:find(L.MeteorCast) then--There is no CLEU cast trigger for meteor, only yell
 		if not self.Options.AnnounceAlternatePhase then
 			warningMeteor:Show()
 			timerMeteorCast:Start()--7 seconds from boss yell the meteor impacts.
@@ -183,7 +183,7 @@
 end
 
 function mod:CHAT_MSG_RAID_BOSS_EMOTE(msg)
-	if msg:match(L.twilightcutter) then
+	if msg:find(L.twilightcutter) then
 		if not self.Options.AnnounceAlternatePhase then
 			warningTwilightCutter:Show()
 			timerTwilightCutterCast:Start()

trunk/DBM-ChamberOfAspects/localization.de.lua

Action: modified

Old revision: 4304

Old date: 2010-07-05 13:44:46 UTC

@@ -179,5 +179,11 @@
 })
 
 L:SetMiscLocalization({
-	twilightcutter			= "Die kreisenden Sphären pulsieren vor dunkler Energie!"
+	MeteorCast				= "Die Himmel brennen!",
+	Phase2					= "Ihr werdet im Reich des Zwielichts nur Leid finden! Tretet ein, wenn ihr es wagt!",
+	Phase3					= "Ich bin das Licht und die Dunkelheit!",--partial, message find should find it though.
+	twilightcutter			= "Die kreisenden Sphären pulsieren vor dunkler Energie!",
+	YellCombustion			= "Combustion on me!",--needs translation
+	YellConsumption			= "Consumption on me!",--needs translation
+	Kill					= "Relish this victory, mortals, for it will be your last. This world will burn with the master's return!"--needs translation
 })

trunk/DBM-ChamberOfAspects/localization.fr.lua

Action: modified

Old revision: 4304

Old date: 2010-07-05 13:44:46 UTC

@@ -81,3 +81,111 @@
 	FireWalls		= "Tsunamis de flammes ratés (cet essai): %s"
 })
 
+------------------------
+--  The Ruby Sanctum  --
+------------------------
+--  Baltharus the Warborn  --
+-----------------------------
+L = DBM:GetModLocalization("Baltharus")
+
+L:SetGeneralLocalization({
+	name = "Baltharus the Warborn"
+})
+
+L:SetWarningLocalization({
+	WarningSplitSoon	= "Split soon"
+})
+
+L:SetOptionLocalization({
+	WarningSplitSoon	= "Show pre-warning for Split",
+	RangeFrame			= "Show range frame (12 yards)",
+	SetIconOnBrand		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(74505)
+})
+
+L:SetMiscLocalization({
+})
+
+-------------------------
+--  Saviana Ragefire  --
+-------------------------
+L = DBM:GetModLocalization("Saviana")
+
+L:SetGeneralLocalization({
+	name = "Saviana Ragefire"
+})
+
+L:SetWarningLocalization({
+	SpecialWarningTranq		= "Enrage - Tranq now"
+})
+
+L:SetOptionLocalization({
+	SpecialWarningTranq		= "Show special warning for $spell:78722 (to tranq)",
+	RangeFrame				= "Show range frame (10 yards)",
+	BeaconIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(74453)
+})
+
+L:SetMiscLocalization{
+}
+
+--------------------------
+--  General Zarithrian  --
+--------------------------
+L = DBM:GetModLocalization("Zarithrian")
+
+L:SetGeneralLocalization({
+	name = "General Zarithrian"
+})
+
+L:SetWarningLocalization({
+	WarnAdds	= "New adds",
+	warnCleaveArmor	= "%s on >%s< (%s)"		-- Cleave Armor on >args.destName< (args.amount)
+})
+
+L:SetTimerLocalization({
+	TimerAdds	= "New adds"
+})
+
+L:SetOptionLocalization({
+	WarnAdds		= "Announce new adds",
+	TimerAdds		= "Show timer for new adds",
+	warnCleaveArmor	= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(74367, GetSpellInfo(74367) or "unknown")
+})
+
+L:SetMiscLocalization({
+	SummonMinions	= "Turn them to ash, minions!"--needs translation
+})
+
+-------------------------------------
+--  Halion the Twilight Destroyer  --
+-------------------------------------
+L = DBM:GetModLocalization("Halion")
+
+L:SetGeneralLocalization({
+	name = "Halion the Twilight Destroyer"
+})
+
+L:SetWarningLocalization({
+	WarnPhase2Soon		= "Phase 2 soon",
+	WarnPhase3Soon		= "Phase 3 soon",
+	TwilightCutterCast	= "Casting Twilight Cutter: 5 sec"
+})
+
+L:SetOptionLocalization({
+	WarnPhase2Soon			= "Show pre-warning for Phase 2 (at ~79%)",
+	WarnPhase3Soon			= "Show pre-warning for Phase 3 (at ~54%)",
+	TwilightCutterCast		= "Show warning when $spell:77844 is being cast",
+	AnnounceAlternatePhase	= "Show warnings/timers for phase you aren't in as well",
+	SoundOnConsumption		= "Play sound on $spell:74562 or $spell:74792",--We use localized text for these functions
+	SetIconOnConsumption	= "Set icons on $spell:74562 or $spell:74792 targets",--So we can use single functions for both versions of spell.
+	YellOnConsumption		= "Yell on $spell:74562 or $spell:74792"
+})
+
+L:SetMiscLocalization({
+	MeteorCast				= "Les cieux s'embrasent !",
+	Phase2					= "Vous ne trouverez que souffrance au royaume du crépuscule ! Entrez si vous l'osez !",
+	Phase3					= "I am the light and the darkness! Cower, mortals, before the herald of Deathwing!",--needs translation
+	twilightcutter			= "Les sphères volantes rayonnent d'énergie noire !",
+	YellCombustion			= "Combustion on me!",--needs translation
+	YellConsumption			= "Consumption on me!",--needs translation
+	Kill					= "Relish this victory, mortals, for it will be your last. This world will burn with the master's return!"--needs translation
+})
\ No newline at end of file

r4304 (Azael): zhtw update

Azael — Mon, 05 Jul 2010 13:44:46 GMT

Author: Azael
Date: Mon Jul 05 15:44:46 CEST 2010
Revision: 4304

Log:

zhtw update

Updated

trunk/DBM-Core/localization.tw.lua

Action: modified

Old revision: 4303

Old date: 2010-07-05 13:37:32 UTC

@@ -78,8 +78,8 @@
 	"/dbm version：進行團隊範圍內的版本檢測（也可使用：ver）。",
 	"/dbm unlock：顯示一個可移動的計時器（也可使用：move）。",
 	"/dbm timer  <文字>：開始一個以<文字>為名稱的時間為秒的計時器。",
-	"/dbm broadcast timer  <文字>：向團隊廣播一個以<文字>為名稱，時間為秒的計時器（需要團隊隊長或助理權限）。",
-	"/dbm break <分鐘>: 開始休息計時器<分鐘>。向所有團隊成員發送一個DBM休息計時器（需要團隊隊長或助理權限）。",
+	"/dbm broadcast timer  <文字>：向團隊廣播一個以<文字>為名稱，時間為秒的計時器（需開啟團隊廣播及助理權限）。",
+	"/dbm break <分鐘>: 開始休息計時器<分鐘>。向所有團隊成員發送一個DBM休息計時器（需開啟團隊廣播及助理權限）。",
 	"/dbm help：顯示可用命令的說明。",
 }
 
@@ -181,7 +181,7 @@
 
 DBM_ARROW_MOVABLE				= "可移動箭頭"
 
-DBM_ARROW_NO_RAIDGROUP				= "此功能只能作用於團隊及處身團隊副本中。"
+DBM_ARROW_NO_RAIDGROUP				= "此功能僅作用於團隊副本中的團隊小隊。"
 DBM_ARROW_ERROR_USAGE	= {
 	"DBM-Arrow 用法:",
 	"/dbm arrow    建立一個箭頭在特定的位置(0 < x/y < 100)",

r4303 (bluenyx): koKR update

bluenyx — Mon, 05 Jul 2010 13:37:32 GMT

Author: bluenyx
Date: Mon Jul 05 15:37:32 CEST 2010
Revision: 4303

Log:

koKR update

Updated

trunk/DBM-ChamberOfAspects/localization.kr.lua

Updated

trunk/DBM-Icecrown/localization.kr.lua

trunk/DBM-ChamberOfAspects/localization.kr.lua

Action: modified

Old revision: 4302

Old date: 2010-07-05 13:32:08 UTC

@@ -115,7 +115,6 @@
 })
 
 L:SetMiscLocalization({
-	SplitTrigger		= "고통이 두 배면, 재미가 반이지."
 })
 
 
@@ -129,7 +128,7 @@
 })
 
 L:SetWarningLocalization({
-	SpecialWarningTranq		= "격노 - 지금 마취!"
+	SpecialWarningTranq		= "격노 - 지금 평정!"
 })
 
 L:SetOptionLocalization({

trunk/DBM-Icecrown/localization.kr.lua

Action: modified

Old revision: 4302

Old date: 2010-07-05 13:32:08 UTC

@@ -281,7 +281,6 @@
 	RangeFrame					= "거리 프레임 보기 (8 미터)",	
 	WarnUnstableOoze			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(69558, GetSpellInfo(69558) or "알 수 없음"),	
 	InfectionIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(71224),
-	ExplosionIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69839),
 	TankArrow					= "큰 수액괴물 탱커 방향 DBM 화살표 보기(테스트)"
 }

r4302 (Azael): zhtw update

Azael — Mon, 05 Jul 2010 13:32:08 GMT

Author: Azael
Date: Mon Jul 05 15:32:08 CEST 2010
Revision: 4302

Log:

zhtw update

Updated

trunk/DBM-ChamberOfAspects/localization.tw.lua

Updated

trunk/DBM-GUI/localization.tw.lua

Updated

trunk/DBM-Icecrown/localization.tw.lua

Updated

trunk/DBM-Party-WotLK/DBM-Party-WotLK.toc

Updated

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

Updated

trunk/DBM-Ulduar/localization.tw.lua

Updated

trunk/DBM-WorldEvents/localization.tw.lua

trunk/DBM-ChamberOfAspects/localization.tw.lua

Action: modified

Old revision: 4301

Old date: 2010-07-05 11:25:28 UTC

@@ -91,16 +91,16 @@
 L = DBM:GetModLocalization("Baltharus")
 
 L:SetGeneralLocalization({
-	name = "『戰爭之子』巴爾薩拉斯"
+	name 			= "『戰爭之子』巴爾薩魯斯"
 })
 
 L:SetWarningLocalization({
-	WarningSplitSoon	= "即將分裂"
+	WarningSplitSoon	= "分裂 即將到來"
 })
 
 L:SetOptionLocalization({
-	WarningSplitSoon	= "為分裂顯示預警",
-	RangeFrame			= "顯示距離框體（12碼）",
+	WarningSplitSoon	= "為分裂顯示預先警告",
+	RangeFrame		= "顯示距離框 (12碼)",
 	SetIconOnBrand		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(74505)
 })
 
@@ -114,24 +114,20 @@
 L = DBM:GetModLocalization("Saviana")
 
 L:SetGeneralLocalization({
-	name = "『怒火』薩維安娜"
+	name 			= "薩薇安娜‧怒焰"
 })
 
 L:SetWarningLocalization({
-	specWarnConflagNear		= "焚焰於你附近 - 注意",
-	SpecialWarningTranq		= "激怒 - 現在寧神"
+	SpecialWarningTranq	= "狂怒 - 現在寧神射擊"
 })
 
 L:SetOptionLocalization({
-	specWarnConflagNear		= "當$spell:74452在你附近時顯示特殊警報",
-	SpecialWarningTranq		= "為激怒顯示特殊警報",--$spell:78722 is not in 3.3.3 game files, it cannot be added in to local until 3.3.5
-	YellOnConflag			= "被$spell:74452時大喊",
-	RangeFrame				= "顯示距離框體（10碼）",
-	ConflagIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(74452)
+	SpecialWarningTranq	= "為狂怒顯示特別警告 (寧神用)",
+	RangeFrame		= "顯示距離框 (10碼)",
+	BeaconIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(74453)
 })
 
 L:SetMiscLocalization{
-	YellConflag				= "焚焰於我！"
 }
 
 --------------------------
@@ -140,11 +136,12 @@
 L = DBM:GetModLocalization("Zarithrian")
 
 L:SetGeneralLocalization({
-	name = "扎瑞斯萊恩將軍"
+	name 			= "扎里斯利安將軍"
 })
 
 L:SetWarningLocalization({
-	WarnAdds	= "新的小怪"
+	WarnAdds		= "新的小怪",
+	warnCleaveArmor		= "%s 在 >%s< (%s)"	-- Cleave Armor on >args.destName< (args.amount)
 })
 
 L:SetTimerLocalization({
@@ -153,7 +150,8 @@
 
 L:SetOptionLocalization({
 	WarnAdds		= "提示新的小怪",
-	TimerAdds		= "為新的小怪顯示計時條"
+	TimerAdds		= "為新的小怪顯示計時器",
+	warnCleaveArmor		= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(74367, GetSpellInfo(74367) or "unknown")
 })
 
 L:SetMiscLocalization({
@@ -170,23 +168,27 @@
 })
 
 L:SetWarningLocalization({
-	WarnPhase2Soon		= "即將第二階段",
-	WarnPhase3Soon		= "即將第三階段"
+	WarnPhase2Soon		= "第二階段 即將到來",
+	WarnPhase3Soon		= "第三階段 即將到來",
+	TwilightCutterCast	= "施放暮光切割: 5秒後"
 })
 
 L:SetOptionLocalization({
-	WarnPhase2Soon			= "為第二階段顯示預警（在79%時）",
-	WarnPhase3Soon			= "為第三階段顯示預警（在54%時）",
-	SoundOnConsumption		= "當$spell:74562或$spell:74792的目標為自己時播放聲音",
-	YellOnConsumption		= "當$spell:74562或$spell:74792的目標為自己時大喊",
-	SetIconOnConsumption	= "對$spell:74562和$spell:74792的目標設置團隊標記"
+	WarnPhase2Soon		= "為第二階段顯示預先警告 (大約79%)",
+	WarnPhase3Soon		= "為第三階段顯示預先警告 (大約54%)",
+	TwilightCutterCast	= "當$spell:77844開始施放時顯示警告",
+	AnnounceAlternatePhase	= "不管你進不進下一階段一樣顯示警告/計時器",
+	SoundOnConsumption	= "為$spell:74562或$spell:74792播放音效",--We use localized text for these functions
+	SetIconOnConsumption	= "為$spell:74562或$spell:74792的目標設置標記",--So we can use single functions for both versions of spell.
+	YellOnConsumption	= "當你中了$spell:74562或$spell:74792時大喊"
 })
 
 L:SetMiscLocalization({
-	YellPull				= "你們的世界在滅亡的邊緣搖搖欲墜。你們接下來全都會見證這個毀滅新紀元的來臨!",
+	MeteorCast		= "天堂也將燃燒!",
+	Phase2			= "在暮光的國度只有磨難在等著你!有膽量的話就進去吧!",
+	Phase3			= "我是光明亦是黑暗!凡人，匍匐在死亡之翼的信使面前吧!",
 	twilightcutter			= "這些環繞的球體散發著黑暗能量!",
-	phase2					= "在暮光的國度只有磨難在等著你!有膽量的話就進去吧!",
-	phase3					= "我是光明亦是黑暗!凡人，匍匐在死亡之翼的信使面前吧!",
-	YellCombustion			= "熾熱燃灼於我！",
-	YellConsumption			= "靈魂耗損於我！"
+	YellCombustion		= "我中了熾熱燃灼!",
+	YellConsumption		= "我中了靈魂耗損!",
+	Kill			= "Relish this victory, mortals, for it will be your last. This world will burn with the master's return!"
 })
\ No newline at end of file

trunk/DBM-GUI/localization.tw.lua

Action: modified

Old revision: 4301

Old date: 2010-07-05 11:25:28 UTC

@@ -49,7 +49,8 @@
 L.EnableStatus 				= "回復“status”密語"
 L.AutoRespond 				= "啟用戰鬥中自動密語回復"
 L.EnableMiniMapIcon			= "顯示小地圖圖示"
-L.FixCLEUOnCombatStart			= "當戰鬥開始時嘗試修復戰鬥記錄"
+L.FixCLEUOnCombatStart			= "清除戰鬥紀錄的快取"
+L.Latency_Text				= "設定最高延遲同步門檻: %d"
 
 L.Button_RangeFrame			= "顯示/隱藏距離監視器"
 L.Button_TestBars			= "測試計時條"

trunk/DBM-Icecrown/localization.tw.lua

Action: modified

Old revision: 4301

Old date: 2010-07-05 11:25:28 UTC

@@ -12,11 +12,11 @@
 }
 
 L:SetWarningLocalization{
-	specWarnTrap			= "陷阱激活! - 亡縛守衛釋放了"
+	specWarnTrap			= "觸發陷阱! - 亡縛守衛被釋放了"
 }
 
 L:SetOptionLocalization{
-	specWarnTrap			= "為陷阱激活顯示預先警告",
+	specWarnTrap			= "當觸發陷阱時顯示特別警告",
 	SetIconOnDarkReckoning		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69483),
 	SetIconOnDeathPlague		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(72865)
 }
@@ -38,11 +38,11 @@
 
 L:SetWarningLocalization{
 	warnMortalWound			= "%s: >%s< (%s)",
-	specWarnTrap			= "陷阱激活! - 復仇的血肉收割者即將到來"
+	specWarnTrap			= "觸發陷阱! - 復仇的血肉收割者 到來"
 }
 
 L:SetOptionLocalization{
-	specWarnTrap			= "為陷阱激活顯示預先警告",
+	specWarnTrap			= "當觸發陷阱時顯示特別警告",
 	warnMortalWound			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(71127, GetSpellInfo(71127) or "unknown")
 }
 
@@ -248,7 +248,7 @@
 	RangeFrame			= "顯示距離框 (8碼)",
 	WarnGastricBloat		= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(72551, GetSpellInfo(72551) or "unknown"),
 	SetIconOnGasSpore		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69279),
-	AnnounceSporeIcons		= "公佈$spell:69279目標設置的標記到團隊頻道\n(需要開啟警告及團隊隊長或助理權限)"
+	AnnounceSporeIcons		= "公佈$spell:69279目標設置的標記到團隊頻道\n(需開啟團隊廣播及助理權限)"
 }
 
 L:SetMiscLocalization{
@@ -278,9 +278,9 @@
 	NextPoisonSlimePipes		= "為下一次劇毒軟泥管顯示計時器",
 	WarnOozeSpawn			= "為小軟泥的出現顯示警告",
 	specWarnLittleOoze		= "當你被小軟泥怪盯上時顯示特別警告",
+	RangeFrame			= "顯示距離框 (8碼)",
 	WarnUnstableOoze		= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(69558, GetSpellInfo(69558) or "unknown"),
 	InfectionIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(71224),
-	ExplosionIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69839),
 	TankArrow			= "為大軟泥怪副坦顯示DBM箭頭 (測試中)"
 }
 
@@ -311,8 +311,8 @@
 L:SetOptionLocalization{
 	WarnPhase2Soon			= "為第2階段顯示預先警告 (大約83%)",
 	WarnPhase3Soon			= "為第3階段顯示預先警告 (大約38%)",
-	specWarnMalleableGoo		= "當你中了延展黏液時顯示特別警告(只在你是第一個目標時有用)",
-	specWarnMalleableGooNear	= "當你附近有人中了延展黏液時顯示特別警告\n(只在你附近的人是第一個目標時有用)",
+	specWarnMalleableGoo		= "當你是$spell:72295第一個目標時顯示特別警告",
+	specWarnMalleableGooNear	= "當你是附近$spell:72295第一個目標時顯示特別警告",
 	WarnMutatedPlague		= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(72451, GetSpellInfo(72451) or "unknown"),
 	OozeAdhesiveIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(70447),
 	GaseousBloatIcon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(70672),
@@ -466,11 +466,11 @@
 	warnInstability			= "為你的$spell:69766堆疊顯示警告",
 	warnChilledtotheBone		= "為你的$spell:70106堆疊顯示警告",
 	warnMysticBuffet		= "為你的$spell:70128堆疊顯示警告",
-	AnnounceFrostBeaconIcons	= "公佈$spell:70126目標設置的標記到團隊頻道\n(需要團隊隊長或助理權限)",
+	AnnounceFrostBeaconIcons	= "公佈$spell:70126目標設置的標記到團隊頻道\n(需開啟團隊廣播及助理權限)",
 	SetIconOnFrostBeacon		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(70126),
 	SetIconOnUnchainedMagic		= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69762),
 	ClearIconsOnAirphase		= "空中階段前清除所有標記",
-	RangeFrame			= "顯示距離框 (普通10碼, 困難20碼) (只會顯示已標記的玩家)"
+	RangeFrame			= "顯示距離框 (普通10碼, 困難20碼)"
 }
 
 L:SetMiscLocalization{
@@ -529,7 +529,8 @@
 	TrapIcon			= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(73539),
 	ValkyrIcon			= "為華爾琪影衛設置標記",
 	DefileArrow			= "當你附近的人中了$spell:72762時顯示DBM箭頭",
-	TrapArrow			= "當你附近的人中了$spell:73539時顯示DBM箭頭"
+	TrapArrow			= "當你附近的人中了$spell:73539時顯示DBM箭頭",
+	AnnounceValkGrabs		= "提示誰被華爾琪影衛抓住到團隊頻道\n(需開啟團隊廣播及助理權限)"
 }
 
 L:SetMiscLocalization{
@@ -538,5 +539,7 @@
 	YellTrap			= "我中了暗影陷阱!",
 	YellKill			= "沒有問題尚未解答。沒有任何懷疑。你們就是艾澤拉斯最偉大的勇士。你們克服了每一個我所設下的考驗。我最強大的僕人們都在你們不屈不撓的猛攻中倒下…在你們奔放的怒火之中…",
 	LKRoleplay			= "你們的原動力真的是正義感嗎？我很懷疑……",
-	PlagueWhisper			= "你染上了"
+	PlagueWhisper			= "你染上了",
+	ValkGrabbedIcon			= "華爾琪影衛{rt%d}抓住了 %s",
+	ValkGrabbed			= "華爾琪影衛抓住了 %s"
 }
\ No newline at end of file

trunk/DBM-Party-WotLK/DBM-Party-WotLK.toc

Action: modified

Old revision: 4301

Old date: 2010-07-05 11:25:28 UTC

@@ -15,7 +15,7 @@
 ## X-DBM-Mod-SubCategories-frFR: Ahn'Kahet,Azjol-Nérub,GT: L'Épuration de Stratholme,Drak'Tharon,Gundrak,Salles de foudre,Salles de pierre,Le Nexus,L'Occulus,Donjon d'Utgarde,Cime d'Utgarde,Fort Pourpre,L'épreuve du champion,La Forge des âmes,La Fosse de Saron,Salles des Reflets
 ## X-DBM-Mod-SubCategories-deDE: Ahn'kahet,Azjol-Nerub,HdZ: Stratholme,Drak'Tharon,Gundrak,Die Hallen der Blitze,Die Hallen des Steins,Der Nexus,Das Oculus,Burg Utgarde,Turm Utgarde,Die Violette Festung,Prüfung des Champions,Die Seelenschmiede,Grube von Saron,Hallen der Reflexion
 ## X-DBM-Mod-SubCategories-ruRU: Ан'кахет,Азжол-Неруб,Очищение Стратхольма,Крепость Драк'Тарон,Гундрак,Чертоги Молний,Чертоги Камня,Нексус,Окулус,Крепость Утгард,Вершина Утгард,Аметистовая крепость,Испытание чемпиона,Кузня Душ,Яма Сарона,Залы Отражений
-## X-DBM-Mod-SubCategories-zhTW: 安卡罕特,阿茲歐-奈幽,舊斯坦索姆,德拉克薩隆要塞,剛德拉克,雷光大廳,石之大廳,奧核之心,奧核之眼,俄特加德要塞,俄特加德之巔,紫羅蘭堡,勇士試煉,眾魂熔爐,薩倫之淵,倒影大廳,世界事件
+## X-DBM-Mod-SubCategories-zhTW: 安卡罕特,阿茲歐-奈幽,舊斯坦索姆,德拉克薩隆要塞,剛德拉克,雷光大廳,石之大廳,奧核之心,奧核之眼,俄特加德要塞,俄特加德之巔,紫羅蘭堡,勇士試煉,眾魂熔爐,薩倫之淵,倒影大廳
 ## X-DBM-Mod-SubCategories-koKR: 안카헤트: 고대 왕국,아졸네룹,시간의 동굴: 옛 스트라솔름,드락타론 성채,군드락,번개의 전당,돌의 전당,마력의 탑,마력의 눈,우트가드 성채,우트가드 첨탑,보랏빛 요새,용사의 시험장,영혼의 제련소,사론의 구덩이,투영의 전당
 ## X-DBM-Mod-SubCategories-esES: Ahn'Kahlet,Azjol-Nerub,CoT: La Matanza de Stratholme,Fortaleza de Drak'Tharon,Gundrak,Cámaras de Relámpagos,Camaras de Piedra,El Nexo,El Oculus,Fortaleza de Utgarde,Pinaculo de Utgarde,Bastion Violeta,Prueba del Campeón,La Forja de Almas,Foso de Saron,Cámaras de Reflexión
 ## X-DBM-Mod-SubCategories-esMX: Ahn'Kahlet,Azjol-Nerub,CoT: La Matanza de Stratholme,Fortaleza de Drak'Tharon,Gundrak,Cámaras de Relámpagos,Camaras de Piedra,El Nexo,El Oculus,Fortaleza de Utgarde,Pinaculo de Utgarde,Bastion Violeta,Prueba del Campeón,La Forja de Almas,Foso de Saron,Cámaras de Reflexión

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

Action: modified

Old revision: 4301

Old date: 2010-07-05 11:25:28 UTC

@@ -1158,12 +1158,18 @@
 	warnExplode			= "食屍鬼爆炸 - 快跑開"
 })
 
+L:SetTimerLocalization{
+	TimerCombatStart	= "戰鬥開始"
+}
+
 L:SetOptionLocalization({
+	TimerCombatStart		= "為戰鬥開始顯示計時器",
 	warnExplode				= "當食屍鬼爪牙即將自我爆炸時警告",
 	SetIconOnMarkedTarget	= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(67823)
 })
 
 L:SetMiscLocalization({
+	Pull			= "幹得好。今天，你已證明了你自己-",
 	YellCombatEnd	= "恭喜你，勇士們。儘管試煉隱藏著許多不安的變數，但你們仍然通過了考驗。"	-- can also be "No! I must not fail... again ..."
 })

trunk/DBM-Ulduar/localization.tw.lua

Action: modified

Old revision: 4301

Old date: 2010-07-05 11:25:28 UTC

@@ -437,7 +437,8 @@
 	SpecialWarningLLNear		= "當你附近的人中了$spell:63276時顯示特別警告",
 	YellOnLifeLeech			= "當你中了$spell:63276時大喊",
 	YellOnShadowCrash		= "當你中了$spell:62660時大喊",
-	hardmodeSpawn			= "為薩倫聚惡體出現顯示計時器 (困難模式)"
+	hardmodeSpawn			= "為薩倫聚惡體出現顯示計時器 (困難模式)",
+	CrashArrow			= "當你附近的人中了$spell:62660時顯示DBM箭頭"
 }
 
 L:SetMiscLocalization{

trunk/DBM-WorldEvents/localization.tw.lua

Action: modified

Old revision: 4301

Old date: 2010-07-05 11:25:28 UTC

@@ -76,3 +76,37 @@
 L:SetMiscLocalization({
 	SayCombatStart		= "他們有告訴你我是誰還有我為什麼這麼做嗎?"
 })
+
+-------------
+--  Ahune  --
+-------------
+L = DBM:GetModLocalization("Ahune")
+
+L:SetGeneralLocalization({
+	name 			= "艾胡恩"
+})
+
+L:SetWarningLocalization({
+	Submerged		= "艾胡恩已隱沒",
+	Emerged			= "艾胡恩已現身",
+	specWarnAttack		= "艾胡恩擁有易傷 - 現在攻擊!"
+})
+
+L:SetTimerLocalization({
+	SubmergTimer		= "隱沒",
+	EmergeTimer		= "現身",
+	TimerCombat		= "戰鬥開始"
+})
+
+L:SetOptionLocalization({
+	Submerged		= "當艾胡恩隱沒時顯示警告",
+	Emerged			= "當艾胡恩現身時顯示警告",
+	specWarnAttack		= "當艾胡恩擁有易傷時顯示特別警告",
+	SubmergTimer		= "為隱沒顯示計時器",
+	EmergeTimer		= "為現身顯示計時器",
+	TimerCombat		= "為戰鬥開始顯示計時器"
+})
+
+L:SetMiscLocalization({
+	Pull			= "冰石已經溶化了!"
+})
\ No newline at end of file

r4301 (Snamor): #Ruby Sanctum/All: esES update #ICC/All: esES update

Snamor — Mon, 05 Jul 2010 11:25:28 GMT

Author: Snamor
Date: Mon Jul 05 13:25:28 CEST 2010
Revision: 4301

Log:

#Ruby Sanctum/All: esES update
#ICC/All: esES update

Updated

trunk/DBM-ChamberOfAspects/localization.es.lua

Updated

trunk/DBM-Icecrown/localization.es.lua

trunk/DBM-ChamberOfAspects/localization.es.lua

Action: modified

Old revision: 4300

Old date: 2010-07-05 04:56:21 UTC

@@ -108,7 +108,6 @@
 })
 
 L:SetMiscLocalization({
-	SplitTrigger		= "El doble de dolor y la mitad de diversión."
 })
 
 -------------------------

trunk/DBM-Icecrown/localization.es.lua

Action: modified

Old revision: 4300

Old date: 2010-07-05 04:56:21 UTC

@@ -289,7 +289,6 @@
 	RangeFrame					= "Mostrar distancia (8 yardas)",
 	WarnUnstableOoze			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(69558, GetSpellInfo(69558) or "unknown"),
 	InfectionIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(71224),
-	ExplosionIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69839),
 	TankArrow					= "Mostrar flecha hacia el tanque del Moco grande (Experimental)"
 }

r4300 (Vampik): ruRU update

Vampik — Mon, 05 Jul 2010 04:56:21 GMT

Author: Vampik
Date: Mon Jul 05 06:56:21 CEST 2010
Revision: 4300

Log:

ruRU update

Updated

trunk/DBM-ChamberOfAspects/localization.ru.lua

Updated

trunk/DBM-Icecrown/localization.ru.lua

trunk/DBM-ChamberOfAspects/localization.ru.lua

Action: modified

Old revision: 4299

Old date: 2010-07-05 04:51:08 UTC

@@ -105,7 +105,6 @@
 })
 
 L:SetMiscLocalization({
-	SplitTrigger		= "Вдвое сильнее страдание."
 })
 
 -------------------------

trunk/DBM-Icecrown/localization.ru.lua

Action: modified

Old revision: 4299

Old date: 2010-07-05 04:51:08 UTC

@@ -280,7 +280,6 @@
 	RangeFrame					= "Показывать окно проверки дистанции (8 м)",
 	WarnUnstableOoze			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(69558, GetSpellInfo(69558) or "unknown"),
 	InfectionIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(71224),
-	ExplosionIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69839),
 	TankArrow					= "Показывать стрелку для кайтера Большого слизнюка (экспериментально)"
 }

r4299 (Omega): removed unused locals

Omega — Mon, 05 Jul 2010 04:51:08 GMT

Author: Omega
Date: Mon Jul 05 06:51:08 CEST 2010
Revision: 4299

Log:

removed unused locals

Updated

trunk/DBM-ChamberOfAspects/localization.en.lua

Updated

trunk/DBM-Icecrown/localization.en.lua

trunk/DBM-ChamberOfAspects/localization.en.lua

Action: modified

Old revision: 4298

Old date: 2010-07-05 04:45:44 UTC

@@ -103,7 +103,6 @@
 })
 
 L:SetMiscLocalization({
-	SplitTrigger		= "Twice the Pain and half the fun."
 })
 
 -------------------------

trunk/DBM-Icecrown/localization.en.lua

Action: modified

Old revision: 4298

Old date: 2010-07-05 04:45:44 UTC

@@ -278,7 +278,6 @@
 	RangeFrame					= "Show range frame (8 yards)",
 	WarnUnstableOoze			= DBM_CORE_AUTO_ANNOUNCE_OPTIONS.spell:format(69558, GetSpellInfo(69558) or "unknown"),
 	InfectionIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(71224),
-	ExplosionIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(69839),
 	TankArrow					= "Show DBM arrow for Big Ooze kiter (Experimental)"
 }

r4298 (Omega): remove icon setting on big ooze right before it explodes, it didn't work and was never really useful anwyays.

Omega — Mon, 05 Jul 2010 04:45:44 GMT

Author: Omega
Date: Mon Jul 05 06:45:44 CEST 2010
Revision: 4298

Log:

remove icon setting on big ooze right before it explodes, it didn't work and was never really useful anwyays.
commented out blazing icon for now since that doesn't work either.

Updated

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Updated

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

trunk/DBM-Icecrown/FrostwingHalls/Valithria.lua

Action: modified

Old revision: 4297

Old date: 2010-07-05 03:11:47 UTC

@@ -3,7 +3,7 @@
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(36789)
-mod:SetUsedIcons(8)
+--mod:SetUsedIcons(8)
 mod:RegisterCombat("yell", L.YellPull)
 mod:RegisterKill("yell", L.YellKill)
 
@@ -38,7 +38,7 @@
 
 local berserkTimer		= mod:NewBerserkTimer(420)
 
-mod:AddBoolOption("SetIconOnBlazingSkeleton", true)
+--mod:AddBoolOption("SetIconOnBlazingSkeleton", true)
 
 local GutSprayTargets = {}
 local spamSupression = 0
@@ -82,14 +82,14 @@
 	self:UnscheduleMethod("Portals")
 	self:ScheduleMethod(46.5, "Portals")
 end
-
+--[[
 function mod:SPELL_CAST_START(args)
 	if args:IsSpellID(70754, 71748, 72023, 72024) then--Fireball (its the first spell Blazing SKeleton's cast upon spawning)
 		if self.Options.SetIconOnBlazingSkeleton then
 			self:SetIcon(args.sourceGUID, 8)
 		end
 	end
-end
+end--]]
 
 function mod:SPELL_CAST_SUCCESS(args)
 	if args:IsSpellID(71741) then--Mana Void

trunk/DBM-Icecrown/ThePlagueworks/Rotface.lua

Action: modified

Old revision: 4297

Old date: 2010-07-05 03:11:47 UTC

@@ -3,7 +3,7 @@
 
 mod:SetRevision(("$Revision$"):sub(12, -3))
 mod:SetCreatureID(36627)
-mod:SetUsedIcons(6, 7, 8)
+mod:SetUsedIcons(6, 7)
 mod:RegisterCombat("combat")
 
 mod:RegisterEvents(
@@ -48,7 +48,6 @@
 local soundMutatedInfection		= mod:NewSound(71224)
 mod:AddBoolOption("RangeFrame", mod:IsRanged())
 mod:AddBoolOption("InfectionIcon", true)
-mod:AddBoolOption("ExplosionIcon", false)
 mod:AddBoolOption("TankArrow")
 
 local RFVileGasTargets	= {}
@@ -114,11 +113,6 @@
 		warnRadiatingOoze:Show()
 	elseif args:IsSpellID(69558) then
 		warnUnstableOoze:Show(args.spellName, args.destName, args.amount or 1)
-		if (args.amount or 1) >= 5 then	--It's about to blow
-			if self.Options.ExplosionIcon then
-				self:SetIcon(args.destName, 8, 8)
-			end
-		end
 	elseif args:IsSpellID(69674, 71224, 73022, 73023) then
 		warnMutatedInfection:Show(args.destName)
 		timerMutatedInfection:Start(args.destName)

r4297 (Omega): don't register spell cast success, it's not used

Omega — Mon, 05 Jul 2010 03:11:47 GMT

Author: Omega
Date: Mon Jul 05 05:11:47 CEST 2010
Revision: 4297

Log:

don't register spell cast success, it's not used

Updated

trunk/DBM-ChamberOfAspects/Ruby/Baltharus.lua

Action: modified

Old revision: 4296

Old date: 2010-07-05 03:10:32 UTC

@@ -9,7 +9,6 @@
 
 mod:RegisterEvents(
 	"SPELL_CAST_START",
-	"SPELL_CAST_SUCCESS",
 	"SPELL_AURA_APPLIED",
 	"UNIT_HEALTH"
 )

r4296 (Omega): bah missed a timer.

Omega — Mon, 05 Jul 2010 03:10:32 GMT

Author: Omega
Date: Mon Jul 05 05:10:32 CEST 2010
Revision: 4296

Log:

bah missed a timer.

Updated

trunk/DBM-ChamberOfAspects/Ruby/Baltharus.lua

Action: modified

Old revision: 4295

Old date: 2010-07-05 03:09:37 UTC

@@ -41,7 +41,6 @@
 end
 
 function mod:OnCombatStart(delay)
-	timerWhirlwindCD:Start(15.5-delay)--need more pulls to verify consistency
 	warnedSplit1 = false
 	warnedSplit2 = false
 	warnedSplit3 = false

r4295 (Omega): #Ruby/Baltharus: Rest of baltharus whirlwind updates

Omega — Mon, 05 Jul 2010 03:09:37 GMT

Author: Omega
Date: Mon Jul 05 05:09:37 CEST 2010
Revision: 4295

Log:

#Ruby/Baltharus: Rest of baltharus whirlwind updates

Updated

trunk/DBM-ChamberOfAspects/Ruby/Baltharus.lua

Action: modified

Old revision: 4294

Old date: 2010-07-05 02:48:15 UTC

@@ -16,12 +16,13 @@
 
 local warningSplitSoon		= mod:NewAnnounce("WarningSplitSoon", 2)
 local warningRepellingWave	= mod:NewSpellAnnounce(74509, 3)
+local warnWhirlwind			= mod:NewSpellAnnounce(75125, 3, nil, mod:IsTank() or mod:IsHealer())
 local warningWarnBrand		= mod:NewTargetAnnounce(74505, 4)
 
 local specWarnBrand			= mod:NewSpecialWarningYou(74505)
+local specWarnRepellingWave	= mod:NewSpecialWarningSpell(74509)
 
-local timerWhirlwindCD		= mod:NewCDTimer(22, 75125)
-local timerWhirlwind		= mod:NewBuffActiveTimer(4, 75125)
+local timerWhirlwind		= mod:NewBuffActiveTimer(4, 75125, nil, mod:IsTank() or mod:IsHealer())
 local timerRepellingWave	= mod:NewBuffActiveTimer(4, 74509)--1 second cast + 3 second stun
 local timerBrand			= mod:NewBuffActiveTimer(10, 74505)
 
@@ -60,32 +61,15 @@
 function mod:SPELL_CAST_START(args)
 	if args:IsSpellID(74509) then
 		warningRepellingWave:Show()
+		specWarnRepellingWave:Show()
 		timerRepellingWave:Show()
 	end
 end
 
---[[function mod:SPELL_CAST_SUCCESS(args)--Use spell cast success if aura apply is bad from hoping.
-	if args:IsSpellID(74505) then
-		brandTargets[#brandTargets + 1] = args.destName
-		timerBrand:Show(args.destName)
-		if args:IsPlayer() then
-			specWarnBrand:Show()
-		end
-		if self.Options.SetIconOnBrand then
-			self:SetIcon(args.destName, brandIcon, 10)
-			brandIcon = brandIcon - 1
-		end
-		self:Unschedule(showBrandWarning)
-		self:Schedule(0.3, showBrandWarning)
-	end
-end--]]
-
 function mod:SPELL_AURA_APPLIED(args)
-	if args:IsSpellID(75125) and args:GetSrcCreatureID() == 39751 then --(Ignore bladestorm from the clone. Only show from original since clone SHOULD be pulled out.)
-		specWarnWhirlwind:Show()
-		timerWhirlwindCD:Start()
+	if args:IsSpellID(75125) then
+		warnWhirlwind:Show()
 		timerWhirlwind:Show()
-		soundWhirlwind:Play()
 	elseif args:IsSpellID(74505) then
 		brandTargets[#brandTargets + 1] = args.destName
 		if args:IsPlayer() then
@@ -93,7 +77,7 @@
 			timerBrand:Show()
 		end
 		if self.Options.SetIconOnBrand then
-			if 	brandIcon < 1 then	--Icons are gonna be crazy on this fight if people don't control jumps, we will use ALL of them and only reset icons if we run out of them
+			if 	brandIcon < 1 then
 				brandIcon = 8
 			end
 			self:SetIcon(args.destName, brandIcon, 10)

r4294 (Omega): #Ruby/Baltharus: removed special warning and run away sound for whirlwind, this only hits the tank apparently.

Omega — Mon, 05 Jul 2010 02:48:15 GMT

Author: Omega
Date: Mon Jul 05 04:48:15 CEST 2010
Revision: 4294

Log:

#Ruby/Baltharus: removed special warning and run away sound for whirlwind, this only hits the tank apparently.

Updated

trunk/DBM-ChamberOfAspects/Ruby/Baltharus.lua

Action: modified

Old revision: 4293

Old date: 2010-07-05 02:46:03 UTC

@@ -18,7 +18,6 @@
 local warningRepellingWave	= mod:NewSpellAnnounce(74509, 3)
 local warningWarnBrand		= mod:NewTargetAnnounce(74505, 4)
 
-local specWarnWhirlwind		= mod:NewSpecialWarningRun(75125, mod:IsMelee())
 local specWarnBrand			= mod:NewSpecialWarningYou(74505)
 
 local timerWhirlwindCD		= mod:NewCDTimer(22, 75125)
@@ -26,7 +25,6 @@
 local timerRepellingWave	= mod:NewBuffActiveTimer(4, 74509)--1 second cast + 3 second stun
 local timerBrand			= mod:NewBuffActiveTimer(10, 74505)
 
-local soundWhirlwind 		= mod:NewSound(75125, nil, mod:IsMelee())
 mod:AddBoolOption("SetIconOnBrand", true)
 mod:AddBoolOption("RangeFrame")

r4293 (Omega): #Ruby/Baltharus: he only splits twice on 25 man now not 3 times, changed it to account for this and new percents he splits at on 25 man

Omega — Mon, 05 Jul 2010 02:46:03 GMT

Author: Omega
Date: Mon Jul 05 04:46:03 CEST 2010
Revision: 4293

Log:

#Ruby/Baltharus: he only splits twice on 25 man now not 3 times, changed it to account for this and new percents he splits at on 25 man

Updated

trunk/DBM-ChamberOfAspects/Ruby/Baltharus.lua

Action: modified

Old revision: 4292

Old date: 2010-07-05 00:48:58 UTC

@@ -107,16 +107,18 @@
 end
 
 function mod:UNIT_HEALTH(uId)
-	if not warnedSplit2 and self:GetUnitCreatureId(uId) == 39751 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.54 then
-		warnedSplit2 = true
-		warningSplitSoon:Show()
-	elseif (mod:IsDifficulty("normal25") or mod:IsDifficulty("heroic25")) then
-		if not warnedSplit1 and self:GetUnitCreatureId(uId) == 39751 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.79 then
+	if (mod:IsDifficulty("normal25") or mod:IsDifficulty("heroic25")) then
+		if not warnedSplit1 and self:GetUnitCreatureId(uId) == 39751 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.70 then
 			warnedSplit1 = true
 			warningSplitSoon:Show()
-		elseif not warnedSplit3 and self:GetUnitCreatureId(uId) == 39751 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.29 then
+		elseif not warnedSplit3 and self:GetUnitCreatureId(uId) == 39751 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.37 then
 			warnedSplit3 = true
 			warningSplitSoon:Show()
 		end
+	else
+		if not warnedSplit2 and self:GetUnitCreatureId(uId) == 39751 and UnitHealth(uId) / UnitHealthMax(uId) <= 0.54 then
+			warnedSplit2 = true
+			warningSplitSoon:Show()
 	end
+	end
 end
\ No newline at end of file

r4292 (Omega): fr update

Omega — Mon, 05 Jul 2010 00:48:58 GMT

Author: Omega
Date: Mon Jul 05 02:48:58 CEST 2010
Revision: 4292

Log:

fr update

Updated

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

Action: modified

Old revision: 4291

Old date: 2010-07-05 00:38:48 UTC

@@ -606,11 +606,11 @@
 })
 
 L:SetMiscLocalization({
-	Pull	= "Ouvrez l'œil ! Je vais régler ça en deux coups de cuillè -",
+	Pull	= "Ouvrez l'œil ! Je vais régler ça en deux coups de cuillè -",
 	Phase1	= "Faille de sécurité détectée. Analyse des archives historiques transférée en attente de basse priorité. Contre-mesures déclenchées.",
 	Phase2	= "Seuil d'indice de menace dépassé. Archivation céleste annulée. Niveau de sécurité augmenté.",
 	Phase3	= "Indice de menace critique. Analyse du Vide détournée. Lancement des protocoles d'épuration.",
-	Kill	= "Alerte : systèmes de protection désactivés. Purge de la mémoire en cours... "
+	Kill	= "Alerte : systèmes de protection désactivés. Purge de la mémoire en cours…"
 })
 
 ---------------

r4291 (Omega): #ICC/Blood Princes: Now waits 4.5 seconds before hiding range frame after teldarim or keleseth become empowered in case valanaar casts empowered shock vortex right before change. This should make the auto range finder hiding for encounter behave more like it was intended, hiding any time it's simply not possible for valanaar to cast empowered shock vortex.

Omega — Mon, 05 Jul 2010 00:38:48 GMT

Author: Omega
Date: Mon Jul 05 02:38:48 CEST 2010
Revision: 4291

Log:

#ICC/Blood Princes: Now waits 4.5 seconds before hiding range frame after teldarim or keleseth become empowered in case valanaar casts empowered shock vortex right before change. This should make the auto range finder hiding for encounter behave more like it was intended, hiding any time it's simply not possible for valanaar to cast empowered shock vortex.

Updated

trunk/DBM-Icecrown/TheCrimsonHall/BPCouncil.lua

Action: modified

Old revision: 4290

Old date: 2010-07-05 00:28:06 UTC

@@ -89,6 +89,10 @@
 	end
 end
 
+function mod:HideRange()
+	DBM.RangeCheck:Hide()
+end
+
 function mod:TrySetTarget()
 	if DBM:GetRaidRank() >= 1 and self.Options.ActivePrinceIcon then
 		for i = 1, GetNumRaidMembers() do
@@ -135,7 +139,7 @@
 		timerTargetSwitch:Start()
 		activePrince = args.destGUID
 		if self.Options.RangeFrame then
-			DBM.RangeCheck:Hide()
+			self:ScheduleMethod(4.5, "HideRange")--delay hiding range frame for a few seconds after change incase valanaar got a last second vortex cast off
 		end
 	elseif args:IsSpellID(70982) and self:IsInCombat() then
 		warnTargetSwitch:Show(L.Taldaram)
@@ -143,7 +147,7 @@
 		timerTargetSwitch:Start()
 		activePrince = args.destGUID
 		if self.Options.RangeFrame then
-			DBM.RangeCheck:Hide()
+			self:ScheduleMethod(4.5, "HideRange")--delay hiding range frame for a few seconds after change incase valanaar got a last second vortex cast off
 		end
 	elseif args:IsSpellID(72999) then	--Shadow Prison (hard mode)
 		if args:IsPlayer() then

r4290 (Omega): #Ruby/Halion: Sync debuff timers too not just targets, since on heroic debuffs cross phases you'll want more prediction.

Omega — Mon, 05 Jul 2010 00:28:06 GMT

Author: Omega
Date: Mon Jul 05 02:28:06 CEST 2010
Revision: 4290

Log:

#Ruby/Halion: Sync debuff timers too not just targets, since on heroic debuffs cross phases you'll want more prediction.

Updated

trunk/DBM-ChamberOfAspects/Ruby/Halion.lua

Action: modified

Old revision: 4289

Old date: 2010-07-04 19:59:29 UTC

@@ -81,13 +81,13 @@
 			self:SendSync("Meteor")
 		end--]]
 	if args:IsSpellID(74792) then
+		if not self.Options.AnnounceAlternatePhase then
+			warningShadowConsumption:Show(args.destName)
 		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
 			timerShadowConsumptionCD:Start(20)
 		else
 			timerShadowConsumptionCD:Start()
 		end
-		if not self.Options.AnnounceAlternatePhase then
-			warningShadowConsumption:Show(args.destName)
 		end
 		if mod:LatencyCheck() then
 			self:SendSync("ShadowTarget", args.destName)
@@ -103,13 +103,13 @@
 			self:SetIcon(args.destName, 8)
 		end
 	elseif args:IsSpellID(74562) then
+		if not self.Options.AnnounceAlternatePhase then
+			warningFieryConsumption:Show(args.destName)
 		if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
 			timerFieryConsumptionCD:Start(20)
 		else
 			timerFieryConsumptionCD:Start()
 		end
-		if not self.Options.AnnounceAlternatePhase then
-			warningFieryConsumption:Show(args.destName)
 		end
 		if mod:LatencyCheck() then
 			self:SendSync("FieryTarget", args.destName)
@@ -215,10 +215,20 @@
 	elseif msg == "ShadowTarget" then
 		if self.Options.AnnounceAlternatePhase then
 			warningShadowConsumption:Show(target)
+			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
+				timerShadowConsumptionCD:Start(20)
+			else
+				timerShadowConsumptionCD:Start()
 		end
+		end
 	elseif msg == "FieryTarget" then
 		if self.Options.AnnounceAlternatePhase then
 			warningFieryConsumption:Show(target)
+			if mod:IsDifficulty("heroic10") or mod:IsDifficulty("heroic25") then
+				timerFieryConsumptionCD:Start(20)
+			else
+				timerFieryConsumptionCD:Start()
 		end
 	end
 end
+end

r4289 (Omega): add latency check to trap sync too.

Omega — Sun, 04 Jul 2010 19:59:29 GMT

Author: Omega
Date: Sun Jul 04 21:59:29 CEST 2010
Revision: 4289

Log:

add latency check to trap sync too.

Updated

trunk/DBM-Icecrown/TheFrozenThrone/LichKing.lua

Action: modified

Old revision: 4288

Old date: 2010-07-04 15:41:20 UTC

@@ -118,7 +118,7 @@
 end
 
 function mod:TankTrap()
-	if mod:LatencyCheck() then--Laggy people can still get wrong target 10 times, so don't send sync if you fail latency check.
+	if mod:LatencyCheck() then
 		self:SendSync("TrapOn", LKTank)
 	end
 end
@@ -129,7 +129,9 @@
 	if targetname ~= LKTank then--If scan doesn't return tank abort other scans and do other warnings.
 		self:UnscheduleMethod("TrapTarget")
 		self:UnscheduleMethod("TankTrap")--Also unschedule tanktrap since we got a scan that returned a non tank.
-		self:SendSync("TrapOn", targetname)--No latency check performed in this function, if you didn't grab tank then your scan was right, lagging or not.
+		if mod:LatencyCheck() then
+			self:SendSync("TrapOn", targetname)
+		end
 	else
 		self:UnscheduleMethod("TankTrap")
 		self:ScheduleMethod(1, "TankTrap") --If scan returns tank schedule warnings for tank after all other scans have completed. If none of those scans return another player this will be allowed to fire.

r4288 (bluenyx): koKR update

bluenyx — Sun, 04 Jul 2010 15:41:20 GMT

Author: bluenyx
Date: Sun Jul 04 17:41:20 CEST 2010
Revision: 4288

Log:

koKR update

Updated

trunk/DBM-ChamberOfAspects/localization.kr.lua

Action: modified

Old revision: 4287

Old date: 2010-07-04 14:40:30 UTC

@@ -200,5 +200,5 @@
 	twilightcutter			= "주위를 회전하는 구슬들이 고동치며 어둠의 기운을 내뿜습니다!",
 	YellCombustion			= "나에게 맹렬한 발화!",
 	YellConsumption			= "나에게 영혼 소진!",
-	Kill					= "Relish this victory, mortals, for it will be your last. This world will burn with the master's return!"
+	Kill					= "필멸자들아, 승리를 만끽해라. 그것이 마지막일 테니. 주인님이 돌아오시면 이 세상은 불타버리리라!"
 })

r4287 (bluenyx): koKR update

bluenyx — Sun, 04 Jul 2010 14:40:30 GMT

Author: bluenyx
Date: Sun Jul 04 16:40:30 CEST 2010
Revision: 4287

Log:

koKR update

Updated

trunk/DBM-ChamberOfAspects/localization.kr.lua

Action: modified

Old revision: 4286

Old date: 2010-07-04 12:18:11 UTC

@@ -115,7 +115,7 @@
 })
 
 L:SetMiscLocalization({
-	SplitTrigger		= "Twice the Pain and half the fun."
+	SplitTrigger		= "고통이 두 배면, 재미가 반이지."
 })
 
 
@@ -166,7 +166,7 @@
 })
 
 L:SetMiscLocalization({
-	SummonMinions	= "Turn them to ash, minions!"
+	SummonMinions	= "저놈들을 재로 만들어버려라!"
 })
 -------------------------------------
 --  Halion the Twilight Destroyer  --
@@ -194,10 +194,10 @@
 })
 
 L:SetMiscLocalization({
-	MeteorCast				= "The heavens burn!",
+	MeteorCast				= "하늘이 타오른다!",
 	Phase2					= "황혼 세계에서는 고통만이 있으리라! 자신 있다면 들어와 봐라!",
-	Phase3					= "I am the light and the darkness! Cower, mortals, before the herald of Deathwing!",
-	twilightcutter			= "The orbiting spheres pulse with dark energy!",
+	Phase3					= "나는 빛이자 어둠이다! 필멸자들어, 데스윙의 사자 앞에 무릎 꿇어라!",
+	twilightcutter			= "주위를 회전하는 구슬들이 고동치며 어둠의 기운을 내뿜습니다!",
 	YellCombustion			= "나에게 맹렬한 발화!",
 	YellConsumption			= "나에게 영혼 소진!",
 	Kill					= "Relish this victory, mortals, for it will be your last. This world will burn with the master's return!"

r4286 (bluenyx): koKR update

bluenyx — Sun, 04 Jul 2010 12:18:11 GMT

Author: bluenyx
Date: Sun Jul 04 14:18:11 CEST 2010
Revision: 4286

Log:

koKR update

Updated

trunk/DBM-ChamberOfAspects/localization.kr.lua

Action: modified

Old revision: 4285

Old date: 2010-07-04 12:00:22 UTC

@@ -180,7 +180,7 @@
 L:SetWarningLocalization({
 	WarnPhase2Soon		= "곧 2 단계",
 	WarnPhase3Soon		= "곧 3 단계",
-	TwilightCutterCast	= "Casting Twilight Cutter: 5 sec"
+	TwilightCutterCast	= "황혼 절단기 시전 : 5 초"
 })
 
 L:SetOptionLocalization({
@@ -198,7 +198,7 @@
 	Phase2					= "황혼 세계에서는 고통만이 있으리라! 자신 있다면 들어와 봐라!",
 	Phase3					= "I am the light and the darkness! Cower, mortals, before the herald of Deathwing!",
 	twilightcutter			= "The orbiting spheres pulse with dark energy!",
-	YellCombustion			= "Combustion on me!",
-	YellConsumption			= "Consumption on me!",
+	YellCombustion			= "나에게 맹렬한 발화!",
+	YellConsumption			= "나에게 영혼 소진!",
 	Kill					= "Relish this victory, mortals, for it will be your last. This world will burn with the master's return!"
 })

r4285 (bluenyx): koKR update(not complete - ChamberOfAspects)

bluenyx — Sun, 04 Jul 2010 12:00:22 GMT

Author: bluenyx
Date: Sun Jul 04 14:00:22 CEST 2010
Revision: 4285

Log:

koKR update(not complete - ChamberOfAspects)

Updated

trunk/DBM-ChamberOfAspects/localization.kr.lua

Updated

trunk/DBM-GUI/localization.kr.lua

Updated

trunk/DBM-Ulduar/localization.kr.lua

trunk/DBM-ChamberOfAspects/localization.kr.lua

Action: modified

Old revision: 4284

Old date: 2010-07-04 09:33:44 UTC

@@ -133,7 +133,7 @@
 })
 
 L:SetOptionLocalization({
-	SpecialWarningTranq		= "$spell:78722의 특수 경고 보기 (마취 관련)",
+	SpecialWarningTranq		= "$spell:78722 특수 경고 보기(마취)",
 	RangeFrame				= "거리 프레임 보기 (10 미터)",
 	BeaconIcon				= DBM_CORE_AUTO_ICONS_OPTION_TEXT:format(74453)
 })
@@ -179,20 +179,26 @@
 
 L:SetWarningLocalization({
 	WarnPhase2Soon		= "곧 2 단계",
-	WarnPhase3Soon		= "곧 3 단계"
+	WarnPhase3Soon		= "곧 3 단계",
+	TwilightCutterCast	= "Casting Twilight Cutter: 5 sec"
 })
 
 L:SetOptionLocalization({
 	WarnPhase2Soon			= "2 단계 사전 경고 보기 (79% 전)",
 	WarnPhase3Soon			= "3 단계 사전 경고 보기 (54% 전)",
-	AnnounceAlternatePhase	= "모든 단계의 경고/타이머 보기",	
-	SoundOnConsumption		= "연소일 경우 소리 재생",--We use localized text for these functions
-	SetIconOnConsumption	= "연소 대상 공격대 아이콘 설정"--So we can use single functions for both versions of spell.
+	TwilightCutterCast		= "$spell:77844을 시전할 때 경고 보기",	
+	AnnounceAlternatePhase	= "해당 위치에 없을 경우에도 모든 단계의 경고/타이머 보기",
+	SoundOnConsumption		= "$spell:74562 또는 $spell:74792 소리 재생",--We use localized text for these functions
+	SetIconOnConsumption	= "$spell:74562 또는 $spell:74792 대상 공격대 아이콘 설정",--So we can use single functions for both versions of spell.
+	YellOnConsumption		= "$spell:74562 또는 $spell:74792 외치기"	
 })
 
 L:SetMiscLocalization({
 	MeteorCast				= "The heavens burn!",
 	Phase2					= "황혼 세계에서는 고통만이 있으리라! 자신 있다면 들어와 봐라!",
 	Phase3					= "I am the light and the darkness! Cower, mortals, before the herald of Deathwing!",
-	twilightcutter			= "The orbiting spheres pulse with dark energy!"
+	twilightcutter			= "The orbiting spheres pulse with dark energy!",
+	YellCombustion			= "Combustion on me!",
+	YellConsumption			= "Consumption on me!",
+	Kill					= "Relish this victory, mortals, for it will be your last. This world will burn with the master's return!"
 })

trunk/DBM-GUI/localization.kr.lua

Action: modified

Old revision: 4284

Old date: 2010-07-04 09:33:44 UTC

@@ -131,7 +131,8 @@
 L.SpamBlockRaidWarning			= "다른 보스 모드가 알리는 경보 감추기" 
 L.SpamBlockBossWhispers			= "전투 중 사용되는  경보 귓속말 감추기"
 L.BlockVersionUpdatePopup		= "업데이트 알림 창 끄기"
-L.ShowBigBrotherOnCombatStart	= "전투가 시작되면 BigBrother 버프 체크 수락"
+L.ShowBigBrotherOnCombatStart	= "전투가 시작되면 BigBrother 버프 체크 켜기"
+L.BigBrotherAnnounceToRaid		= "Big Brother 결과를 공격대에 알리기"
 
 L.Area_SpamFilter_Outgoing		= "공통 필터 옵션"
 L.SpamBlockNoShowAnnounce		= "알림 또는 경고 소리 실행하지 않기"

trunk/DBM-Ulduar/localization.kr.lua

Action: modified

Old revision: 4284

Old date: 2010-07-04 09:33:44 UTC

@@ -509,7 +509,8 @@
 	YellOnLifeLeech					= "생명력 흡수를 당할 때 외치기",
 	YellOnShadowCrash				= "어둠 붕괴일 때 외치기",
 	WarningLeechLife				= "생명력 흡수 시전 경고 보기",		
-	hardmodeSpawn					= "사로나이드 원혼 생성 타이머 보기(하드모드)"
+	hardmodeSpawn					= "사로나이드 원혼 생성 타이머 보기(하드모드)",
+	CrashArrow						= "$spell:62660의 방향을 DBM Arrow로 표시하기(당신 주변일 경우)"
 }
 
 L:SetMiscLocalization{

r4284 (Snamor): #GUI: esES update

Snamor — Sun, 04 Jul 2010 09:33:44 GMT

Author: Snamor
Date: Sun Jul 04 11:33:44 CEST 2010
Revision: 4284

Log:

#GUI: esES update

Updated

trunk/DBM-GUI/localization.es.lua

Action: modified

Old revision: 4283

Old date: 2010-07-03 19:05:56 UTC

@@ -130,9 +130,10 @@
 L.Area_SpamFilter		= "Opciones de spam"
 L.HideBossEmoteFrame		= "Esconder lo que dice el boss"
 L.SpamBlockRaidWarning		= "Filtrar anuncios de otros Boss Mods" 
-L.SpamBlockBossWhispers		= "Avisar por susurros spam de cada boss "
-L.BlockVersionUpdatePopup	= "Desabilitar actualizaciones"
+L.SpamBlockBossWhispers		= "Filtrar los avisos de  mientras estas en combate"
+L.BlockVersionUpdatePopup	= "Desabilitar avisos de actualizaciones"
 L.ShowBigBrotherOnCombatStart	= "Comprobar los bufos con Big Brother al inicio del combate"
+L.BigBrotherAnnounceToRaid		= "Anunciar los resultados de Big Brother a la banda"
 
 L.Area_SpamFilter_Outgoing		= "Opciones de Filtro Global"
 L.SpamBlockNoShowAnnounce		= "No mostrar avisos o reproducir sonidos"

r4283 (Vampik): Fix Battle.net auto-response

Vampik — Sat, 03 Jul 2010 19:05:56 GMT

Author: Vampik
Date: Sat Jul 03 21:05:56 CEST 2010
Revision: 4283

Log:

Fix Battle.net auto-response

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 4282

Old date: 2010-07-03 18:42:57 UTC

@@ -1831,9 +1831,15 @@
 			else
 				self:AddMsg(DBM_CORE_BOSS_DOWN_LONG:format(mod.combatInfo.name, strFromTime(thisTime), strFromTime(lastTime), strFromTime(bestTime)))
 			end
+			local msg
 			for k, v in pairs(autoRespondSpam) do
-				SendChatMessage(chatPrefixShort..DBM_CORE_WHISPER_COMBAT_END_KILL:format(UnitName("player"), (mod.combatInfo.name or "")), "WHISPER", nil, k)
+				msg = msg or chatPrefixShort..DBM_CORE_WHISPER_COMBAT_END_KILL:format(UnitName("player"), (mod.combatInfo.name or ""))
+				if type(k) == "string" then
+					SendChatMessage(msg, "WHISPER", nil, k)
+				elseif type(k) == "number" then
+					BNSendWhisper(k, msg)
 			end
+			end
 			fireEvent("kill", mod)
 		end
 		table.wipe(autoRespondSpam)

r4282 (Omega): added some icons to brann event

Omega — Sat, 03 Jul 2010 18:42:57 GMT

Author: Omega
Date: Sat Jul 03 20:42:57 CEST 2010
Revision: 4282

Log:

added some icons to brann event

Updated

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

Action: modified

Old revision: 4281

Old date: 2010-07-03 14:09:40 UTC

@@ -15,8 +15,8 @@
 	"CHAT_MSG_MONSTER_YELL"
 )
 
-local warningPhase	= mod:NewAnnounce("WarningPhase", 2)
-local timerEvent	= mod:NewTimer(302, "timerEvent")
+local warningPhase	= mod:NewAnnounce("WarningPhase", 2, "Interface\\Icons\\Spell_Nature_WispSplode")
+local timerEvent	= mod:NewTimer(302, "timerEvent", "Interface\\Icons\\Spell_Holy_BorrowedTime")
 
 function mod:OnCombatStart(delay)
 	timerEvent:Start(-delay)

r4281 (Vampik): ruRU update

Vampik — Sat, 03 Jul 2010 14:09:40 GMT

Author: Vampik
Date: Sat Jul 03 16:09:40 CEST 2010
Revision: 4281

Log:

ruRU update

Updated

trunk/DBM-GUI/localization.ru.lua

Action: modified

Old revision: 4280

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

@@ -132,6 +132,7 @@
 L.SpamBlockBossWhispers			= "Фильтрация  предупреждений шепотом в бою"
 L.BlockVersionUpdatePopup		= "Отключить всплывающее сообщение об устаревшей версии"
 L.ShowBigBrotherOnCombatStart	= "Выполнять проверку положительных эффектов Big Brother в начале боя"
+L.BigBrotherAnnounceToRaid		= "Объявлять результаты проверки Big Brother в рейд"
 
 L.Area_SpamFilter_Outgoing		= "Параметры общего фильтра"
 L.SpamBlockNoShowAnnounce		= "Не объявлять или предупреждать звуком игрока"

r4280 (tandanu): forgot to remove some debug stuff :(

tandanu — Sat, 03 Jul 2010 11:56:54 GMT

Author: tandanu
Date: Sat Jul 03 13:56:54 CEST 2010
Revision: 4280

Log:

forgot to remove some debug stuff :(

Updated

trunk/DBM-GUI/DBM-GUI.lua

Action: modified

Old revision: 4279

Old date: 2010-07-03 11:43:15 UTC

@@ -1819,10 +1819,10 @@
 		spamArea:CreateCheckButton(L.SpamBlockRaidWarning, true, nil, "SpamBlockRaidWarning")
 		spamArea:CreateCheckButton(L.SpamBlockBossWhispers, true, nil, "SpamBlockBossWhispers")
 		spamArea:CreateCheckButton(L.BlockVersionUpdatePopup, true, nil, "BlockVersionUpdatePopup")
---		if BigBrother and type(BigBrother.ConsumableCheck) == "function" then
+		if BigBrother and type(BigBrother.ConsumableCheck) == "function" then
 			spamArea:CreateCheckButton(L.ShowBigBrotherOnCombatStart, true, nil, "ShowBigBrotherOnCombatStart")
 			spamArea:CreateCheckButton(L.BigBrotherAnnounceToRaid, true, nil, "BigBrotherAnnounceToRaid")
---		end
+		end
 		spamArea:AutoSetDimension()
 		spamOutArea:AutoSetDimension()
 		spamPanel:SetMyOwnHeight()

r4279 (tandanu): increment version number for 4.50b release (internal version number: 4.51-r4279 to show an update notification)

tandanu — Sat, 03 Jul 2010 11:43:15 GMT

Author: tandanu
Date: Sat Jul 03 13:43:15 CEST 2010
Revision: 4279

Log:

increment version number for 4.50b release (internal version number: 4.51-r4279 to show an update notification)

Updated

trunk/DBM-Core/DBM-Core.lua

Action: modified

Old revision: 4278

Old date: 2010-07-03 11:37:16 UTC

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