Merge pull request #37178 from ZhilkinSerg/mods-json-ammo-effects-no-…

…boom Remove non-existing NO_BOOM ammo effect from mods
CleverRaven · Jan 20, 2020 · 6e4eacd · 6e4eacd
2 parents 64d2a62 + 011254a
commit 6e4eacd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/data/mods/Modular_Turrets/roboguns.json b/data/mods/Modular_Turrets/roboguns.json
@@ -45,7 +45,6 @@
     "name": "integral teargas launcher",
     "skill": "launcher",
     "ammo": "40x46mm",
-    "ammo_effects": "NO_BOOM",
     "clip_size": 50,
     "dispersion": 270,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ] ]
@@ -57,7 +56,6 @@
     "name": "integral beanbag launcher",
     "skill": "launcher",
     "ammo": "40x46mm",
-    "ammo_effects": "NO_BOOM",
     "clip_size": 50,
     "dispersion": 270,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "2 rd.", 2 ] ]
@@ -145,7 +143,7 @@
     "skill": "launcher",
     "ammo": "flammable",
     "clip_size": 200,
-    "ammo_effects": [ "NO_BOOM", "FIRE_20", "WIDE" ],
+    "ammo_effects": [ "FIRE_20", "WIDE" ],
     "range": 4,
     "dispersion": 300,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4 ] ]
@@ -163,7 +161,7 @@
     "durability": 8,
     "loudness": 12,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4 ], [ "AUTO", "auto", 6 ] ],
-    "ammo_effects": [ "LASER", "INCENDIARY", "NO_BOOM" ]
+    "ammo_effects": [ "LASER", "INCENDIARY" ]
   },
   {
     "id": "robogun_plasma",

diff --git a/data/mods/blazemod/blaze_blob.json b/data/mods/blazemod/blaze_blob.json
@@ -141,7 +141,7 @@
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "clip_size": 50,
     "ammo_effects": [ "WIDE" ],
-    "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM" ]
+    "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
     "id": "bitergrow",
@@ -738,8 +738,8 @@
     "sight_dispersion": 150,
     "durability": 10,
     "clip_size": 250,
-    "ammo_effects": [ "JET", "BEANBAG", "BLINDS_EYES", "RECOVER_100", "WIDE", "NO_BOOM", "CUSTOM_EXPLOSION" ],
-    "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM", "FIRE_20" ]
+    "ammo_effects": [ "JET", "BEANBAG", "BLINDS_EYES", "RECOVER_100", "WIDE", "CUSTOM_EXPLOSION" ],
+    "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ]
   },
   {
     "id": "inkiegrow",
@@ -986,7 +986,7 @@
     "durability": 10,
     "clip_size": 250,
     "ammo_effects": [ "FRAG", "WIDE" ],
-    "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM", "FIRE_20" ]
+    "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ]
   },
   {
     "id": "razorqueengrow",
@@ -1100,7 +1100,7 @@
     "durability": 10,
     "clip_size": 20,
     "ammo_effects": [ "BOUNCE", "WIDE" ],
-    "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM" ]
+    "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
     "id": "sicklegrow",
@@ -1143,7 +1143,7 @@
     "durability": 10,
     "ups_charges": 19,
     "ammo_effects": [ "LIGHTNING", "BEANBAG", "WIDE" ],
-    "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM" ]
+    "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
     "id": "sparkiegrow",
@@ -1234,8 +1234,8 @@
     "durability": 10,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
     "clip_size": 180,
-    "ammo_effects": [ "INCENDIARY", "FLARE", "WIDE", "NO_BOOM", "STREAM" ],
-    "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_BOOM", "FIRE_20" ]
+    "ammo_effects": [ "INCENDIARY", "FLARE", "WIDE", "STREAM" ],
+    "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ]
   },
   {
     "id": "torchiegrow",