raidboss: update seal triggers to SystemLogMessage (#5965)

This is related to #4201.
quisquous · Dec 1, 2023 · bf5b96c · bf5b96c
1 parent 6a3869f
commit bf5b96c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 51 deletions.
diff --git a/ui/raidboss/data/02-arr/raid/t1.ts b/ui/raidboss/data/02-arr/raid/t1.ts
@@ -1,6 +1,5 @@
 import Conditions from '../../../../../resources/conditions';
 import { Responses } from '../../../../../resources/responses';
-import Util from '../../../../../resources/util';
 import ZoneId from '../../../../../resources/zone_id';
 import { RaidbossData } from '../../../../../types/data';
 import { TriggerSet } from '../../../../../types/trigger';
@@ -88,12 +87,9 @@ const triggerSet: TriggerSet<Data> = {
  },
  {
  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/ui/raidboss/data/03-hw/alliance/weeping_city.ts b/ui/raidboss/data/03-hw/alliance/weeping_city.ts
@@ -1,6 +1,5 @@
 import Conditions from '../../../../../resources/conditions';
 import { Responses } from '../../../../../resources/responses';
-import Util from '../../../../../resources/util';
 import ZoneId from '../../../../../resources/zone_id';
 import { RaidbossData } from '../../../../../types/data';
 import { TriggerSet } from '../../../../../types/trigger';
@@ -83,35 +82,26 @@ const triggerSet: TriggerSet<Data> = {
  // 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;
  },
  },
  {
  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/ui/raidboss/data/04-sb/eureka/eureka_hydatos.ts b/ui/raidboss/data/04-sb/eureka/eureka_hydatos.ts
@@ -91,22 +91,16 @@ const triggerSet: TriggerSet<Data> = {
  },
  {
  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/ui/raidboss/data/06-ew/dungeon/the_sildihn_subterrane.ts b/ui/raidboss/data/06-ew/dungeon/the_sildihn_subterrane.ts
@@ -1,6 +1,5 @@
 import Outputs from '../../../../../resources/outputs';
 import { Responses } from '../../../../../resources/responses';
-import Util from '../../../../../resources/util';
 import ZoneId from '../../../../../resources/zone_id';
 import { RaidbossData } from '../../../../../types/data';
 import { TriggerSet } from '../../../../../types/trigger';
@@ -122,12 +121,9 @@ const triggerSet: TriggerSet<Data> = {
  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,
  },
@@ -154,12 +150,9 @@ const triggerSet: TriggerSet<Data> = {
  },
  {
  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,
  },