WoWInterface SVN KharthussHunterTimers

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk
    from Rev 39 to Rev 40
    ↔ Reverse comparison
  •

Rev 39 → Rev 40

KHunterTimers/globals.lua
6,11 → 6,11
KHT_NUM_SLIDERS = 7;
 
KHT_NUM_TIMERS = {
[1] = 14, -- Beast
[2] = 14, -- Marks
[3] = 16, -- Surv
[4] = 20, -- Pets
[5] = 24, -- Misc
[1] = 12, -- Beast
[2] = 8, -- Marks
[3] = 14, -- Surv
[4] = 11, -- Pets
[5] = 23, -- Misc
[6] = 44 -- Trinkets
};
 
27,25 → 27,17
[9] = KHT_INTIM,
[10] = KHT_MEND_PET,
[11] = KHT_CROWS,
[12] = KHT_SCARE_BEAST,
[13] = KHT_STAMPEDE,
[14] = KHT_WIDOW_VENOM
[12] = KHT_STAMPEDE
},
[2] = { -- Marks
[1] = KHT_MARKS,
[2] = KHT_AUTO_SHOT,
[3] = KHT_CONC_BARRAGE,
[4] = KHT_CONC_SHOT,
[5] = KHT_FLARE,
[6] = KHT_GLAIVE,
[7] = KHT_HUNTERS_MARK,
[8] = KHT_STEADY,
[9] = KHT_MASTER_MARKS,
[10] = KHT_PIERCING,
[11] = KHT_RAPID_FIRE,
[12] = KHT_SERPENT,
[13] = KHT_SILENCE_SHOT,
[14] = KHT_THRILL
[3] = KHT_CONC_SHOT,
[4] = KHT_FLARE,
[5] = KHT_GLAIVE,
[6] = KHT_RAPID_FIRE,
[7] = KHT_SNIPER,
[8] = KHT_THRILL
},
[3] = { -- Surv
[1] = KHT_SURV,
57,35 → 49,24
[7] = KHT_EXPL_TRAP,
[8] = KHT_FREEZING_TRAP,
[9] = KHT_FROST_TRAP,
[10] = KHT_IMMO_TRAP,
[11] = KHT_LOCK_LOAD,
[12] = KHT_MISDIRECTION,
[13] = KHT_SCATTER,
[14] = KHT_SNAKE_TRAP,
[15] = KHT_SNIPER,
[16] = KHT_WYVERN
[10] = KHT_LOCK_LOAD,
[11] = KHT_MISDIRECTION,
[12] = KHT_SERPENT,
[13] = KHT_SNAKE_TRAP,
[14] = KHT_WYVERN
},
[4] = { -- Pets
[1] = KHT_PETS,
[2] = KHT_ANKLE,
[3] = KHT_CARRION,
[4] = KHT_COWER,
[5] = KHT_CULLING,
[6] = KHT_DASH,
[7] = KHT_FURIOUS,
[8] = KHT_STAND,
[9] = KHT_BITE,
[10] = KHT_RABID,
[11] = KHT_COURAGE,
[12] = KHT_RECOVERY,
[13] = KHT_ROAR,
[14] = KHT_SERENITY,
[15] = KHT_SHIELD,
[16] = KHT_SPIRIT_MEND,
[17] = KHT_WARP,
[18] = KHT_VENOM_WEB,
[19] = KHT_WEB,
[20] = KHT_WEB_WRAP
[3] = KHT_DASH,
[4] = KHT_FURIOUS,
[5] = KHT_STAND,
[6] = KHT_BITE,
[7] = KHT_COURAGE,
[8] = KHT_ROAR,
[9] = KHT_SHIELD,
[10] = KHT_SPIRIT_MEND,
[11] = KHT_WARP
},
[5] = { -- Misc
[1] = KHT_MISC,
102,16 → 83,15
[12] = KHT_DRAGON_8PC,
[13] = KHT_FLAMEWAKER,
[14] = KHT_HEROISM,
[15] = KHT_HYPER,
[16] = KHT_SAUROK,
[17] = KHT_SCOURGE,
[18] = KHT_STONEFORM,
[19] = KHT_THUNDER,
[20] = KHT_TIME_WARP,
[21] = KHT_WAR_STOMP,
[22] = KHT_WINDRUNNER,
[23] = KHT_WYRMSTALKER,
[24] = KHT_ZG
[15] = KHT_SAUROK,
[16] = KHT_SCOURGE,
[17] = KHT_STONEFORM,
[18] = KHT_THUNDER,
[19] = KHT_TIME_WARP,
[20] = KHT_WAR_STOMP,
[21] = KHT_WINDRUNNER,
[22] = KHT_WYRMSTALKER,
[23] = KHT_ZG
},
[6] = { -- Trinkets
[1] = KHT_TRINKETS,
KHunterTimers/KHunterTimers.lua
310,10 → 310,10
break;
end
end
elseif( spellName == KHT_EXPL_TRAP.." "..KHT_PRIMED or spellName == KHT_IMMO_TRAP.." "..KHT_PRIMED and fireTrapTimer ) then
elseif( spellName == KHT_EXPL_TRAP.." "..KHT_PRIMED and fireTrapTimer ) then
for num = 1, KHTvars["numBars"], 1 do
local barframe = _G["KHunterTimersStatus"..num];
if( barframe.spell == KHT_EXPL_TRAP.." "..KHT_PRIMED or barframe.spell == KHT_IMMO_TRAP.." "..KHT_PRIMED ) then
if( barframe.spell == KHT_EXPL_TRAP.." "..KHT_PRIMED ) then
allReadyActive = true;
bar = num;
break;
337,15 → 337,6
break;
end
end
elseif( KHT_sfind( spellName, KHT_HUNTERS_MARK ) ) then
for num = 1, KHTvars["numBars"] do
local barframe = _G["KHunterTimersStatus"..num];
if( KHT_sfind( barframe.spell, KHT_HUNTERS_MARK ) ) then
allReadyActive = true;
bar = num;
break;
end
end
elseif( spellName == KHT_AUTO_SHOT ) and KHTvars["sticky"] then
if( KHunterTimersStatus1.spell == KHT_AUTO_SHOT ) then
allReadyActive = true;
396,8 → 387,6
local texture;
if( string.find( spellName, KHT_FREEZING_TRAP ) )then
texture = KHTvars["textures"][KHT_FREEZING_TRAP]
elseif( string.find( spellName, KHT_IMMO_TRAP ) ) then
texture = KHTvars["textures"][KHT_IMMO_TRAP]
elseif( string.find( spellName, KHT_FROST_TRAP ) ) then
texture = KHTvars["textures"][KHT_FROST_TRAP]
elseif( string.find( spellName, KHT_EXPL_TRAP ) ) then
558,8 → 547,7
elseif( frostTrapTimer ) and ( text == KHT_FROST_TRAP.." "..KHT_PRIMED or
text == KHT_FREEZING_TRAP.." "..KHT_PRIMED ) then
frostTrapTimer = false;
elseif( fireTrapTimer ) and ( text == KHT_EXPL_TRAP.." "..KHT_PRIMED or
text == KHT_IMMO_TRAP.." "..KHT_PRIMED ) then
elseif( fireTrapTimer ) and ( text == KHT_EXPL_TRAP.." "..KHT_PRIMED ) then
fireTrapTimer = false;
elseif( natureTrapTimer ) and ( text == KHT_SNAKE_TRAP.." "..KHT_PRIMED ) then
natureTrapTimer = false;
1197,14 → 1185,12
elseif( KHTvars["skills"][KHT_STAMPEDE] and spellName == KHT_STAMPEDE ) then
KHunterTimersFrame_add( 20000, spellName, spellId );
elseif( KHTvars["skills"][KHT_CROWS] and spellName == KHT_CROWS ) then
KHunterTimersFrame_add( 30000, spellName, spellId, destName, destGUID );
KHunterTimersFrame_add( 15000, spellName, spellId, destName, destGUID );
end
end
if( KHTvars["skills"][KHT_MARKS] ) then
if( KHTvars["skills"][KHT_CONC_SHOT] and spellName == KHT_CONC_SHOT ) then
KHunterTimersFrame_add( 6000 + KHTvars["impconc"], spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_SILENCE_SHOT] and spellName == KHT_SILENCE_SHOT ) then
KHunterTimersFrame_add( 3000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_FLARE] and spellName == KHT_FLARE ) then
KHunterTimersFrame_add( 20000, spellName, spellId );
elseif( KHTvars["skills"][KHT_SERPENT] and spellName == KHT_SERPENT ) then
1214,8 → 1200,6
if( KHTvars["skills"][KHT_SURV] ) then
if( KHTvars["skills"][KHT_MISDIRECTION] and spellName == KHT_MISDIRECTION and spellId == 34477 ) then
KHunterTimersFrame_add( 20000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_SCATTER] and spellName == KHT_SCATTER ) then
KHunterTimersFrame_add( 4000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_DETERRENCE] and spellName == KHT_DETERRENCE ) then
KHunterTimersFrame_add( 5000, spellName, spellId );
end
1238,13 → 1222,6
barframe.endTime = 0;
end
end
elseif( fireTrapTimer and string.find( spellName, KHT_IMMO_TRAP ) ) then
for i=1, KHTvars["numBars"] do
local barframe = _G["KHunterTimersStatus"..i];
if( string.find( barframe.spell, KHT_IMMO_TRAP.." "..KHT_PRIMED ) ) then
barframe.endTime = 0;
end
end
else
for i=1, KHTvars["numBars"] do
local barframe = _G["KHunterTimersStatus"..i];
1270,13 → 1247,6
KHunterTimersFrame_add( 4000, spellName, spellId );
end
end
if( KHTvars["skills"][KHT_MARKS] ) then
if( KHTvars["skills"][KHT_MASTER_MARKS] and spellName == KHT_READY_SET ) then
KHunterTimersFrame_add( 30000, spellName, spellId );
elseif( KHTvars["skills"][KHT_MASTER_MARKS] and spellName == KHT_FIRE ) then
KHunterTimersFrame_add( 10000, spellName, spellId );
end
end
if( KHTvars["skills"][KHT_SURV] ) then
if( KHTvars["skills"][KHT_MISDIRECTION] and spellName == KHT_MISDIRECTION and spellId == 35079 ) then
KHunterTimersFrame_add( 4000, spellName, spellId );
1287,30 → 1257,18
if( KHTvars["skills"][KHT_PETS] ) then
if( KHTvars["skills"][KHT_STAND] and spellName == KHT_STAND ) then
KHunterTimersFrame_add( 20000, spellName, spellId );
elseif( KHTvars["skills"][KHT_RABID] and spellName == KHT_RABID ) then
KHunterTimersFrame_add( 20000, spellName, spellId );
elseif( KHTvars["skills"][KHT_SERENITY] and spellName == KHT_SERENITY ) then
KHunterTimersFrame_add( 15000, spellName, spellId );
elseif( KHTvars["skills"][KHT_BITE] and spellName == KHT_BITE_PROC ) then
KHunterTimersFrame_add( 12000, spellName, spellId );
elseif( KHTvars["skills"][KHT_DASH] and spellName == KHT_DASH ) then
KHunterTimersFrame_add( 15000, spellName, spellId );
elseif( KHTvars["skills"][KHT_CARRION] and spellName == KHT_CARRION ) then
KHunterTimersFrame_add( 10000, spellName, spellId );
elseif( KHTvars["skills"][KHT_FURIOUS] and spellName == KHT_FURIOUS ) then
KHunterTimersFrame_add( 20000, spellName, spellId );
elseif( KHTvars["skills"][KHT_WARP] and spellName == KHT_WARP and spellId == 35346 ) then
KHunterTimersFrame_add( 6000, spellName, spellId );
elseif( KHTvars["skills"][KHT_SHIELD] and spellName == KHT_SHIELD ) then
KHunterTimersFrame_add( 12000, spellName, spellId );
elseif( KHTvars["skills"][KHT_CULLING] and spellName == KHT_CULLING ) then
KHunterTimersFrame_add( 10000, spellName, spellId );
elseif( KHTvars["skills"][KHT_COWER] and spellName == KHT_COWER ) then
KHunterTimersFrame_add( 6000, spellName, spellId );
elseif( KHTvars["skills"][KHT_ANKLE] and spellName == KHT_ANKLE ) then
KHunterTimersFrame_add( 6000, spellName, spellId );
elseif( KHTvars["skills"][KHT_RECOVERY] and spellName == KHT_RECOVERY ) then
KHunterTimersFrame_add( 9000, spellName, spellId );
elseif( KHTvars["skills"][KHT_COURAGE] and spellName == KHT_COURAGE ) then
KHunterTimersFrame_add( 60000, spellName, spellId );
end
1348,8 → 1306,6
KHunterTimersFrame_add( 10000, spellName, spellId );
elseif( KHTvars["skills"][KHT_WINDRUNNER] and spellName == KHT_WINDRUNNER_4PC and spellId == 68130 ) then
KHunterTimersFrame_add( 10000, spellName, spellId );
elseif( KHTvars["skills"][KHT_HYPER] and spellName == KHT_HYP_SPEED ) then
KHunterTimersFrame_add( 12000, spellName, spellId );
elseif( KHTvars["skills"][KHT_FLAMEWAKER] and spellName == KHT_FLAMEWAKER_4PC and spellId == 99060 ) then
KHunterTimersFrame_add( 15000, spellName, spellId );
elseif( KHTvars["skills"][KHT_TIME_WARP] and spellName == KHT_TIME_WARP and spellId == 80353 ) then
1472,12 → 1428,8
end
if( fromPlayer or fromPet ) then
if( KHTvars["skills"][KHT_BEAST] ) then
if( KHTvars["skills"][KHT_SCARE_BEAST] and spellName == KHT_SCARE_BEAST ) then
KHunterTimersFrame_add( 20000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_INTIM] and spellName == KHT_INTIM and spellId == 24394 ) then
if( KHTvars["skills"][KHT_INTIM] and spellName == KHT_INTIM and spellId == 24394 ) then
KHunterTimersFrame_add( 3000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_WIDOW_VENOM] and spellName == KHT_WIDOW_VENOM ) then
KHunterTimersFrame_add( 30000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_DIRE] and spellName == KHT_DIRE ) then
KHunterTimersFrame_add( 15000, spellName, spellId );
end
1488,10 → 1440,6
khtSerpentAoE = true;
end
khtMulti = false;
elseif( KHTvars["skills"][KHT_CONC_BARRAGE] and spellName == KHT_CONC_BARRAGE ) then
KHunterTimersFrame_add( 4000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_PIERCING] and spellName == KHT_PIERCING ) then
KHunterTimersFrame_add( 8000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_GLAIVE] and spellName == KHT_GLAIVE ) then
KHunterTimersFrame_add( 3000, spellName );
end
1521,18 → 1469,15
KHunterTimersFrame_add( 30000*KHTvars["traptimemult"], KHT_FROST_TRAP.." "..KHT_AURA, spellId );
end
end
elseif( string.find( spellName, KHT_EXPL_TRAP ) or string.find( spellName, KHT_IMMO_TRAP ) ) then
elseif( string.find( spellName, KHT_EXPL_TRAP ) ) then
if( fireTrapTimer ) then
for num = 1, KHTvars["numBars"] do
local barframe = _G[ "KHunterTimersStatus"..num];
if( barframe.spell == KHT_EXPL_TRAP.." "..KHT_PRIMED or
barframe.spell == KHT_IMMO_TRAP.." "..KHT_PRIMED ) then
if( barframe.spell == KHT_EXPL_TRAP.." "..KHT_PRIMED ) then
barframe.endTime = 0;
end
end
if( KHTvars["skills"][KHT_IMMO_TRAP] and string.find( spellName, KHT_IMMO_TRAP ) ) then
KHunterTimersFrame_add( 15000, KHT_IMMO_TRAP, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_EXPL_TRAP] and string.find( spellName, KHT_EXPL_TRAP ) ) then
if( KHTvars["skills"][KHT_EXPL_TRAP] and string.find( spellName, KHT_EXPL_TRAP ) ) then
KHunterTimersFrame_add( 20000, KHT_EXPL_TRAP.." "..KHT_AURA, spellId );
end
end
1543,12 → 1488,6
KHunterTimersFrame_add( 12000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_SPIRIT_MEND] and spellName == KHT_SPIRIT_MEND ) then
KHunterTimersFrame_add( 10000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_WEB] and spellName == KHT_WEB ) then
KHunterTimersFrame_add( 5000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_VENOM_WEB] and spellName == KHT_VENOM_WEB ) then
KHunterTimersFrame_add( 5000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_WEB_WRAP] and spellName == KHT_WEB_WRAP ) then
KHunterTimersFrame_add( 3000, spellName, spellId, destName, destGUID );
end
end
if( KHTvars["skills"][KHT_MISC] ) then
1559,11 → 1498,6
end
elseif( combatEvent == "SPELL_AURA_APPLIED_DOSE" ) then
if( toPlayer or toPet ) then
if( KHTvars["skills"][KHT_MARKS] ) then
if( KHTvars["skills"][KHT_MASTER_MARKS] and spellName == KHT_READY_SET ) then
KHunterTimersFrame_add( 30000, spellName, spellId );
end
end
if( KHTvars["skills"][KHT_PETS] ) then
if( KHTvars["skills"][KHT_BITE] and spellName == KHT_BITE_PROC ) then
KHunterTimersFrame_add( 12000, spellName, spellId );
1578,9 → 1512,7
end
end
if( KHTvars["skills"][KHT_PETS] ) then
if( KHTvars["skills"][KHT_CULLING] and spellName == KHT_CULLING ) then
KHunterTimersFrame_add( 10000, spellName, spellId );
elseif( KHTvars["skills"][KHT_COURAGE] and spellName == KHT_COURAGE ) then
if( KHTvars["skills"][KHT_COURAGE] and spellName == KHT_COURAGE ) then
KHunterTimersFrame_add( 60000, spellName, spellId );
end
end
1638,12 → 1570,6
khtSerpentAoE = true;
end
khtMulti = false;
elseif( KHTvars["skills"][KHT_CONC_BARRAGE] and spellName == KHT_CONC_BARRAGE ) then
KHunterTimersFrame_add( 4000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_PIERCING] and spellName == KHT_PIERCING ) then
KHunterTimersFrame_add( 8000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_WIDOW_VENOM] and spellName == KHT_WIDOW_VENOM ) then
KHunterTimersFrame_add( 30000, spellName, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_GLAIVE] and spellName == KHT_GLAIVE ) then
KHunterTimersFrame_add( 3000, spellName );
end
1665,18 → 1591,15
KHunterTimersFrame_add( 30000*KHTvars["traptimemult"], KHT_FROST_TRAP.." "..KHT_AURA, spellId );
end
end
elseif( string.find( spellName, KHT_EXPL_TRAP ) or string.find( spellName, KHT_IMMO_TRAP ) ) then
elseif( string.find( spellName, KHT_EXPL_TRAP ) ) then
if( fireTrapTimer ) then
for num = 1, KHTvars["numBars"] do
local barframe = _G[ "KHunterTimersStatus"..num];
if( barframe.spell == KHT_EXPL_TRAP.." "..KHT_PRIMED or
barframe.spell == KHT_IMMO_TRAP.." "..KHT_PRIMED ) then
if( barframe.spell == KHT_EXPL_TRAP.." "..KHT_PRIMED ) then
barframe.endTime = 0;
end
end
if( KHTvars["skills"][KHT_IMMO_TRAP] and string.find( spellName, KHT_IMMO_TRAP ) ) then
KHunterTimersFrame_add( 15000, KHT_IMMO_TRAP, spellId, destName, destGUID );
elseif( KHTvars["skills"][KHT_EXPL_TRAP] and string.find( spellName, KHT_EXPL_TRAP ) ) then
if( KHTvars["skills"][KHT_EXPL_TRAP] and string.find( spellName, KHT_EXPL_TRAP ) ) then
KHunterTimersFrame_add( 20000, KHT_EXPL_TRAP.." "..KHT_AURA, spellId );
end
end
1728,14 → 1651,6
khtRapidFire = timeLeft;
end
end
if( KHTvars["skills"][KHT_STEADY] ) then
local spellName, _, _, _, _, duration, timeLeft, _, _, _, spellId = UnitBuff("player", KHT_STEADY, nil );
if( spellName and timeLeft ~= khtImpSteady ) then
duration = timeLeft - GetTime();
KHunterTimersFrame_add( duration*1000, spellName, spellId );
khtImpSteady = timeLeft;
end
end
if( KHTvars["skills"][KHT_SNIPER] ) then
local spellName, _, _, _, _, duration, timeLeft, _, _, _, spellId = UnitBuff("player", KHT_SNIPER, nil );
if( spellName and timeLeft ~= khtSniper ) then
1804,14 → 1719,6
end
end
end
if( KHTvars["skills"][KHT_HUNTERS_MARK] ) then
local spellName, _, _, _, _, duration, timeLeft, unitCaster, _, _, spellId = UnitDebuff("target", KHT_HUNTERS_MARK, nil );
if( spellName and unitCaster == "player" and timeLeft ~= khtMark ) then
duration = timeLeft - GetTime();
KHunterTimersFrame_add( duration*1000, spellName, spellId, UnitName("target"), UnitGUID("target") );
khtMark = timeLeft;
end
end
end
if( KHTvars["skills"][KHT_SURV] ) then
if( KHTvars["skills"][KHT_EXPL_SHOT] ) then
1829,7 → 1736,7
frostTrapTimer = true;
KHunterTimersFrame_add( 60000, secondArg.." "..KHT_PRIMED );
end
elseif( secondArg == KHT_EXPL_TRAP or secondArg == KHT_IMMO_TRAP ) then
elseif( secondArg == KHT_EXPL_TRAP ) then
if( KHTvars["skills"][KHT_SURV] and KHTvars["skills"][secondArg] ) then
fireTrapTimer = true;
KHunterTimersFrame_add( 60000, secondArg.." "..KHT_PRIMED );
2543,20 → 2450,14
KHTvars["textures"][KHT_BLOOD_HUNT_2PC] = KHT_BLOOD_HUNT_2PC_ICON;
KHTvars["textures"][KHT_BLOOD_HUNT_4PC] = KHT_BLOOD_HUNT_4PC_ICON;
KHTvars["textures"][KHT_WINDRUNNER_4PC] = KHT_WINDRUNNER_4PC_ICON;
KHTvars["textures"][KHT_HYP_SPEED] = KHT_HYP_SPEED_ICON;
KHTvars["textures"][KHT_FLAMEWAKER_4PC] = KHT_FLAMEWAKER_4PC_ICON;
KHTvars["textures"][KHT_WYRMSTALKER_4PC] = KHT_WYRMSTALKER_4PC_ICON;
KHTvars["textures"][KHT_SAUROK_2PC] = KHT_SAUROK_2PC_ICON;
 
