Merge pull request #62 from AtomicFox556/devbranch

Explosives overhaul

data/json/EraOfDecay/emit.json

@@ -0,0 +1,9 @@
+[
+  {
+    "id": "emit_small_toxic_stream",
+    "type": "emit",
+    "field": "fd_toxic_gas",
+    "intensity": 2,
+    "qty": 10
+  }
+]

data/json/EraOfDecay/items/ammo/sling_ready_grenade.json

@@ -0,0 +1,34 @@
+[
+  {
+    "type": "AMMO",
+    "id": "sling-ready_flashbang",
+    "name": { "str": "sling-ready M84 stun grenade" },
+    "description": "A military-grade stun grenade, also known as flashbang.  To throw it without using a staff sling, wield it and then activate it to pull the pin and prime the grenade.  You will then have 2 seconds to throw it before it explodes.",
+    "weight": "370 g",
+    "volume": "270 ml",
+    "longest_side": "133 mm",
+    "price": 2000,
+    "price_postapoc": 250,
+    "to_hit": -1,
+    "bashing": 5,
+    "material": [ "steel" ],
+    "symbol": "*",
+    "color": "dark_gray",
+    "use_action": {
+      "need_wielding": true,
+      "target": "flashbang_act",
+      "msg": "You pull the pin on your %s.",
+      "target_charges": 2,
+      "active": true,
+      "menu_text": "Pull pin",
+      "type": "transform"
+    },
+    "flags": [ "BOMB", "GRENADE", "ACT_IN_FIRE" ],
+    "ammo_type": "sling-ready_grenade",
+    "damage": { "damage_type": "bash", "amount": 6 },
+    "//": "Currently this item explodes instantly upon hit if used with a staff sling; it's supposed to drop an active grenade with normal explosion delay, however.",
+    "range": 25,
+    "dispersion": 14,
+    "effects": [ "NEVER_MISFIRES", "NON_FOULING", "FLASHBANG", "NO_PENETRATE_OBSTACLES" ]
+  }
+]

data/json/EraOfDecay/items/comestibles/med.json

@@ -193,5 +193,31 @@
     "container": "flask_glass",
     "flags": [ "NO_INGEST", "WATER_DISSOLVE" ],
     "use_action": { "type": "heal", "disinfectant_power": 4, "bite": 0.95, "move_cost": 3000 }
+  },
+  {
+    "id": "chem_chloral_hydrate",
+    "type": "COMESTIBLE",
+    "comestible_type": "MED",
+    "name": { "str_sp": "chloral hydrate" },
+    "description": "A colorless water-soluble powder with slightly acrid odor, known as a hypnotic and sedative pharmaceutical drug.  It also is a starting point for the synthesis of other organic compounds.",
+    "weight": "500 mg",
+    "volume": "1 ml",
+    "price": 3000,
+    "price_postapoc": 10000,
+    "stack_size": 1,
+    "material": [ "powder" ],
+    "symbol": "!",
+    "color": "light_red",
+    "container": "bottle_plastic_pill_prescription",
+    "stim": -8,
+    "fun": 5,
+    "flags": [ "WATER_DISSOLVE", "EDIBLE_FROZEN" ],
+    "addiction_potential": 40,
+    "addiction_type": "sleeping pill",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Can be used to treat insomnia.",
+      "effect_on_conditions": [ "EOC_SLEEP" ]
+    }
   }
 ]

data/json/EraOfDecay/items/containers/other.json

@@ -0,0 +1,33 @@
+[
+  {
+    "id": "claybomb_hull",
+    "type": "GENERIC",
+    "category": "container",
+    "name": { "str": "clay fire bomb hull" },
+    "looks_like": "bottle_plastic",
+    "description": "A round fragile clay vessel with a leather lid, intended to be filled with some sort of burning mixture, lit and thrown.",
+    "weight": "370 g",
+    "volume": "903 ml",
+    "longest_side": "12 cm",
+    "price": 0,
+    "price_postapoc": 10,
+    "to_hit": -1,
+    "bashing": 2,
+    "material": [ "clay" ],
+    "symbol": ")",
+    "color": "cyan",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "750 ml",
+        "max_item_volume": "17 ml",
+        "max_contains_weight": "3 kg",
+        "moves": 400
+      }
+    ],
+    "qualities": [ [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
+    "flags": [ "COLLAPSE_CONTENTS" ]
+  }
+]

