raidboss: update ShB timelines

CONTRIBUTING.md

@@ -76,6 +76,15 @@ and on the server-side (GitHub).
 You will need to [install](README.md#npm-and-webpack) `nodejs` and run `npm install`
 in order to install local versions of husky, lint-staged, and eslint.
 
+It is recommended that you also install ts-node and typescript globally, e.g.
+
+```shell
+npm install -g typescript
+npm install -g ts-node
+```
+
+This will let you run commands as `ts-node` directly instead of `npx ts-node`.
+
 If the pre-commit validations are causing you significant problems,
 feel free to bypass the checks with `--no-verify` flag,
 such as `git commit --no-verify`,

docs/RaidbossGuide.md

@@ -107,13 +107,13 @@ Boolean, defaults to true. If true, timelines and triggers will reset automatica
 ```javascript
 {
   id: 'id string',
-  // Note: netRegex only, see `NetFields` from [net_fields.d.ts](https://github.com/quisquous/cactbot/blob/main/types/net_fields.d.ts)
   type: 'StartsUsing',
   disabled: false,
-  // Note: use the regex helpers from [netregexes.ts](https://github.com/quisquous/cactbot/blob/main/resources/netregexes.ts)
-  netRegex: NetRegexes.startsUsing({ id: 'some-id', source: 'some-name' }),
+  // Note: see `NetFields` from [net_fields.d.ts](https://github.com/quisquous/cactbot/blob/main/types/net_fields.d.ts)
+  // Note: `netRegex: NetRegexes({ id: 'some-id', source: 'some-name' })` is still supported for backwards compatibility.
+  netRegex: { id: 'some-id', source: 'some-name' },
   // Note: prefer to use the regex helpers from [regexes.ts](https://github.com/quisquous/cactbot/blob/main/resources/regexes.ts)
-  regex: /trigger-regex-for-act-log-lines/,
+  regex: Regexes.ability({ id: 'some-id', source: 'some-name' }),
   condition: function(data, matches, output) { return true if it should run },
   preRun: function(data, matches, output) { do stuff.. },
   delaySeconds: 0,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cactbot",
-  "version": "0.29.13",
+  "version": "0.29.16",
   "license": "Apache-2.0",
   "type": "module",
   "types": "./types",

plugin/CactbotEventSource/FFXIVProcessKo.cs

@@ -8,7 +8,7 @@
 
 namespace Cactbot {
   public class FFXIVProcessKo : FFXIVProcess {
-    // Last updated for FFXIV 6.2
+    // Last updated for FFXIV 6.3
 
     [StructLayout(LayoutKind.Explicit)]
     public unsafe struct EntityMemory {
@@ -29,16 +29,16 @@ public unsafe struct EntityMemory {
       [FieldOffset(0x92)]
       public ushort distance;
 
-      [FieldOffset(0xA0)]
+      [FieldOffset(0xB0)]
       public Single pos_x;
 
-      [FieldOffset(0xA4)]
+      [FieldOffset(0xB4)]
       public Single pos_z;
 
-      [FieldOffset(0xA8)]
+      [FieldOffset(0xB8)]
       public Single pos_y;
 
-      [FieldOffset(0xB0)]
+      [FieldOffset(0xC0)]
       public Single rotation;
 
       [FieldOffset(0x1C4)]
@@ -504,10 +504,10 @@ public struct NinjaJobMemory {
       [FieldOffset(0x00)]
       public ushort hutonMilliseconds;
 
-      [FieldOffset(0x04)]
+      [FieldOffset(0x02)]
       public byte ninkiAmount;
 
-      [FieldOffset(0x05)]
+      [FieldOffset(0x03)]
       private byte hutonCount; // Why though?
     };
 

plugin/CactbotEventSource/Properties/AssemblyInfo.cs

@@ -21,5 +21,5 @@
 // - Revision
 // GitHub has only 3 version components, so Revision should always be 0.
 // CactbotOverlay and CactbotEventSource version should match.
-[assembly: AssemblyVersion("0.29.13.0")]
-[assembly: AssemblyFileVersion("0.29.13.0")]
+[assembly: AssemblyVersion("0.29.16.0")]
+[assembly: AssemblyFileVersion("0.29.16.0")]

plugin/CactbotOverlay/Properties/AssemblyInfo.cs

@@ -20,5 +20,5 @@
 // - Build Number
 // - Revision
 // GitHub has only 3 version components, so Revision should always be 0.
-[assembly: AssemblyVersion("0.29.13.0")]
-[assembly: AssemblyFileVersion("0.29.13.0")]
+[assembly: AssemblyVersion("0.29.16.0")]
+[assembly: AssemblyFileVersion("0.29.16.0")]

resources/netregexes.ts

@@ -35,6 +35,12 @@ const keysThatRequireTranslationAsConst = [
 export const keysThatRequireTranslation: readonly string[] = keysThatRequireTranslationAsConst;
 export type KeysThatRequireTranslation = typeof keysThatRequireTranslationAsConst[number];
 
+export const gameLogCodes = {
+  echo: '0038',
+  dialog: '0044',
+  message: '0839',
+} as const;
+
 const defaultParams = <
   T extends LogDefinitionTypes,
   V extends LogDefinitionVersions,
@@ -474,7 +480,7 @@ export default class NetRegexes {
       ['type', 'timestamp', 'code', 'name', 'line', 'capture'],
     );
 
-    return NetRegexes.gameLog({ ...params, code: '0038' });
+    return NetRegexes.gameLog({ ...params, code: gameLogCodes.echo });
   }
 
   /**
@@ -489,7 +495,7 @@ export default class NetRegexes {
       ['type', 'timestamp', 'code', 'name', 'line', 'capture'],
     );
 
-    return NetRegexes.gameLog({ ...params, code: '0044' });
+    return NetRegexes.gameLog({ ...params, code: gameLogCodes.dialog });
   }
 
   /**
@@ -504,7 +510,7 @@ export default class NetRegexes {
       ['type', 'timestamp', 'code', 'name', 'line', 'capture'],
     );
 
-    return NetRegexes.gameLog({ ...params, code: '0839' });
+    return NetRegexes.gameLog({ ...params, code: gameLogCodes.message });
   }
 
   /**

resources/outputs.ts

@@ -94,6 +94,17 @@ export default {
     cn: '顺劈',
     ko: '광역 탱버',
   },
+  tankBusterCleaves: {
+    en: 'Tank Buster Cleaves',
+    de: 'Tankbuster Cleaves',
+    fr: 'Tankbuster cleaves',
+    ja: 'MT・ST同時範囲攻撃',
+    cn: '双T扇形死刑',
+    ko: '광역 탱버',
+  },
+  tankBusterCleavesOnYou: {
+    en: 'Tank Cleaves on YOU',
+  },
   avoidTankCleave: {
     en: 'Avoid tank cleave',
     de: 'Tank Cleave ausweichen',
@@ -102,6 +113,14 @@ export default {
     cn: '远离顺劈',
     ko: '광역 탱버 피하기',
   },
+  avoidTankCleaves: {
+    en: 'Avoid Tank Cleaves',
+    de: 'Tankbuster Cleaves ausweichen',
+    fr: 'Évitez les cleaves (tankbusters)',
+    ja: '範囲攻撃を避けて',
+    cn: '躲避双T扇形死刑',
+    ko: '광역 탱버 피하기',
+  },
   tankCleaveOnYou: {
     en: 'Tank cleave on YOU',
     de: 'Tank Cleave aud DIR',
@@ -390,12 +409,14 @@ export default {
   front: {
     en: 'Front',
     fr: 'Devant',
+    ja: '前',
     cn: '前',
     ko: '앞',
   },
   back: {
     en: 'Back',
     fr: 'Derrière',
+    ja: '後ろ',
     cn: '后',
     ko: '뒤',
   },

resources/util.ts

@@ -7,6 +7,7 @@ import { Job, Role } from '../types/job';
 import { NetMatches } from '../types/net_matches';
 import { OutputStrings } from '../types/trigger';
 
+import { gameLogCodes } from './netregexes';
 import Outputs from './outputs';
 import { callOverlayHandler } from './overlay_plugin_api';
 
@@ -414,6 +415,7 @@ const Util = {
     watchCombatantOverride = watchFunc;
     clearCombatantsOverride = clearFunc;
   },
+  gameLogCodes: gameLogCodes,
 } as const;
 
 export default Util;

resources/zone_info.ts

@@ -1111,6 +1111,7 @@ const data: ZoneInfoType = {
       'en': 'Mount Ordeals',
       'fr': 'Le Mont du Supplice',
       'ja': 'ルビカンテ討滅戦',
+      'ko': '루비칸테 토벌전',
     },
     'offsetX': -100,
     'offsetY': -100,
@@ -1126,6 +1127,7 @@ const data: ZoneInfoType = {
       'en': 'Mount Ordeals (Extreme)',
       'fr': 'Le Mont du Supplice (extrême)',
       'ja': '極ルビカンテ討滅戦',
+      'ko': '극 루비칸테 토벌전',
     },
     'offsetX': -100,
     'offsetY': -100,
@@ -1141,6 +1143,7 @@ const data: ZoneInfoType = {
       'en': 'Lapis Manalis',
       'fr': 'Lapis Manalis',
       'ja': '雪山冥洞 ラピス・マナリス',
+      'ko': '라피스 마날리스',
     },
     'offsetX': -46,
     'offsetY': 570,
@@ -1406,6 +1409,7 @@ const data: ZoneInfoType = {
       'en': 'The Clockwork Castletown',
       'fr': 'Le Traquenard oriental',
       'ja': '東方絡繰御殿',
+      'ko': '동방 꼭두각시 어전',
     },
     'offsetX': 0,
     'offsetY': 0,
@@ -1421,6 +1425,7 @@ const data: ZoneInfoType = {
       'en': 'Crystalline Conflict (Custom Match - The Clockwork Castletown)',
       'fr': 'Crystalline Conflict (partie personnalisée - Le Traquenard oriental)',
       'ja': 'クリスタルコンフリクト(東方絡繰御殿：カスタムマッチ)',
+      'ko': '크리스탈라인 컨플릭트(동방 꼭두각시 어전: 친선 경기)',
     },
     'offsetX': 0,
     'offsetY': 0,
@@ -1436,6 +1441,7 @@ const data: ZoneInfoType = {
       'en': 'Euphrosyne',
       'fr': 'Domaine divin - Euphrosyne',
       'ja': '喜びの神域 エウプロシュネ',
+      'ko': '환희의 신역 에우프로시네',
     },
     'offsetX': 0,
     'offsetY': 480,
@@ -1451,6 +1457,7 @@ const data: ZoneInfoType = {
       'en': 'An Unforeseen Bargain',
       'fr': 'Pour une bouchée de pain',
       'ja': 'パンひとつと引き換えに',
+      'ko': '빵 하나와 바꾸어',
     },
     'offsetX': 0,
     'offsetY': 0,
@@ -1496,6 +1503,7 @@ const data: ZoneInfoType = {
       'en': 'The Shifting Gymnasion Agonon',
       'fr': 'Elpis Gymnasion',
       'ja': '宝物庫 エルピス・ギュムナシオン祭殿',
+      'ko': '보물고 엘피스 김나시온 제전',
     },
     'offsetX': -100,
     'offsetY': -100,

types/trigger.d.ts

@@ -115,7 +115,7 @@ export type BaseTrigger<
 type BaseNetTrigger<Data extends RaidbossData, Type extends TriggerTypes> = {
   id: string;
   type: Type;
-  netRegex: NetParams[Type] | CactbotBaseRegExp<Type>;
+  netRegex: NetParams[Type];
   disabled?: boolean;
   condition?: TriggerField<Data, NetMatches[Type], boolean | undefined>;
   preRun?: TriggerField<Data, NetMatches[Type], void>;
@@ -208,7 +208,15 @@ export type TriggerSet<Data extends RaidbossData = RaidbossData> =
 // Less strict type for user triggers + built-in triggers, including deprecated fields.
 export type LooseTimelineTrigger = Partial<TimelineTrigger<RaidbossData>>;
 
-export type LooseTrigger = Partial<BaseNetTrigger<RaidbossData, 'None'> & PartialRegexTrigger>;
+export type LooseTrigger = Partial<
+  & Omit<BaseNetTrigger<RaidbossData, 'None'>, 'netRegex'>
+  & PartialRegexTrigger
+  & {
+    // Built-in cactbot netRegex only supports the `NetParams` variety of specification,
+    // but for backwards compatibility, also handle anybody still using `NetRegexes.foo()`.
+    netRegex: NetParams['None'] | CactbotBaseRegExp<'None'>;
+  }
+>;
 
 export type LooseTriggerSet =
   & Omit<Partial<TriggerSet>, 'triggers' | 'timelineTriggers'>

ui/fisher/static-data.ts

@@ -18323,6 +18323,26 @@ const data: FisherData = {
       '38345': '솜해조구',
       '38346': '토양 정화용 약어',
       '38347': '양치용 해면동물',
+      '38810': '온도 미역',
+      '38811': '켄의 가마솥',
+      '38812': '자색대구',
+      '38813': '글로리안다의 눈물',
+      '38814': '일 리다',
+      '38830': '만려어',
+      '38831': '이끼연어',
+      '38832': '비디유트와트 놀래기',
+      '38833': '갈색바나나장어',
+      '38834': '빙토거북',
+      '38835': '우주 안개',
+      '38836': '안테이아 달리아',
+      '38837': '호수 짱뚱어',
+      '38838': '청동 장어',
+      '38839': '줄농어',
+      '38840': '청동송어',
+      '38841': '라노시아사우루스',
+      '38935': '징가',
+      '38939': '녹청 구피',
+      '39240': '잎새어',
     },
   },
   'placefish': {
@@ -25190,6 +25210,11 @@ const data: FisherData = {
     '38835': 3,
     '38836': 3,
     '39240': 1,
+    '39879': 3,
+    '39880': 3,
+    '39881': 3,
+    '39882': 3,
+    '39883': 3,
   },
 };
 

ui/jobs/jobs.ts

@@ -26,7 +26,7 @@ UserConfig.getUserConfigLocation('jobs', defaultOptions, () => {
     'fr': 640,
     'ja': 640,
     'cn': 630,
-    'ko': 625,
+    'ko': 630,
   };
   const ffxivVersion = ffxivlanguageToVersion[options.ParserLanguage];