summaryrefslogtreecommitdiff
path: root/revert-09_undo-yet-more-ammo-balancing.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert-09_undo-yet-more-ammo-balancing.patch')
-rw-r--r--revert-09_undo-yet-more-ammo-balancing.patch308
1 files changed, 308 insertions, 0 deletions
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
new file mode 100644
index 0000000..01dd4e1
--- /dev/null
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -0,0 +1,308 @@
+From 30517b3811fa707a3dcfb0849efb0cfd4977c98d Mon Sep 17 00:00:00 2001
+From: Chaosvolt <chaosvolt@users.noreply.github.com>
+Date: Mon, 12 Dec 2022 08:08:09 -0600
+Subject: [PATCH 148/177] Ammo rebalance project, part 7 (#2121)
+
+* [WIP] Ammo rebalance project, part 7
+
+* Typofix
+
+Doi
+
+* Update 40x46mm, casing description stuff
+
+* And do 40x53mm
+
+* Obsolete/migrate redundant 8mm ammo
+
+* Re-add comment that got ate by merge conflict fix
+
+* Updates per feedback
+---
+ .../itemgroups/Weapons_Mods_Ammo/ammo.json | 1 -
+ data/json/itemgroups/military.json | 4 +-
+ data/json/items/ammo/40x46mm.json | 57 ++++++++-----------
+ data/json/items/ammo/40x53mm.json | 29 +++-------
+ data/json/items/ammo/8x40mm.json | 23 ++++----
+ data/json/items/migration.json | 15 +++++
+ data/json/obsoletion/recipes.json | 10 ++++
+ data/json/professions.json | 4 +-
+ data/json/recipes/ammo/shot.json | 4 +-
+ .../Generic_Guns/ammo/gg_ammo_migration.json | 3 -
+ .../Generic_Guns/recipes/recipe_obsolete.json | 7 +--
+ data/mods/No_Rivtech_Guns/modinfo.json | 1 -
+ .../more_classes_scenarios/cs_classes.json | 6 +-
+ doc/GAME_BALANCE.md | 6 +-
+ 22 files changed, 110 insertions(+), 108 deletions(-)
+
+diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
+index c10de498fb4..63682ca9ef1 100644
+--- a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
++++ b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
+@@ -246,7 +246,6 @@
+ { "item": "762_51_incendiary", "prob": 10 },
+ { "item": "762_51", "prob": 40 },
+ { "item": "8mm_caseless", "prob": 30 },
+- { "item": "8mm_fmj", "prob": 30 },
+ { "item": "8mm_hvp", "prob": 10 },
+ { "item": "8mm_inc", "prob": 20 },
+ { "item": "8mm_jhp", "prob": 10 },
+diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
+index 67766ba566a..8f564eb87aa 100644
+--- a/data/json/itemgroups/military.json
++++ b/data/json/itemgroups/military.json
+@@ -226,7 +226,7 @@
+ { "item": "8mm_caseless", "prob": 2 },
+ { "item": "rm99_pistol", "prob": 1 },
+ { "item": "8mm_jhp", "prob": 2 },
+- { "item": "8mm_fmj", "prob": 2 },
++ { "item": "8mm_hvp", "prob": 2 },
+ { "item": "laser_rifle", "prob": 1 },
+ { "item": "rm103a_pistol", "prob": 1 },
+ { "item": "laser_sight", "prob": 15 },
+@@ -388,7 +388,7 @@
+ { "item": "50_mk211", "prob": 1 },
+ { "item": "50ss", "prob": 8 },
+ { "item": "50_incendiary", "prob": 8 },
+- { "item": "8mm_fmj", "prob": 6 },
++ { "item": "8mm_jhp", "prob": 6 },
+ { "item": "8mm_inc", "prob": 6 },
+ { "item": "8mm_caseless", "prob": 6 },
+ { "item": "m202_flash", "prob": 15 },
+diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json
+index 530278fd5d8..352b67d154c 100644
+--- a/data/json/items/ammo/40x46mm.json
++++ b/data/json/items/ammo/40x46mm.json
+@@ -69,19 +69,6 @@
+ "casing": "40x46mm_m118_casing",
+ "extend": { "effects": [ "SHOT" ] }
+ },
+- {
+- "id": "40x46mm_buckshot_m199",
+- "copy-from": "40x46mm_grenade",
+- "type": "AMMO",
+- "name": { "str": "40x46mm buckshot" },
+- "description": "An improvised 40x46mm buckshot load somewhat resembling M576.",
+- "weight": "120 g",
+- "range": 10,
+- "damage": { "damage_type": "bullet", "amount": 90, "armor_penetration": 4 },
+- "recoil": 1000,
+- "casing": "40x46mm_m199_casing",
+- "extend": { "effects": [ "SHOT" ] }
+- },
+ {
+ "id": "40x46mm_slug_m118",
+ "copy-from": "40x46mm_grenade",
+diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json
+index 4541de0dab2..aeb0d2e732e 100644
+--- a/data/json/items/ammo/40x53mm.json
++++ b/data/json/items/ammo/40x53mm.json
+@@ -60,17 +61,4 @@
+ "recoil": 1200,
+ "casing": "40x53mm_m169_casing"
+- },
+- {
+- "id": "40x53mm_flechette_m169",
+- "copy-from": "40x53mm_grenade",
+- "type": "AMMO",
+- "name": { "str": "40x53mm flechette" },
+- "description": "An improvised 40x53mm flechette load containing 100 steel darts.",
+- "weight": "340 g",
+- "range": 10,
+- "damage": { "damage_type": "bullet", "amount": 85, "armor_penetration": 6 },
+- "recoil": 1200,
+- "casing": "40x53mm_m169_casing",
+- "extend": { "effects": [ "SHOT" ] }
+ }
+ ]
+diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json
+index 25d9b16a37b..8ca62a1bfb3 100644
+--- a/data/json/items/ammo/8x40mm.json
++++ b/data/json/items/ammo/8x40mm.json
+@@ -39,14 +39,6 @@
+ "dispersion": 1.2,
+ "recoil": 0.5
+ },
+- {
+- "id": "8mm_fmj",
+- "copy-from": "8mm_caseless",
+- "type": "AMMO",
+- "name": { "str": "8x40mm FMJ" },
+- "description": "8x40mm caseless rounds, full metal jacket. Military grade ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.",
+- "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 10 } }
+- },
+ {
+ "id": "8mm_hvp",
+ "copy-from": "8mm_caseless",
+diff --git a/data/json/items/migration.json b/data/json/items/migration.json
+index ed67da394f0..31158a8187c 100644
+--- a/data/json/obsoletion/migration.json
++++ b/data/json/obsoletion/migration.json
+@@ -1740,6 +1740,21 @@
+ "id": "rubber_armor_horse",
+ "type": "MIGRATION",
+ "replace": "rubber_armor_medium_quadruped"
++ },
++ {
++ "id": "40x46mm_buckshot_m199",
++ "type": "MIGRATION",
++ "replace": "40x46mm_m576"
++ },
++ {
++ "id": "40x53mm_flechette_m169",
++ "type": "MIGRATION",
++ "replace": "40x53mm_m1001"
++ },
++ {
++ "id": "8mm_fmj",
++ "type": "MIGRATION",
++ "replace": "8mm_caseless"
+ },
+ {
+ "id": "chem_zinc_powder",
+diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json
+index c0c56cead36..8e1335380e2 100644
+--- a/data/json/obsoletion/recipes.json
++++ b/data/json/obsoletion/recipes.json
+@@ -3147,5 +3147,15 @@
+ "type": "recipe",
+ "result": "rubber_armor_horse_from_scratch",
+ "obsolete": true
++ },
++ {
++ "type": "recipe",
++ "result": "40x46mm_buckshot_m199",
++ "obsolete": true
++ },
++ {
++ "type": "recipe",
++ "result": "40x53mm_flechette_m169",
++ "obsolete": true
+ },
+ {
+ "type": "recipe",
+diff --git a/data/json/professions.json b/data/json/professions.json
+index cd30799fa83..f84f94b6d33 100644
+--- a/data/json/professions.json
++++ b/data/json/professions.json
+@@ -45,8 +45,8 @@
+ "subtype": "collection",
+ "id": "army_mags_rm11b",
+ "entries": [
+- { "item": "8x40_10_mag", "ammo-item": "8mm_fmj", "charges": 10 },
+- { "item": "8x40_10_mag", "ammo-item": "8mm_fmj", "charges": 10 }
++ { "item": "8x40_10_mag", "ammo-item": "8mm_caseless", "charges": 10 },
++ { "item": "8x40_10_mag", "ammo-item": "8mm_caseless", "charges": 10 }
+ ]
+ },
+ {
+diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json
+index 80a7881ea64..27b7bb17832 100644
+--- a/data/json/recipes/ammo/shot.json
++++ b/data/json/recipes/ammo/shot.json
+@@ -149,7 +149,7 @@
+ ]
+ },
+ {
+- "result": "40x53mm_flechette_m169",
++ "result": "40x53mm_m1001",
+ "type": "recipe",
+ "category": "CC_AMMO",
+ "subcategory": "CSC_AMMO_SHOT",
+@@ -197,7 +197,7 @@
+ ]
+ },
+ {
+- "result": "40x46mm_buckshot_m199",
++ "result": "40x46mm_m576",
+ "type": "recipe",
+ "category": "CC_AMMO",
+ "subcategory": "CSC_AMMO_SHOT",
+diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
+index 675f5ba932d..8e61d596190 100644
+--- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
++++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
+@@ -147,7 +147,6 @@
+ "556_incendiary",
+ "762_m43",
+ "8mm_caseless",
+- "8mm_fmj",
+ "8mm_hvp",
+ "8mm_inc",
+ "reloaded_556",
+@@ -260,11 +259,9 @@
+ "id": [
+ "40x46mm_m576",
+ "40x46mm_buckshot_m118",
+- "40x46mm_buckshot_m199",
+ "40x46mm_flechette_m118",
+ "40x46mm_flechette_m199",
+ "40x53mm_m1001",
+- "40x53mm_flechette_m169",
+ "40x53mm_buckshot_m169"
+ ],
+ "type": "MIGRATION",
+diff --git a/data/mods/Generic_Guns/recipes/recipe_obsolete.json b/data/mods/Generic_Guns/recipes/recipe_obsolete.json
+index e4e3796a108..8653252ae1d 100644
+--- a/data/mods/Generic_Guns/recipes/recipe_obsolete.json
++++ b/data/mods/Generic_Guns/recipes/recipe_obsolete.json
+@@ -366,7 +366,7 @@
+ },
+ {
+ "type": "recipe",
+- "result": "40x46mm_buckshot_m199",
++ "result": "40x46mm_m576",
+ "obsolete": true
+ },
+ {
+@@ -399,11 +399,6 @@
+ "result": "40x53mm_slug_m169",
+ "obsolete": true
+ },
+- {
+- "type": "recipe",
+- "result": "40x53mm_flechette_m169",
+- "obsolete": true
+- },
+ {
+ "type": "recipe",
+ "result": "shot_paper_00",
+diff --git a/data/mods/No_Rivtech_Guns/modinfo.json b/data/mods/No_Rivtech_Guns/modinfo.json
+index 716658fe996..983a1d1d2e4 100644
+--- a/data/mods/No_Rivtech_Guns/modinfo.json
++++ b/data/mods/No_Rivtech_Guns/modinfo.json
+@@ -14,7 +14,6 @@
+ "items": [
+ "8mm_caseless",
+ "8mm_bootleg",
+- "8mm_fmj",
+ "8mm_jhp",
+ "8mm_inc",
+ "5x50dart",
+diff --git a/data/mods/more_classes_scenarios/cs_classes.json b/data/mods/more_classes_scenarios/cs_classes.json
+index d10e81bd771..95a92381547 100644
+--- a/data/mods/more_classes_scenarios/cs_classes.json
++++ b/data/mods/more_classes_scenarios/cs_classes.json
+@@ -4,8 +4,8 @@
+ "subtype": "collection",
+ "id": "army_mags_rm2000",
+ "entries": [
+- { "item": "8x40_10_mag", "ammo-item": "8mm_fmj", "charges": 10 },
+- { "item": "8x40_10_mag", "ammo-item": "8mm_fmj", "charges": 10 }
++ { "item": "8x40_10_mag", "ammo-item": "8mm_caseless", "charges": 10 },
++ { "item": "8x40_10_mag", "ammo-item": "8mm_caseless", "charges": 10 }
+ ]
+ },
+ {
+@@ -53,7 +53,7 @@
+ { "item": "kukri", "container-item": "sheath" },
+ {
+ "item": "rm2000_smg",
+- "ammo-item": "8mm_fmj",
++ "ammo-item": "8mm_caseless",
+ "charges": 25,
+ "contents-item": [ "shoulder_strap", "suppressor", "holo_sight" ]
+ },
+--
+2.39.0
+
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-07 00:13:08 +0000