data/json/EraOfDecay/items/generic/parts.json

@@ -55,5 +55,22 @@
     "symbol": ",",
     "color": "light_gray",
     "ammo_type": "components"
+  },
+  {
+    "id": "blasting_cap",
+    "type": "AMMO",
+    "category": "spare_parts",
+    "name": { "str": "blasting cap" },
+    "description": "A small sensitive primary explosive device used to detonate a larger, more powerful and less sensitive secondary explosive.  Useful for making explosive devices.",
+    "weight": "7 g",
+    "volume": "5 ml",
+    "price": 500,
+    "price_postapoc": 10,
+    "material": [ "copper" ],
+    "explode_in_fire": true,
+    "explosion": { "power": 20 },
+    "symbol": ",",
+    "color": "light_gray",
+    "ammo_type": "components"
   }
 ]

data/json/EraOfDecay/items/generic/resources.json

@@ -1084,5 +1084,36 @@
     "volume": "1 L",
     "weight": "7800 g",
     "bashing": 3
+  },
+  {
+    "type": "AMMO",
+    "id": "chem_amatol",
+    "copy-from": "reagent_powder",
+    "name": { "str_sp": "amatol" },
+    "description": "A mixture of TNT and ammonium nitrate, for use in explosive devices.",
+    "//": "Stats assume 50% ammonium nitrate and 50% TNT by weight.",
+    "//REF": "0.91",
+    "material": [ "powder" ],
+    "price": 7500,
+    "price_postapoc": 2500,
+    "color": "yellow",
+    "explode_in_fire": true,
+    "explosion": { "power": 1, "shrapnel": 0 },
+    "weight": "1690 mg"
+  },
+  {
+    "type": "AMMO",
+    "id": "chem_ammonal",
+    "copy-from": "reagent_powder",
+    "name": { "str_sp": "ammonal" },
+    "description": "A mixture of aluminum powder and ammonium nitrate, for use in explosive devices.",
+    "//": "Stats assume 95% ammonium nitrate and 5% aluminum powder.",
+    "//REF": "0.9",
+    "material": [ "powder" ],
+    "price": 7500,
+    "price_postapoc": 2500,
+    "explode_in_fire": true,
+    "explosion": { "power": 1, "shrapnel": 0 },
+    "weight": "1774 mg"
   }
 ]

data/json/EraOfDecay/items/item_migration.json

@@ -33,5 +33,45 @@
     "id": "poppysyrup",
     "type": "MIGRATION",
     "replace": "opium"
+  },
+  {
+    "id": "military_explosive_bomb",
+    "type": "MIGRATION",
+    "replace": "homemade_bomb"
+  },
+  {
+    "id": "military_explosive_bomb_act",
+    "type": "MIGRATION",
+    "replace": "homemade_bomb_act"
+  },
+  {
+    "id": "military_explosive_half_barrel_bomb",
+    "type": "MIGRATION",
+    "replace": "half_barrel_bomb"
+  },
+  {
+    "id": "military_explosive_half_barrel_bomb_act",
+    "type": "MIGRATION",
+    "replace": "half_barrel_bomb_act"
+  },
+  {
+    "id": "military_explosive_full_barrel_bomb",
+    "type": "MIGRATION",
+    "replace": "full_barrel_bomb"
+  },
+  {
+    "id": "military_explosive_full_barrel_bomb_act",
+    "type": "MIGRATION",
+    "replace": "full_barrel_bomb_act"
+  },
+  {
+    "id": "military_explosive_full_barrel_bomb_act",
+    "type": "MIGRATION",
+    "replace": "full_barrel_bomb_act"
+  },
+  {
+    "id": "exploding_arrow_warhead",
+    "type": "MIGRATION",
+    "replace": "arrow_exploding"
   }
 ]

