diff --git a/02-arr/raid/t1.js b/02-arr/raid/t1.js index 814e743cfb..84649e34f6 100644 --- a/02-arr/raid/t1.js +++ b/02-arr/raid/t1.js @@ -77,12 +77,9 @@ Options.Triggers.push({ }, { id: 'T1 Slime Timer First', - type: 'GameLog', - netRegex: { - line: 'The Allagan megastructure will be sealed off.*?', - code: Util.gameLogCodes.message, - capture: false, - }, + type: 'SystemLogMessage', + // The Allagan megastructure will be sealed off + netRegex: { id: '7DC', param1: '379', capture: false }, delaySeconds: 35, suppressSeconds: 5, infoText: (_data, _matches, output) => output.text(), diff --git a/03-hw/alliance/weeping_city.js b/03-hw/alliance/weeping_city.js index 804328b845..344ae2b2e6 100644 --- a/03-hw/alliance/weeping_city.js +++ b/03-hw/alliance/weeping_city.js @@ -70,22 +70,16 @@ Options.Triggers.push({ // Because of this, we restrict those triggers for each boss to activate // only when that boss is in progress. id: 'Weeping City HeadMarker Arachne', - type: 'GameLog', - netRegex: { - line: 'The Queen\'s Room will be sealed off.*?', - code: Util.gameLogCodes.message, - capture: false, - }, + type: 'SystemLogMessage', + // The Queen's Room will be sealed off + netRegex: { id: '7DC', param1: '6E0', capture: false }, run: (data) => data.arachneStarted = true, }, { id: 'Weeping City HeadMarker Ozma', - type: 'GameLog', - netRegex: { - line: 'The Gloriole will be sealed off.*?', - code: Util.gameLogCodes.message, - capture: false, - }, + type: 'SystemLogMessage', + // The Gloriole will be sealed off + netRegex: { id: '7DC', param1: '6E5', capture: false }, run: (data) => { data.arachneStarted = false; data.ozmaStarted = true; @@ -93,12 +87,9 @@ Options.Triggers.push({ }, { id: 'Weeping City HeadMarker Calofisteri', - type: 'GameLog', - netRegex: { - line: 'The Tomb Of The Nullstone will be sealed off.*?', - code: Util.gameLogCodes.message, - capture: false, - }, + type: 'SystemLogMessage', + // The Tomb Of The Nullstone will be sealed off + netRegex: { id: '7DC', param1: '6E6', capture: false }, run: (data) => { data.ozmaStarted = false; data.calStarted = true; diff --git a/04-sb/eureka/eureka_hydatos.js b/04-sb/eureka/eureka_hydatos.js index 7d782371ef..8b1458ec77 100644 --- a/04-sb/eureka/eureka_hydatos.js +++ b/04-sb/eureka/eureka_hydatos.js @@ -75,22 +75,16 @@ Options.Triggers.push({ }, { id: 'BA Seal', - type: 'GameLog', - netRegex: { - line: '.* will be sealed off.*?', - code: Util.gameLogCodes.message, - capture: false, - }, + type: 'SystemLogMessage', + // "will be sealed off" + netRegex: { id: '7DC', capture: false }, run: (data) => data.sealed = true, }, { id: 'BA Clear Data', - type: 'GameLog', - netRegex: { - line: '.*is no longer sealed.*?', - code: Util.gameLogCodes.message, - capture: false, - }, + type: 'SystemLogMessage', + // "is no longer sealed" + netRegex: { id: '7DE', capture: false }, run: (data) => { delete data.side; delete data.mythcall; diff --git a/06-ew/dungeon/the_sildihn_subterrane.js b/06-ew/dungeon/the_sildihn_subterrane.js index 44954b2034..33dfb3f1f0 100644 --- a/06-ew/dungeon/the_sildihn_subterrane.js +++ b/06-ew/dungeon/the_sildihn_subterrane.js @@ -92,12 +92,9 @@ Options.Triggers.push({ triggers: [ { id: 'Sildihn Geryon Seal Left Mechs', - type: 'GameLog', - netRegex: { - line: 'The Silt Pump will be sealed off.*?', - code: Util.gameLogCodes.message, - capture: false, - }, + type: 'SystemLogMessage', + // The Silt Pump will be sealed off + netRegex: { id: '7DC', param1: '1068', capture: false }, // May be overwritten by Runaway Sludge below. run: (data) => data.catapultMechs = leftDoorYesPump, }, @@ -124,12 +121,9 @@ Options.Triggers.push({ }, { id: 'Sildihn Geryon Seal Right Mechs', - type: 'GameLog', - netRegex: { - line: 'The Settling Basin will be sealed off.*?', - code: Util.gameLogCodes.message, - capture: false, - }, + type: 'SystemLogMessage', + // The Settling Basin will be sealed off + netRegex: { id: '7DC', param1: '106D', capture: false }, // May be overwritten by Suddenly Sewage below. run: (data) => data.catapultMechs = rightDoorNoCeruleum, },