Merge pull request #36 from cirrahn/feature/v11-compatibility

Support Lancer v2.0.0 and Foundry v11
Z3nner · Jun 7, 2024 · bc4af79 · bc4af79
2 parents 88397bb + eae8dd3
commit bc4af79
Show file tree

Hide file tree

Showing 77 changed files with 439 additions and 303 deletions.
diff --git a/module.json b/module.json
@@ -14,21 +14,21 @@
     "minimumCoreVersion": "10",
     "compatibility": {
         "minimum": 10,
-        "verified": "10.312"
+        "verified": "11.315"
     },
     "url": "https://github.com/Z3nner/lancer-weapon-fx",
     "manifest": "https://github.com/Z3nner/lancer-weapon-fx/releases/latest/download/module.json",
     "download": "https://github.com/Z3nner/lancer-weapon-fx/releases/download/1.7.2/module.zip",
     "relationships": {
         "requires": [
-        {
-            "id": "sequencer",
-            "type": "module",
-            "manifest": "https://github.com/fantasycalendar/FoundryVTT-Sequencer/releases/latest/download/module.json",
-            "compatibility": {
-                "minimum": "2.3.7"
+            {
+                "id": "sequencer",
+                "type": "module",
+                "manifest": "https://github.com/fantasycalendar/FoundryVTT-Sequencer/releases/latest/download/module.json",
+                "compatibility": {
+                    "minimum": "2.3.7"
+                }
             }
-        }
         ]
     },
     "languages": [

diff --git a/packs/weaponfx.db b/packs/weaponfx.db
diff --git a/packs/weaponfx_manual.db b/packs/weaponfx_manual.db
diff --git a/packs_source/weaponfx.db/AMR.RPjF4SvsMP3dolyX.js b/packs_source/weaponfx.db/AMR.RPjF4SvsMP3dolyX.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -31,4 +31,4 @@ for (const target of targetTokens) {
             .waitUntilFinished();
     }
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Annihilator.XYVkQ3LALbGc6B7i.js b/packs_source/weaponfx.db/Annihilator.XYVkQ3LALbGc6B7i.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -37,4 +37,4 @@ for (const target of targetTokens) {
             .waitUntilFinished(-400);
 	}	
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Apocalypse Rail.Ui60K7EYoOV23KNM.js b/packs_source/weaponfx.db/Apocalypse Rail.Ui60K7EYoOV23KNM.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 const target = game.modules.get("lancer-weapon-fx").api.getTargetLocationsFromTokenGroup(targetTokens, 1)[0];
 
@@ -29,4 +29,4 @@ let sequence = new Sequence()
     .volume(game.modules.get("lancer-weapon-fx").api.getEffectVolume(0.5))
     ;
 
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/ArcBow.SvEgMaioDs6CiqaK.js b/packs_source/weaponfx.db/ArcBow.SvEgMaioDs6CiqaK.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 const findFarthestTargetOfGroup = function (targetTokens) {
     let farthestToken = null;
@@ -70,4 +70,4 @@ let sequence = new Sequence()
 
 sequence = repeatImpactAnimationForEachTarget(sequence, targetTokens);
 
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Assault Rifle.R006179gUEan7xqn.js b/packs_source/weaponfx.db/Assault Rifle.R006179gUEan7xqn.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -21,4 +21,4 @@ for (const target of targetTokens) {
         .waitUntilFinished();
 }
 
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/AssimilationMaw.JDu8MtHJgZSjN6TQ.js b/packs_source/weaponfx.db/AssimilationMaw.JDu8MtHJgZSjN6TQ.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -31,4 +31,4 @@ for (const target of targetTokens) {
         .waitUntilFinished(-1000);
 
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/AutoPod.JMFCQVUjBc3QLBpS.js b/packs_source/weaponfx.db/AutoPod.JMFCQVUjBc3QLBpS.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -22,4 +22,4 @@ for (const target of targetTokens) {
        .scale(.6)
        .atLocation(target);
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/BattleRifle.DdNSH1DTIsRyJCK9.js b/packs_source/weaponfx.db/BattleRifle.DdNSH1DTIsRyJCK9.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -63,4 +63,4 @@ for (let i=0; i < targetTokens.length; i++) {
         .rotate(230)
         .center();
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/BlastPick.blc8AUjYhehKKhc5.js b/packs_source/weaponfx.db/BlastPick.blc8AUjYhehKKhc5.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -34,4 +34,4 @@ for (const target of targetTokens) {
             .waitUntilFinished(-800);
     }
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Bolt Thrower.6lzGhwqHNYxXY25N.js b/packs_source/weaponfx.db/Bolt Thrower.6lzGhwqHNYxXY25N.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -26,4 +26,4 @@ for (const target of targetTokens) {
             .volume(game.modules.get("lancer-weapon-fx").api.getEffectVolume(0.5));
     }
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Brood Siblings Molt.qfPYlbW1NHKOEJXF.js b/packs_source/weaponfx.db/Brood Siblings Molt.qfPYlbW1NHKOEJXF.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -32,4 +32,4 @@ for (const target of targetTokens) {
             .waitUntilFinished(-1500);
     }
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Burst Launcher.EHls7n7amW2fEZ97.js b/packs_source/weaponfx.db/Burst Launcher.EHls7n7amW2fEZ97.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 const target = targetTokens[0];
 

diff --git a/packs_source/weaponfx.db/CannonAirburst.FL83T6qsM9zFOdAQ.js b/packs_source/weaponfx.db/CannonAirburst.FL83T6qsM9zFOdAQ.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 const pTarget = game.modules.get("lancer-weapon-fx").api.getTargetLocationsFromTokenGroup(targetTokens, 1)[0];
 
@@ -52,4 +52,4 @@ for (let i=0; i < targetTokens.length; i++) {
         .volume(game.modules.get("lancer-weapon-fx").api.getEffectVolume(0.5))
 	.delay(350);
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Charged Blade.kozGi0iZPK18rFlI.js b/packs_source/weaponfx.db/Charged Blade.kozGi0iZPK18rFlI.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -28,4 +28,4 @@ for (const target of targetTokens) {
             .atLocation(target)
             .waitUntilFinished(-1200);
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Combat Drill.Tyi49hWX1axZsrq2.js b/packs_source/weaponfx.db/Combat Drill.Tyi49hWX1axZsrq2.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -47,4 +47,4 @@ for (const target of targetTokens) {
             .delay(200)
 		}
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Cyclone Pulse Rifle.1me7RVE8gdTnu9lk.js b/packs_source/weaponfx.db/Cyclone Pulse Rifle.1me7RVE8gdTnu9lk.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -25,4 +25,4 @@ for (const target of targetTokens) {
             .waitUntilFinished();
     }
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/DD 288.XVCMT31Y9x5NgCf6.js b/packs_source/weaponfx.db/DD 288.XVCMT31Y9x5NgCf6.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -38,4 +38,4 @@ for (const target of targetTokens) {
             .rotate(180)
             .delay(200);
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/DefaultMelee.JRAC43fdq4sRWQl8.js b/packs_source/weaponfx.db/DefaultMelee.JRAC43fdq4sRWQl8.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -30,4 +30,4 @@ for (const target of targetTokens) {
             .repeats(2, 80)
             .waitUntilFinished(-2200);
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/DefaultTech.nCYIyBz5RESLVDdt.js b/packs_source/weaponfx.db/DefaultTech.nCYIyBz5RESLVDdt.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 targetTokens.forEach(target => {
     let sequence = new Sequence()
@@ -48,4 +48,4 @@ targetTokens.forEach(target => {
             .playIf(!targetsMissed.has(target.id))
 
     sequence.play();
-	});
+	});
diff --git a/packs_source/weaponfx.db/Displacer.IrU7oILyUlyEecJs.js b/packs_source/weaponfx.db/Displacer.IrU7oILyUlyEecJs.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 const pTarget = game.modules.get("lancer-weapon-fx").api.getTargetLocationsFromTokenGroup(targetTokens, 1)[0];
 
@@ -62,4 +62,4 @@ for (let i=0; i < targetTokens.length; i++) {
     }
 }
 
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/DisruptorWhip.sdz6igpK2LGYTJfY.js b/packs_source/weaponfx.db/DisruptorWhip.sdz6igpK2LGYTJfY.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -46,4 +46,4 @@ for (const target of targetTokens) {
             .waitUntilFinished(-1500);
     }
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Flamethrower.uOyi8zHzCseXGQSR.js b/packs_source/weaponfx.db/Flamethrower.uOyi8zHzCseXGQSR.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 const target = game.modules.get("lancer-weapon-fx").api.getTargetLocationsFromTokenGroup(targetTokens, 1)[0];
 
@@ -26,4 +26,4 @@ for (let i=0; i < targetTokens.length; i++) {
 	    .scaleToObject(1.2);
     }
 }
-        sequence.play();
+        sequence.play();
diff --git a/packs_source/weaponfx.db/Flechette Launcher.4znqR8pQvSs3KpZo.js b/packs_source/weaponfx.db/Flechette Launcher.4znqR8pQvSs3KpZo.js
@@ -1,4 +1,4 @@
-const {sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence()
     .sound()
@@ -14,4 +14,4 @@ let sequence = new Sequence()
     .scale(0.5)
     .repeats(6, 20)
     .atLocation(sourceToken, {randomOffset: 2.2, gridUnits: true})
-    .play();
+    .play();
diff --git a/packs_source/weaponfx.db/Fuel Rod Gun.5B4QaBx52NzRhdum.js b/packs_source/weaponfx.db/Fuel Rod Gun.5B4QaBx52NzRhdum.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 const target = targetTokens[0];
 
@@ -29,4 +29,4 @@ if (!targetsMissed.has(target.id)) {
         .volume(game.modules.get("lancer-weapon-fx").api.getEffectVolume(0.5))
 }
 
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/HMG.X6m0372eLE56NK6l.js b/packs_source/weaponfx.db/HMG.X6m0372eLE56NK6l.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -23,4 +23,4 @@ for (const target of targetTokens) {
         .waitUntilFinished();
 }
 
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Hammer.uIr2lCpJWXbDaowG.js b/packs_source/weaponfx.db/Hammer.uIr2lCpJWXbDaowG.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -26,4 +26,4 @@ for (const target of targetTokens) {
             .waitUntilFinished(-6000);
     }
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Impact Lance.gciDprfhVSDqYDPd.js b/packs_source/weaponfx.db/Impact Lance.gciDprfhVSDqYDPd.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 let sequence = new Sequence();
 
@@ -25,4 +25,4 @@ for (const target of targetTokens) {
             .waitUntilFinished(-400);
     }
 }
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Kraul Rifle.eyeOAl8lFp0w3Hfd.js b/packs_source/weaponfx.db/Kraul Rifle.eyeOAl8lFp0w3Hfd.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 const target = targetTokens[0];
 
@@ -26,4 +26,4 @@ if (!targetsMissed.has(target.id)) {
         .volume(game.modules.get("lancer-weapon-fx").api.getEffectVolume(0.5))
 }
 
-sequence.play();
+sequence.play();
diff --git a/packs_source/weaponfx.db/Lasers.hWPrLPzlj6Y5RvC5.js b/packs_source/weaponfx.db/Lasers.hWPrLPzlj6Y5RvC5.js
@@ -1,4 +1,4 @@
-const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(typeof messageId === "undefined" ? null : messageId, actor);
+const {targetsMissed, targetTokens, sourceToken} = game.modules.get("lancer-weapon-fx").api.getMacroVariables(this);
 
 const random = Sequencer.Helpers.random_float_between(200, 300);
 
@@ -27,4 +27,4 @@ for (let i=0; i < targetTokens.length; i++) {
         .repeats(3, random)
 		.waitUntilFinished();
 }
-sequence.play();
+sequence.play();