From b39337c61ec6b16f1405916d4afbeffeac8b94c6 Mon Sep 17 00:00:00 2001 From: shagu Date: Sun, 16 Jul 2017 15:02:42 +0200 Subject: [PATCH] castbar: add new interrupt spells --- env/locales_deDE.lua | 50 ++++++++++++++++++++++++++++++++++++++++---- env/locales_enUS.lua | 50 ++++++++++++++++++++++++++++++++++++++++---- env/locales_frFR.lua | 50 ++++++++++++++++++++++++++++++++++++++++---- env/locales_koKR.lua | 50 ++++++++++++++++++++++++++++++++++++++++---- env/locales_ruRU.lua | 50 ++++++++++++++++++++++++++++++++++++++++---- env/locales_zhCN.lua | 50 ++++++++++++++++++++++++++++++++++++++++---- modules/castbar.lua | 16 +++++++++++++- 7 files changed, 291 insertions(+), 25 deletions(-) diff --git a/env/locales_deDE.lua b/env/locales_deDE.lua index 1cfe7c08..9dd38c9b 100644 --- a/env/locales_deDE.lua +++ b/env/locales_deDE.lua @@ -35,10 +35,52 @@ pfUI_locale["deDE"]["rangecheck"] = { } pfUI_locale["deDE"]["interrupts"] = { - ["Schildhieb"] = true; - ["Zuschlagen"] = true; - ["Tritt"] = true; - ["Erdschock"] = true; + ["Schildhieb"] = true, + ["Zuschlagen"] = true, + ["Tritt"] = true, + ["Erdschock"] = true, + ["Kriegsdonner"] = true, + ["Erschütternder Schlag"] = true, + ["Sturmangriffsbetäubung"] = true, + ["Betäubung abfangen"] = true, + ["Hammer der Gerechtigkeit"] = true, + ["Fieser Trick"] = true, + ["Solarplexus"] = true, + ["Nierenhieb"] = true, + ["Stille"] = true, + ["Gegenzauber"] = true, + ["Gegenzauber - zum Schweigen gebracht"] = true, + ["Hieb"] = true, + ["Furcht"] = true, + ["Schreckensgeheul"] = true, + ["Psychischer Schrei"] = true, + ["Drohruf"] = true, + ["Sternenfeuerbetäubung"] = true, + ["Rachebetäubung"] = true, + ["Verbesserter erschütternder Schuss"] = true, + ["Einschlag"] = true, + ["Feuerschwall"] = true, + ["Blackout"] = true, + ["Betäuben"] = true, + ["Streitkolbenbetäubung"] = true, + ["Erderschütterer"] = true, + ["Buße"] = true, + ["Streuschuss"] = true, + ["Blenden"] = true, + ["Winterschlaf"] = true, + ["Stich des Flügeldrachen"] = true, + ["Raue Kupferbombe"] = true, + ["Große Kupferbombe"] = true, + ["Kleine Bronzebombe"] = true, + ["Große Bronzebombe"] = true, + ["Große Eisenbombe"] = true, + ["Mithrilschrapnellbombe"] = true, + ["Hochexplosive Bombe"] = true, + ["Dunkeleisenbombe"] = true, + ["Eisengranate"] = true, + ["M73 Schrapnellgranate"] = true, + ["Thoriumgranate"] = true, + ["Goblin-Mörser"] = true, } pfUI_locale["deDE"]["hunterpaging"] = { diff --git a/env/locales_enUS.lua b/env/locales_enUS.lua index 79ac1c24..a2de6086 100644 --- a/env/locales_enUS.lua +++ b/env/locales_enUS.lua @@ -35,10 +35,52 @@ pfUI_locale["enUS"]["rangecheck"] = { } pfUI_locale["enUS"]["interrupts"] = { - ["Shield Bash"] = true; - ["Pummel"] = true; - ["Kick"] = true; - ["Earth Shock"] = true; + ["Shield Bash"] = true, + ["Pummel"] = true, + ["Kick"] = true, + ["Earth Shock"] = true, + ["War Stomp"] = true, + ["Concussion Blow"] = true, + ["Charge Stun"] = true, + ["Intercept Stun"] = true, + ["Hammer of Justice"] = true, + ["Cheap Shot"] = true, + ["Gouge"] = true, + ["Kidney Shot"] = true, + ["Silence"] = true, + ["Counterspell"] = true, + ["Counterspell - Silenced"] = true, + ["Bash"] = true, + ["Fear"] = true, + ["Howl of Terror"] = true, + ["Psychic Scream"] = true, + ["Intimidating Shout"] = true, + ["Starfire Stun"] = true, + ["Revenge Stun"] = true, + ["Improved Concussive Shot"] = true, + ["Impact"] = true, + ["Pyroclasm"] = true, + ["Blackout"] = true, + ["Stun"] = true, + ["Mace Stun Effect"] = true, + ["Earthshaker"] = true, + ["Repentance"] = true, + ["Scatter Shot"] = true, + ["Blind"] = true, + ["Hibernate"] = true, + ["Wyvern Sting"] = true, + ["Rough Copper Bomb"] = true, + ["Large Copper Bomb"] = true, + ["Small Bronze Bomb"] = true, + ["Big Bronze Bomb"] = true, + ["Big Iron Bomb"] = true, + ["Mithril Frag Bomb"] = true, + ["Hi-Explosive Bomb"] = true, + ["Dark Iron Bomb"] = true, + ["Iron Grenade"] = true, + ["M73 Frag Grenade"] = true, + ["Thorium Grenade"] = true, + ["Goblin Mortar"] = true, } pfUI_locale["enUS"]["hunterpaging"] = { diff --git a/env/locales_frFR.lua b/env/locales_frFR.lua index 1e74446a..191ba794 100644 --- a/env/locales_frFR.lua +++ b/env/locales_frFR.lua @@ -35,10 +35,52 @@ pfUI_locale["frFR"]["rangecheck"] = { } pfUI_locale["frFR"]["interrupts"] = { - ["Coup de bouclier"] = true; - ["Volée de coups"] = true; - ["Coup de pied"] = true; - ["Horion de terre"] = true; + ["Coup de bouclier"] = true, + ["Volée de coups"] = true, + ["Coup de pied"] = true, + ["Horion de terre"] = true, + ["Choc martial"] = true, + ["Coup traumatisant"] = true, + ["Charge étourdissante"] = true, + ["Interception étourdissante"] = true, + ["Marteau de la justice"] = true, + ["Coup bas"] = true, + ["Suriner"] = true, + ["Aiguillon perfide"] = true, + ["Silence"] = true, + ["Contresort"] = true, + ["Contresort - Silencieux"] = true, + ["Sonner"] = true, + ["Peur"] = true, + ["Hurlement de terreur"] = true, + ["Cri psychique"] = true, + ["Cri d’intimidation"] = true, + ["Feu stellaire étourdissant"] = true, + ["Etourdissement vengeur"] = true, + ["Trait de choc amélioré"] = true, + ["Impact"] = true, + ["Pyroclasme"] = true, + ["Aveuglement"] = true, + ["Etourdir"] = true, + ["Effet étourdissant de la masse"] = true, + ["Trembleterre"] = true, + ["Repentir"] = true, + ["Flèche de dispersion"] = true, + ["Cécité"] = true, + ["Hibernation"] = true, + ["Piqûre de wyverne"] = true, + ["Bombe grossière en cuivre"] = true, + ["Grande bombe en cuivre"] = true, + ["Petite bombe en bronze"] = true, + ["Grande bombe en bronze"] = true, + ["Grande bombe en fer"] = true, + ["Bombe explosive en mithril"] = true, + ["Bombe explosive"] = true, + ["Bombe en sombrefer"] = true, + ["Grenade en fer"] = true, + ["Grenade à fragmentation M73"] = true, + ["Grenade en thorium"] = true, + ["Mortier des gobelins"] = true, } pfUI_locale["frFR"]["hunterpaging"] = { diff --git a/env/locales_koKR.lua b/env/locales_koKR.lua index db7e2560..03f32288 100644 --- a/env/locales_koKR.lua +++ b/env/locales_koKR.lua @@ -35,10 +35,52 @@ pfUI_locale["koKR"]["rangecheck"] = { } pfUI_locale["koKR"]["interrupts"] = { - ["방패 가격"] = true; - ["자루 공격"] = true; - ["발차기"] = true; - ["대지 충격"] = true; + ["방패 가격"] = true, + ["자루 공격"] = true, + ["발차기"] = true, + ["대지 충격"] = true, + ["전투 발구르기"] = true, + ["충격의 일격"] = true, + ["돌진 기절"] = true, + ["봉쇄 기절"] = true, + ["심판의 망치"] = true, + ["비열한 습격"] = true, + ["후려치기"] = true, + ["급소 가격"] = true, + ["침묵"] = true, + ["마법 차단"] = true, + ["마법 차단 - 침묵"] = true, + ["강타"] = true, + ["공포"] = true, + ["공포의 울부짖음"] = true, + ["영혼의 절규"] = true, + ["위협의 외침"] = true, + ["별빛 화살 기절"] = true, + ["복수 기절"] = true, + ["충격포 연마"] = true, + ["충돌"] = true, + ["화염 파열"] = true, + ["의식 상실"] = true, + ["기절"] = true, + ["철퇴 기절 효과"] = true, + ["대지진"] = true, + ["참회"] = true, + ["산탄 사격"] = true, + ["실명"] = true, + ["겨울잠"] = true, + ["비룡 쐐기"] = true, + ["천연 구리 폭탄"] = true, + ["대형 구리 폭탄"] = true, + ["소형 청동 폭탄"] = true, + ["대형 청동 폭탄"] = true, + ["대형 철제 폭탄"] = true, + ["미스릴 파편 폭탄"] = true, + ["고폭탄"] = true, + ["검은무쇠 폭탄"] = true, + ["철제 수류탄"] = true, + ["M73 수류탄"] = true, + ["토륨 수류탄"] = true, + ["고블린 박격포"] = true, } pfUI_locale["koKR"]["hunterpaging"] = { diff --git a/env/locales_ruRU.lua b/env/locales_ruRU.lua index f7c92902..d6328803 100644 --- a/env/locales_ruRU.lua +++ b/env/locales_ruRU.lua @@ -35,10 +35,52 @@ pfUI_locale["ruRU"]["rangecheck"] = { } pfUI_locale["ruRU"]["interrupts"] = { - ["Удар щитом"] = true; - ["Зуботычина"] = true; - ["Пинок"] = true; - ["Земной шок"] = true; + ["Удар щитом"] = true, + ["Зуботычина"] = true, + ["Пинок"] = true, + ["Земной шок"] = true, + ["Громовая поступь"] = true, + ["Оглушающий удар"] = true, + ["Атака-оглушение"] = true, + ["Перехват оглушение."] = true, + ["Молот правосудия"] = true, + ["Подлый трюк"] = true, + ["Парализующий удар"] = true, + ["Удар по почкам"] = true, + ["Молчание"] = true, + ["Антимагия"] = true, + ["Антимагия - немота"] = true, + ["Оглушить"] = true, + ["Страх"] = true, + ["Вой ужаса"] = true, + ["Ментальный крик"] = true, + ["Устрашающий крик"] = true, + ["Звездный огонь - оглушение"] = true, + ["Реванш - оглушение"] = true, + ["Улучшенный шокирующий выстрел"] = true, + ["Сотрясение"] = true, + ["Огнесдвиг"] = true, + ["Затмение"] = true, + ["Оглушение"] = true, + ["Эффект оглушения дробящего оружия"] = true, + ["Землетрясущий"] = true, + ["Покаяние"] = true, + ["Дезориентирующий выстрел"] = true, + ["Ослепление"] = true, + ["Спячка"] = true, + ["Жало виверны"] = true, + ["Грубая медная бомба"] = true, + ["Большая медная бомба"] = true, + ["Небольшая бронзовая бомба"] = true, + ["Большая бронзовая бомба"] = true, + ["Большая железная бомба"] = true, + ["Мифриловая осколочная бомба"] = true, + ["Взрывоопасная бомба"] = true, + ["Бомба из черного железа"] = true, + ["Железная граната"] = true, + ["Осколочная граната M73"] = true, + ["Ториевая граната"] = true, + ["Гоблинская мортира"] = true, } pfUI_locale["ruRU"]["hunterpaging"] = { diff --git a/env/locales_zhCN.lua b/env/locales_zhCN.lua index 25b9f599..fb2588b1 100644 --- a/env/locales_zhCN.lua +++ b/env/locales_zhCN.lua @@ -35,10 +35,52 @@ pfUI_locale["zhCN"]["rangecheck"] = { } pfUI_locale["zhCN"]["interrupts"] = { - ["盾击"] = true; - ["拳击"] = true; - ["脚踢"] = true; - ["地震术"] = true; + ["盾击"] = true, + ["拳击"] = true, + ["脚踢"] = true, + ["地震术"] = true, + ["战争践踏"] = true, + ["震荡猛击"] = true, + ["冲锋击昏"] = true, + ["拦截昏迷"] = true, + ["制裁之锤"] = true, + ["偷袭"] = true, + ["凿击"] = true, + ["肾击"] = true, + ["沉默"] = true, + ["法术反制"] = true, + ["法术反制 - 沉默"] = true, + ["重击"] = true, + ["恐惧术"] = true, + ["恐惧嚎叫"] = true, + ["心灵尖啸"] = true, + ["破胆怒吼"] = true, + ["星火昏迷"] = true, + ["复仇昏迷"] = true, + ["强化震荡射击"] = true, + ["冲击"] = true, + ["火焰冲撞"] = true, + ["昏阙"] = true, + ["昏迷"] = true, + ["锤击昏迷效果"] = true, + ["震地者"] = true, + ["忏悔"] = true, + ["驱散射击"] = true, + ["致盲"] = true, + ["休眠"] = true, + ["翼龙钉刺"] = true, + ["劣质铜壳炸弹"] = true, + ["大型铜壳炸弹"] = true, + ["小型青铜炸弹"] = true, + ["重磅青铜炸弹"] = true, + ["重磅铁制炸弹"] = true, + ["秘银破片炸弹"] = true, + ["高爆炸弹"] = true, + ["黑铁炸弹"] = true, + ["铁皮手雷"] = true, + ["M73破片手榴弹"] = true, + ["瑟银手榴弹"] = true, + ["地精迫击炮"] = true, } pfUI_locale["zhCN"]["hunterpaging"] = { diff --git a/modules/castbar.lua b/modules/castbar.lua index dec83d76..47ad86d2 100644 --- a/modules/castbar.lua +++ b/modules/castbar.lua @@ -414,6 +414,8 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.target.SPELL_CRIT = string.gsub(string.gsub(string.gsub(SPELLLOGCRITSELFOTHER,"%d%$",""),"%%d","%%d+"),"%%s","(.+)") pfUI.castbar.target.OTHER_SPELL_HIT = string.gsub(string.gsub(string.gsub(SPELLLOGOTHEROTHER,"%d%$",""), "%%s", "(.+)"), "%%d", "%%d+") pfUI.castbar.target.OTHER_SPELL_CRIT = string.gsub(string.gsub(string.gsub(SPELLLOGOTHEROTHER,"%d%$",""), "%%s", "(.+)"), "%%d", "%%d+") + pfUI.castbar.target.SPELL_INTERRUPT = string.gsub(string.gsub(SPELLINTERRUPTSELFOTHER, "%d%$",""),"%%s","(.+)") + pfUI.castbar.target.OTHER_SPELL_INTERRUPT = string.gsub(string.gsub(SPELLINTERRUPTOTHEROTHER,"%d%$",""),"%%s", "(.+)") pfUI.castbar.target:RegisterEvent("CHAT_MSG_SPELL_SELF_DAMAGE") pfUI.castbar.target:RegisterEvent("CHAT_MSG_SPELL_HOSTILEPLAYER_DAMAGE") @@ -499,6 +501,18 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.target:StopAction(mob, spell) return end + + -- You interrupt (.+)'s (.+)."; + for mob, spell in string.gfind(arg1, pfUI.castbar.target.SPELL_INTERRUPT) do + pfUI.castbar.target:StopAction(mob, "INTERRUPT") + return + end + + -- (.+) interrupts (.+)'s (.+). + for _, mob, spell in string.gfind(arg1, pfUI.castbar.target.OTHER_SPELL_INTERRUPT) do + pfUI.castbar.target:StopAction(mob, "INTERRUPT") + return + end end end) @@ -520,7 +534,7 @@ pfUI:RegisterModule("castbar", function () end function pfUI.castbar.target:StopAction(mob, spell) - if pfUI.castbar.target.casterDB[mob] and L["interrupts"][spell] ~= nil then + if pfUI.castbar.target.casterDB[mob] and ( L["interrupts"][spell] ~= nil or spell == "INTERRUPT" ) then pfUI.castbar.target.casterDB[mob] = nil end end