Skip to content

Commit

Permalink
Update Cata Ele and Enhancement
Browse files Browse the repository at this point in the history
  • Loading branch information
@doadin
doadin committed Oct 17, 2024
1 parent 07c564d commit 0ea2d84
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 34 deletions.
35 changes: 19 additions & 16 deletions Specialization/Cata/Elemental.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,21 @@ local function ClearCDs()
end

function Elemental:callaction()
if (MaxDps:CheckSpellUsable(classtable.FlametongueWeapon, 'FlametongueWeapon')) and cooldown[classtable.FlametongueWeapon].ready then
if not setSpell then setSpell = classtable.FlametongueWeapon end
end
if (MaxDps:CheckSpellUsable(classtable.LightningShield, 'LightningShield')) and cooldown[classtable.LightningShield].ready then
if not setSpell then setSpell = classtable.LightningShield end
end
if (MaxDps:CheckSpellUsable(classtable.ManaSpringTotem, 'ManaSpringTotem')) and cooldown[classtable.ManaSpringTotem].ready then
if not setSpell then setSpell = classtable.ManaSpringTotem end
end
if (MaxDps:CheckSpellUsable(classtable.WrathofAirTotem, 'WrathofAirTotem')) and cooldown[classtable.WrathofAirTotem].ready then
if not setSpell then setSpell = classtable.WrathofAirTotem end
end
--if (MaxDps:CheckSpellUsable(classtable.FlametongueWeapon, 'FlametongueWeapon')) and cooldown[classtable.FlametongueWeapon].ready then
-- if not setSpell then setSpell = classtable.FlametongueWeapon end
--end
--if (MaxDps:CheckSpellUsable(classtable.LightningShield, 'LightningShield')) and cooldown[classtable.LightningShield].ready then
-- if not setSpell then setSpell = classtable.LightningShield end
--end
--if (MaxDps:CheckSpellUsable(classtable.ManaSpringTotem, 'ManaSpringTotem')) and cooldown[classtable.ManaSpringTotem].ready then
-- if not setSpell then setSpell = classtable.ManaSpringTotem end
--end
--if (MaxDps:CheckSpellUsable(classtable.WrathofAirTotem, 'WrathofAirTotem')) and cooldown[classtable.WrathofAirTotem].ready then
-- if not setSpell then setSpell = classtable.WrathofAirTotem end
--end
--if (MaxDps:CheckSpellUsable(classtable.VolcanicPotion, 'VolcanicPotion')) and (not UnitAffectingCombat('player') or MaxDps:Bloodlust() or ttd <= 40) and cooldown[classtable.VolcanicPotion].ready then
-- if not setSpell then setSpell = classtable.VolcanicPotion end
--end
if (MaxDps:CheckSpellUsable(classtable.WindShear, 'WindShear')) and cooldown[classtable.WindShear].ready then
MaxDps:GlowCooldown(classtable.WindShear, ( select(8,UnitCastingInfo('target')) ~= nil and not select(8,UnitCastingInfo('target')) or select(7,UnitChannelInfo('target')) ~= nil and not select(7,UnitChannelInfo('target'))) )
end
Expand All @@ -101,7 +104,7 @@ function Elemental:callaction()
if (MaxDps:CheckSpellUsable(classtable.UnleashElements, 'UnleashElements')) and cooldown[classtable.UnleashElements].ready then
if not setSpell then setSpell = classtable.UnleashElements end
end
if (MaxDps:CheckSpellUsable(classtable.FlameShock, 'FlameShock')) and (not debuff[classtable.FlameShockDeBuff].up or ticks_remain <2 or ( ( MaxDps:Bloodlust() or buff[classtable.ElementalMasteryBuff].up ) and ticks_remain <3 )) and cooldown[classtable.FlameShock].ready then
if (MaxDps:CheckSpellUsable(classtable.FlameShock, 'FlameShock')) and (not debuff[classtable.FlameShockDeBuff].up or debuff[classtable.FlameShockDeBuff].refreshable or ( ( MaxDps:Bloodlust() or buff[classtable.ElementalMasteryBuff].up ) and debuff[classtable.FlameShockDeBuff].refreshable )) and cooldown[classtable.FlameShock].ready then
if not setSpell then setSpell = classtable.FlameShock end
end
if (MaxDps:CheckSpellUsable(classtable.LavaBurst, 'LavaBurst')) and (debuff[classtable.FlameShockDeBuff].remains >( classtable and classtable.LavaBurst and GetSpellInfo(classtable.LavaBurst).castTime /1000 )) and cooldown[classtable.LavaBurst].ready then
Expand All @@ -110,13 +113,13 @@ function Elemental:callaction()
if (MaxDps:CheckSpellUsable(classtable.EarthShock, 'EarthShock')) and (buff[classtable.LightningShieldBuff].up == 9) and cooldown[classtable.EarthShock].ready then
if not setSpell then setSpell = classtable.EarthShock end
end
if (MaxDps:CheckSpellUsable(classtable.EarthShock, 'EarthShock')) and (buff[classtable.LightningShieldBuff].count >6 and debuff[classtable.FlameShockDeBuff].remains >cooldown and debuff[classtable.FlameShockDeBuff].remains <cooldown + action.flame_shock.tick_time) and cooldown[classtable.EarthShock].ready then
if (MaxDps:CheckSpellUsable(classtable.EarthShock, 'EarthShock')) and (buff[classtable.LightningShieldBuff].count >6) and cooldown[classtable.EarthShock].ready then
if not setSpell then setSpell = classtable.EarthShock end
end
if (MaxDps:CheckSpellUsable(classtable.FireElementalTotem, 'FireElementalTotem')) and (not debuff[classtable.FireElementalTotemDeBuff].up and buff[classtable.VolcanicPotionBuff].up and temporary_bonus.spell_power >= 2400) and cooldown[classtable.FireElementalTotem].ready then
if (MaxDps:CheckSpellUsable(classtable.FireElementalTotem, 'FireElementalTotem')) and (not debuff[classtable.FireElementalTotemDeBuff].up and buff[classtable.VolcanicPotionBuff].up) and cooldown[classtable.FireElementalTotem].ready then
if not setSpell then setSpell = classtable.FireElementalTotem end
end
if (MaxDps:CheckSpellUsable(classtable.FireElementalTotem, 'FireElementalTotem')) and (not debuff[classtable.FireElementalTotemDeBuff].up and not buff[classtable.VolcanicPotionBuff].up and temporary_bonus.spell_power >= 1200) and cooldown[classtable.FireElementalTotem].ready then
if (MaxDps:CheckSpellUsable(classtable.FireElementalTotem, 'FireElementalTotem')) and (not debuff[classtable.FireElementalTotemDeBuff].up and not buff[classtable.VolcanicPotionBuff].up) and cooldown[classtable.FireElementalTotem].ready then
if not setSpell then setSpell = classtable.FireElementalTotem end
end
if (MaxDps:CheckSpellUsable(classtable.EarthElementalTotem, 'EarthElementalTotem')) and (not debuff[classtable.EarthElementalTotemDeBuff].up) and cooldown[classtable.EarthElementalTotem].ready then
Expand Down
39 changes: 21 additions & 18 deletions Specialization/Cata/Enhancement.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,24 +85,27 @@ local function ClearCDs()
end

