Update acid cannons (cataclysmbnteam#3339)

mythosmod · Oct 2, 2023 · f6afd6b · f6afd6b
1 parent 4a0798e
commit f6afd6b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
@@ -51,6 +51,16 @@
     "aoe": { "field_type": "fd_fire", "intensity_min": 2, "intensity_max": 2, "radius": 3 },
     "explosion": { "damage": 20, "radius": 7, "fire": true }
   },
+  {
+    "id": "ACID_TRAIL",
+    "type": "ammo_effect",
+    "trail": { "field_type": "fd_acid", "intensity_min": 1, "intensity_max": 3, "chance": 66 }
+  },
+  {
+    "id": "ACID_TRAIL_WEAK",
+    "type": "ammo_effect",
+    "trail": { "field_type": "fd_acid", "intensity_min": 1, "intensity_max": 2, "chance": 33 }
+  },
   {
     "id": "ACIDBOMB",
     "type": "ammo_effect",

diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
@@ -390,7 +390,7 @@
     "phase": "liquid",
     "category": "chems",
     "fun": -30,
-    "ammo_data": { "ammo_type": "acid", "damage": { "damage_type": "acid", "amount": 2 }, "effects": [ "RECOVER_10" ] }
+    "ammo_data": { "ammo_type": "acid", "damage": { "damage_type": "acid", "amount": 2 } }
   },
   {
     "type": "COMESTIBLE",
@@ -412,7 +412,7 @@
     "phase": "liquid",
     "category": "chems",
     "fun": -15,
-    "ammo_data": { "ammo_type": "acid", "damage": { "damage_type": "acid", "amount": 1 }, "effects": [ "RECOVER_10" ] }
+    "ammo_data": { "ammo_type": "acid", "damage": { "damage_type": "acid", "amount": 1 } }
   },
   {
     "type": "COMESTIBLE",
@@ -436,7 +436,7 @@
     "fun": -45,
     "freezing_point": 25,
     "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" ] }
+    "ammo_data": { "ammo_type": "acid", "damage": { "damage_type": "acid", "amount": 3 }, "effects": [ "ACID_TRAIL" ] }
   },
   {
     "type": "COMESTIBLE",
@@ -570,7 +570,7 @@
     "bashing": 1,
     "ammo_type": "acid",
     "damage": { "damage_type": "acid", "amount": 6 },
-    "effects": [ "RECOVER_10" ],
+    "effects": [ "ACID_TRAIL_WEAK" ],
     "phase": "liquid",
     "container": "bottle_glass",
     "//freezing_point": 25,
@@ -592,7 +592,7 @@
     "bashing": 1,
     "ammo_type": "acid",
     "damage": { "damage_type": "acid", "amount": 5 },
-    "effects": [ "RECOVER_10" ],
+    "effects": [ "ACID_TRAIL_WEAK" ],
     "phase": "liquid",
     "container": "bottle_glass",
     "//freezing_point": 25,
@@ -614,7 +614,7 @@
     "bashing": 1,
     "ammo_type": "acid",
     "damage": { "damage_type": "acid", "amount": 4 },
-    "effects": [ "RECOVER_10" ],
+    "effects": [ "ACID_TRAIL_WEAK" ],
     "phase": "liquid",
     "container": "bottle_glass",
     "//freezing_point": -44,
@@ -797,7 +797,6 @@
     "bashing": 1,
     "ammo_type": "acid",
     "damage": { "damage_type": "acid", "amount": 3 },
-    "effects": [ "RECOVER_10" ],
     "phase": "liquid",
     "container": "bottle_glass"
   },