From b7d3f4a348dd7d55ece97b391a30f090e99377ad Mon Sep 17 00:00:00 2001
From: Chaosvolt <chaosvolt@users.noreply.github.com>
Date: Sat, 8 Apr 2023 17:07:35 -0500
Subject: [PATCH] Water cannon can load acid

---
 data/json/items/ammo_types.json              |  6 +++++
 data/json/items/chemicals_and_resources.json | 25 ++++++++++++++------
 data/json/items/gun/misc.json                |  4 ++--
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
index 62583254eb9a..6655e6d6584c 100644
--- a/data/json/items/ammo_types.json
+++ b/data/json/items/ammo_types.json
@@ -628,5 +628,11 @@
     "type": "ammunition_type",
     "name": "water",
     "default": "water"
+  },
+  {
+    "id": "acid",
+    "type": "ammunition_type",
+    "name": "acid",
+    "default": "acid"
   }
 ]
diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
index decec7c8b6bf..42a65c1b8bfb 100644
--- a/data/json/items/chemicals_and_resources.json
+++ b/data/json/items/chemicals_and_resources.json
@@ -389,7 +389,8 @@
     "volume": "250 ml",
     "phase": "liquid",
     "category": "chems",
-    "fun": -30
+    "fun": -30,
+    "ammo_data": { "ammo_type": "acid", "damage": { "damage_type": "acid", "amount": 2 }, "effects": [ "RECOVER_10" ] }
   },
   {
     "type": "COMESTIBLE",
@@ -410,7 +411,8 @@
     "volume": "250 ml",
     "phase": "liquid",
     "category": "chems",
-    "fun": -15
+    "fun": -15,
+    "ammo_data": { "ammo_type": "acid", "damage": { "damage_type": "acid", "amount": 1 }, "effects": [ "RECOVER_10" ] }
   },
   {
     "type": "COMESTIBLE",
@@ -433,7 +435,8 @@
     "category": "chems",
     "fun": -45,
     "freezing_point": 25,
-    "drop_action": { "type": "emit_actor", "emits": [ "emit_acid_splash" ], "scale_qty": true }
+    "drop_action": { "type": "emit_actor", "emits": [ "emit_acid_splash" ], "scale_qty": true },
+    "ammo_data": { "ammo_type": "acid", "damage": { "damage_type": "acid", "amount": 3 }, "effects": [ "RECOVER_10" ] }
   },
   {
     "type": "COMESTIBLE",
@@ -565,7 +568,9 @@
     "volume": "250 ml",
     "weight": "460 g",
     "bashing": 1,
-    "ammo_type": "components",
+    "ammo_type": "acid",
+    "damage": { "damage_type": "acid", "amount": 6 },
+    "effects": [ "RECOVER_10" ],
     "phase": "liquid",
     "container": "bottle_glass",
     "//freezing_point": 25,
@@ -585,7 +590,9 @@
     "volume": "250 ml",
     "weight": "460 g",
     "bashing": 1,
-    "ammo_type": "components",
+    "ammo_type": "acid",
+    "damage": { "damage_type": "acid", "amount": 5 },
+    "effects": [ "RECOVER_10" ],
     "phase": "liquid",
     "container": "bottle_glass",
     "//freezing_point": 25,
@@ -605,7 +612,9 @@
     "volume": "250 ml",
     "weight": "375 g",
     "bashing": 1,
-    "ammo_type": "components",
+    "ammo_type": "acid",
+    "damage": { "damage_type": "acid", "amount": 4 },
+    "effects": [ "RECOVER_10" ],
     "phase": "liquid",
     "container": "bottle_glass",
     "//freezing_point": -44,
@@ -786,7 +795,9 @@
     "volume": "250 ml",
     "weight": "300 g",
     "bashing": 1,
-    "ammo_type": "components",
+    "ammo_type": "acid",
+    "damage": { "damage_type": "acid", "amount": 3 },
+    "effects": [ "RECOVER_10" ],
     "phase": "liquid",
     "container": "bottle_glass"
   },
diff --git a/data/json/items/gun/misc.json b/data/json/items/gun/misc.json
index 9e00d0ea9930..322d81404a80 100644
--- a/data/json/items/gun/misc.json
+++ b/data/json/items/gun/misc.json
@@ -29,12 +29,12 @@
     "symbol": "&",
     "color": "dark_gray",
     "name": { "str": "water cannon" },
-    "description": "A water cannon from a fire truck.  Mounted on a vehicle, it could be used to stop fires or \"protesters\".",
+    "description": "A water cannon from a fire truck.  Mounted on a vehicle, it could be used to stop fires or \"protesters\".  Or it could be loaded with something more corrosive, for a lot less firefighting and a lot more excessive force.",
     "price": 50000,
     "material": "steel",
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "NON-FOULING" ],
     "ammo_effects": [ "JET", "BEANBAG", "NEVER_MISFIRES" ],
-    "ammo": "water",
+    "ammo": [ "water", "acid" ],
     "weight": "24500 g",
     "volume": "12500 ml",
     "price_postapoc": 500,