temp update

jobs.js

@@ -1,5 +1,3 @@
-
-
 // console.log('Language set to ' + Options.Language);
 
 // Options.ShowMPTickerOutOfCombat = false;

oopsyraidsy.js

@@ -1,13 +1,19 @@
 
-
 Options.PlayerNicks = {
   'Paprika Rika': 'Pap',
   'Elmindreda Farshaw': 'Min',
+  'Elmindreda Far\'shaw': 'Min',
   'Mikoto Misaka': 'Miko',
   'Lohpopo Lopopo': 'Loh',
   'Ninene Nine': 'Nine',
   'Wikiki Wiki': 'Wiki',
   'Kinono Kino': 'Kino',
+  'The\'man The\'Myth': 'Zero',
+  'Sanjuro Katsuki': 'San',
+  'Alshiana Valtarios': 'Alshi',
+  'Cheesygordita Crunch': 'Cheesy',
+  'Tsukiya Tamada': 'Tsuki',
+  'Women\'s Champion': 'Kev',
 };
 
 Options.Debug = true;

raidboss.js

@@ -21,6 +21,7 @@ Options.PlayerNicks = {
   'Alshiana Valtarios': 'Alshi',
   'Cheesygordita Crunch': 'Cheesy',
   'Tsukiya Tamada': 'Tsuki',
+  'Women\'s Champion': 'Kev',
 };
 
 // Prepend emoji to all added timeline events to make them stand out.
@@ -32,7 +33,6 @@ function emojify(arr) {
   return arr;
 }
 
-
 Options.Triggers.push(...[
   {
     zoneRegex: /.*/,
@@ -65,21 +65,25 @@ Options.Triggers.push(...[
       {
         id: 'Test Lang',
         netRegex: NetRegexes.echo({ line: 'cactbot lang.*?', capture: false }),
-        infoText: function(data) {
-          console.log('override');
-          return {
-            en: 'Language2: ' + data.parserLang,
-          };
+        infoText: (data, _, output) => {
+          return output.text({ parserLang: data.parserLang });
+        },
+        outputStrings: {
+          text: {
+            en: 'Language2: ${parserLang}',
+          },
         },
       },
       {
         id: 'Test Lang',
-        netRegex: NetRegexes.echo({ line: 'cactbot lang.*?', capture: false }),
-        infoText: function(data) {
-          console.log('override3');
-          return {
-            en: 'Language3: ' + data.parserLang,
-          };
+        regex: Regexes.echo({ line: 'boop.*?', capture: false }),
+        infoText: (data, _, output) => {
+          return output.text({ parserLang: data.parserLang });
+        },
+        outputStrings: {
+          text: {
+            en: 'Language3: ${parserLang}',
+          },
         },
       },
     ],
@@ -115,7 +119,9 @@ Options.Triggers.push(...[
     ],
   },
   {
-    zoneRegex: /The Second Coil Of Bahamut - Turn \(2\)/,
+    zoneRegex: {
+      en: /The Second Coil Of Bahamut - Turn \(2\)/,
+    },
     filename: 'user t7',
     triggers: [
       {

raidboss/test-timeline.txt

@@ -16,4 +16,4 @@
 14 "the test timeline"
 15 "with user/raidboss.js"
 25 "Final Sting X"
-40 "Death"
+40 "Death"

raidboss/test.js

@@ -2,8 +2,25 @@ console.log('git raidboss user/raidboss/test.js file');
 
 Options.Triggers.push({
   zoneId: ZoneId.MiddleLaNoscea,
-  overrideTimelineFile: true,
-  timelineFile: 'test-timeline.txt',
+  // overrideTimelineFile: true,
+  // timelineFile: 'test-timeline.txt',
+  timelineTriggers: [
+    {
+      id: 'Test Timeline Trigger',
+      regex: /Angry Dummy II/,
+      beforeSeconds: 2,
+      infoText: 'BOOP',
+    },
+  ],
+  timelineReplace: [
+    {
+      locale: 'en',
+      replaceText: {
+        'Final Sting': 'Finalest Sting',
+        'Angry Dummy': 'Mildly Irate Dummy',
+      },
+    },
+  ],
   triggers: [
     {
       id: 'Test Poke',
@@ -15,5 +32,20 @@ Options.Triggers.push({
       // This overrides the type and text of the output.
       alarmText: 'POKE (user file override)',
     },
+    {
+      // no id!
+      netRegex: NetRegexes.gameNameLog({ line: 'You poke the striking dummy.*?', capture: false }),
+      alarmText: 'POKE EXTRA',
+    },
+    {
+      id: 'Test Poke 3',
+      netRegex: NetRegexes.gameNameLog({ line: 'You poke the striking dummy.*?', capture: false }),
+      preRun: function(data) {
+        data.pokes = (data.pokes || 0) + 1;
+      },
+      // Instead of printing the number of pokes with infoText like the original trigger,
+      // This overrides the type and text of the output.
+      alarmText: 'POKE (user file override)',
+    },
   ],
 });