data/json/EraOfDecay/items/tools/explosives.json

@@ -0,0 +1,24 @@
+[
+  {
+    "id": "claybomb_lit",
+    "type": "TOOL",
+    "category": "weapons",
+    "name": { "str": "lit clay fire bomb" },
+    "description": "A round fragile clay vessel full of flammable liquid with a flaming rag stoppered in its opening.  Throwing it will shatter the vessel on impact and ignite a fireball.  Dropping it will set you on fire, so don't do that unless you want to burn to death.",
+    "weight": "937 g",
+    "volume": "909 ml",
+    "longest_side": "12 cm",
+    "price": 0,
+    "price_postapoc": 0,
+    "to_hit": -1,
+    "bashing": 2,
+    "material": [ "clay" ],
+    "symbol": "*",
+    "color": "light_gray",
+    "initial_charges": 1,
+    "max_charges": 1,
+    "turns_per_charge": 1,
+    "use_action": [ "MOLOTOV_LIT" ],
+    "flags": [ "LIGHT_15", "TRADER_AVOID", "NPC_THROW_NOW", "WATER_EXTINGUISH" ]
+  }
+]

data/json/EraOfDecay/recipes/ammo/other.json

@@ -0,0 +1,51 @@
+[
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "flamethrower_fuel",
+    "id_suffix": "mix_1",
+    "charges": 2,
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "chemistry",
+    "time": "3 m",
+    "batch_time_factors": [ 80, 5 ],
+    "book_learn": [ [ "textbook_gaswarfare", 0 ], [ "textbook_anarch", 0 ], [ "manual_launcher", 0 ] ],
+    "components": [ [ [ "gasoline", 1 ], [ "avgas", 1 ], [ "chem_acetone", 1 ] ], [ [ "chem_turpentine", 1 ] ] ],
+    "flags": [ "BLIND_HARD" ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "flamethrower_fuel",
+    "id_suffix": "mix_2",
+    "charges": 4,
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "chemistry",
+    "time": "3 m",
+    "batch_time_factors": [ 80, 5 ],
+    "book_learn": [ [ "textbook_gaswarfare", 0 ], [ "textbook_anarch", 0 ], [ "manual_launcher", 0 ] ],
+    "components": [ [ [ "gasoline", 3 ], [ "avgas", 3 ] ], [ [ "crude_lamp_oil", 1 ], [ "lamp_oil", 1 ], [ "motor_oil", 1 ] ] ],
+    "flags": [ "BLIND_HARD" ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "flamethrower_fuel",
+    "id_suffix": "mix_3",
+    "charges": 4,
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "chemistry",
+    "time": "3 m",
+    "batch_time_factors": [ 80, 5 ],
+    "book_learn": [ [ "textbook_gaswarfare", 0 ], [ "textbook_anarch", 0 ], [ "manual_launcher", 0 ] ],
+    "components": [
+      [ [ "gasoline", 2 ], [ "avgas", 2 ] ],
+      [ [ "crude_lamp_oil", 1 ], [ "lamp_oil", 1 ], [ "motor_oil", 1 ] ],
+      [ [ "chem_turpentine", 1 ] ]
+    ],
+    "flags": [ "BLIND_HARD" ]
+  }
+]

data/json/EraOfDecay/recipes/chem/drugs.json

@@ -223,5 +223,19 @@
       [ [ "chem_thiourea", 13 ] ],
       [ [ "chem_chloroacetamide", 35 ] ]
     ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "chem_chloral_hydrate",
+    "category": "CC_CHEM",
+    "subcategory": "CSC_CHEM_DRUGS",
+    "skill_used": "chemistry",
+    "difficulty": 2,
+    "time": "5 m",
+    "charges": 330,
+    "autolearn": true,
+    "qualities": [ { "id": "CONTAIN", "level": 1 } ],
+    "components": [ [ [ "chem_chloral", 105 ] ], [ [ "water_clean", 1 ] ] ]
   }
 ]