Obsolete obsolete explosives.

Drewscriver · Apr 30, 2020 · 0cfbbe5 · 0cfbbe5
1 parent 900772e
commit 0cfbbe5
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 149 deletions.
diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json
@@ -514,54 +514,6 @@
     },
     "flags": [ "TRADER_AVOID" ]
   },
-  {
-    "id": "fragment_bomb",
-    "type": "TOOL",
-    "name": { "str": "fragment bomb" },
-    "description": "A crude and bulky improvised bomb.  Made from a container, an explosive surrounded by small pieces of metal and a fuse.  Use this item to light the fuse.  You will then have five turns before it explodes; throwing it would be a good idea.",
-    "category": "weapons",
-    "weight": "470 g",
-    "volume": "500 ml",
-    "bashing": 4,
-    "to_hit": 1,
-    "price": 900,
-    "price_postapoc": 750,
-    "material": [ "aluminum", "iron" ],
-    "symbol": "*",
-    "color": "green",
-    "explode_in_fire": true,
-    "explosion": { "power": 175, "shrapnel": { "casing_mass": 240, "fragment_mass": 0.4 } },
-    "use_action": {
-      "target": "fragment_bomb_act",
-      "msg": "You light the fuse on the %s.",
-      "target_charges": 5,
-      "active": true,
-      "need_fire": 1,
-      "menu_text": "Light fuse",
-      "type": "transform"
-    },
-    "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB", "NO_REPAIR" ]
-  },
-  {
-    "id": "fragment_bomb_act",
-    "copy-from": "fragment_bomb",
-    "type": "TOOL",
-    "name": { "str": "active fragment bomb" },
-    "description": "A crude and bulky improvised bomb.  Made from a container, an explosive surrounded by small pieces of metal and a fuse.  The fuse has been lit, you should throw it.",
-    "price": 0,
-    "price_postapoc": 0,
-    "initial_charges": 5,
-    "max_charges": 5,
-    "turns_per_charge": 1,
-    "use_action": {
-      "type": "explosion",
-      "no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
-      "sound_volume": 0,
-      "sound_msg": "ssss...",
-      "explosion": { "power": 175, "shrapnel": { "casing_mass": 240, "fragment_mass": 0.4 } }
-    },
-    "flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
-  },
   {
     "id": "fungicidalbomb",
     "copy-from": "grenade_canister",
@@ -1154,54 +1106,6 @@
     "use_action": "MOLOTOV_LIT",
     "flags": [ "LIGHT_15", "TRADER_AVOID", "NPC_THROW_NOW", "NO_REPAIR", "WATER_EXTINGUISH" ]
   },
-  {
-    "id": "nail_bomb",
-    "type": "TOOL",
-    "name": { "str": "nail bomb" },
-    "description": "A crude and bulky improvised bomb.  Made from a container, an explosive surrounded by nails and a fuse.  Use this item to light the fuse.  You will then have five turns before it explodes; throwing it would be a good idea.",
-    "category": "weapons",
-    "weight": "470 g",
-    "volume": "500 ml",
-    "bashing": 4,
-    "to_hit": 1,
-    "price": 900,
-    "price_postapoc": 500,
-    "material": [ "aluminum", "iron" ],
-    "symbol": "*",
-    "color": "green",
-    "explode_in_fire": true,
-    "explosion": { "power": 175, "shrapnel": { "casing_mass": 160, "fragment_mass": 0.4, "drop": "nail", "recovery": 16 } },
-    "use_action": {
-      "target": "nail_bomb_act",
-      "msg": "You light the fuse on the %s.",
-      "target_charges": 5,
-      "active": true,
-      "need_fire": 1,
-      "menu_text": "Light fuse",
-      "type": "transform"
-    },
-    "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB", "NO_REPAIR" ]
-  },
-  {
-    "id": "nail_bomb_act",
-    "copy-from": "nail_bomb",
-    "type": "TOOL",
-    "name": { "str": "active nail bomb" },
-    "description": "A crude and bulky improvised bomb.  Made from a container, an explosive surrounded by nails and a fuse.  The fuse has been lit, you should throw it.",
-    "price": 0,
-    "price_postapoc": 0,
-    "initial_charges": 5,
-    "max_charges": 5,
-    "turns_per_charge": 1,
-    "use_action": {
-      "type": "explosion",
-      "no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
-      "sound_volume": 0,
-      "sound_msg": "ssss...",
-      "explosion": { "power": 175, "shrapnel": { "casing_mass": 160, "fragment_mass": 0.4, "drop": "nail", "recovery": 16 } }
-    },
-    "flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
-  },
   {
     "id": "bootleg_pipebomb",
     "type": "TOOL",

diff --git a/data/json/obsolete.json b/data/json/obsolete.json
@@ -95,6 +95,102 @@
     },
     "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB" ]
   },
