From 8c42eb8c394afcce93b0d89b3868260d4f8dcc6d Mon Sep 17 00:00:00 2001
From: Chaosvolt <chaosvolt@users.noreply.github.com>
Date: Wed, 26 Jun 2024 03:02:16 -0500
Subject: [PATCH] feat(balance): swap damage bracket of ATGM and blackpowder
 cannon so civil war guns don't kill tanks better than a TOW (#4892)

---
 data/json/items/ammo/atgm.json   |  2 +-
 data/json/items/ammo/cannon.json | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/json/items/ammo/atgm.json b/data/json/items/ammo/atgm.json
index 97fbfc9eaf03..385a2ca86ae0 100644
--- a/data/json/items/ammo/atgm.json
+++ b/data/json/items/ammo/atgm.json
@@ -15,7 +15,7 @@
     "bashing": 1,
     "ammo_type": "atgm",
     "casing": "atgm_spent",
-    "damage": { "damage_type": "bullet", "amount": 250, "armor_multiplier": 0.1 },
+    "damage": { "damage_type": "bullet", "amount": 450, "armor_multiplier": 0.1 },
     "range": 100,
     "recoil": 6000,
     "effects": [ "EXPLOSIVE_HUGE", "NEVER_MISFIRES" ]
diff --git a/data/json/items/ammo/cannon.json b/data/json/items/ammo/cannon.json
index 24371268d51d..38330ac1ab8f 100644
--- a/data/json/items/ammo/cannon.json
+++ b/data/json/items/ammo/cannon.json
@@ -11,11 +11,11 @@
     "price": "200 USD",
     "price_postapoc": "20 USD",
     "looks_like": "cannon_round_ball",
-    "//2": "Base damage of 544, rounded down to 450 to be close to 25% that of round shot, balanced as FMJ.",
-    "damage": { "damage_type": "bullet", "amount": 450, "armor_penetration": 215 },
+    "//2": "balanced as +P with blackpowder levels of arpen.",
+    "damage": { "damage_type": "bullet", "amount": 250, "armor_penetration": 50 },
     "dispersion": 500,
     "recoil": 52500,
-    "extend": { "effects": [ "EXPLOSIVE", "FRAG" ] }
+    "extend": { "effects": [ "EXPLOSIVE_BIG" ] }
   },
   {
     "id": "cannon_round_ball",
@@ -35,8 +35,8 @@
     "stack_size": 1,
     "ammo_type": "cannon",
     "range": 50,
-    "//2": "Base damage of 352, rounded down to 350, balanced as FMJ.",
-    "damage": { "damage_type": "bullet", "amount": 350, "armor_penetration": 150 },
+    "//2": "Balanced as FMJ with blackpowder levels of arpen.",
+    "damage": { "damage_type": "bullet", "amount": 200, "armor_penetration": 50 },
     "dispersion": 620,
     "recoil": 26250,
     "loudness": 900,