From 4043f48d693a52802dec557d121967284a8e244e Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sun, 25 Apr 2021 09:38:10 -0700
Subject: Fix numerous inconsistent grenade names Add readme to better list
 changes

---
 json/items/tool/explosive.json | 191 +++++++++++++++++++++++++++++++++++++++++
 readme                         |  21 +++++
 2 files changed, 212 insertions(+)
 create mode 100644 json/items/tool/explosive.json
 create mode 100644 readme

diff --git a/json/items/tool/explosive.json b/json/items/tool/explosive.json
new file mode 100644
index 0000000..e8dd1df
--- /dev/null
+++ b/json/items/tool/explosive.json
@@ -0,0 +1,191 @@
+[
+  {
+    "id": "EMPbomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "EMPbomb_act",
+    "name": { "str": "EMP bomb (active)" }
+  },
+  {
+    "id": "flashbang",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "flashbang",
+    "name": { "str": "flashbang grenade" }
+  },
+  {
+    "id": "flashbang_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "flashbang_act",
+    "name": { "str": "flashbang grenade (active)" }
+  },
+  {
+    "id": "fragment_bomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "fragment_bomb_act",
+    "name": { "str": "fragment bomb (lit)" }
+  },
+  {
+    "id": "fungicidalbomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "fungicidalbomb_act",
+    "name": { "str": "fungicidal gas grenade (active)" }
+  },
+  {
+    "id": "fungicidalbomb_makeshift_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "fungicidalbomb_makeshift_act",
+    "name": { "str": "makeshift fungicidal gas grenade (active)" }
+  },
+  {
+    "id": "gasbomb_makeshift_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "gasbomb_makeshift_act",
+    "name": { "str": "makeshift gas canister (active)" }
+  },
+  {
+    "id": "grenade",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "grenade",
+    "name": { "str": "fragmentation grenade" }
+  },
+  {
+    "id": "grenade_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "grenade_act",
+    "name": { "str": "fragmentation grenade (active)" }
+  },
+  {
+    "id": "grenade_emp_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "grenade_emp_act",
+    "name": { "str": "EMP grenade (active)" }
+  },
+  {
+    "id": "grenade_inc_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "grenade_inc_act",
+    "name": { "str": "incendiary grenade (active)" }
+  },
+  {
+    "id": "gasbomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "gasbomb_act",
+    "name": { "str": "tear gas grenade (active)" }
+  },
+  {
+    "id": "insecticidalbomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "insecticidalbomb_act",
+    "name": { "str": "insecticidal gas grenade (active)" }
+  },
+  {
+    "id": "insecticidalbomb_makeshift_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "insecticidalbomb_makeshift_act",
+    "name": { "str": "makeshift insecticidal gas grenade (active)" }
+  },
+  {
+    "id": "makeshift_grenade",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "makeshift_grenade",
+    "name": { "str": "makeshift fragmentation grenade" }
+  },
+  {
+    "id": "makeshift_grenade_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "makeshift_grenade_act",
+    "name": { "str": "makeshift fragmentation grenade (active)" }
+  },
+  {
+    "id": "mininuke_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "mininuke_act",
+    "name": { "str": "mininuke (armed)", "str_pl": "mininukes (armed)" }
+  },
+  {
+    "id": "molotov_lit",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "molotov_lit",
+    "name": { "str": "Molotov cocktail (lit)" }
+  },
+  {
+    "id": "nail_bomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "nail_bomb_act",
+    "name": { "str": "nail bomb (lit)" }
+  },
+  {
+    "id": "pipebomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "pipebomb_act",
+    "name": { "str": "pipe bomb (lit)" }
+  },
+  {
+    "id": "scrambler_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "scrambler_act",
+    "name": { "str": "scrambler grenade (active)" }
+  },
+  {
+    "id": "smokebomb",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "smokebomb",
+    "name": { "str": "smoke grenade" }
+  },
+  {
+    "id": "smokebomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "smokebomb_act",
+    "name": { "str": "smoke grenade (active)" }
+  },
+  {
+    "id": "tool_anfo_charge_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "tool_anfo_charge_act",
+    "name": { "str": "ANFO charge (lit)" }
+  },
+  {
+    "id": "tool_black_powder_charge_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "tool_black_powder_charge_act",
+    "name": { "str": "black gunpowder charge (lit)" }
+  },
+  {
+    "id": "tool_rdx_charge_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "tool_rdx_charge_act",
+    "name": { "str": "RDX charge (lit)" }
+  },
+  {
+    "id": "tool_rocket_candy_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "copy-from": "tool_rocket_candy_act",
+    "name": { "str": "rocket candy (lit)" }
+  }
+]
diff --git a/readme b/readme
new file mode 100644
index 0000000..73bb809
--- /dev/null
+++ b/readme
@@ -0,0 +1,21 @@
+Add recipes for:
+fragmentation grenade
+tear gas grenade
+incendiary grenade
+fungicical grenade
+insecticidal grenade
+emp grenade
+scrambler grenade
+C-4 Explosives
+40x46mm M433
+40x46mm M576
+40x46mm M651
+
+Rename grenade to fragmentation grenade
+Rename flashbang to flashbang grenade
+Rename smoke bomb to smoke grenade
+
+Fix thw wildly inconsistent use of grenade, canister, armed, active, lit amongst explosives.
+-$GRENADE (lit) for those using matches
+-$GRENADE (active) for those using pins
+-$EXPLOSIVE (armed) for those on a manual timer
-- 
cgit v1.2.1