encounter_tools: attempt to support CEs without breaking others

I'm not certain this works properly yet, but it appears to locate the
CEs if I merge with my occult crescent timeline file.

Instead of blindly listing all CEs with their ID, I added look up tables
for the CEs to resources. I suspect there is a more elegant way to do
this, with less boiler plate code. I also don't really know how to share
this data with the trigger files, which need inverted mappings.

This method is similar to some code written by Valarnin, but I adapted
it so that it will only apply to known valid CEs. That should prevent
breaking any other zones or encounter logic. I'm open to other methods
of integrating CE support if there are better solutions.

Signed-off-by: Jacob Keller <[email protected]>

Author: jacob-keller

resources/ce_info.ts

@@ -0,0 +1,66 @@
+// I have no idea if this could be automatically generated
+// TODO: share these somehow with the trigger file?
+
+type CEMap = { [id: string]: string };
+
+export const OccultCrescentSouthHornCEs: CEMap = {
+  '32F': 'Calamity Bound',
+  '343': 'Company Of Stone',
+  '330': 'Crawling Death',
+  '32B': 'Cursed Concern',
+  '329': 'Eternal Watch',
+  '32A': 'Flame Of Dusk',
+  '323': 'From Times Bygone',
+  '327': 'Noise Complaint',
+  '338': 'On The Hunt',
+  '320': 'Scourge Of The Mind',
+  '32E': 'Shark Attack',
+  '322': 'The Black Regiment',
+  '348': 'The Unbridled',
+  '349': 'Trial By Claw',
+  '339': 'With Extreme Predjudice',
+};
+
+export const BozjanSouthernFrontCEs: CEMap = {
+  '1CA': 'The Hunt for Red Choctober',
+  '1CB': 'Metal Fox Chaos',
+  '1CC': 'The Baying of the Hound(s)',
+  '1CD': 'The Shadow of Death\'s Hand',
+  '1CE': 'Trampled under Hoof',
+  '1D0': 'Vigil for the Lost',
+  '1D1': 'Patriot Games',
+  '1D2': 'Aces High',
+  '1D3': 'And the Flames Went Higher',
+  '1D4': 'Kill It with Fire',
+  '1D5': 'The Final Furlong',
+  '1D6': 'The Fires of War',
+  '1D7': 'The Battle of Castrum Lacus Litore',
+  '1D8': 'Adrammelech',
+  '1DA': 'Albeleo',
+  '1DB': 'Beast of Man',
+  '1DC': 'Where Strode the Behemoth',
+  '1DF': 'Rise of the Robots\'',
+};
+
+export const ZadnorCEs: CEMap = {
+  '207': 'Looks to Die For',
+  '20E': 'Feeling the Burn',
+  '20F': 'Never Cry Wolf',
+  '210': 'There Would Be Blood',
+  '211': 'On Serpents\' Wings',
+  '212': 'A Familiar Face',
+  '218': 'Lean, Mean, Magitek Machines',
+  '21B': 'From Beyond the Grave',
+  '21C': 'Here Comes the Cavalry',
+  '21D': 'Time To Burn',
+  '21E': 'Head of the Snake',
+  '21F': 'The Broken Blade',
+  '220': 'Taking the Lyon\'s Share',
+  '221': 'With Diremite and Main',
+  '222': 'Worn to a Shadow',
+  '213': 'The Dalriada',
+  '214': 'The Dalraida - Cuchulainn',
+  '215': 'The Dalriada - Hallway',
+  '216': 'The Dalriada - Saunion',
+  '217': 'The Dalriada - Diablo',
+};

util/logtools/encounter_tools.ts

@@ -1,9 +1,15 @@
+import {
+  BozjanSouthernFrontCEs,
+  OccultCrescentSouthHornCEs,
+  ZadnorCEs,
+} from '../../resources/ce_info';
 import ContentType from '../../resources/content_type';
 import DTFuncs from '../../resources/datetime';
 import NetRegexes, { commonNetRegex } from '../../resources/netregexes';
 import { UnreachableCode } from '../../resources/not_reached';
 import PetData from '../../resources/pet_names';
 import StringFuncs from '../../resources/stringhandlers';
+import ZoneId from '../../resources/zone_id';
 import ZoneInfo from '../../resources/zone_info';
 import { NetAnyMatches, NetMatches } from '../../types/net_matches';
 import { CactbotBaseRegExp } from '../../types/net_trigger';
@@ -90,6 +96,7 @@ export class EncounterFinder {
   currentZone: ZoneEncInfo = {};
   currentFight: FightEncInfo = {};
   currentSeal?: string;
+  currentCE?: string;
   zoneInfo?: typeof ZoneInfo[number];
 
   haveWon = false;
@@ -112,6 +119,7 @@ export class EncounterFinder {
 
   sealRegexes: Array<CactbotBaseRegExp<'GameLog'>> = [];
   unsealRegexes: Array<CactbotBaseRegExp<'GameLog'>> = [];
+  ceRegex: CactbotBaseRegExp<'ActorControl'>;
 
   initializeZone(): void {
     this.currentZone = {};
@@ -152,6 +160,8 @@ export class EncounterFinder {
       const line = `.*?${lang}.*?`;
       this.unsealRegexes.push(NetRegexes.message({ line: line }));
     }
+
+    this.ceRegex = NetRegexes.network6d({ command: '80000014' });
   }
 
   skipZone(): boolean {
@@ -324,6 +334,12 @@ export class EncounterFinder {
         return;
       }
     }
+
+    const ce = this.ceRegex.exec(line)?.groups;
+
+    if (ce) {
+      this.onCE(line, ce);
+    }
   }
 
   // start/endZone always bracket all fights and seals.
@@ -340,7 +356,7 @@ export class EncounterFinder {
   }
   onStartFight(
     line: string,
-    matches: NetMatches['Ability' | 'GameLog' | 'SystemLogMessage' | 'InCombat'],
+    matches: NetMatches['Ability' | 'ActorControl' | 'GameLog' | 'SystemLogMessage' | 'InCombat'],
     fightName?: string,
     sealId?: string,
   ): void {
@@ -380,6 +396,34 @@ export class EncounterFinder {
     this.onEndFight(line, matches, 'Unseal');
     this.currentSeal = undefined;
   }
+
+  onCE(line: string, matches: NetMatches['ActorControl']): void {
+    let validCEs = undefined;
+    if (this.currentZone.zoneId === ZoneId.TheBozjanSouthernFront) {
+      validCEs = BozjanSouthernFrontCEs;
+    } else if (this.currentZone.zoneId === ZoneId.Zadnor) {
+      validCEs = ZadnorCEs;
+    } else if (this.currentZone.zoneId === ZoneId.TheOccultCrescentSouthHorn) {
+      validCEs = OccultCrescentSouthHornCEs;
+    } else {
+      return;
+    }
+
+    if (matches.data0 === '00') {
+      this.onEndFight(line, matches, 'CE End');
+      this.currentCE = undefined;
+    } else {
+      const id = matches.data0;
+      const ceName = validCEs[id];
+
+      if (ceName === undefined) {
+        return;
+      }
+
+      this.currentCE = id;
+      this.onStartFight(line, matches, ceName);
+    }
+  }
 }
 
 class EncounterCollector extends EncounterFinder {