Merge branch 'main' into more-r4n

CONTRIBUTING.md

@@ -121,6 +121,11 @@ will immediately update the overlay,
 prompting a refresh within the overlay itself.
 This is the recommended approach of validating local code changes.
 
+For convenience, webpack has access to the `/user/webpack/` directory
+inside your local git root.
+You can use this directory to store assets for your persoonal user confiiguration (if any).
+The `/user/` directory is also suppressed for change tracking by `/.gitignore`.
+
 Alternatively, `npm run build` will locally create a production distribution
 of cactbot. This shouldn't be necessary for developing
 and will be slower than running `npm start` for validating changes,

plugin/CactbotEventSource/FFXIVProcessIntl.cs

@@ -277,6 +277,8 @@ public unsafe override JObject GetJobSpecificData(EntityJob job) {
                 return JObject.FromObject(*(SageJobMemory*)&p[0]);
             case EntityJob.RPR:
                 return JObject.FromObject(*(ReaperJobMemory*)&p[0]);
+            case EntityJob.VPR:
+                return JObject.FromObject(*(ViperJobMemory*)&p[0]);
             case EntityJob.PCT:
                 return JObject.FromObject(*(PictomancerJobMemory*)&p[0]);
           }
@@ -548,6 +550,12 @@ public bool paradox {
           return enochian_state.HasFlag(EnochianFlags.Paradox);
         }
       }
+
+      public int astralSoulStacks {
+        get {
+          return ((int)enochian_state >> 2) & 0x7; // = 0b111, to get the last 3 bits.
+        }
+      }
     };
 
     [StructLayout(LayoutKind.Explicit)]
@@ -924,6 +932,47 @@ public struct ReaperJobMemory {
       public byte voidShroud;
     }
 
+    [StructLayout(LayoutKind.Explicit)]
+    public struct ViperJobMemory {
+      public enum AdvancedCombo : byte {
+        Dreadwinder = 1,
+        HuntersCoil = 2,
+        SwiftskinsCoil = 3,
+        PitOfDread = 4,
+        HuntersDen = 5,
+        SwiftskinsDen = 6,
+        Reawaken = 7,
+        FirstGeneration = 8,
+        SecondGeneration = 9,
+        ThirdGeneration = 10,
+        FourthGeneration = 11,
+      }
+
+      [FieldOffset(0x00)]
+      public byte rattlingCoilStacks;
+
+      [FieldOffset(0x01)]
+      public byte anguineTribute;
+
+      [FieldOffset(0x02)]
+      public byte serpentOffering;
+
+      [NonSerialized]
+      [FieldOffset(0x03)]
+      private AdvancedCombo _advancedCombo;
+
+      public string advancedCombo {
+        get {
+          return _advancedCombo.ToString();
+        }
+      }
+
+      [FieldOffset(0x06)]
+      public ushort reawakenedTimer;
+    }
+
+
+
     [StructLayout(LayoutKind.Explicit)]
     public struct PictomancerJobMemory {
       [Flags]

resources/effect_id.ts

@@ -944,6 +944,7 @@ const data = {
   'HpBoost3': '618',
   'HpBoost4': '619',
   'Hubris': 'A2B',
+  'HuntersInstinct': 'E54',
   'HuntersVenom': 'E49',
   'HydrobulletTarget': 'EA4',
   'HydrofallTarget': 'EA3',
@@ -1286,6 +1287,7 @@ const data = {
   'Normal': '89C',
   'NormalStance': '1CB',
   'NoseForBattle': '486',
+  'NoxiousGnash': 'E53',
   'Nuisance': 'F6E',
   'NullBlack': 'A4B',
   'NullWhite': 'A4A',

resources/outputs.ts

@@ -98,6 +98,7 @@ export default {
     en: 'Avoid Tank Tethers',
     fr: 'Évitez les liens des Tanks',
     ja: 'タンクの線を避けて',
+    cn: '远离坦克连线',
   },
   tankCleave: {
     en: 'Tank cleave',

types/event.d.ts

@@ -94,6 +94,24 @@ export interface JobDetail {
     lemureShroud: number;
     voidShroud: number;
   };
+  'VPR': {
+    rattlingCoilStacks: number;
+    anguineTribute: number;
+    serpentOffering: number;
+    advancedCombo:
+      | 'Dreadwinder'
+      | 'HuntersCoil'
+      | 'SwiftskinsCoil'
+      | 'PitOfDread'
+      | 'HuntersDen'
+      | 'SwiftskinsDen'
+      | 'Reawaken'
+      | 'FirstGeneration'
+      | 'SecondGeneration'
+      | 'ThirdGeneration'
+      | 'FourthGeneration';
+    reawakenedTimer: number;
+  };
   'BRD': {
     songName: BardSongType;
     lastPlayed: BardSongType;
@@ -130,6 +148,7 @@ export interface JobDetail {
     umbralHearts: number;
     polyglot: number;
     nextPolyglotMilliseconds: number;
+    astralSoulStacks: number;
   };
   'ACN': {
     aetherflowStacks: number;

ui/jobs/bars.ts

@@ -17,6 +17,7 @@ import {
   kMPUI3Rate,
 } from './constants';
 import { JobsEventEmitter } from './event_emitter';
+import { FfxivVersion } from './jobs';
 import './jobs_config';
 import { JobsOptions } from './jobs_options';
 import { Player } from './player';
@@ -589,6 +590,7 @@ export class Bars {
     prevMp?: number;
     umbralStacks?: number;
     inCombat: boolean;
+    ffxivVersion: FfxivVersion;
   }): void {
     if (!this.o.mpTicker)
       return;
@@ -608,7 +610,9 @@ export class Bars {
     if (data.umbralStacks === -3)
       umbralTick = kMPUI3Rate;
 
-    const mpTick = Math.floor(data.maxMp * baseTick) + Math.floor(data.maxMp * umbralTick);
+    const mpTick = data.ffxivVersion < 700
+      ? Math.floor(data.maxMp * baseTick) + Math.floor(data.maxMp * umbralTick)
+      : data.maxMp * baseTick;
     if (delta === mpTick && data.umbralStacks <= 0) // MP ticks disabled in AF
       this.o.mpTicker.duration = kMPTickInterval;