Engine now allows particles from modules

Bidi92 · Jan 1, 2018 · 5543ffc · 5543ffc
1 parent ec6b171
commit 5543ffc
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 53 deletions.
diff --git a/engine/src/main/java/org/destinationsol/game/particle/EffectConfig.java b/engine/src/main/java/org/destinationsol/game/particle/EffectConfig.java
@@ -49,7 +49,7 @@ public static EffectConfig load(JsonValue node, EffectTypes types, GameColors co
         String texName = node.getString("tex");
         boolean floatsUp = node.getBoolean("floatsUp", false);
         Color tint = cols.load(node.getString("tint"));
-        TextureAtlas.AtlasRegion tex = Assets.getAtlasRegion("core:" + texName + "Particle");
+        TextureAtlas.AtlasRegion tex = Assets.getAtlasRegion(texName + "Particle");
         return new EffectConfig(effectType, sz, tex, floatsUp, tint);
     }
 

diff --git a/modules/core/assets/configs/abilitiesConfig.json b/modules/core/assets/configs/abilitiesConfig.json
@@ -2,7 +2,7 @@
     "sloMo": {
         "effect": {
             "effectFile": "core:areaShipAbility",
-            "tex": "sloMo",
+            "tex": "core:sloMo",
             "tint": "fire",
             "size": 5
         },
@@ -12,7 +12,7 @@
     "knockBack": {
         "effect": {
             "effectFile": "core:knockBack",
-            "tex": "knockBack",
+            "tex": "core:knockBack",
             "tint": "50 200 250"
         },
         "activatedSound": "core:knockBack"
@@ -21,7 +21,7 @@
     "emWave": {
         "effect": {
             "effectFile": "core:areaShipAbility",
-            "tex": "emWave",
+            "tex": "core:emWave",
             "tint": "0 255 0"
         },
         "activatedSound": "core:unshield"
@@ -30,7 +30,7 @@
     "unShield": {
         "effect": {
             "effectFile": "core:knockBack",
-            "tex": "unShield",
+            "tex": "core:unShield",
             "tint": "0 100 255"
         },
 

diff --git a/modules/core/assets/configs/projectilesConfig.json b/modules/core/assets/configs/projectilesConfig.json
@@ -10,7 +10,7 @@
         "collisionEffect": {
             "effectFile": "core:explFire",
             "size": 0.1,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "120 210 90"
         },
 
@@ -28,7 +28,7 @@
         "collisionEffect": {
             "effectFile": "core:explFire",
             "size": 0.2,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "180 70 200"
         },
 
@@ -48,15 +48,15 @@
         "collisionEffectBg": {
             "effectFile": "core:explSmoke",
             "size": 0.6,
-            "tex": "smoke",
+            "tex": "core:smoke",
             "floatsUp": true,
             "tint": "smoke"
         },
 
         "collisionEffect": {
             "effectFile": "core:explFire",
             "size": 0.4,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "fire"
         },
 
@@ -74,7 +74,7 @@
         "collisionEffect": {
             "effectFile": "core:spark",
             "size": 0.5,
-            "tex": "spark",
+            "tex": "core:spark",
             "tint": "fire"
         }
     },
@@ -91,7 +91,7 @@
         "collisionEffect": {
             "effectFile": "core:spark",
             "size": 0.5,
-            "tex": "spark",
+            "tex": "core:spark",
             "tint": "fire"
         }
     },
@@ -111,30 +111,30 @@
 
         "trailEffect": {
             "effectFile": "core:smoke",
-            "tex": "smoke",
+            "tex": "core:smoke",
             "floatsUp": true,
             "tint": "smoke"
         },
 
         "bodyEffect": {
             "effectFile": "core:flame",
             "size": 0.15,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "fire"
         },
 
         "collisionEffectBg": {
             "effectFile": "core:explSmoke",
             "size": 0.6,
-            "tex": "smoke",
+            "tex": "core:smoke",
             "floatsUp": true,
             "tint": "smoke"
         },
 
         "collisionEffect": {
             "effectFile": "core:explFire",
             "size": 0.4,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "fire"
         },
 
@@ -154,14 +154,14 @@
         "collisionEffectBg": {
             "effectFile": "core:explSmoke",
             "size": 0.6,
-            "tex": "smoke",
+            "tex": "core:smoke",
             "floatsUp": true,
             "tint": "smoke"
         },
         "collisionEffect": {
             "effectFile": "core:explFire",
             "size": 0.4,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "fire"
         },
 
@@ -178,23 +178,23 @@
 
         "trailEffect": {
             "effectFile": "core:smoke",
-            "tex": "smoke",
+            "tex": "core:smoke",
             "floatsUp": true,
             "tint": "smoke"
         },
 
         "collisionEffectBg": {
             "effectFile": "core:explSmoke",
             "size": 0.3,
-            "tex": "smoke",
+            "tex": "core:smoke",
             "floatsUp": true,
             "tint": "smoke"
         },
 
         "collisionEffect": {
             "effectFile": "core:spark",
             "size": 1,
-            "tex": "spark",
+            "tex": "core:spark",
             "tint": "fire"
         }
     },
@@ -213,30 +213,30 @@
 
         "trailEffect": {
             "effectFile": "core:smoke",
-            "tex": "smoke",
+            "tex": "core:smoke",
             "floatsUp": true,
             "tint": "smoke"
         },
 
         "bodyEffect": {
             "effectFile": "core:flame",
             "size": 0.15,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "fire"
         },
 
         "collisionEffectBg": {
             "effectFile": "core:explSmoke",
             "size": 0.6,
-            "tex": "smoke",
+            "tex": "core:smoke",
             "floatsUp": true,
             "tint": "smoke"
         },
 
         "collisionEffect": {
             "effectFile": "core:explFire",
             "size": 0.4,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "fire"
         },
 
@@ -254,14 +254,14 @@
 
         "trailEffect": {
             "effectFile": "core:railTrail",
-            "tex": "techieTrail",
+            "tex": "core:techieTrail",
             "tint": "white"
         },
 
         "collisionEffect": {
             "effectFile": "core:spark",
             "size": 0.5,
-            "tex": "spark",
+            "tex": "core:spark",
             "tint": "fire"
         }
     },
