Use more real grenade names and weights.

3 files changed, 60 insertions, 13 deletions

diff --git a/json/items/tool/explosive.json b/json/items/tool/explosive.json
index 0f4cb8b..0c8033c 100644
--- a/json/items/tool/explosive.json
+++ b/json/items/tool/explosive.json
@@ -41,14 +41,18 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "flashbang",
-    "name": { "str": "flashbang grenade" }
+    "name": { "str": "M84 stun grenade" },
+    "weight": "370 g",
+    "description": "This is a US military M84 stun grenade, more colloquially known as a flashbang.  Use this item to pull the pin and light the fuse.  You will then have five turns before it detonates with intense light and sound, blinding, deafening and disorienting anyone nearby."
   },
   {
     "id": "flashbang_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "flashbang_act",
-    "name": { "str": "flashbang grenade (active)", "str_pl": "flashbang grenades (active)" }
+    "name": { "str": "M84 stun grenade (active)", "str_pl": "M84 stun grenade (active)" },
+    "weight": "370 g",
+    "description": "This stun grenade is active, and will soon detonate with intense light and sound, blinding, deafening and disorienting anyone nearby.  It may be a good idea to throw it!"
   },
   {
     "id": "fragment_bomb_act",
@@ -58,11 +62,20 @@
     "name": { "str": "fragment bomb (lit)", "str_pl": "fragment bombs (lit)" }
   },
   {
+    "id": "fungicidalbomb",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "fungicidalbomb",
+    "name": { "str": "fungicidal gas grenade", "str_pl": "fungicidal gas grenades" },
+    "weight": "539 g"
+  },
+  {
     "id": "fungicidalbomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "fungicidalbomb_act",
-    "name": { "str": "fungicidal gas grenade (active)", "str_pl": "fungicidal gas grenades (active)" }
+    "name": { "str": "fungicidal gas grenade (active)", "str_pl": "fungicidal gas grenades (active)" },
+    "weight": "539 g"
   },
   {
     "id": "fungicidalbomb_makeshift_act",
@@ -84,7 +97,8 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "grenade_act",
-    "name": { "str": "M67 fragmentation grenade (active)", "str_pl": "M67 fragmentation grenades (active)" }
+    "name": { "str": "M67 fragmentation grenade (active)", "str_pl": "M67 fragmentation grenades (active)" },
+    "description": "This fragmentation grenade is active, and will explode any second now.  Better throw it!"
   },
   {
     "id": "makeshift_grenade",
@@ -108,18 +122,38 @@
     "name": { "str": "EMP grenade (active)", "str_pl": "EMP grenades (active)" }
   },
   {
+    "id": "grenade_inc",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "grenade_inc",
+    "name": { "str": "M14 incendiary grenade", "str_pl": "M14 incendiary grenades" },
+    "description": "This is a US military M14 incendiary grenade.  Use this item to pull the pin and light the fuse.  You will then have five turns before it explodes into a raging inferno; throwing it would be a good idea."
+  },
+  {
     "id": "grenade_inc_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "grenade_inc_act",
-    "name": { "str": "incendiary grenade (active)", "str_pl": "incendiary grenades (active)" }
+    "name": { "str": "M14 incendiary grenade (active)", "str_pl": "M14 incendiary grenades (active)" },
+    "description": "This is an active incendiary grenade, likely to burst into an inferno any second now.  Better throw it!"
+  },
+  {
+    "id": "gasbomb",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "gasbomb",
+    "name": { "str": "M7A2 tear gas grenade", "str_pl": "M7A2 tear gas grenades" },
+    "weight": "539 g",
+    "description": "This is a US military M7A2 tear gas grenade.  Use this item to pull the pin and light the fuse.  In five turns it will begin to expel a highly toxic CS gas for some time.  This gas damages and slows those who enter it, as well as obscuring vision and scent."
   },
   {
     "id": "gasbomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "gasbomb_act",
-    "name": { "str": "tear gas grenade (active)", "str_pl": "tear gas grenades (active)" }
+    "name": { "str": "M7A2 tear gas grenade (active)", "str_pl": "M7A2 tear gas grenades (active)" },
+    "weight": "539 g",
+    "description": "This tear gas grenade has had its pin removed and is expelling highly toxic CS gas."
   },
   {
     "id": "gasbomb_makeshift_act",
@@ -129,11 +163,20 @@
     "name": { "str": "makeshift gas canister (active)", "str_pl": "makeshift gas canisters (active)" }
   },
   {
+    "id": "insecticidalbomb",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "insecticidalbomb",
+    "name": { "str": "insecticidal gas grenade", "str_pl": "insecticidal gas grenades" },
+    "weight": "539 g"
+  },
+  {
     "id": "insecticidalbomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "insecticidalbomb_act",
-    "name": { "str": "insecticidal gas grenade (active)", "str_pl": "insecticidal gas grenades (active)" }
+    "name": { "str": "insecticidal gas grenade (active)", "str_pl": "insecticidal gas grenades (active)" },
+    "weight": "539 g"
   },
   {
     "id": "insecticidalbomb_makeshift_act",
@@ -182,14 +225,18 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "smokebomb",
-    "name": { "str": "smoke grenade" }
+    "name": { "str": "M18 smoke grenade" },
+    "weight": "539 g",
+    "description": "This is a US military M18 smoke grenade.  Use this item to pull the pin and light the fuse.  Five turns after you do that, it will begin to expel a thick black smoke.  This smoke will slow those who enter it, as well as obscuring vision and scent."
   },
   {
     "id": "smokebomb_act",
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "smokebomb_act",
-    "name": { "str": "smoke grenade (active)", "str_pl": "smoke grenades (active)" }
+    "name": { "str": "M18 smoke grenade (active)", "str_pl": "M18 smoke grenades (active)" },
+    "weight": "539 g",
+    "description": "This smoke grenade has had its pin removed and is expelling thick smoke."
   },
   {
     "id": "tool_anfo_charge_act",
diff --git a/json/recipes/weapons/explosive.json b/json/recipes/weapons/explosive.json
index 4fec666..43fddf6 100644
--- a/json/recipes/weapons/explosive.json
+++ b/json/recipes/weapons/explosive.json
@@ -49,8 +49,8 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
-      [ [ "oxy_powder", 75 ] ],
-      [ [ "incendiary", 50 ] ],
+      [ [ "chem_ammonium_nitrate", 5 ] ],
+      [ [ "incendiary", 5 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },
diff --git a/json/uncraft/weapon/explosive.json b/json/uncraft/weapon/explosive.json
index 93a42b4..d13fb05 100644
--- a/json/uncraft/weapon/explosive.json
+++ b/json/uncraft/weapon/explosive.json
@@ -22,8 +22,8 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
-      [ [ "oxy_powder", 75 ] ],
-      [ [ "incendiary", 50 ] ],
+      [ [ "chem_ammonium_nitrate", 5 ] ],
+      [ [ "incendiary", 5 ] ],
       [ [ "canister_empty", 1 ] ]
     ]
   },