+  {
+    "id": "nail_bomb",
+    "type": "TOOL",
+    "name": { "str": "nail bomb" },
+    "description": "A crude and bulky improvised bomb.  Made from a container, an explosive surrounded by nails and a fuse.  Use this item to light the fuse.  You will then have five turns before it explodes; throwing it would be a good idea.",
+    "category": "weapons",
+    "weight": "470 g",
+    "volume": "500 ml",
+    "bashing": 4,
+    "to_hit": 1,
+    "price": 900,
+    "price_postapoc": 500,
+    "material": [ "aluminum", "iron" ],
+    "symbol": "*",
+    "color": "green",
+    "explode_in_fire": true,
+    "explosion": { "power": 175, "shrapnel": { "casing_mass": 160, "fragment_mass": 0.4, "drop": "nail", "recovery": 16 } },
+    "use_action": {
+      "target": "nail_bomb_act",
+      "msg": "You light the fuse on the %s.",
+      "target_charges": 5,
+      "active": true,
+      "need_fire": 1,
+      "menu_text": "Light fuse",
+      "type": "transform"
+    },
+    "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB", "NO_REPAIR" ]
+  },
+  {
+    "id": "nail_bomb_act",
+    "copy-from": "nail_bomb",
+    "type": "TOOL",
+    "name": { "str": "active nail bomb" },
+    "description": "A crude and bulky improvised bomb.  Made from a container, an explosive surrounded by nails and a fuse.  The fuse has been lit, you should throw it.",
+    "price": 0,
+    "price_postapoc": 0,
+    "initial_charges": 5,
+    "max_charges": 5,
+    "turns_per_charge": 1,
+    "use_action": {
+      "type": "explosion",
+      "no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
+      "sound_volume": 0,
+      "sound_msg": "ssss...",
+      "explosion": { "power": 175, "shrapnel": { "casing_mass": 160, "fragment_mass": 0.4, "drop": "nail", "recovery": 16 } }
+    },
+    "flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
+  },
+  {
+    "id": "fragment_bomb",
+    "type": "TOOL",
+    "name": { "str": "fragment bomb" },
+    "description": "A crude and bulky improvised bomb.  Made from a container, an explosive surrounded by small pieces of metal and a fuse.  Use this item to light the fuse.  You will then have five turns before it explodes; throwing it would be a good idea.",
+    "category": "weapons",
+    "weight": "470 g",
+    "volume": "500 ml",
+    "bashing": 4,
+    "to_hit": 1,
+    "price": 900,
+    "price_postapoc": 750,
+    "material": [ "aluminum", "iron" ],
+    "symbol": "*",
+    "color": "green",
+    "explode_in_fire": true,
+    "explosion": { "power": 175, "shrapnel": { "casing_mass": 240, "fragment_mass": 0.4 } },
+    "use_action": {
+      "target": "fragment_bomb_act",
+      "msg": "You light the fuse on the %s.",
+      "target_charges": 5,
+      "active": true,
+      "need_fire": 1,
+      "menu_text": "Light fuse",
+      "type": "transform"
+    },
+    "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB", "NO_REPAIR" ]
+  },
+  {
+    "id": "fragment_bomb_act",
+    "copy-from": "fragment_bomb",
+    "type": "TOOL",
+    "name": { "str": "active fragment bomb" },
+    "description": "A crude and bulky improvised bomb.  Made from a container, an explosive surrounded by small pieces of metal and a fuse.  The fuse has been lit, you should throw it.",
+    "price": 0,
+    "price_postapoc": 0,
+    "initial_charges": 5,
+    "max_charges": 5,
+    "turns_per_charge": 1,
+    "use_action": {
+      "type": "explosion",
+      "no_deactivate_msg": "You've already lit the fuse - what are you waiting for?",
+      "sound_volume": 0,
+      "sound_msg": "ssss...",
+      "explosion": { "power": 175, "shrapnel": { "casing_mass": 240, "fragment_mass": 0.4 } }
+    },
+    "flags": [ "BOMB", "TRADER_AVOID", "NO_REPAIR" ]
+  },
   {
     "id": "tool_rdx_charge_act",
     "type": "TOOL",

diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json
@@ -66,6 +66,21 @@
     "result": "offal_cooked",
     "obsolete": true
   },