@@ -288,14 +288,14 @@
 
         "bodyEffect": {
             "effectFile": "core:electricity2",
-            "tex": "electricity",
+            "tex": "core:electricity",
             "tint": "white"
         },
 
         "collisionEffect": {
             "effectFile": "core:explFire",
             "size": 0.2,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "white"
         },
 
@@ -315,7 +315,7 @@
         "collisionEffect": {
             "effectFile": "core:explFire",
             "size": 0.8,
-            "tex": "fire",
+            "tex": "core:fire",
             "tint": "20 255 20"
         },
 

diff --git a/modules/core/assets/configs/specialEffectsConfig.json b/modules/core/assets/configs/specialEffectsConfig.json
@@ -1,58 +1,58 @@
 {
     "smoke": {
         "effectFile": "core:smoke",
-        "tex": "smoke",
+        "tex": "core:smoke",
         "floatsUp": true,
         "tint": "smoke"
     },
 
     "fire": {
         "effectFile": "core:fire",
-        "tex": "fire",
+        "tex": "core:fire",
         "floatsUp": true,
         "tint": "fire"
     },
 
     "electricity": {
         "effectFile": "core:electricity",
-        "tex": "electricity",
+        "tex": "core:electricity",
         "tint": "white"
     },
 
     "shipExplosionSmoke": {
         "effectFile": "core:explSmoke",
-        "tex": "smoke",
+        "tex": "core:smoke",
         "floatsUp": true,
         "tint": "smoke"
     },
 
     "shipExplosionFire": {
         "effectFile": "core:explFire",
-        "tex": "fire",
+        "tex": "core:fire",
         "tint": "fire"
     },
 
     "asteroidDust": {
         "effectFile": "core:explSmoke",
-        "tex": "fire",
+        "tex": "core:fire",
         "tint": "dust"
     },
 
     "forceBeacon": {
         "effectFile": "core:forceBeacon",
-        "tex": "forceBeacon",
+        "tex": "core:forceBeacon",
         "tint": "white"
     },
 
     "starPortFlow": {
         "effectFile": "core:starPortFlow",
-        "tex": "forceTail",
+        "tex": "core:forceTail",
         "tint": "white"
     },
 
     "transcendentWork": {
         "effectFile": "core:transcendentWork",
-        "tex": "forceTail",
+        "tex": "core:forceTail",
         "tint": "white"
     }
 }