-- Talent Procs
KHTvars["textures"][KHT_COBRA_STRIKES] = KHT_COBRA_STRIKES_ICON;
KHTvars["textures"][KHT_CONC_BARRAGE] = KHT_CONC_BARRAGE_ICON;
KHTvars["textures"][KHT_PET_FRENZY] = KHT_PET_FRENZY_ICON;
KHTvars["textures"][KHT_STEADY] = KHT_STEADY_ICON;
KHTvars["textures"][KHT_LOCK_LOAD] = KHT_LOCK_LOAD_ICON;
KHTvars["textures"][KHT_PIERCING] = KHT_PIERCING_ICON;
KHTvars["textures"][KHT_READY_SET] = KHT_READY_SET_ICON;
KHTvars["textures"][KHT_FIRE] = KHT_FIRE_ICON;
KHTvars["textures"][KHT_SNIPER] = KHT_SNIPER_ICON;
 
-- Trinkets
KHunterTimers/version history.txt
1,5 → 1,7
Version History
 
v3.7.0
- Updates for 6.0.2 patch
v3.6.10
- TOC update for 5.4 patch
v3.6.9
KHunterTimers/KHunterTimers.toc
1,7 → 1,7
## Interface: 50400
## Interface: 60000
## Title: Kharthus's Hunter Timers
## Notes: Times hunter buffs/debuffs
## Version: 3.6.10
## Version: 3.7.0b1
## DefaultState: Enabled
## LoadOnDemand: 0
## SavedVariables: KHTvars
KHunterTimers/localization.lua
5,42 → 5,29
--Shots
KHT_AUTO_SHOT = GetSpellInfo(75); -- Auto Shot
KHT_CONC_SHOT = GetSpellInfo(5116); -- Concussive Shot
KHT_SCATTER = GetSpellInfo(19503); -- Scatter Shot
KHT_SILENCE_SHOT = GetSpellInfo(34490); -- Silencing Shot
KHT_BLACK_ARROW = GetSpellInfo(3674); -- Black Arrow
KHT_CHIMERA = GetSpellInfo(53209); -- Chimera Shot
KHT_MULTI = GetSpellInfo(2643); -- Multi-Shot
KHT_COBRA = GetSpellInfo(77767); -- Cobra Shot
KHT_EXPL_SHOT = GetSpellInfo(53301); -- Explosive Shot
KHT_WIDOW_VENOM = GetSpellInfo(82654); -- Widow Venom
 