+  {
+    "result": "tool_rdx_charge",
+    "type": "recipe",
+    "obsolete": true
+  },
+  {
+    "result": "nail_bomb",
+    "type": "recipe",
+    "obsolete": true
+  },
+  {
+    "result": "fragment_bomb",
+    "type": "recipe",
+    "obsolete": true
+  },
   {
     "type": "recipe",
     "result": "30gal_drum",

diff --git a/data/json/recipes/weapon/explosive.json b/data/json/recipes/weapon/explosive.json
@@ -262,45 +262,6 @@
     "using": [ [ "accelerant_liquid", 500 ] ],
     "components": [ [ [ "rag", 1 ] ], [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ], [ "clay_canister", 1 ] ] ]
   },
-  {
-    "result": "nail_bomb",
-    "type": "recipe",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_EXPLOSIVE",
-    "skill_used": "fabrication",
-    "skills_required": [ "mechanics", 0 ],
-    "difficulty": 1,
-    "time": "8 m",
-    "reversible": true,
-    "autolearn": true,
-    "using": [ [ "volatile_explosive", 18 ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ], [ "clay_canister", 1 ], [ "can_drink_unsealed", 1 ] ],
-      [ [ "nail", 40 ] ],
-      [ [ "fuse", 1 ] ],
-      [ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ]
-    ]
-  },
-  {
-    "result": "fragment_bomb",
-    "type": "recipe",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_EXPLOSIVE",
-    "skill_used": "fabrication",
-    "skills_required": [ "mechanics", 0 ],
-    "difficulty": 1,
-    "time": "12 m",
-    "reversible": true,
-    "autolearn": true,
-    "qualities": [ { "id": "SAW_M", "level": 1 } ],
-    "using": [ [ "volatile_explosive", 18 ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ], [ "clay_canister", 1 ], [ "can_drink_unsealed", 1 ] ],
-      [ [ "nail", 50 ], [ "scrap", 4 ] ],
-      [ [ "fuse", 1 ] ],
-      [ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ]
-    ]
-  },
   {
     "result": "dynamite_bomb",
     "type": "recipe",
@@ -458,19 +419,5 @@
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "using": [ [ "volatile_explosive", 250 ] ],
     "components": [ [ [ "jug_plastic", 1 ] ], [ [ "scrap", 20 ] ], [ [ "fuse", 1 ] ] ]
-  },
-  {
-    "result": "tool_rdx_charge",
-    "type": "recipe",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_EXPLOSIVE",
-    "skill_used": "fabrication",
-    "difficulty": 9,
-    "time": "5 h",
-    "reversible": true,
-    "using": [ [ "cordage", 5 ] ],
-    "book_learn": [ [ "manual_launcher", 9 ] ],
-    "qualities": [ { "id": "SAW_M", "level": 1 } ],
-    "components": [ [ [ "keg", 1 ], [ "keg_steel", 1 ] ], [ [ "chem_rdx", 6000 ] ], [ [ "chem_hmtd", 4000 ] ], [ [ "scrap", 50 ] ] ]
   }
 ]