diff --git a/modules/core/assets/items/engines/desertBigEngine/desertBigEngine.json b/modules/core/assets/items/engines/desertBigEngine/desertBigEngine.json
@@ -3,7 +3,7 @@
     "effect": {
         "effectFile": "core:flame",
         "size": 0.3,
-        "tex": "smoke",
+        "tex": "core:smoke",
         "tint": "fire"
     },
     "workSounds": [

diff --git a/modules/core/assets/items/engines/desertEngine/desertEngine.json b/modules/core/assets/items/engines/desertEngine/desertEngine.json
@@ -3,7 +3,7 @@
     "effect": {
         "effectFile": "core:flame",
         "size": 0.07,
-        "tex": "smoke",
+        "tex": "core:smoke",
         "tint": "fire"
     },
     "workSounds": [

diff --git a/modules/core/assets/items/engines/imperialBigEngine/imperialBigEngine.json b/modules/core/assets/items/engines/imperialBigEngine/imperialBigEngine.json
@@ -3,7 +3,7 @@
     "effect": {
         "effectFile": "core:flame",
         "size": 0.3,
-        "tex": "fire",
+        "tex": "core:fire",
         "tint": "hsb 140 20 65"
     },
     "workSounds": [

diff --git a/modules/core/assets/items/engines/imperialEngine/imperialEngine.json b/modules/core/assets/items/engines/imperialEngine/imperialEngine.json
@@ -3,7 +3,7 @@
     "effect": {
         "effectFile": "core:flame",
         "size": 0.07,
-        "tex": "fire",
+        "tex": "core:fire",
         "tint": "hsb 140 20 65"
     },
     "workSounds": [

diff --git a/modules/core/assets/items/engines/minerEngine/minerEngine.json b/modules/core/assets/items/engines/minerEngine/minerEngine.json
@@ -3,7 +3,7 @@
     "effect": {
         "effectFile": "core:smokeEngine",
         "size": 0.07,
-        "tex": "smoke",
+        "tex": "core:smoke",
         "tint": "smoke"
     },
     "workSounds": [

diff --git a/modules/core/assets/items/engines/pirateBigEngine/pirateBigEngine.json b/modules/core/assets/items/engines/pirateBigEngine/pirateBigEngine.json
@@ -3,7 +3,7 @@
     "effect": {
         "effectFile": "core:flame",
         "size": 0.3,
-        "tex": "fire",
+        "tex": "core:fire",
         "tint": "hsb 8 75 100"
     },
     "workSounds": [

diff --git a/modules/core/assets/items/engines/pirateEngine/pirateEngine.json b/modules/core/assets/items/engines/pirateEngine/pirateEngine.json
@@ -3,7 +3,7 @@
     "effect": {
         "effectFile": "core:flame",
         "size": 0.07,
-        "tex": "fire",
+        "tex": "core:fire",
         "tint": "hsb 8 75 100"
     },
     "workSounds": [

diff --git a/modules/core/assets/items/engines/techieEngine/techieEngine.json b/modules/core/assets/items/engines/techieEngine/techieEngine.json
@@ -2,7 +2,7 @@
     "big": false,
     "effect": {
         "effectFile": "core:techieEngine",
-        "tex": "techieTrail",
+        "tex": "core:techieTrail",
         "tint": "white"
     },
     "workSounds": [