From b0e8f2f0430131203c76072531b2a9556c5f68fa Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Mon, 14 Nov 2011 19:11:25 +0000 Subject: [PATCH] koKR localization added git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@434 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Ovale.lua | 3 ++- Ovale.toc | 1 + defaut/Druide.lua | 41 ++++++++++++++++++++++------------------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Ovale.lua b/Ovale.lua index 7662807..24270d6 100644 --- a/Ovale.lua +++ b/Ovale.lua @@ -219,7 +219,8 @@ Ovale.buffSpellList = spellhaste = { 24907, -- Moonkin aura - 2895 -- Wrath of Air Totem + 2895, -- Wrath of Air Totem + 49868 -- Mind Quickening }, enrage = { diff --git a/Ovale.toc b/Ovale.toc index ccc5563..e8d0bb2 100644 --- a/Ovale.toc +++ b/Ovale.toc @@ -15,6 +15,7 @@ embeds.xml Locale-frFR.lua Locale-deDE.lua Locale-enUS.lua +Locale-koKR.lua Locale-ptBR.lua Locale-ruRU.lua Locale-zhTW.lua diff --git a/defaut/Druide.lua b/defaut/Druide.lua index c435151..ce9e3ac 100644 --- a/defaut/Druide.lua +++ b/defaut/Druide.lua @@ -191,6 +191,12 @@ AddIcon help=cd mastery=1 Item(Trinket1Slot usable=1) } +AddFunction AddCombo +{ + if CheckBoxOn(shred) Spell(SHRED) + if CheckBoxOff(shred) Spell(MANGLE) +} + AddIcon help=main mastery=2 { if Stance(1) # bear @@ -234,7 +240,7 @@ AddIcon help=main mastery=2 Spell(MANGLECAT) #ravage,if=buff.stampede_cat.up&buff.stampede_cat.remains<=1 - if BuffPresent(STAMPEDE) and BuffExpires(STAMPEDE 1) and CheckBoxOn(shred) Spell(RAVAGE) + if BuffPresent(STAMPEDE) and BuffExpires(STAMPEDE 1) Spell(RAVAGE) #ferocious_bite,if=buff.combo_points.stack>=1&dot.rip.ticking&dot.rip.remains<=1&target.health_pct<=25 if ComboPoints(more 0) and TargetDebuffPresent(RIP mine=1) and TargetDebuffExpires(RIP 1 mine=1) and TargetLifePercent(less 25) @@ -245,7 +251,7 @@ AddIcon help=main mastery=2 Spell(FEROCIOUSBITE) #/shred,extend_rip=1,if=dot.rip.ticking&dot.rip.remains<=4&target.health_pct>25 TODO: extend_rip=1? - if TargetDebuffPresent(RIP mine=1) and TargetDebuffExpires(RIP 4 mine=1) and TargetLifePercent(more 25) and CheckBoxOn(shred) Spell(SHRED) + if TargetDebuffPresent(RIP mine=1) and TargetDebuffExpires(RIP 4 mine=1) and TargetLifePercent(more 25) AddCombo() #rip,if=buff.combo_points.stack>=5&target.time_to_die>=6&dot.rip.remains<2.0&(buff.berserk.up|dot.rip.remains<=cooldown.tigers_fury.remains) if ComboPoints(more 4) and TargetDeadIn(more 6) and TargetDebuffExpires(RIP 2 mine=1) and @@ -265,7 +271,7 @@ AddIcon help=main mastery=2 Spell(RAKE) #shred,if=buff.omen_of_clarity.react - if CheckBoxOn(shred) and BuffPresent(CLEARCASTING) Spell(SHRED) + if BuffPresent(CLEARCASTING) AddCombo() #savage_roar,if=buff.combo_points.stack>=1&buff.savage_roar.remains<=1 if ComboPoints(more 0) and BuffExpires(SAVAGEROAR 1) Spell(SAVAGEROAR) @@ -274,22 +280,19 @@ AddIcon help=main mastery=2 if {TargetDeadIn(less 4) and ComboPoints(more 4)} or {TargetDeadIn(less 1) and ComboPoints(more 0)} Spell(FEROCIOUSBITE) #/ferocious_bite,if=buff.combo_points.stack>=5&dot.rip.remains>=14.0&buff.savage_roar.remains>=10.0 if ComboPoints(more 4) and TargetDebuffPresent(RIP 14 mine=1) and BuffPresent(SAVAGEROAR 10) Spell(FEROCIOUSBITE) - if CheckBoxOn(shred) - { - #ravage,if=buff.stampede_cat.up&!buff.omen_of_clarity.react&buff.tigers_fury.up - if BuffPresent(STAMPEDE) and BuffExpires(CLEARCASTING) and BuffPresent(TIGERSFURY) Spell(RAVAGE) - #/shred,if=buff.tigers_fury.up|buff.berserk.up - if BuffPresent(TIGERSFURY) or BuffPresent(BERSERK) Spell(SHRED) - #/shred,if=(buff.combo_points.stack<5&dot.rip.remains<3.0)|(buff.combo_points.stack=0&buff.savage_roar.remains<2 - if {ComboPoints(less 5) and TargetDebuffExpires(RIP 3 mine=1)} or {ComboPoints(less 1) and BuffExpires(SAVAGEROAR 2)} Spell(SHRED) - #/shred,if=cooldown.tigers_fury.remains<=3.0 - if spell(TIGERSFURY) < 3 Spell(SHRED) - #/shred,if=target.time_to_die<=8.5 - if TargetDeadIn(less 8.5) Spell(SHRED) - #/shred,if=time_to_max_energy<=1.0 - if 1s before Mana(more 99) Spell(SHRED) - } - if CheckBoxOff(shred) and ComboPoints(less 5) Spell(MANGLE) + + #ravage,if=buff.stampede_cat.up&!buff.omen_of_clarity.react&buff.tigers_fury.up + if BuffPresent(STAMPEDE) and BuffExpires(CLEARCASTING) and BuffPresent(TIGERSFURY) Spell(RAVAGE) + #/shred,if=buff.tigers_fury.up|buff.berserk.up + if BuffPresent(TIGERSFURY) or BuffPresent(BERSERK) AddCombo() + #/shred,if=(buff.combo_points.stack<5&dot.rip.remains<3.0)|(buff.combo_points.stack=0&buff.savage_roar.remains<2 + if {ComboPoints(less 5) and TargetDebuffExpires(RIP 3 mine=1)} or {ComboPoints(less 1) and BuffExpires(SAVAGEROAR 2)} AddCombo() + #/shred,if=cooldown.tigers_fury.remains<=3.0 + if spell(TIGERSFURY) < 3 AddCombo() + #/shred,if=target.time_to_die<=8.5 + if TargetDeadIn(less 8.5) AddCombo() + #/shred,if=time_to_max_energy<=1.0 + if 1s before Mana(more 99) AddCombo() } } -- 1.7.9.5