triggers build: raidboss: asura ActorSetPos update (OverlayPlugin#89) 6…

…4b82b3
ShadyWhite · Mar 11, 2024 · 849468e · 849468e
1 parent e399ffc
commit 849468e
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 246 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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" }