From 7620a1a7167cb0ccbea133f8b3e9fe984cee419e Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Mon, 5 May 2014 18:02:34 +0000 Subject: [PATCH] Remove or fix the help for small icons to the sides of the main icon. Most of them were inaccurately labeled with "help=cd" which gave an incorrect hover tooltip suggesting that they were abilities that should be held for high damage phases. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1373 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- scripts/ovale_druid.lua | 28 ++++++++++++++-------------- scripts/ovale_mage.lua | 22 +++++++++++----------- scripts/ovale_monk.lua | 23 +++++++++++------------ scripts/ovale_paladin.lua | 26 ++++++++++++-------------- scripts/ovale_priest.lua | 6 +++--- scripts/ovale_rogue.lua | 12 ++++++------ scripts/ovale_shaman.lua | 24 ++++++++++++------------ 7 files changed, 69 insertions(+), 72 deletions(-) diff --git a/scripts/ovale_druid.lua b/scripts/ovale_druid.lua index 6def1e2..e09b386 100644 --- a/scripts/ovale_druid.lua +++ b/scripts/ovale_druid.lua @@ -158,7 +158,7 @@ AddFunction BalancePrecombatCdActions ### Balance Icons -AddIcon mastery=balance help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=balance size=small checkboxon=opt_icons_left { Spell(barkskin) Spell(survival_instincts) @@ -200,13 +200,13 @@ AddIcon mastery=balance help=cd BalanceDefaultCdActions() } -AddIcon mastery=balance help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=balance size=small checkboxon=opt_icons_right { if TalentPoints(heart_of_the_wild_talent) Spell(heart_of_the_wild_caster) if TalentPoints(natures_vigil_talent) Spell(natures_vigil) } -AddIcon mastery=balance help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=balance size=small checkboxon=opt_icons_right { UseItemActions() } @@ -572,7 +572,7 @@ AddListItem(opt_feral_rotation advanced "Use advanced rotation" mastery=feral) ### Feral Icons -AddIcon mastery=feral help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=feral size=small checkboxon=opt_icons_left { Spell(barkskin) Spell(survival_instincts) @@ -622,13 +622,13 @@ AddIcon mastery=feral help=cd if List(opt_feral_rotation advanced) FeralAdvancedCdActions() } -AddIcon mastery=feral help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=feral size=small checkboxon=opt_icons_right { if TalentPoints(heart_of_the_wild_talent) Spell(heart_of_the_wild_melee) if TalentPoints(natures_vigil_talent) Spell(natures_vigil) } -AddIcon mastery=feral help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=feral size=small checkboxon=opt_icons_right { UseItemActions() } @@ -709,12 +709,12 @@ AddFunction GuardianPrecombatActions ### Guardian icons. -AddIcon mastery=guardian help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=guardian size=small checkboxon=opt_icons_left { Spell(might_of_ursoc) } -AddIcon mastery=guardian help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=guardian size=small checkboxon=opt_icons_left { Spell(barkskin) if TalentPoints(force_of_nature_talent) Spell(force_of_nature_tank) @@ -742,13 +742,13 @@ AddIcon mastery=guardian help=cd GuardianCdActions() } -AddIcon mastery=guardian help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=guardian size=small checkboxon=opt_icons_right { #renewal,if=talent.renewal.enabled&incoming_damage_5>0.8*health.max if TalentPoints(renewal_talent) and IncomingDamage(5) > 0.8 * MaxHealth() Spell(renewal) } -AddIcon mastery=guardian help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=guardian size=small checkboxon=opt_icons_right { UseItemActions() } @@ -831,14 +831,14 @@ AddFunction RestorationPrecombatActions ### Restoration icons. -AddIcon mastery=restoration help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=restoration size=small checkboxon=opt_icons_left { Spell(barkskin) Spell(might_of_ursoc) Spell(survival_instincts) } -AddIcon mastery=restoration help=buff size=small checkboxon=opt_icons_left +AddIcon mastery=restoration size=small checkboxon=opt_icons_left { #innervate,if=mana.pct<90 if ManaPercent() < 90 Spell(innervate) @@ -868,12 +868,12 @@ AddIcon mastery=restoration help=cd RestorationCdActions() } -AddIcon mastery=restoration help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=restoration size=small checkboxon=opt_icons_right { Spell(ironbark) } -AddIcon mastery=restoration help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=restoration size=small checkboxon=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_mage.lua b/scripts/ovale_mage.lua index d1469f3..8616da4 100644 --- a/scripts/ovale_mage.lua +++ b/scripts/ovale_mage.lua @@ -185,7 +185,7 @@ AddFunction ArcanePrecombatCdActions ### Arcane icons. -AddIcon mastery=arcane help=Blink size=small checkboxon=opt_icons_left +AddIcon mastery=arcane size=small checkboxon=opt_icons_left { if TalentPoints(cold_snap_talent) and HealthPercent() < 30 Spell(cold_snap) Spell(blink) @@ -221,12 +221,12 @@ AddIcon mastery=arcane help=cd ArcaneDefaultCdActions() } -AddIcon mastery=arcane help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=arcane size=small checkboxon=opt_icons_right { if BuffExpires(burst_haste any=1) and DebuffExpires(burst_haste_debuff) Spell(time_warp) } -AddIcon mastery=arcane help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=arcane size=small checkboxon=opt_icons_right { UseItemActions() } @@ -378,13 +378,13 @@ AddFunction FirePrecombatCdActions ### Fire icons. -AddIcon mastery=fire help=Blink size=small checkboxon=opt_icons_left +AddIcon mastery=fire size=small checkboxon=opt_icons_left { if TalentPoints(cold_snap_talent) and HealthPercent() < 30 Spell(cold_snap) Spell(blink) } -AddIcon mastery=fire help=Combustion size=small checkboxon=opt_icons_left +AddIcon mastery=fire size=small checkboxon=opt_icons_left { Spell(combustion) } @@ -412,12 +412,12 @@ AddIcon mastery=fire help=cd FireDefaultCdActions() } -AddIcon mastery=fire help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=fire size=small checkboxon=opt_icons_right { if BuffExpires(burst_haste any=1) and DebuffExpires(burst_haste_debuff) Spell(time_warp) } -AddIcon mastery=fire help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=fire size=small checkboxon=opt_icons_right { UseItemActions() } @@ -571,13 +571,13 @@ AddFunction FrostAoeActions ### Frost icons. -AddIcon mastery=frost help=Blink size=small checkboxon=opt_icons_left +AddIcon mastery=frost size=small checkboxon=opt_icons_left { if TalentPoints(cold_snap_talent) and HealthPercent() < 30 Spell(cold_snap) Spell(blink) } -AddIcon mastery=frost help=combustion size=small checkboxon=opt_icons_left +AddIcon mastery=frost size=small checkboxon=opt_icons_left { if pet.Present() Spell(water_elemental_freeze) } @@ -605,12 +605,12 @@ AddIcon mastery=frost help=cd FrostDefaultCdActions() } -AddIcon mastery=frost help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=frost size=small checkboxon=opt_icons_right { if BuffExpires(burst_haste any=1) and DebuffExpires(burst_haste_debuff) Spell(time_warp) } -AddIcon mastery=frost help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=frost size=small checkboxon=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_monk.lua b/scripts/ovale_monk.lua index c5a2742..b912352 100644 --- a/scripts/ovale_monk.lua +++ b/scripts/ovale_monk.lua @@ -156,20 +156,19 @@ AddFunction BrewmasterPrecombatActions ### Brewmaster icons. -AddIcon mastery=brewmaster help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=brewmaster size=small checkboxon=opt_icons_left { if TalentPoints(dampen_harm_talent) Spell(dampen_harm) if TalentPoints(diffuse_magic_talent) Spell(diffuse_magic) } -AddIcon mastery=brewmaster help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=brewmaster size=small checkboxon=opt_icons_left { Spell(fortifying_brew) Spell(symbiosis_survival_instincts) UseRacialSurvivalActions() } -# Defensive abilities AddIcon mastery=brewmaster help=cd { BrewmasterShortCdActions() @@ -200,12 +199,12 @@ AddIcon mastery=brewmaster help=cd BrewmasterCdActions() } -AddIcon mastery=brewmaster help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=brewmaster size=small checkboxon=opt_icons_right { if TotemExpires(statue) or BuffExpires(sanctuary_of_the_ox_buff) Spell(summon_black_ox_statue) } -AddIcon mastery=brewmaster help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=brewmaster size=small checkboxon=opt_icons_right { UseItemActions() } @@ -292,12 +291,12 @@ AddFunction MistweaverPrecombatActions ### Mistweaver icons. -AddIcon mastery=mistweaver help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=mistweaver size=small checkboxon=opt_icons_right { if TotemExpires(statue) Spell(summon_jade_serpent_statue) } -AddIcon mastery=mistweaver help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=mistweaver size=small checkboxon=opt_icons_left { if BuffCount(renewing_mist_buff) > 5 Spell(thunder_focus_tea) Spell(revival) @@ -349,7 +348,7 @@ AddIcon mastery=mistweaver help=mana size=small checkboxon=opt_icons_left } } -AddIcon mastery=mistweaver help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=mistweaver size=small checkboxon=opt_icons_right { UseItemActions() } @@ -474,13 +473,13 @@ AddFunction WindwalkerPrecombatCdActions ### Windwalker icons. -AddIcon mastery=windwalker help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=windwalker size=small checkboxon=opt_icons_left { if TalentPoints(dampen_harm_talent) Spell(dampen_harm) if TalentPoints(diffuse_magic_talent) Spell(diffuse_magic) } -AddIcon mastery=windwalker help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=windwalker size=small checkboxon=opt_icons_left { if TalentPoints(chi_burst_talent) Spell(chi_burst) if TalentPoints(chi_wave_talent) Spell(chi_wave) @@ -519,12 +518,12 @@ AddIcon mastery=windwalker help=cd WindwalkerDefaultCdActions() } -AddIcon mastery=windwalker help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=windwalker size=small checkboxon=opt_icons_right { Spell(zen_meditation) } -AddIcon mastery=windwalker help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=windwalker size=small checkboxon=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_paladin.lua b/scripts/ovale_paladin.lua index c51085a..f1d6781 100644 --- a/scripts/ovale_paladin.lua +++ b/scripts/ovale_paladin.lua @@ -67,15 +67,14 @@ AddFunction HolyPrecombatActions ### Holy Icons -# Damage reduction cooldowns. -AddIcon mastery=holy help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=holy size=small checkboxon=opt_icons_left { Spell(divine_protection) Spell(devotion_aura) UseRacialSurvivalActions() } -AddIcon mastery=holy help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=holy help=mana size=small checkboxon=opt_icons_left { if ManaPercent() <98 Spell(arcane_torrent_mana) if ManaPercent() <88 Spell(divine_plea) @@ -113,12 +112,12 @@ AddIcon mastery=holy help=cd Spell(guardian_of_ancient_kings_heal) } -AddIcon mastery=holy help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=holy size=small checkboxon=opt_icons_right { if BuffPresent(righteous_fury) Texture(spell_holy_sealoffury) } -AddIcon mastery=holy help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=holy size=small checkboxon=opt_icons_right { UseItemActions() } @@ -221,7 +220,7 @@ AddFunction ProtectionPrecombatActions ### Protection Icons -AddIcon mastery=protection help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=protection size=small checkboxon=opt_icons_left { Spell(divine_protection) Spell(ardent_defender) @@ -230,7 +229,7 @@ AddIcon mastery=protection help=cd size=small checkboxon=opt_icons_left UseRacialSurvivalActions() } -AddIcon mastery=protection help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=protection size=small checkboxon=opt_icons_left { if DebuffExpires(forbearance_debuff) { @@ -273,13 +272,12 @@ AddIcon mastery=protection help=cd ProtectionDefaultCdActions() } -# Righteous Fury indicator. -AddIcon mastery=protection help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=protection size=small checkboxon=opt_icons_right { if BuffPresent(righteous_fury) Texture(spell_holy_sealoffury) } -AddIcon mastery=protection help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=protection size=small checkboxon=opt_icons_right { UseItemActions() } @@ -431,7 +429,7 @@ AddFunction RetributionPrecombatCdActions ### Retribution Icons -AddIcon mastery=retribution help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=retribution size=small checkboxon=opt_icons_left { if IsRooted() { @@ -440,7 +438,7 @@ AddIcon mastery=retribution help=cd size=small checkboxon=opt_icons_left } } -AddIcon mastery=retribution help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=retribution size=small checkboxon=opt_icons_left { Spell(lay_on_hands) Spell(hand_of_protection) @@ -470,14 +468,14 @@ AddIcon mastery=retribution help=cd RetributionDefaultCdActions() } -AddIcon mastery=retribution help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=retribution size=small checkboxon=opt_icons_right { #seal_of_righteousness,if=active_enemies>=4 if Enemies() >= 4 and not Stance(paladin_seal_of_righteousness) Spell(seal_of_righteousness) if BuffPresent(righteous_fury) Texture(spell_holy_sealoffury) } -AddIcon mastery=retribution help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=retribution size=small checkboxon=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_priest.lua b/scripts/ovale_priest.lua index be3ef20..f95cc87 100644 --- a/scripts/ovale_priest.lua +++ b/scripts/ovale_priest.lua @@ -170,7 +170,7 @@ AddFunction ShadowPrecombatCdActions ### Feral Icons -AddIcon mastery=shadow help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=shadow size=small checkboxon=opt_icons_left { if TalentPoints(desperate_prayer_talent) Spell(desperate_prayer) Spell(dispersion) @@ -207,12 +207,12 @@ AddIcon mastery=shadow help=cd ShadowDefaultCdActions() } -AddIcon mastery=shadow help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=shadow size=small checkboxon=opt_icons_right { Spell(mass_dispel) } -AddIcon mastery=shadow help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=shadow size=small checkboxon=opt_icons_right { UseItemActions() } diff --git a/scripts/ovale_rogue.lua b/scripts/ovale_rogue.lua index 1e46e00..b2c5546 100644 --- a/scripts/ovale_rogue.lua +++ b/scripts/ovale_rogue.lua @@ -174,13 +174,13 @@ AddIcon mastery=assassination help=cd AssassinationDefaultCdActions() } -AddIcon mastery=assassination help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=assassination size=small checkboxon=opt_icons_right { Spell(feint) UseRacialSurvivalActions() } -AddIcon mastery=assassination help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=assassination size=small checkboxon=opt_icons_right { Spell(cloak_of_shadows) } @@ -377,13 +377,13 @@ AddIcon mastery=combat help=cd CombatDefaultCdActions() } -AddIcon mastery=combat help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=combat size=small checkboxon=opt_icons_right { Spell(feint) UseRacialSurvivalActions() } -AddIcon mastery=combat help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=combat size=small checkboxon=opt_icons_right { Spell(cloak_of_shadows) } @@ -588,13 +588,13 @@ AddIcon mastery=subtlety help=cd SubtletyDefaultCdActions() } -AddIcon mastery=subtlety help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=subtlety size=small checkboxon=opt_icons_right { Spell(feint) UseRacialSurvivalActions() } -AddIcon mastery=subtlety help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=subtlety size=small checkboxon=opt_icons_right { Spell(cloak_of_shadows) } diff --git a/scripts/ovale_shaman.lua b/scripts/ovale_shaman.lua index ec16838..1fa0ff6 100644 --- a/scripts/ovale_shaman.lua +++ b/scripts/ovale_shaman.lua @@ -140,7 +140,7 @@ AddFunction ElementalPrecombatCdActions ### Elemental icons. -AddIcon mastery=elemental help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=elemental size=small checkboxon=opt_icons_left { if TalentPoints(stone_bulwark_totem_talent) Spell(stone_bulwark_totem) if TalentPoints(astral_shift_talent) Spell(astral_shift) @@ -148,7 +148,7 @@ AddIcon mastery=elemental help=cd size=small checkboxon=opt_icons_left Spell(earthbind_totem) } -AddIcon mastery=elemental help=buff size=small checkboxon=opt_icons_left +AddIcon mastery=elemental size=small checkboxon=opt_icons_left { if IsFeared() Spell(tremor_totem) #if IsStunned() Spell(windwalk_totem) @@ -190,7 +190,7 @@ AddIcon mastery=elemental help=cd ElementalSingleCdActions() } -AddIcon mastery=elemental help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=elemental size=small checkboxon=opt_icons_right { #bloodlust,if=target.health.pct<25|time>5 if target.HealthPercent() < 25 or TimeInCombat() > 5 Bloodlust() @@ -198,7 +198,7 @@ AddIcon mastery=elemental help=cd size=small checkboxon=opt_icons_right if not TotemPresent(air totem=stormlash_totem) and not BuffPresent(stormlash_buff) and { BuffPresent(burst_haste any=1) or TimeInCombat() >= 60 } Spell(stormlash_totem) } -AddIcon mastery=elemental help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=elemental size=small checkboxon=opt_icons_right { UseItemActions() } @@ -381,7 +381,7 @@ AddFunction EnhancementPrecombatCdActions ### Enhancement icons. -AddIcon mastery=enhancement help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=enhancement size=small checkboxon=opt_icons_left { if TalentPoints(stone_bulwark_totem_talent) Spell(stone_bulwark_totem) if TalentPoints(astral_shift_talent) Spell(astral_shift) @@ -389,7 +389,7 @@ AddIcon mastery=enhancement help=cd size=small checkboxon=opt_icons_left Spell(earthbind_totem) } -AddIcon mastery=enhancement help=buff size=small checkboxon=opt_icons_left +AddIcon mastery=enhancement size=small checkboxon=opt_icons_left { if IsFeared() Spell(tremor_totem) #if IsStunned() Spell(windwalk_totem) @@ -429,7 +429,7 @@ AddIcon mastery=enhancement help=cd EnhancementSingleCdActions() } -AddIcon mastery=enhancement help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=enhancement size=small checkboxon=opt_icons_right { #bloodlust,if=target.health.pct<25|time>5 if target.HealthPercent() < 25 or TimeInCombat() > 5 Spell(bloodlust) @@ -437,7 +437,7 @@ AddIcon mastery=enhancement help=cd size=small checkboxon=opt_icons_right if not TotemPresent(air totem=stormlash_totem) and not BuffPresent(stormlash_buff) and { BuffPresent(burst_haste any=1) or TimeInCombat() >= 60 } Spell(stormlash_totem) } -AddIcon mastery=enhancement help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=enhancement size=small checkboxon=opt_icons_right { UseItemActions() } @@ -494,7 +494,7 @@ AddFunction RestorationShortCdActions ### Restoration icons. -AddIcon mastery=restoration help=cd size=small checkboxon=opt_icons_left +AddIcon mastery=restoration size=small checkboxon=opt_icons_left { if TalentPoints(stone_bulwark_totem_talent) Spell(stone_bulwark_totem) if TalentPoints(astral_shift_talent) Spell(astral_shift) @@ -502,7 +502,7 @@ AddIcon mastery=restoration help=cd size=small checkboxon=opt_icons_left Spell(earthbind_totem) } -AddIcon mastery=restoration help=buff size=small checkboxon=opt_icons_left +AddIcon mastery=restoration size=small checkboxon=opt_icons_left { if IsFeared() Spell(tremor_totem) #if IsStunned() Spell(windwalk_totem) @@ -540,13 +540,13 @@ AddIcon mastery=restoration help=cd Spell(earth_elemental_totem) } -AddIcon mastery=restoration help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=restoration size=small checkboxon=opt_icons_right { if BuffExpires(stormlash_totem_buff any=1) and {BuffPresent(burst_haste any=1) or TimeInCombat() >60} Spell(stormlash_totem) if BuffExpires(burst_haste any=1) Bloodlust() } -AddIcon mastery=restoration help=cd size=small checkboxon=opt_icons_right +AddIcon mastery=restoration size=small checkboxon=opt_icons_right { UseItemActions() } -- 1.7.9.5