From cf0eb4a407422b29440a31d2e4b4aa7cbdc2c3bb Mon Sep 17 00:00:00 2001 From: Sidoine De Wispelaere Date: Wed, 3 Nov 2010 23:56:11 +0000 Subject: [PATCH] added TW locales by l222lin changes in enhancement shaman script (evilkachu) changes in warlock script (Hinalover) added heroism as a generic buff git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@324 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- Condition.lua | 7 ++++++ Locale-zhTW.lua | 50 +++++++++++++++++++++++++++++++++++++++++ Ovale.toc | 3 ++- defaut/Chaman.lua | 24 +++++++++++--------- defaut/Demoniste.lua | 61 +++++++++++++++++++++++++++++++++++++++----------- 5 files changed, 121 insertions(+), 24 deletions(-) create mode 100644 Locale-zhTW.lua diff --git a/Condition.lua b/Condition.lua index df8de71..b9d83a2 100644 --- a/Condition.lua +++ b/Condition.lua @@ -111,6 +111,13 @@ local buffSpellList = 46856, -- Trauma rank 1 46857, -- Trauma rank 2 16511 --Hemorrhage + }, + heroism= + { + 2825, --Bloodlust + 32182, --Heroism + 80353, --Time warp + 90355 -- Ancient Hysteria } } diff --git a/Locale-zhTW.lua b/Locale-zhTW.lua new file mode 100644 index 0000000..988658e --- /dev/null +++ b/Locale-zhTW.lua @@ -0,0 +1,50 @@ +local AceLocale = LibStub:GetLibrary("AceLocale-3.0") +local L = AceLocale:NewLocale("Ovale", "zhTW", true) +if not L then return end +L["Largeur des icônes"] = "圖示寬度" +L["La largeur des icônes"] = "調整圖示寬度" +L["Hauteur des icônes"] = "圖示高度" +L["La hauteur des icônes"] = "調整圖示高度" +L["Largeur des petites icônes"] = "小圖示寬度" +L["La largeur des petites icônes"] = "調整小圖示寬度" +L["Hauteur des petites icônes"] = "小圖示高度" +L["La hauteur des petites icônes"] = "調整小圖示高度" +L["En combat uniquement"] = "在戰鬥中顯示" +L["Code"] = "守則" +L["Afficher la fenêtre"] = "顯示窗口" +L["Cacher la fenêtre"] = "隱藏窗口" +L["AOE"] = "多目標攻擊" +L["None"] = "None" +L["Blood"] = true +L["Melee"] = true +L["Raccourcis clavier"] = "鍵盤快捷鍵" +L["Afficher les raccourcis clavier dans le coin inférieur gauche des icônes"] = "顯示快捷鍵上左下角的遠近提醒小圖示" +L["Affichage numérique"] = "數字顯示" +L["Affiche le temps de recharge sous forme numérique"] = "技能剩餘時間以數字顯示" +L["Si cible uniquement"] = "如果有目標" +L["Verrouiller position"] = "鎖定圖示位置" +L["Vertical"] = 垂直 +L["Marge entre deux icônes"] = "圖示間距" +L["Focus"] = 專注目標 +L["Apparence"] = "框架外觀設定" +L["Cacher bouton vide"] = "隱藏空按鈕" +L["Cacher si cible amicale ou morte"] = "隱藏友好或死亡的目標" +L["main"] = "主要攻擊" +L["offgcd"] = "隱藏技能冷卻.\nCast 當前你的攻擊主力." +L["cd"] = "顯示技能冷卻.\nCast 盡快乘以損壞或保持階段." +L["aoe"] = "多目標攻擊" +L["mana"] = "法力增益" +L["Cliquer pour afficher/cacher les options"] = "點擊隱藏/顯示選項" +L["Illuminer l'icône"] = "高亮圖標" +L["Illuminer l'icône quand la technique doit être spammée"] = "當技能能使用時高亮圖標" +L["Prédictif"] = "預測" +L["Affiche les deux prochains sorts et pas uniquement le suivant"] = "顯示下兩個技能,不只是下一個" +L["Défilement"] = "移動" +L["Les icônes se déplacent"] = "移動圖示" +L["multidot"] = "對多目標點" +L["buff"] = "Buffs" +L["Inverser la boîte à cocher "] = "切換複選框" +L["Ignorer les clics souris"] = "忽略鼠標點擊" +L["Correction de la latence"] = "延遲校正" +L["Cacher dans les véhicules"] = "隱藏 in vehicles" +L["Illuminer l'icône quand le temps de recharge est écoulé"] = "當圖示發出閃光時,表示技能可以使用了" \ No newline at end of file diff --git a/Ovale.toc b/Ovale.toc index 757bfe4..6cf35b7 100644 --- a/Ovale.toc +++ b/Ovale.toc @@ -3,7 +3,7 @@ ## Notes: Show the icon of the next spell to cast ## Notes-frFR: Affiche l'icône du prochain sort à lancer ## Author: Sidoine -## Version: 4.0.14 +## Version: 4.0.15 ## OptionalDeps: Ace3, ButtonFacade, Recount, Skada, LibBabble-CreatureType-3.0 ## SavedVariables: OvaleDB ## SavedVariablesPerCharacter: OvaleDBPC @@ -14,6 +14,7 @@ embeds.xml Locale-frFR.lua Locale-enUS.lua +Locale-zhTW.lua Ovale.lua Condition.lua OvaleIcone.lua diff --git a/defaut/Chaman.lua b/defaut/Chaman.lua index ceaf339..6c614c7 100644 --- a/defaut/Chaman.lua +++ b/defaut/Chaman.lua @@ -105,20 +105,24 @@ AddIcon help=main mastery=2 if CheckBoxOn(aoe) { if TotemExpires(fire) Spell(MAGMATOTEM) - unless TotemExpires(fire) Spell(FIRENOVA) + if BuffExpires(LIGHTNINGSHIELD) Spell(LIGHTNINGSHIELD) if BuffPresent(MAELSTROMWEAPON stacks=5) Spell(CHAINLIGHTNING) + if TotemPresent(fire) Spell(FIRENOVA) } - - if BuffPresent(MAELSTROMWEAPON stacks=5) Spell(LIGHTNINGBOLT) - if TargetDebuffExpires(FLAMESHOCK 2 haste=spell mine=1) Spell(FLAMESHOCK) - if TargetDebuffExpires(STORMSTRIKE) Spell(STORMSTRIKE) - if BuffExpires(LIGHTNINGSHIELD) Spell(LIGHTNINGSHIELD) - if TotemExpires(fire) Spell(SEARINGTOTEM) - Spell(FERALSPIRIT) - Spell(SHAMANISTICRAGE) - Spell(EARTHSHOCK) + + if CheckBoxOff(aoe) + { + if TotemExpires(fire) Spell(SEARINGTOTEM) + if BuffExpires(LIGHTNINGSHIELD) Spell(LIGHTNINGSHIELD) + if BuffPresent(MAELSTROMWEAPON stacks=5) Spell(LIGHTNINGBOLT) + } + Spell(STORMSTRIKE) Spell(LAVALASH) + if TargetDebuffExpires(FLAMESHOCK 2 haste=spell mine=1) Spell(FLAMESHOCK) + Spell(EARTHSHOCK) + Spell(SHAMANISTICRAGE priority=2) + Spell(FERALSPIRIT priority=2) } AddIcon help=cd diff --git a/defaut/Demoniste.lua b/defaut/Demoniste.lua index a8f1388..cd4c3e5 100644 --- a/defaut/Demoniste.lua +++ b/defaut/Demoniste.lua @@ -46,7 +46,14 @@ Define(SHADOWBURN 17877) Define(SOULFIRE 6353) SpellAddBuff(SOULFIRE IMPROVEDSOULFIREBUFF=15) Define(SOULBURN 74434) -Define(SUMMONFELGUARD 18540) + SpellInfo(SOULBURN cd=45) + SpellAddBuff(SOULBURN SOULBURN=15) +Define(SUMMONINFERNAL 1122) +Define(SUMMONDOOMGUARD 18540) +Define(SUMMONFELGUARD 30146) +Define(SUMMONFELHUNTER 691) +Define(SUMMONIMP 688) +Define(SUMMONSUCCUBUS 712) Define(UNSTABLEAFFLICTION 30108) SpellAddTargetDebuff(UNSTABLEAFFLICTION UNSTABLEAFFLICTION=15) @@ -56,6 +63,7 @@ Define(DECIMATION 63167) Define(MOLTENCORE 71165) Define(EMPOWEREDIMP 47283) Define(IMPROVEDSOULFIREBUFF 85383) +Define(SHADOWTRANCE 17941) #Talent Define(IMPROVEDSOULFIRE 11197) @@ -67,6 +75,8 @@ AddListItem(curse none L(None) default) AddListItem(bane agony SpellName(BANEOFAGONY)) AddListItem(bane doom SpellName(BANEOFDOOM) default) AddListItem(bane havoc SpellName(BANEOFHAVOC) mastery=3) +AddListItem(afflic shadow SpellName(SHADOWBOLT) default mastery=1) +AddListItem(afflic drain SpellName(DRAINLIFE) mastery=1) ScoreSpells(CURSEELEMENTS SHADOWBOLT HAUNT UNSTABLEAFFLICTION IMMOLATE CONFLAGRATE CURSEWEAKNESS BANEOFAGONY CORRUPTION SOULFIRE DRAINSOUL INCINERATE SHADOWBOLT CHAOSBOLT) @@ -79,20 +89,22 @@ AddIcon help=main mastery=1 if List(curse weakness) and TargetDebuffExpires(CURSEWEAKNESS 2) and TargetDeadIn(more 8) Spell(CURSEWEAKNESS) if TargetDebuffExpires(HAUNT 1.5 mine=1) Spell(HAUNT) - if TargetDebuffExpires(UNSTABLEAFFLICTION 1.5 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(UNSTABLEAFFLICTION) - if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) if TargetDebuffExpires(BANEOFDOOM 0 mine=1) and TargetDebuffExpires(BANEOFAGONY 0 mine=1) { if List(bane doom) and TargetDeadIn(more 20) Spell(BANEOFDOOM) if TargetDeadIn(more 10) Spell(BANEOFAGONY) } + if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) + if TargetDebuffExpires(UNSTABLEAFFLICTION 1.5 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(UNSTABLEAFFLICTION) if TargetLifePercent(less 25) Spell(DRAINSOUL) - Spell(SHADOWBOLT) + if List(afflic drain) and BuffPresent(SHADOWTRANCE) Spell(SHADOWBOLT) + if List(afflic shadow) Spell(SHADOWBOLT) + if List(afflic drain) Spell(DRAINLIFE) } AddIcon help=cd mastery=1 { - Spell(SUMMONFELGUARD) + if BuffPresent(heroism) Spell(SUMMONFELGUARD) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } @@ -104,14 +116,18 @@ AddIcon help=main mastery=2 if List(curse elements) and TargetDebuffExpires(magicaldamagetaken 2) and TargetDeadIn(more 8) Spell(CURSEELEMENTS) if List(curse weakness) and TargetDebuffExpires(CURSEWEAKNESS 2) and TargetDeadIn(more 8) Spell(CURSEWEAKNESS) - if TargetDebuffExpires(IMMOLATE 2 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(IMMOLATE) if TargetDebuffPresent(IMMOLATE) Spell(HANDOFGULDAN) - if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) + if BuffPresent(METAMORPHOSIS) Spell(SOULBURN) + if BuffPresent(SOULBURN) Spell(SOULFIRE) + if TargetDebuffExpires(IMMOLATE 2 mine=1 haste=spell) and TargetDeadIn(more 4) Spell(IMMOLATE) if TargetDebuffExpires(BANEOFDOOM 5 mine=1) and TargetDebuffExpires(BANEOFAGONY 0 mine=1) { if List(bane doom) and TargetDeadIn(more 15) Spell(BANEOFDOOM) if TargetDeadIn(more 10) Spell(BANEOFAGONY) } + Spell(HANDOFGULDAN) + if BuffPresent(METAMORPHOSIS 10) and BuffExpires(METAMORPHOSIS 16) Spell(IMMOLATE) + if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) if BuffPresent(MOLTENCORE) Spell(INCINERATE) if BuffPresent(DECIMATION) Spell(SOULFIRE) @@ -121,7 +137,7 @@ AddIcon help=main mastery=2 AddIcon help=cd mastery=2 { Spell(METAMORPHOSIS) - Spell(SUMMONFELGUARD) + if BuffPresent(METAMORPHOSIS) Spell(SUMMONINFERNAL) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } @@ -135,22 +151,23 @@ AddIcon help=main mastery=3 if TalentPoints(IMPROVEDSOULFIRE more 0) and TargetLifePercent(more 80) and BuffExpires(IMPROVEDSOULFIREBUFF) Spell(SOULFIRE) - if 1s after TargetDebuffPresent(IMMOLATE mine=1) Spell(CONFLAGRATE) - if TargetDebuffExpires(IMMOLATE 2 mine=1 haste=spell) and TargetDeadIn(more 8) Spell(IMMOLATE) - if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) if TargetDebuffExpires(BANEOFDOOM 0 mine=1) and TargetDebuffExpires(BANEOFAGONY 0 mine=1) { if List(bane doom) and TargetDeadIn(more 20) Spell(BANEOFDOOM) if TargetDeadIn(more 10) unless List(cure havoc) Spell(BANEOFAGONY) } - if BuffPresent(EMPOWEREDIMP) or BuffPresent(SOULBURN) Spell(SOULFIRE) + if TargetDebuffExpires(IMMOLATE 2 mine=1 haste=spell) and TargetDeadIn(more 3) Spell(IMMOLATE) + if 1s after TargetDebuffPresent(IMMOLATE mine=1) Spell(CONFLAGRATE) + if TargetDebuffExpires(CORRUPTION 2 mine=1) and TargetDebuffExpires(SEEDOFCORRUPTION 0 mine=1) and TargetDeadIn(more 9) Spell(CORRUPTION) Spell(CHAOSBOLT) + if BuffPresent(EMPOWEREDIMP) or BuffPresent(SOULBURN) Spell(SOULFIRE) Spell(INCINERATE) } AddIcon help=cd mastery=3 { - Spell(SUMMONFELGUARD) + if BuffPresent(heroism) Spell(SUMMONFELGUARD) + Spell(DEMONSOUL) Item(Trinket0Slot usable=1) Item(Trinket1Slot usable=1) } @@ -160,4 +177,22 @@ AddIcon size=small Spell(SOULBURN usable=1) } +AddIcon size=small mastery=1 +{ + unless PetPresent() + { + if List(afflic shadow) Spell(SUMMONSUCCUBUS) + if List(afflic drain) Spell(SUMMONIMP) + } +} + +AddIcon size=small mastery=2 +{ + unless PetPresent() Spell(SUMMONFELGUARD) +} + +AddIcon size=small mastery=3 +{ + unless PetPresent() Spell(SUMMONIMP) +} ]] -- 1.7.9.5