Merge pull request #26 from Z3nner/FXPass

Z3nner · Jan 9, 2024 · 31bb32f · 31bb32f
2 parents d8bb517 + 84309a0
commit 31bb32f
Show file tree

Hide file tree

Showing 161 changed files with 5,898 additions and 732 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,4 +20,6 @@ The workflow for creating and editing macros is as follows:
 - To edit an existing macro, edit the files in `packs_source/weaponfx.db/<macro name>.[js|json]`
 - Then, compile the macro compendium with `npm run db:pack`
 
-You can then copy the module files (or symlink the folder) into your Foundry modules directory to test in-game. 
+The `weaponfx` pack is the default. To create a macro in a different pack, use `--pack <packName>`, for example: `npm run new-effect "My Manual Name" -- --pack weaponfx_manual`
+
+You can then copy the module files (or symlink the folder) into your Foundry modules directory to test in-game.
diff --git a/icons/PinakaArea.png b/icons/PinakaArea.png
diff --git a/icons/SmokeArea.png b/icons/SmokeArea.png
diff --git a/icons/SmokeGrenadeArea.png b/icons/SmokeGrenadeArea.png
diff --git a/icons/bright-explosion.png b/icons/bright-explosion.png
diff --git a/icons/cluster-bomb.png b/icons/cluster-bomb.png
diff --git a/icons/cracked-shield.png b/icons/cracked-shield.png
diff --git a/icons/explosion-rays.png b/icons/explosion-rays.png
diff --git a/icons/front-teeth.png b/icons/front-teeth.png
diff --git a/icons/incoming-rocket.png b/icons/incoming-rocket.png
diff --git a/icons/mushroom-cloud.png b/icons/mushroom-cloud.png
diff --git a/icons/nexus.png b/icons/nexus.png
diff --git a/icons/on-target.png b/icons/on-target.png
diff --git a/icons/war-pick.png b/icons/war-pick.png
diff --git a/jest.config.json b/jest.config.json
@@ -0,0 +1,4 @@
+{
+	"moduleFileExtensions": ["js"],
+	"transform": {}
+}
diff --git a/module.json b/module.json
@@ -15,35 +15,14 @@
     "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.6.0/module.zip",
+
     "relationships": {
-        "requires": [
-            {
+        "requires": {
                 "id": "sequencer",
                 "type": "module",
                 "manifest": "https://github.com/fantasycalendar/FoundryVTT-Sequencer/releases/latest/download/module.json",
-                "compatibility": {
-                    "minimum": "2.3.7"
-                }
-            },
-            {
-                "id": "animated-spell-effects",
-                "type": "module",
-                "manifest": "https://github.com/jackkerouac/animated-spell-effects/releases/latest/download/module.json"
-            },
-            {
-                "id": "animated-spell-effects-cartoon",
-                "type": "module",
-                "manifest": "https://github.com/jackkerouac/animated-spell-effects-cartoon/releases/download/latest/module.json",
-                "compatibility": {
-                    "minimum": "0.2.0"
-                }
-            },
-            {
-                "id": "tokenmagic",
-                "type": "module",
-                "manifest": "https://raw.githubusercontent.com/Feu-Secret/Tokenmagic/master/tokenmagic/module.json"
-            }
-        ]
+                "compatibility": {"minimum": "2.3.7"}
+              }
     },
     "languages": [
         {
@@ -62,6 +41,20 @@
             "path": "packs/weaponfx.db",
             "type": "Macro",
             "module": "lancer-weapon-fx"
+        },
+        {
+            "name": "WeaponFXManual",
+            "label": "Lancer Weapon FX (Manual)",
+            "path": "packs/weaponfx_manual.db",
+            "type": "Macro",
+            "module": "lancer-weapon-fx"
+        },
+        {
+            "name": "WeaponFXUtility",
+            "label": "Lancer Weapon FX (Utility)",
+            "path": "packs/utility.db",
+            "type": "Macro",
+            "module": "lancer-weapon-fx"
         }
     ]
 }