--Buffs
KHT_HUNTERS_MARK = GetSpellInfo(1130); -- Hunter's Mark
KHT_MISDIRECTION = GetSpellInfo(34477); -- Misdirection
KHT_RAPID_FIRE = GetSpellInfo(3045); -- Rapid Fire
KHT_CAMO = GetSpellInfo(51753); -- Camouflage
 
--Pet Skills
KHT_STAND = GetSpellInfo(53478); -- Last Stand
KHT_RABID = GetSpellInfo(53401); -- Rabid
KHT_ROAR = GetSpellInfo(53480); -- Roar of Sacrifice
KHT_SERENITY = GetSpellInfo(50318); -- Serenity Dust
KHT_BITE = GetSpellInfo(54680); -- Monstrous Bite
KHT_BITE_PROC = GetSpellInfo(54681); -- Monstrous Strength
KHT_DASH = GetSpellInfo(1850); -- Dash
KHT_CARRION = GetSpellInfo(54044); -- Carrion Feeder
KHT_FURIOUS = GetSpellInfo(24604); -- Furious Howl
KHT_WARP = GetSpellInfo(35346); -- Time Warp
KHT_SHIELD = GetSpellInfo(26064); -- Shell Shield
KHT_CULLING = GetSpellInfo(70893); -- Culling the Herd
KHT_COWER = GetSpellInfo(1742); -- Cower
KHT_ANKLE = GetSpellInfo(50433); -- Ankle Crack
KHT_RECOVERY = GetSpellInfo(53517); -- Roar of Recovery
KHT_SPIRIT_MEND = GetSpellInfo(90361); -- Spirit Mend
KHT_COURAGE = GetSpellInfo(93435); -- Roar of Courage
KHT_WEB = GetSpellInfo(4167); -- Web
KHT_VENOM_WEB = GetSpellInfo(54706); -- Venom Web Spray
KHT_WEB_WRAP = GetSpellInfo(96201); -- Web Wrap
KHT_CLEAVE = GetSpellInfo(118455); -- Beast Cleave
 
