Revert someof combat to RP timer changes, since I reworked and restor…

…ed object and I do still want distinction of combat auto starts from rp "this doesn't auto engage" timers

DBM-Raids-WoTLK/Coliseum/Jaraxxus.lua

@@ -40,7 +40,7 @@ local specWarnNetherPower		= mod:NewSpecialWarningDispel(67009, "MagicDispeller"
 local SpecWarnFelFireball		= mod:NewSpecialWarningInterrupt(66532, "HasInterrupt", nil, 2, 1, 2)
 local SpecWarnFelFireballDispel	= mod:NewSpecialWarningDispel(66532, false, nil, 2, 1, 2)
 
-local timerCombatStart          = mod:NewRPTimer(87.5)--rollplay for first pull
+local timerCombatStart          = mod:NewCombatTimer(87.5)--rollplay for first pull
 local timerFlame 				= mod:NewTargetTimer(8, 66197, nil, nil, nil, 3)--There are 8 debuff Ids. Since we detect first to warn, use an 8sec timer to cover duration of trigger spell and damage debuff.
 local timerFlameCD				= mod:NewCDTimer(30, 66197, nil, nil, nil, 3)
 local timerNetherPowerCD		= mod:NewCDTimer(42, 67009, nil, "MagicDispeller", nil, 5, nil, DBM_COMMON_L.MAGIC_ICON)

DBM-Raids-WoTLK/Coliseum/NorthrendBeasts.lua

@@ -52,7 +52,7 @@ local specWarnCharge		= mod:NewSpecialWarningRun(52311, nil, nil, nil, 4, 2)
 local specWarnFrothingRage	= mod:NewSpecialWarningDispel(66759, "RemoveEnrage", nil, nil, 1, 2)
 
 local enrageTimer			= mod:NewBerserkTimer(223)
-local timerCombatStart      = mod:NewRPTimer(24)
+local timerCombatStart      = mod:NewCombatTimer(24)
 local timerNextBoss			= mod:NewTimer(190, "TimerNextBoss", 2457, nil, nil, 1)
 local timerSubmerge			= mod:NewTimer(45, "TimerSubmerge", "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendBurrow.blp", nil, nil, 6)
 local timerEmerge			= mod:NewTimer(10, "TimerEmerge", "Interface\\AddOns\\DBM-Core\\textures\\CryptFiendUnBurrow.blp", nil, nil, 6)

DBM-Raids-WoTLK/Icecrown/TheFrozenThrone/LichKing.lua

@@ -69,7 +69,7 @@ local specWarnHarvestSouls			= mod:NewSpecialWarningSpell(73654, nil, nil, nil,
 local specWarnValkyrLow				= mod:NewSpecialWarning("SpecWarnValkyrLow", nil, nil, nil, 1, 2, nil, nil, 71844)
 local specWarnGTFO					= mod:NewSpecialWarningGTFO(68983, nil, nil, nil, 1, 8)
 
-local timerCombatStart				= mod:NewRPTimer(53.5)
+local timerCombatStart				= mod:NewCombatTimer(53.5)
 local timerPhaseTransition			= mod:NewTimer(62.5, "PhaseTransition", 72262, nil, nil, 6)
 local timerSoulreaper	 			= mod:NewTargetTimer(5.1, 69409, nil, "Tank|Healer")
 local timerSoulreaperCD	 			= mod:NewNextTimer(30.5, 69409, nil, "Tank|Healer", nil, 5, nil, DBM_COMMON_L.TANK_ICON)

DBM-Raids-WoTLK/Icecrown/TheLowerSpire/Deathbringer.lua

@@ -35,7 +35,7 @@ local warnRuneofBlood		= mod:NewTargetNoFilterAnnounce(72410, 3, nil, "Tank|Heal
 
 local specwarnRuneofBlood	= mod:NewSpecialWarningTaunt(72410, nil, nil, nil, 1, 2)
 
-local timerCombatStart		= mod:NewRPTimer(45)
+local timerCombatStart		= mod:NewCombatTimer(45)
 local timerRuneofBlood		= mod:NewNextTimer(20, 72410, nil, "Tank|Healer", nil, 5, nil, DBM_COMMON_L.TANK_ICON)
 local timerBoilingBlood		= mod:NewNextTimer(15.5, 72385, nil, "Healer", nil, 5, nil, DBM_COMMON_L.HEALER_ICON)
 local timerBloodNova		= mod:NewNextTimer(20, 72378, nil, nil, nil, 2)

DBM-Raids-WoTLK/Icecrown/TheLowerSpire/GunshipBattle.lua

@@ -45,7 +45,7 @@ local warnBladestorm		= mod:NewSpellAnnounce(69652, 3, nil, "Melee")
 local warnWoundingStrike	= mod:NewTargetNoFilterAnnounce(69651, 2, nil, "Tank|Healer")
 local warnAddsSoon			= mod:NewAnnounce("WarnAddsSoon", 2, addsIcon, nil, nil, nil, 23334, DBM_COMMON_L.ADDS)
 
-local timerCombatStart		= mod:NewRPTimer(42)
+local timerCombatStart		= mod:NewCombatTimer(42)
 local timerBelowZeroCD		= mod:NewNextTimer(33.5, 69705, nil, nil, nil, 5)
 local timerBattleFuryActive	= mod:NewBuffActiveTimer(17, 69638, nil, "Tank|Healer", nil, 5, nil, DBM_COMMON_L.TANK_ICON)
 local timerAdds				= mod:NewTimer(60, "TimerAdds", addsIcon, nil, nil, 1, DBM_COMMON_L.TANK_ICON..DBM_COMMON_L.DAMAGE_ICON, nil, nil, nil, nil, nil, nil, 23334, nil, DBM_COMMON_L.ADDS)

DBM-Raids-WoTLK/Ulduar/Algalon.lua

@@ -52,7 +52,7 @@ local specWarnPhasePunch		= mod:NewSpecialWarningStack(64412, nil, 4, nil, nil,
 local specWarnBigBang			= mod:NewSpecialWarningSpell(64584, nil, nil, nil, 3, 2)
 local specWarnCosmicSmash		= mod:NewSpecialWarningDodge(64596, nil, nil, nil, 2, 2)
 
-local timerCombatStart			= mod:NewRPTimer(42)
+local timerCombatStart			= mod:NewCombatTimer(42)
 local timerNextBigBang			= mod:NewNextTimer(90.5, 64584, nil, nil, nil, 2)
 local timerBigBangCast			= mod:NewCastTimer(8, 64584, nil, nil, nil, 2, nil, DBM_COMMON_L.DEADLY_ICON)
 local timerNextCollapsingStar	= mod:NewTimer(15, "NextCollapsingStar", "237016")