diff --git a/02-arr/dungeon/haukke_manor.js b/02-arr/dungeon/haukke_manor.js index 879816e1f5..d6be8029ac 100644 --- a/02-arr/dungeon/haukke_manor.js +++ b/02-arr/dungeon/haukke_manor.js @@ -39,34 +39,6 @@ Options.Triggers.push({ condition: Conditions.targetIsYou(), response: Responses.getBehind('info'), }, - { - // Void Lamp Spawn - id: 'Haukke Normal Void Lamps', - type: 'GameLog', - netRegex: { - line: 'The void lamps have begun emitting an eerie glow', - code: Util.gameLogCodes.message, - capture: false, - }, - infoText: (_data, _matches, output) => output.text(), - outputStrings: { - text: { - en: 'Turn off Lamps', - de: 'Schalte die Lampen aus', - fr: 'Éteignez les lampes', - ja: '消灯する', - cn: '关灯', - ko: '등불 끄기', - }, - }, - }, - { - // Lady's Candle Spawn - id: 'Haukke Normal Ladys Candle', - type: 'AddedCombatant', - netRegex: { npcNameId: '425', capture: false }, - response: Responses.killAdds(), - }, { // 2 Lady's Handmaiden and 1 Manor Sentry Spawn // The sentry outside the bosses room loads when you enter the zone. @@ -97,8 +69,6 @@ Options.Triggers.push({ 'Manor Claviger': 'Herrenhaus-Schlüsselträgerin', 'Lady Amandine': 'Lady Amandine', 'Manor Steward': 'Seneschall', - 'The void lamps have begun emitting an eerie glow': - 'Die düsteren Lampen flackern unheilvoll auf', }, }, { @@ -119,7 +89,6 @@ Options.Triggers.push({ 'Manor Claviger': '夫人付きクラヴィジャー', 'Lady Amandine': 'レディ・アマンディヌ', 'Manor Steward': '御用邸の執事長', - 'The void lamps have begun emitting an eerie glow': '不気味なランプが妖しく輝き始めた', }, }, { @@ -129,7 +98,6 @@ Options.Triggers.push({ 'Manor Claviger': '随从女工', 'Lady Amandine': '阿芒迪娜女士', 'Manor Steward': '庄园的总管', - 'The void lamps have begun emitting an eerie glow': '怪异的灯开始发出令人不安的光芒', }, }, { @@ -139,7 +107,6 @@ Options.Triggers.push({ 'Manor Claviger': '부인의 청지기', 'Lady Amandine': '레이디 아망딘', 'Manor Steward': '별궁의 집사장', - 'The void lamps have begun emitting an eerie glow': '불길한 등불이 요사스러운 빛을 발합니다', }, }, ], diff --git a/02-arr/raid/t8.js b/02-arr/raid/t8.js index 44f9403358..4447ca9935 100644 --- a/02-arr/raid/t8.js +++ b/02-arr/raid/t8.js @@ -15,13 +15,11 @@ Options.Triggers.push({ response: Responses.stackMarkerOn('info'), }, { + // https://xivapi.com/LogMessage/2278 + // en: Landmines have been scattered... id: 'T8 Landmine Start', - type: 'GameLog', - netRegex: { - line: 'Landmines have been scattered.*?', - code: Util.gameLogCodes.message, - capture: false, - }, + type: 'SystemLogMessage', + netRegex: { id: '8E6', capture: false }, alertText: (_data, _matches, output) => output.text(), run: (data) => data.landmines = {}, outputStrings: { @@ -179,7 +177,6 @@ Options.Triggers.push({ 'Allagan Field': 'Allagisches Feld', 'Allagan Mine': 'Allagische Mine', 'Clockwork Dreadnaught': 'Brummonaut', - 'Landmines have been scattered': 'Die Landminen haben sich verteilt', 'The Avatar': 'Avatar', 'The central bow': 'Rumpf-Zentralsektor', }, @@ -201,7 +198,6 @@ Options.Triggers.push({ 'Allagan Field': 'Champ Allagois', 'Allagan Mine': 'Mine Allagoise', 'Clockwork Dreadnaught': 'Cuirassé Dreadnaught', - 'Landmines have been scattered': 'Des mines ont été répandues', 'The Avatar': 'Bio-Tréant', 'The central bow': 'l\'axe central - proue', }, @@ -223,7 +219,6 @@ Options.Triggers.push({ 'Allagan Field': 'アラガンフィールド', 'Allagan Mine': 'アラガンマイン', 'Clockwork Dreadnaught': 'ドレッドノート', - 'Landmines have been scattered': '地雷が散布された', 'The Avatar': 'アバター', 'The central bow': '中枢艦首区', }, @@ -245,7 +240,6 @@ Options.Triggers.push({ 'Allagan Field': '亚拉戈领域', 'Allagan Mine': '亚拉戈机雷', 'Clockwork Dreadnaught': '恐慌装甲', - 'Landmines have been scattered': '地雷分布在了各处', 'The Avatar': '降世化身', 'The central bow': '中枢舰首区', }, @@ -267,7 +261,6 @@ Options.Triggers.push({ 'Allagan Field': '알라그 필드', 'Allagan Mine': '알라그 지뢰', 'Clockwork Dreadnaught': '드레드노트', - 'Landmines have been scattered': '지뢰가 뿌려졌습니다', 'The Avatar': '아바타', 'The central bow': '중추 함수 구역', }, diff --git a/02-arr/trial/ifrit-nm.js b/02-arr/trial/ifrit-nm.js index 6d1b6d6dd1..5343fbe002 100644 --- a/02-arr/trial/ifrit-nm.js +++ b/02-arr/trial/ifrit-nm.js @@ -38,9 +38,6 @@ Options.Triggers.push({ 'locale': 'de', 'replaceSync': { 'Ifrit': 'Ifrit', - 'Succumb to the inferno': 'Verglühe zu Asche im heiligen Inferno!', - 'Surrender thyself to the fires of judgment': - 'Die Flammen werden das Fleisch von deinen Knochen sengen ...', }, 'replaceText': { 'Eruption': 'Eruption', @@ -55,8 +52,6 @@ Options.Triggers.push({ 'locale': 'fr', 'replaceSync': { 'Ifrit': 'Ifrit', - 'Succumb to the inferno': 'Succombez aux enfers !', - 'Surrender thyself to the fires of judgment': 'Que le feu du jugement purifie vos âmes !', }, 'replaceText': { 'Eruption': 'Éruption', @@ -71,8 +66,6 @@ Options.Triggers.push({ 'locale': 'ja', 'replaceSync': { 'Ifrit': 'イフリート', - 'Succumb to the inferno': '力戦奮闘……。\\s*されど我が敵にあらず!', - 'Surrender thyself to the fires of judgment': '兵貴神速……。\\s*「炎獄の楔」にて、この者へ裁きを!', }, 'replaceText': { 'Eruption': 'エラプション', @@ -87,8 +80,6 @@ Options.Triggers.push({ 'locale': 'cn', 'replaceSync': { 'Ifrit': '伊弗利特', - 'Succumb to the inferno': '骁勇善战……\\s*蝼蚁之辈!妄想弑神?', - 'Surrender thyself to the fires of judgment': '兵贵神速……\\s*火狱之楔!施以审判!', }, 'replaceText': { 'Eruption': '地火喷发', @@ -103,8 +94,6 @@ Options.Triggers.push({ 'locale': 'ko', 'replaceSync': { 'Ifrit': '이프리트', - 'Succumb to the inferno': '역전분투……. 허나 이 몸의 적수는 되지 못하리니!', - 'Surrender thyself to the fires of judgment': '병귀신속……. \'염옥의 말뚝\'으로 심판을 내리노라!', }, 'replaceText': { 'Eruption': '용암 분출', diff --git a/02-arr/trial/ifrit-nm.txt b/02-arr/trial/ifrit-nm.txt index 6d983ecc2c..56bded1003 100644 --- a/02-arr/trial/ifrit-nm.txt +++ b/02-arr/trial/ifrit-nm.txt @@ -24,7 +24,9 @@ hideall "--sync--" 126.1 "Incinerate" # 70% -200.0 "--sync--" GameLog { code: "0044", name: "Ifrit", line: "Succumb to the inferno.*?" } window 200,0 +# https://xivapi.com/InstanceContentTextData/2601 +# en: Succumb to the Inferno! +200.0 "--sync--" BattleTalk2 { npcNameId: "04A1", instanceContentTextId: "0A29" } window 200,0 201.0 "Incinerate" Ability { id: "1C5", source: "Ifrit" } 209.0 "Eruption" Ability { id: "1C7", source: "Ifrit" } window 210,5 213.5 "Vulcan Burst" Ability { id: "1C6", source: "Ifrit" } @@ -39,7 +41,9 @@ hideall "--sync--" 278.6 "Eruption" # 50% -300.0 "--sync--" GameLog { code: "0044", name: "Ifrit", line: "Surrender thyself to the fires of judgment.*?" } window 300,0 +# https://xivapi.com/InstanceContentTextData/2602 +# en: Surrender thyself to the fires of judgment! +300.0 "--sync--" BattleTalk2 { npcNameId: "04A1", instanceContentTextId: "0A2A" } window 300,0 305.0 "Nail Add" 306.7 "Incinerate" Ability { id: "1C5", source: "Ifrit" } 314.4 "Vulcan Burst" Ability { id: "1C6", source: "Ifrit" } diff --git a/04-sb/ultimate/unending_coil_ultimate.js b/04-sb/ultimate/unending_coil_ultimate.js index 9b4ccd18d9..f69834bb77 100644 --- a/04-sb/ultimate/unending_coil_ultimate.js +++ b/04-sb/ultimate/unending_coil_ultimate.js @@ -393,13 +393,10 @@ Options.Triggers.push({ // --- Nael --- { // https://xivapi.com/NpcYell/6497?pretty=true + // en: From on high I descend, the hallowed moon to call! id: 'UCU Nael Quote 1', - type: 'GameLog', - netRegex: { - line: 'From on high I descend, the hallowed moon to call.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '1961', capture: false }, durationSeconds: 6, infoText: (_data, _matches, output) => output.text(), outputStrings: { @@ -415,13 +412,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6496?pretty=true + // en: From on high I descend, the iron path to walk! id: 'UCU Nael Quote 2', - type: 'GameLog', - netRegex: { - line: 'From on high I descend, the iron path to walk.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '1960', capture: false }, durationSeconds: 6, infoText: (_data, _matches, output) => output.text(), outputStrings: { @@ -437,13 +431,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6495?pretty=true + // en: Take fire, O hallowed moon! id: 'UCU Nael Quote 3', - type: 'GameLog', - netRegex: { - line: 'Take fire, O hallowed moon.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '195F', capture: false }, durationSeconds: 6, infoText: (_data, _matches, output) => output.text(), outputStrings: { @@ -459,13 +450,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6494?pretty=true + // en: Blazing path, lead me to iron rule! id: 'UCU Nael Quote 4', - type: 'GameLog', - netRegex: { - line: 'Blazing path, lead me to iron rule.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '195E', capture: false }, infoText: (_data, _matches, output) => output.text(), outputStrings: { text: { @@ -480,13 +468,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6493?pretty=true + // en: O hallowed moon, take fire and scorch my foes! id: 'UCU Nael Quote 5', - type: 'GameLog', - netRegex: { - line: 'O hallowed moon, take fire and scorch my foes.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '195D', capture: false }, infoText: (_data, _matches, output) => output.text(), outputStrings: { text: { @@ -501,13 +486,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6492?pretty=true + // en: O hallowed moon, shine you the iron path! id: 'UCU Nael Quote 6', - type: 'GameLog', - netRegex: { - line: 'O hallowed moon, shine you the iron path.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '195C', capture: false }, infoText: (_data, _matches, output) => output.text(), outputStrings: { text: { @@ -522,13 +504,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6501?pretty=true + // en: Fleeting light! 'Neath the red moon, scorch you the earth! id: 'UCU Nael Quote 7', - type: 'GameLog', - netRegex: { - line: 'Fleeting light! \'Neath the red moon, scorch you the earth.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '1965', capture: false }, delaySeconds: 4, durationSeconds: 6, // Make this alert so it doesn't overlap with the dive infoText occuring here. @@ -546,13 +525,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6500?pretty=true + // en: Fleeting light! Amid a rain of stars, exalt you the red moon! id: 'UCU Nael Quote 8', - type: 'GameLog', - netRegex: { - line: 'Fleeting light! Amid a rain of stars, exalt you the red moon.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '1964', capture: false }, delaySeconds: 4, durationSeconds: 6, // Make this alert so it doesn't overlap with the dive infoText occuring here. @@ -570,13 +546,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6502?pretty=true + // en: From on high I descend, the moon and stars to bring! id: 'UCU Nael Quote 9', - type: 'GameLog', - netRegex: { - line: 'From on high I descend, the moon and stars to bring.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '1966', capture: false }, durationSeconds: 9, infoText: (_data, _matches, output) => output.text(), outputStrings: { @@ -592,13 +565,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6503?pretty=true + // en: From hallowed moon I descend, a rain of stars to bring! id: 'UCU Nael Quote 10', - type: 'GameLog', - netRegex: { - line: 'From hallowed moon I descend, a rain of stars to bring.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '1967', capture: false }, durationSeconds: 9, infoText: (_data, _matches, output) => output.text(), outputStrings: { @@ -614,13 +584,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6507?pretty=true + // en: From hallowed moon I bare iron, in my descent to wield! id: 'UCU Nael Quote 11', - type: 'GameLog', - netRegex: { - line: 'From hallowed moon I bare iron, in my descent to wield.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '196B', capture: false }, durationSeconds: 9, infoText: (_data, _matches, output) => output.text(), outputStrings: { @@ -636,12 +603,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6506?pretty=true + // en: From hallowed moon I descend, upon burning earth to tread! id: 'UCU Nael Quote 12', - type: 'GameLog', - netRegex: { - line: 'From hallowed moon I descend, upon burning earth to tread.*?', - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '196A', capture: false }, durationSeconds: 9, infoText: (_data, _matches, output) => output.text(), outputStrings: { @@ -657,13 +622,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6504?pretty=true + // en: Unbending iron, take fire and descend! id: 'UCU Nael Quote 13', - type: 'GameLog', - netRegex: { - line: 'Unbending iron, take fire and descend.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '1968', capture: false }, durationSeconds: 9, infoText: (_data, _matches, output) => output.text(), outputStrings: { @@ -679,13 +641,10 @@ Options.Triggers.push({ }, { // https://xivapi.com/NpcYell/6505?pretty=true + // en: Unbending iron, descend with fiery edge! id: 'UCU Nael Quote 14', - type: 'GameLog', - netRegex: { - line: 'Unbending iron, descend with fiery edge.*?', - code: Util.gameLogCodes.dialog, - capture: false, - }, + type: 'NpcYell', + netRegex: { npcYellId: '1969', capture: false }, durationSeconds: 9, infoText: (_data, _matches, output) => output.text(), outputStrings: { @@ -1843,30 +1802,6 @@ Options.Triggers.push({ 'Tail of Darkness': 'Dunkelschweif', 'Thunderwing': 'Donnerschwinge', 'Twintania': 'Twintania', - 'From on high I descend, the hallowed moon to call': - 'Seht, ich steige herab, vom rotglühenden Monde', - 'From on high I descend, the iron path to walk': - 'Seht, ich steige herab, um euch zu beherrschen', - 'Take fire, O hallowed moon': 'Flammender Pfad, geschaffen vom roten Mond', - 'Blazing path, lead me to iron rule': 'Umloderter Pfad, führe mich zur Herrschaft', - 'O hallowed moon, take fire and scorch my foes': 'O roter Mond! Umlodere meinen Pfad', - 'O hallowed moon, shine you the iron path': 'O roter Mond! Führe mich zur Herrschaft', - 'Fleeting light! \'Neath the red moon, scorch you the earth': - 'Neues Gestirn! Glühe herab und umlodere meinen Pfad', - 'Fleeting light! Amid a rain of stars, exalt you the red moon': - 'Neues Gestirn! Überstrahle jede Sternschnuppe', - 'From on high I descend, the moon and stars to bring': - 'Ich steige herab zu Ehre des roten Mondes! Einer Sternschnuppe gleich', - 'From hallowed moon I descend, a rain of stars to bring': - 'O roter Mond, sieh mich herabsteigen! Einer Sternschnuppe gleich', - 'From hallowed moon I bare iron, in my descent to wield': - 'O roter Mond, als Künder deiner Herrschaft stieg ich herab', - 'From hallowed moon I descend, upon burning earth to tread': - 'O roter Mond! Ich stieg herab, um deine Herrschaft zu bringen', - 'Unbending iron, take fire and descend': - 'Zur Herrschaft führt mein umloderter Pfad! Auf diesen steige ich herab', - 'Unbending iron, descend with fiery edge': - 'Zur Herrschaft steige ich herab, auf umlodertem Pfad', }, 'replaceText': { '--push--': '--stoß--', @@ -1935,41 +1870,15 @@ Options.Triggers.push({ 'locale': 'fr', 'replaceSync': { 'Bahamut Prime': 'Primo-Bahamut', - 'Blazing path, lead me to iron rule': - 'La voie marquée par l\'incandescence mène à la domination', 'Fang of Light': 'croc de lumière', 'Firehorn': 'corne-de-feu', - 'Fleeting light! Amid a rain of stars, exalt you the red moon': - 'Supernova, brille de tout ton feu et glorifie la lune rouge', - 'Fleeting light! \'Neath the red moon, scorch you the earth': - 'Supernova, brille de tout ton feu et irradie la terre rougie', - 'From hallowed moon I bare iron, in my descent to wield': - 'De la lune je m\'arme d\'acier et descends', - 'From hallowed moon I descend, a rain of stars to bring': - 'Depuis la lune, j\'invoque une pluie d\'étoiles', - 'From hallowed moon I descend, upon burning earth to tread': - 'De la lune, je descends et marche sur la terre ardente', - 'From on high I descend, the hallowed moon to call': - 'Des cieux je vais descendre et révérer la lune', - 'From on high I descend, the iron path to walk': - 'Du haut des cieux, je vais descendre pour conquérir', - 'From on high I descend, the moon and stars to bring': - 'Du haut des cieux, j\'appelle une pluie d\'étoiles', 'Iceclaw': 'griffe-de-glace', 'Nael Deus Darnus': 'Nael deus Darnus', 'Nael Geminus': 'Nael Geminus', - 'O hallowed moon, shine you the iron path': 'Ô lune! Éclaire la voie de la domination', - 'O hallowed moon, take fire and scorch my foes': - 'Que l\'incandescence de la lune brûle mes ennemis', 'Ragnarok': 'Ragnarok', 'Tail of Darkness': 'queue de ténèbres', - 'Take fire, O hallowed moon': 'Baignez dans la bénédiction de la lune incandescente', 'Thunderwing': 'aile-de-foudre', 'Twintania': 'Gémellia', - 'Unbending iron, descend with fiery edge': - 'Fier acier! Sois ma lame plongeante et deviens incandescent', - 'Unbending iron, take fire and descend': - 'Ô noble acier! Rougis ardemment et deviens ma lame transperçante', }, 'replaceText': { '--push--': '--poussé(e)--', @@ -2050,22 +1959,6 @@ Options.Triggers.push({ 'Tail of Darkness': 'ダークテイル', 'Thunderwing': 'サンダーウィング', 'Twintania': 'ツインタニア', - 'From on high I descend, the hallowed moon to call': '我、舞い降りて\\s*月を仰がん!', - 'From on high I descend, the iron path to walk': '我、舞い降りて\\s*鉄の覇道を征く!', - 'Take fire, O hallowed moon': '赤熱せし\\s*月の祝福を!', - 'Blazing path, lead me to iron rule': '赤熱し、焼かれし道を\\s*鉄の覇道と成す!', - 'O hallowed moon, take fire and scorch my foes': '月よ!\\s*赤熱し、神敵を焼け!', - 'O hallowed moon, shine you the iron path': '月よ!\\s*鉄の覇道を照らせ!', - 'Fleeting light! \'Neath the red moon, scorch you the earth': - '超新星よ、輝きを増せ!\\s*紅月下の赤熱せし地を照らせ!', - 'Fleeting light! Amid a rain of stars, exalt you the red moon': - '超新星よ、輝きを増せ!\\s*星降りの夜に、紅月を称えよ!', - 'From on high I descend, the moon and stars to bring': '我、舞い降りて月を仰ぎ\\s*星降りの夜を招かん!', - 'From hallowed moon I descend, a rain of stars to bring': '我、月より舞い降りて\\s*星降りの夜を招かん!', - 'From hallowed moon I bare iron, in my descent to wield': '我、月より鉄を備え\\s*舞い降りん!', - 'From hallowed moon I descend, upon burning earth to tread': '我、月より舞い降りて\\s*赤熱せし地を歩まん!', - 'Unbending iron, take fire and descend': '鉄よ、赤熱せよ!\\s*舞い降りし我が刃となれ!', - 'Unbending iron, descend with fiery edge': '鉄よ、舞い降りし\\s*我の刃となり赤熱せよ!', }, 'replaceText': { '--push--': '--フェイス切替--', @@ -2143,21 +2036,6 @@ Options.Triggers.push({ 'Tail of Darkness': '暗尾', 'Thunderwing': '雷翼', 'Twintania': '双塔尼亚', - 'From on high I descend, the hallowed moon to call': '我降临于此,\\s*对月长啸!', - 'From on high I descend, the iron path to walk': '我降临于此,\\s*征战铁血霸道!', - 'Take fire, O hallowed moon': '炽热燃烧!\\s*给予我月亮的祝福!', - 'Blazing path, lead me to iron rule': '被炽热灼烧过的轨迹\\s*乃成铁血霸道!', - 'O hallowed moon, take fire and scorch my foes': '月光啊!\\s*用你的炽热烧尽敌人!', - 'O hallowed moon, shine you the iron path': '月光啊!\\s*照亮铁血霸道!', - 'Fleeting light! \'Neath the red moon, scorch you the earth': '超新星啊,更加闪耀吧!\\s*照亮红月下炽热之地!', - 'Fleeting light! Amid a rain of stars, exalt you the red moon': - '超新星啊,更加闪耀吧!\\s*在星降之夜,称赞红月!', - 'From on high I descend, the moon and stars to bring': '我降临于此对月长啸!\\s*召唤星降之夜!', - 'From hallowed moon I descend, a rain of stars to bring': '我自月而来降临于此,\\s*召唤星降之夜!', - 'From hallowed moon I bare iron, in my descent to wield': '我自月而来携钢铁降临于此!', - 'From hallowed moon I descend, upon burning earth to tread': '我自月而来降临于此,\\s*踏过炽热之地!', - 'Unbending iron, take fire and descend': '钢铁燃烧吧!\\s*成为我降临于此的刀剑吧!', - 'Unbending iron, descend with fiery edge': '钢铁成为我降临于此的燃烧之剑!', }, 'replaceText': { '--push--': '--开怪--', @@ -2235,24 +2113,6 @@ Options.Triggers.push({ 'Tail of Darkness': '어둠의 꼬리', 'Thunderwing': '번개날개', 'Twintania': '트윈타니아', - 'From on high I descend, the hallowed moon to call': '흉조가 내려와 달을 올려다보리라!', - 'From on high I descend, the iron path to walk': '흉조가 내려와 강철의 패도를 걸으리라!', - 'Take fire, O hallowed moon': '붉게 타오른 달의 축복을!', - 'Blazing path, lead me to iron rule': '붉게 타오른 길을 강철의 패도로 만들겠노라!', - 'O hallowed moon, take fire and scorch my foes': '달이여! 붉게 타올라 신의 적을 태워버려라!', - 'O hallowed moon, shine you the iron path': '달이여! 강철의 패도를 비춰라!', - 'Fleeting light! \'Neath the red moon, scorch you the earth': - '초신성이여, 빛을 더하라! 붉은 달 아래, 붉게 타오르는 땅을 비춰라!', - 'Fleeting light! Amid a rain of stars, exalt you the red moon': - '초신성이여, 빛을 더하라! 유성이 쏟아지는 밤에, 붉은 달을 우러러보라!', - 'From on high I descend, the moon and stars to bring': - '흉조가 내려와, 달을 올려다보니 유성이 쏟아지는 밤이 도래하리라!', - 'From hallowed moon I descend, a rain of stars to bring': '달로부터 흉조가 내려와 유성이 쏟아지는 밤이 도래하리라!', - 'From hallowed moon I bare iron, in my descent to wield': '달로부터 강철의 패도를 거쳐 흉조가 내려오리라!', - 'From hallowed moon I descend, upon burning earth to tread': - '달로부터 흉조가 내려와 붉게 타오르는 땅을 걸으리라!', - 'Unbending iron, take fire and descend': '강철이여, 붉게 타올라라! 흉조가 내려오니 그 칼날이 되어라!', - 'Unbending iron, descend with fiery edge': '강철이여, 흉조가 내려오는도다! 그 칼날이 되어 붉게 타올라라!', }, 'replaceText': { '--push--': '--최소 RDPS컷--', diff --git a/06-ew/trial/asura.js b/06-ew/trial/asura.js index 85830f05f3..4bef3de8eb 100644 --- a/06-ew/trial/asura.js +++ b/06-ew/trial/asura.js @@ -208,19 +208,18 @@ Options.Triggers.push({ }, { id: 'Asura Iconic Execution With Jump', - type: 'CombatantMemory', - // Filter to only enemy actors for performance - netRegex: { id: '4[0-9A-Fa-f]{7}', capture: true }, + type: 'ActorSetPos', + // The Asura Image doesn't have associated ActorSetPos lines except for this mechanic. + // Can't meaningfully filter regex as nearly all 271 lines are NPCs; but it's <100 in total. + netRegex: {}, condition: (data, matches) => data.iconicExecutionCount >= 3 && data.asuraImageId === matches.id && data.storedIconMech !== undefined, alertText: (data, matches, output) => { - if (matches.pairPosX === undefined || matches.pairPosY === undefined) - return; const imageLoc = Directions.xyToCardinalDirOutput( - parseFloat(matches.pairPosX), - parseFloat(matches.pairPosY), + parseFloat(matches.x), + parseFloat(matches.y), centerX, centerY, );