Blazemod Mini-PR: Blazemod secondary content refactor (#40024)

* Blazemod secondary content refactor Changes all blob/diamond/vortex ID conventions to be modernised completely across the board and fixes associated issues with previous refactoring of this content. Prelude to separation of this content from the main mod, now that it's modern enough to load without error.
CleverRaven · Apr 30, 2020 · fd5ba95 · fd5ba95
1 parent dfddf3f
commit fd5ba95
Show file tree

Hide file tree

Showing 33 changed files with 657 additions and 659 deletions.
diff --git a/data/mods/blazemod/blob_ammo_types.json b/data/mods/blazemod/blob_ammo_types.json
@@ -1,8 +1,8 @@
 [
   {
-    "id": "bfeed",
+    "id": "blob_feed",
     "name": "blob feed",
-    "default": "bfeed",
+    "default": "blob_feed",
     "type": "ammunition_type"
   }
 ]
diff --git a/data/mods/blazemod/blob_construction.json b/data/mods/blazemod/blob_construction.json
@@ -9,7 +9,14 @@
     "pre_terrain": "t_pit_corpsed",
     "post_terrain": "blob_pit",
     "tools": [
-      [ [ "gloople", -1 ], [ "glooplegrow", -1 ], [ "oozle", -1 ], [ "oozlegrow", -1 ], [ "gray", -1 ], [ "graygrow", -1 ] ]
+      [
+        [ "blob_gloople", -1 ],
+        [ "blob_glooplegrow", -1 ],
+        [ "blob_oozle", -1 ],
+        [ "blob_oozlegrow", -1 ],
+        [ "blob_gray", -1 ],
+        [ "blob_graygrow", -1 ]
+      ]
     ]
   },
   {
@@ -22,7 +29,14 @@
     "pre_terrain": "t_slime",
     "post_terrain": "blob_pit_slime",
     "tools": [
-      [ [ "gloople", -1 ], [ "glooplegrow", -1 ], [ "oozle", -1 ], [ "oozlegrow", -1 ], [ "gray", -1 ], [ "graygrow", -1 ] ]
+      [
+        [ "blob_gloople", -1 ],
+        [ "blob_glooplegrow", -1 ],
+        [ "blob_oozle", -1 ],
+        [ "blob_oozlegrow", -1 ],
+        [ "blob_gray", -1 ],
+        [ "blob_graygrow", -1 ]
+      ]
     ]
   },
   {
@@ -39,7 +53,7 @@
       "ter_set": "t_pit",
       "sound": "squish!",
       "sound_fail": "squish!",
-      "items": [ { "item": "bfeed", "count": [ 250, 500 ] } ]
+      "items": [ { "item": "blob_feed", "count": [ 250, 500 ] } ]
     },
     "flags": [ "WALL", "TRANSPARENT", "EASY_DECONSTRUCT" ]
   },
@@ -57,7 +71,7 @@
       "ter_set": "t_dirt",
       "sound": "squish!",
       "sound_fail": "squish!",
-      "items": [ { "item": "bfeed", "count": [ 50, 250 ] } ]
+      "items": [ { "item": "blob_feed", "count": [ 50, 250 ] } ]
     },
     "flags": [ "WALL", "TRANSPARENT", "EASY_DECONSTRUCT" ]
   }