function Enhancement:callaction()
if (MaxDps:CheckSpellUsable(classtable.WindfuryWeapon, 'WindfuryWeapon')) and cooldown[classtable.WindfuryWeapon].ready then
if not setSpell then setSpell = classtable.WindfuryWeapon end
end
if (MaxDps:CheckSpellUsable(classtable.FlametongueWeapon, 'FlametongueWeapon')) and cooldown[classtable.FlametongueWeapon].ready then
if not setSpell then setSpell = classtable.FlametongueWeapon end
end
if (MaxDps:CheckSpellUsable(classtable.StrengthofEarthTotem, 'StrengthofEarthTotem')) and cooldown[classtable.StrengthofEarthTotem].ready then
if not setSpell then setSpell = classtable.StrengthofEarthTotem end
end
if (MaxDps:CheckSpellUsable(classtable.WindfuryTotem, 'WindfuryTotem')) and cooldown[classtable.WindfuryTotem].ready then
if not setSpell then setSpell = classtable.WindfuryTotem end
end
if (MaxDps:CheckSpellUsable(classtable.ManaSpringTotem, 'ManaSpringTotem')) and cooldown[classtable.ManaSpringTotem].ready then
if not setSpell then setSpell = classtable.ManaSpringTotem end
end
if (MaxDps:CheckSpellUsable(classtable.LightningShield, 'LightningShield')) and cooldown[classtable.LightningShield].ready then
if not setSpell then setSpell = classtable.LightningShield end
end
--if (MaxDps:CheckSpellUsable(classtable.WindfuryWeapon, 'WindfuryWeapon')) and cooldown[classtable.WindfuryWeapon].ready then
-- if not setSpell then setSpell = classtable.WindfuryWeapon end
--end
--if (MaxDps:CheckSpellUsable(classtable.FlametongueWeapon, 'FlametongueWeapon')) and cooldown[classtable.FlametongueWeapon].ready then
-- if not setSpell then setSpell = classtable.FlametongueWeapon end
--end
--if (MaxDps:CheckSpellUsable(classtable.StrengthofEarthTotem, 'StrengthofEarthTotem')) and cooldown[classtable.StrengthofEarthTotem].ready then
-- if not setSpell then setSpell = classtable.StrengthofEarthTotem end
--end
--if (MaxDps:CheckSpellUsable(classtable.WindfuryTotem, 'WindfuryTotem')) and cooldown[classtable.WindfuryTotem].ready then
-- if not setSpell then setSpell = classtable.WindfuryTotem end
--end
--if (MaxDps:CheckSpellUsable(classtable.ManaSpringTotem, 'ManaSpringTotem')) and cooldown[classtable.ManaSpringTotem].ready then
-- if not setSpell then setSpell = classtable.ManaSpringTotem end
--end
--if (MaxDps:CheckSpellUsable(classtable.LightningShield, 'LightningShield')) and cooldown[classtable.LightningShield].ready then
-- if not setSpell then setSpell = classtable.LightningShield end
--end
--if (MaxDps:CheckSpellUsable(classtable.TolvirPotion, 'TolvirPotion')) and (not UnitAffectingCombat('player') or MaxDps:Bloodlust() or ttd <= 40) and cooldown[classtable.TolvirPotion].ready then
-- if not setSpell then setSpell = classtable.TolvirPotion end
--end
if (MaxDps:CheckSpellUsable(classtable.WindShear, 'WindShear')) and cooldown[classtable.WindShear].ready then
MaxDps:GlowCooldown(classtable.WindShear, ( select(8,UnitCastingInfo('target')) ~= nil and not select(8,UnitCastingInfo('target')) or select(7,UnitChannelInfo('target')) ~= nil and not select(7,UnitChannelInfo('target'))) )
end
Expand Down

0 comments on commit 0ea2d84

Please sign in to comment.