--Racials
76,8 → 63,6
KHT_BLOOD_HUNTER = "Blood Hunter 2/4-piece bonuses";
KHT_WINDRUNNER_4PC, _, KHT_WINDRUNNER_4PC_ICON = GetSpellInfo(68130); -- Windrunner 4-piece bonus
KHT_WINDRUNNER = "Windrunner 4-piece bonus";
KHT_HYP_SPEED, _, KHT_HYP_SPEED_ICON = GetSpellInfo(54758); -- Hyperspeed Accelerators
KHT_HYPER = "Hyperspeed Accelerators";
KHT_FLAMEWAKER_4PC, _, KHT_FLAMEWAKER_4PC_ICON = GetSpellInfo(99060); -- Flamewaker 4-piece bonus
KHT_FLAMEWAKER = "Flamewaker 4-piece bonus";
KHT_WYRMSTALKER_4PC, _, KHT_WYRMSTALKER_4PC_ICON = GetSpellInfo(105919); -- Wyrmstalker 4-piece bonus
87,15 → 72,9
 
--Talent Procs
KHT_COBRA_STRIKES, _, KHT_COBRA_STRIKES_ICON = GetSpellInfo(53257); -- Cobra Strikes
KHT_CONC_BARRAGE, _, KHT_CONC_BARRAGE_ICON = GetSpellInfo(35101); -- Concussive Barrage
KHT_STEADY, _, KHT_STEADY_ICON = GetSpellInfo(53220); -- Improved Steady Shot
KHT_LOCK_LOAD, _, KHT_LOCK_LOAD_ICON = GetSpellInfo(56453); -- Lock and Load
KHT_PIERCING, _, KHT_PIERCING_ICON = GetSpellInfo(63468); -- Piercing Shots
KHT_MASTER_MARKS = GetSpellInfo(34487); -- Master Marksman
KHT_READY_SET, _, KHT_READY_SET_ICON = GetSpellInfo(82925);
KHT_FIRE, _, KHT_FIRE_ICON = GetSpellInfo(82926);
KHT_LOCK_LOAD, _, KHT_LOCK_LOAD_ICON = GetSpellInfo(168980); -- Lock and Load
KHT_FOCUS_FIRE = GetSpellInfo(82692); -- Focus Fire
KHT_SNIPER, _, KHT_SNIPER_ICON = GetSpellInfo(53302); -- Sniper Training
KHT_SNIPER, _, KHT_SNIPER_ICON = GetSpellInfo(76659); -- Sniper Training
KHT_THRILL = GetSpellInfo(34720); -- Thrill of the Hunt
KHT_GLAIVE = GetSpellInfo(117050); -- Glaive Toss
KHT_STAMPEDE = GetSpellInfo(121818); -- Stampede
194,11 → 173,10
--Traps
KHT_FROST_TRAP = GetSpellInfo(13809); -- Frost Trap
KHT_EXPL_TRAP = GetSpellInfo(13813); -- Explosive Trap
KHT_IMMO_TRAP = GetSpellInfo(13795); -- Immolation Trap
KHT_FREEZING_TRAP = GetSpellInfo(1499); -- Freezing Trap
KHT_SNAKE_TRAP = GetSpellInfo(34600); -- Snake Trap
KHT_VENOMOUS = "Venomous Snake";
KHT_ENTRAPMENT, _, KHT_ENTRAPMENT_ICON = GetSpellInfo(19185); -- Entrapment
KHT_ENTRAPMENT, _, KHT_ENTRAPMENT_ICON = GetSpellInfo(19387); -- Entrapment
KHT_AURA = "aura";
KHT_PRIMED = "primed";
 
209,11 → 187,10
KHT_STING = "Sting";
KHT_WYVERN = GetSpellInfo(19386); -- Wyvern Sting
KHT_WYVERN_TEXT = GetSpellInfo(19386).." (Sleep)"; -- Wyvern Sting (Sleep)
KHT_SERPENT = GetSpellInfo(1978); -- Serpent Sting
KHT_SERPENT = GetSpellInfo(87935); -- Serpent Sting
 
--Other
KHT_FLARE = GetSpellInfo(1543); -- Flare
KHT_SCARE_BEAST = GetSpellInfo(1513); -- Scare Beast
KHT_DONE = "Done!"
 
--Status Text---------------------------------------