Fix script problems exposed by new, more strict language parser.
Johnny C. Lam [07-13-14 - 11:31]
Fix script problems exposed by new, more strict language parser.
git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1544 d5049fe3-3747-40f7-a4b5-f36d6801af5f
diff --git a/OvaleSimulationCraft.lua b/OvaleSimulationCraft.lua
index 2abfc28..ef3fc47 100644
--- a/OvaleSimulationCraft.lua
+++ b/OvaleSimulationCraft.lua
@@ -741,7 +741,7 @@ do
--]]
local SPECIAL_PROPERTY = {
["^debuff%.casting%.react$"] = "IsInterruptible()",
- ["^debuff%.flying%.down$"] = "True(not flying_debuff)",
+ ["^debuff%.flying%.down$"] = "True(debuff_flying_down)",
["^buff%.raid_movement%.duration$"] = "0",
-- Pretend the target can never be invulnerable.
["^debuff%.invulnerable%.react$"] = "InCombat(no)",
diff --git a/scripts/ovale_mage_spells.lua b/scripts/ovale_mage_spells.lua
index e552709..6369935 100644
--- a/scripts/ovale_mage_spells.lua
+++ b/scripts/ovale_mage_spells.lua
@@ -23,10 +23,10 @@ Define(arcane_charge 114664)
Define(arcane_charge_debuff 36032)
SpellInfo(arcane_charge_debuff duration=10 maxstacks=4)
Define(arcane_explosion 1449)
- SpellAddDebuff(arcane_explosion arcane_charge_debuff=refresh if_spell=arcane_charge))
+ SpellAddDebuff(arcane_explosion arcane_charge_debuff=refresh if_spell=arcane_charge)
Define(arcane_missiles 5143)
SpellInfo(arcane_missiles duration=2)
- SpellAddDebuff(arcane_missiles arcane_charge_debuff=1 if_spell=arcane_charge))
+ SpellAddDebuff(arcane_missiles arcane_charge_debuff=1 if_spell=arcane_charge)
Define(arcane_missiles_buff 79683)
SpellInfo(arcane_missiles_buff duration=20 maxstacks=2)
Define(arcane_power 12042)
diff --git a/scripts/ovale_paladin.lua b/scripts/ovale_paladin.lua
index 73ecddf..4735b82 100644
--- a/scripts/ovale_paladin.lua
+++ b/scripts/ovale_paladin.lua
@@ -48,7 +48,7 @@ AddFunction HolyAoeActions
Spell(holy_radiance)
}
-AddFunction HolySelflessHealerAoeActions()
+AddFunction HolySelflessHealerAoeActions
{
if BuffCountOnAny(beacon_of_light_buff) == 0 Spell(beacon_of_light)
if HolyPower() == MaxHolyPower() Spell(light_of_dawn)
@@ -179,7 +179,7 @@ AddFunction ProtectionDefaultShortCdActions
unless Spell(hammer_of_wrath usable=1)
{
#consecration,if=target.debuff.flying.down&!ticking
- if target.True(not flying_debuff) and not target.DebuffPresent(consecration_debuff)
+ if target.True(debuff_flying_down) and not target.DebuffPresent(consecration_debuff)
{
if Glyph(glyph_of_consecration) Spell(consecration_glyphed)
if Glyph(glyph_of_consecration no) Spell(consecration)
diff --git a/scripts/ovale_priest.lua b/scripts/ovale_priest.lua
index bcb947b..b13cbbe 100644
--- a/scripts/ovale_priest.lua
+++ b/scripts/ovale_priest.lua
@@ -97,7 +97,7 @@ AddFunction ShadowDefaultMovingActions
AddFunction ShadowDefaultShortCdActions
{
- unless { BuffStacks(shadow_word_death_reset_cooldown_buff) == 1 Spell(shadow_word_death usable=1) }
+ unless { BuffStacks(shadow_word_death_reset_cooldown_buff) == 1 and Spell(shadow_word_death usable=1) }
or { ShadowOrbs() == 3 and { SpellCooldown(mind_blast) < 1.5 or target.HealthPercent() < 20 and SpellCooldown(shadow_word_death) < 1.5 } }
or Spell(mind_blast)
or { BuffStacks(shadow_word_death_reset_cooldown_buff) == 0 and Spell(shadow_word_death usable=1) }
diff --git a/scripts/ovale_shaman_spells.lua b/scripts/ovale_shaman_spells.lua
index d38385b..6db15ff 100644
--- a/scripts/ovale_shaman_spells.lua
+++ b/scripts/ovale_shaman_spells.lua
@@ -125,7 +125,7 @@ Define(lava_lash 60103)
Define(lava_surge_buff 77762)
SpellInfo(lava_surge_buff duration=6)
Define(lightning_bolt 403)
- SpellAddBuff(lightning_bolt ancestral_swiftness_buff=0 if_talent=ancestral_swiftness_talent))
+ SpellAddBuff(lightning_bolt ancestral_swiftness_buff=0 if_talent=ancestral_swiftness_talent)
Define(lightning_shield 324)
SpellAddBuff(lightning_shield lightning_shield_buff=1)
Define(lightning_shield_buff 324)
diff --git a/scripts/ovale_warlock_spells.lua b/scripts/ovale_warlock_spells.lua
index 7fdccbc..793f7f3 100644
--- a/scripts/ovale_warlock_spells.lua
+++ b/scripts/ovale_warlock_spells.lua
@@ -54,7 +54,7 @@ Define(dark_soul_instability_buff 113858)
SpellInfo(dark_soul_instability_buff duration=20)
Define(dark_soul_misery 113860)
SpellInfo(dark_soul_misery cd=120 talent=!archimondes_darkness_talent)
- SpellAddBuffoul_misery dark_soul_misery_buff=1)
+ SpellAddBuff(dark_soul_misery dark_soul_misery_buff=1)
Define(dark_soul_misery_buff 113858)
SpellInfo(dark_soul_misery_buff duration=20)
Define(demonic_circle_teleport 48020)
diff --git a/scripts/simulationcraft_paladin_protection_t16h.lua b/scripts/simulationcraft_paladin_protection_t16h.lua
index d69d017..bcdc942 100644
--- a/scripts/simulationcraft_paladin_protection_t16h.lua
+++ b/scripts/simulationcraft_paladin_protection_t16h.lua
@@ -63,7 +63,7 @@ AddFunction ProtectionDefaultActions
#hammer_of_wrath
Spell(hammer_of_wrath usable=1)
#consecration,if=target.debuff.flying.down&!ticking
- if target.True(not flying_debuff) and not target.DebuffPresent(consecration_debuff) Spell(consecration)
+ if target.True(debuff_flying_down) and not target.DebuffPresent(consecration_debuff) Spell(consecration)
#holy_prism,if=talent.holy_prism.enabled
if TalentPoints(holy_prism_talent) Spell(holy_prism)
#sacred_shield,if=talent.sacred_shield.enabled