diff --git a/data/mods/blazemod/diamond_ammo_types.json b/data/mods/blazemod/diamond_ammo_types.json
@@ -0,0 +1,8 @@
+[
+  {
+    "id": "crystalline_shards",
+    "name": "crystalline shards",
+    "default": "diamond_coal",
+    "type": "ammunition_type"
+  }
+]
diff --git a/data/mods/blazemod/items/ammo/diamond_ammo.json b/data/mods/blazemod/items/ammo/diamond_ammo.json
@@ -1,11 +1,22 @@
 [
   {
     "id": "diamond_coal",
-    "copy-from": "charcoal",
     "type": "AMMO",
-    "category": "spare_parts",
-    "name": { "str_sp": "charcoal" },
-    "casing": "diamond_cluster"
+    "name": { "str_sp": "glittering carbon" },
+    "description": "These small fragments of carbon are have been compressed into a crystalline structure that is beginning to resemble diamonds.",
+    "weight": "3 g",
+    "volume": "250 ml",
+    "price": 10000,
+    "bashing": 1,
+    "material": "diamond",
+    "symbol": "=",
+    "color": "white",
+    "looks_like": "diamond",
+    "count": 100,
+    "ammo_type": "crystalline_shards",
+    "damage": 1,
+    "pierce": 1,
+    "dispersion": 12
   },
   {
     "id": "diamond_shards",

diff --git a/data/mods/blazemod/items/fuel.json b/data/mods/blazemod/items/fuel.json
@@ -1,9 +1,9 @@
 [
   {
-    "id": "bfeedfuel",
+    "id": "blob_feed_fuel",
     "type": "AMMO",
     "category": "fuel",
-    "name": { "str": "liquified blob feed", "str_pl": "bfeedfuel" },
+    "name": { "str_sp": "liquified blob feed" },
     "description": "Liquified blob feed, useful for fueling certain blob based vehicle parts",
     "weight": "1 g",
     "volume": "200ml",
@@ -17,13 +17,13 @@
     "color": "red",
     "count": 250,
     "stack_size": 200,
-    "ammo_type": "bfeed",
+    "ammo_type": "blob_feed",
     "range": 4,
     "damage": 5,
     "pierce": 5
   },
   {
-    "id": "bfeed",
+    "id": "blob_feed",
     "type": "AMMO",
     "category": "fuel",
     "name": { "str_sp": "blob feed" },
@@ -37,6 +37,6 @@
     "symbol": "*",
     "color": "red",
     "count": 25,
-    "ammo_type": "bfeed"
+    "ammo_type": "blob_feed"
   }
 ]
diff --git a/data/mods/blazemod/items/guns/blob_turret.json b/data/mods/blazemod/items/guns/blob_turret.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "biter",
+    "id": "blob_biter",
     "type": "GUN",
     "name": { "str": "biting blob" },
     "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier.  It has evolved the ability to constantly generate calcified protrusions which are then controlled by sinuous tensile strands.  These \"teeth\" can then be used to latch and wound anything unfortunate enough to be nearby.  The outer membrane has also become significantly thicker in order to support its more strenuous movement; though it seems pliable enough to pull apart…",
@@ -11,7 +11,7 @@
     "material": [ "flesh" ],
     "symbol": "&",
     "color": "blue",
-    "ammo": "bfeed",
+    "ammo": "blob_feed",
     "skill": "launcher",
     "range": 1,
     "ranged_damage": { "damage_type": "stab", "amount": 15, "armor_penetration": 15 },
@@ -23,7 +23,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
-    "id": "clutter",
+    "id": "blob_clutter",
     "type": "GUN",
     "name": { "str": "gel shooter" },
     "description": "A living blob turned into an autonomous weapon.  It trawls the ground for material, which it then strips of nutrition.  The remainder is then expelled out at significant velocity towards any nearby threats.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.  It seems pliable enough to pull apart…",
@@ -34,7 +34,7 @@
     "material": [ "flesh", "bone" ],
     "symbol": "&",
     "color": "magenta",
-    "ammo": "bfeed",
+    "ammo": "blob_feed",
     "skill": "pistol",
     "range": 12,
     "ranged_damage": { "damage_type": "stab", "amount": 7 },
@@ -45,7 +45,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
-    "id": "freezie",
+    "id": "blob_freezie",
     "type": "GUN",
     "name": { "str": "frost lancer" },
     "description": "A living blob turned into an autonomous weapon.  A biological aberration that exists at sub-zero temperatures.  After filtering nutrients from the water, it freezes the remainder into an incredibly sharp spear of ice; which it then launches at nearby threats.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -68,7 +68,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "FIRE_20" ]
   },
   {
-    "id": "fuzzle",
+    "id": "blob_fuzzle",
     "type": "GUN",
     "name": { "str": "snapping ooze" },
     "description": "A living blob turned into an autonomous weapon.  A baffling mutation in an already baffling creature, this blob is encased in a thick coat of fur, which serves as a form of protection.  In addition, it is capable of projecting rows of calcified sharp fragments in a manner mimicking the jaw of a more recognizable creature.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -79,7 +79,7 @@
     "material": [ "flesh" ],
     "symbol": "&",
     "color": "brown",
-    "ammo": "bfeed",
+    "ammo": "blob_feed",
     "skill": "launcher",
     "range": 2,
     "ranged_damage": { "damage_type": "stab", "amount": 30, "armor_penetration": 20 },
@@ -91,7 +91,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
-    "id": "horror",
+    "id": "blob_horror",
     "type": "GUN",
     "name": { "str": "blobsaw" },
     "description": "A living blob turned into an autonomous weapon; meant to be stretched across a frame as a form of barrier.  While its simpler cousins have a limit to the number of keratinous protrusions they can project and control; this blob can utilize hundreds of these sharp fangs to shred anything it detects as a threat into unrecognizable ribbons.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -102,7 +102,7 @@
     "material": [ "flesh" ],
     "symbol": "&",
     "color": "blue",
-    "ammo": "bfeed",
+    "ammo": "blob_feed",
     "skill": "launcher",
     "range": 2,
     "ranged_damage": { "damage_type": "stab", "amount": 15, "armor_penetration": 15 },
@@ -114,7 +114,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
-    "id": "inkie",
+    "id": "blob_inkie",
     "type": "GUN",
     "name": { "str": "fuel puffer" },
     "//": "God Dangit Blobby.",
@@ -138,7 +138,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ]
   },
   {
-    "id": "meltie",
+    "id": "blob_meltie",
     "type": "GUN",
     "name": { "str": "acid puffer" },
     "description": "A living blob turned into an autonomous weapon.  A filter feeder, the digestion process produces highly acidic byproducts; which is then expelled at any nearby enemies.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -161,7 +161,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ]
   },
   {
-    "id": "razorqueen",
+    "id": "blob_razorqueen",
     "type": "GUN",
     "name": { "str": "gel spiker" },
     "description": "A living blob turned into an autonomous weapon.  Capable of calcifying large numbers of fang-like fragments within itself.  It hurls groups of these fragments along with a small portion of itself.  When it reaches its destination, the detached remains shoot these fragments in all directions, expiring in the process.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -172,7 +172,7 @@
     "material": [ "flesh" ],
     "symbol": "&",
     "color": "cyan",
-    "ammo": "bfeed",
+    "ammo": "blob_feed",
     "skill": "rifle",
     "range": 18,
     "ranged_damage": { "damage_type": "stab", "amount": 40, "armor_penetration": 30 },
@@ -184,7 +184,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ]
   },
   {
-    "id": "spouterqueen",
+    "id": "blob_spouterqueen",
     "type": "GUN",
     "name": { "str": "gel spouter" },
     "description": "A living blob turned into an autonomous weapon.  It can suck in water from a vehicle tank, and forcibly expel it in a wide cone.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -208,7 +208,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_100" ]
   },
   {
-    "id": "sharp",
+    "id": "blob_sharp",
     "type": "GUN",
     "name": { "str": "gel lancer" },
     "description": "A living blob turned into an autonomous weapon.  Evolving incredible abilities of perception, it is capable of locating and discerning possible threats within a large radius.  When a potential threat is located, it fires a small, calcified projectile with incredible speed and accuracy.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -219,7 +219,7 @@
     "material": [ "flesh" ],
     "symbol": "&",
     "color": "light_blue",
-    "ammo": "bfeed",
+    "ammo": "blob_feed",
     "skill": "pistol",
     "range": 16,
     "ranged_damage": { "damage_type": "stab", "amount": 8, "armor_penetration": 5 },
@@ -230,7 +230,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
-    "id": "gelrazor",
+    "id": "blob_gelrazor",
     "type": "GUN",
     "name": { "str": "gel razor" },
     "description": "A living blob turned into an autonomous weapon.  An enhanced metabolism allows it to calcify large, toothy discs which are then launched towards any nearby threats.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -241,7 +241,7 @@
     "material": [ "flesh", "bone" ],
     "symbol": "&",
     "color": "blue",
-    "ammo": "bfeed",
+    "ammo": "blob_feed",
     "skill": "rifle",
     "range": 12,
     "ranged_damage": { "damage_type": "stab", "amount": 20, "armor_penetration": 10 },
@@ -252,7 +252,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
-    "id": "sparkie",
+    "id": "blob_sparkie",
     "type": "GUN",
     "name": { "str": "shock bulb" },
     "description": "A living blob turned into an autonomous weapon.  Shockingly, it somehow is able to project electricity, which it then discharges at any nearby threats.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -273,7 +273,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
-    "id": "stickie",
+    "id": "blob_stickie",
     "type": "GUN",
     "name": { "str": "gel puffer" },
     "description": "A living blob turned into an autonomous weapon.  A filter feeder, it strips any water it processes of nutrients and expels the remainder towards any nearby threats.  The process of filter-feeding also makes the remaining liquid viscous, though it also dissipates fairly quickly.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",
@@ -296,7 +296,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ]
   },
   {
-    "id": "torchie",
+    "id": "blob_torchie",
     "type": "GUN",
     "name": { "str": "fire puffer" },
     "//": "Need a light?",
@@ -321,7 +321,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "FIRE_20" ]
   },
   {
-    "id": "voideater",
+    "id": "blob_voideater",
     "type": "GUN",
     "name": { "str": "spark blight" },
     "description": "A living blob turned into an autonomous weapon.  It is capable of storing energy from sunlight inside itself in the form of electricity.  Then, in a truly baffling show of force, projects a highly concentrated stream of electricity towards any possible threats.  The amorphous mass can be shaped and attached at your touch, but the weapon itself is inert without something to control it.",

diff --git a/data/mods/blazemod/items/guns/diamond_turret.json b/data/mods/blazemod/items/guns/diamond_turret.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "diamondlance",
+    "id": "diamond_lance",
     "type": "GUN",
     "name": { "str": "diamond lance" },
     "description": "A weapon that is as deadly as it is dazzling.  The diamond matrix in this weapon's center acts as a catalyst; rapidly changing carbon-heavy materials into a crystalline substance that is nearly equal to diamond in hardness.  The substance rapidly decays when separated from the catalyst; thus a pre-shaped lump of carbon is brought into contact with the matrix, immediately crystallized and launched just as quickly.  The launcher requires a specialized chassis in order to be brought to bear on its unfortunate targets.",
@@ -12,7 +12,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
-    "ammo": "diamond_coal",
+    "ammo": "crystalline_shards",
     "skill": "launcher",
     "range": 30,
     "ranged_damage": { "damage_type": "stab", "amount": 100, "armor_penetration": 100 },
@@ -25,7 +25,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
-    "id": "diamondnova",
+    "id": "diamond_nova",
     "type": "GUN",
     "name": { "str": "diamond nova", "str_pl": "diamond novae" },
     "//": "Behold, the bringer of light.",
@@ -38,7 +38,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
-    "ammo": "diamond_coal",
+    "ammo": "crystalline_shards",
     "skill": "launcher",
     "range": 30,
     "ranged_damage": { "damage_type": "stab", "amount": 150, "armor_penetration": 20 },

diff --git a/data/mods/blazemod/items/guns/vortex_turret.json b/data/mods/blazemod/items/guns/vortex_turret.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "vortexaccelerator",
+    "id": "vortex_accelerator",
     "type": "GUN",
     "name": { "str": "vortex accelerator" },
     "description": "This weapon uses powerful bursts of air to launch sharp fragments at its target at high speed.  You'll need some form of platform to mount it on.",
@@ -26,7 +26,7 @@
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ]
   },
   {
-    "id": "vortexcannon",
+    "id": "vortex_cannon",
     "type": "GUN",
     "name": { "str": "vortex cannon" },
     "description": "Essentially a large pneumatic gun made to hurl sharpened metal rails.  Instead of a mechanical system, you've managed to harness the vortex to power this gun.  While powerful for its size, you'll need some form of platform to mount it on.",