From 47c57b02f89758c90464bbeccfcce561846da00e Mon Sep 17 00:00:00 2001
From: Viss Valdyr <33199510+Lamandus@users.noreply.github.com>
Date: Fri, 6 Sep 2024 20:46:21 +0200
Subject: [PATCH] feat(balance): better ammo distribution in ammo vending
 machines (#5313)

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
---
 data/json/itemgroups/vending_machines.json | 39 ++++++++++++++--------
 data/json/mapgen/gunsmith.json             |  2 +-
 data/json/mapgen/s_gun.json                |  6 ++--
 data/json/mapgen/shooting_range.json       |  2 +-
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/data/json/itemgroups/vending_machines.json b/data/json/itemgroups/vending_machines.json
index 0896063894d7..bbb966eba94b 100644
--- a/data/json/itemgroups/vending_machines.json
+++ b/data/json/itemgroups/vending_machines.json
@@ -30,12 +30,32 @@
     "subtype": "collection",
     "id": "vending_ammo",
     "entries": [
-      { "group": "ammo_pistol_common_full", "count-min": 3, "count-max": 8 },
-      { "group": "ammo_rifle_common_full", "prob": 50, "count-min": 2, "count-max": 6 },
-      { "group": "ammo_shotgun_common_full", "prob": 50, "count-min": 2, "count-max": 6 },
-      { "group": "ammo_pistol_rare_full", "prob": 20, "count-min": 1, "count-max": 2 },
-      { "group": "ammo_rifle_rare_full", "prob": 20, "count-min": 1, "count-max": 2 },
-      { "group": "ammo_shotgun_rare_full", "prob": 20, "count-min": 1, "count-max": 2 }
+      { "group": "ammo_pistol_common_full", "prob": 50 },
+      { "group": "ammo_pistol_common_full", "prob": 50 },
+      { "group": "ammo_pistol_common_full", "prob": 50 },
+      { "group": "ammo_pistol_common_full", "prob": 50 },
+      { "group": "ammo_pistol_common_full", "prob": 50 },
+      { "group": "ammo_pistol_common_full", "prob": 50 },
+      { "group": "ammo_pistol_common_full", "prob": 50 },
+      { "group": "ammo_pistol_common_full", "prob": 50 },
+      { "group": "ammo_rifle_common_full", "prob": 30 },
+      { "group": "ammo_rifle_common_full", "prob": 30 },
+      { "group": "ammo_rifle_common_full", "prob": 30 },
+      { "group": "ammo_rifle_common_full", "prob": 30 },
+      { "group": "ammo_rifle_common_full", "prob": 30 },
+      { "group": "ammo_shotgun_common_full", "prob": 30 },
+      { "group": "ammo_shotgun_common_full", "prob": 30 },
+      { "group": "ammo_shotgun_common_full", "prob": 30 },
+      { "group": "ammo_shotgun_common_full", "prob": 30 },
+      { "group": "ammo_shotgun_common_full", "prob": 30 },
+      { "group": "ammo_pistol_rare_full", "prob": 15 },
+      { "group": "ammo_pistol_rare_full", "prob": 15 },
+      { "group": "ammo_pistol_rare_full", "prob": 15 },
+      { "group": "ammo_pistol_rare_full", "prob": 15 },
+      { "group": "ammo_rifle_rare_full", "prob": 10 },
+      { "group": "ammo_rifle_rare_full", "prob": 10 },
+      { "group": "ammo_shotgun_rare_full", "prob": 10 },
+      { "group": "ammo_shotgun_rare_full", "prob": 10 }
     ]
   },
   {
@@ -110,12 +130,5 @@
     "subtype": "collection",
     "id": "vending_medicine",
     "entries": [ { "group": "drugs_pharmacy", "count-min": 10, "count-max": 20 } ]
-  },
-  {
-    "type": "item_group",
-    "id": "vending_guns",
-    "//": "Ammo found in a vending machine.",
-    "subtype": "collection",
-    "items": [ { "group": "vending_ammo", "prob": 100, "count": [ 2, 6 ] } ]
   }
 ]
diff --git a/data/json/mapgen/gunsmith.json b/data/json/mapgen/gunsmith.json
index 759665b473e8..540426ffe729 100644
--- a/data/json/mapgen/gunsmith.json
+++ b/data/json/mapgen/gunsmith.json
@@ -76,7 +76,7 @@
         "t": "f_table"
       },
       "items": { "d": { "item": "trash_dumpster", "chance": 80 } },
-      "vendingmachines": { "$": { "item_group": "vending_guns", "reinforced": true } },
+      "vendingmachines": { "$": { "item_group": "vending_ammo", "reinforced": true } },
       "toilets": { "T": {  } },
       "place_loot": [
         { "group": "gunmod_common", "x": [ 5, 10 ], "y": 10, "chance": 100, "repeat": [ 3, 6 ] },
diff --git a/data/json/mapgen/s_gun.json b/data/json/mapgen/s_gun.json
index 721e2720fec8..09e3809cb0bf 100644
--- a/data/json/mapgen/s_gun.json
+++ b/data/json/mapgen/s_gun.json
@@ -73,7 +73,7 @@
         "U": "f_dumpster",
         "@": "f_target"
       },
-      "vendingmachines": { "$": { "item_group": "vending_guns", "reinforced": true } },
+      "vendingmachines": { "$": { "item_group": "vending_ammo", "reinforced": true } },
       "items": {
         "{": {
           "item": {
@@ -243,7 +243,7 @@
         "S": "f_displaycase",
         "T": "f_displaycase"
       },
-      "vendingmachines": { "$": { "item_group": "vending_guns", "reinforced": true } },
+      "vendingmachines": { "$": { "item_group": "vending_ammo", "reinforced": true } },
       "toilets": { ";": {  } },
       "items": {
         "{": {
@@ -523,7 +523,7 @@
         "N": "f_sink",
         "{": "f_locker"
       },
-      "vendingmachines": { "$": { "item_group": "vending_guns", "reinforced": true } },
+      "vendingmachines": { "$": { "item_group": "vending_ammo", "reinforced": true } },
       "place_items": [
         { "chance": 99, "item": "corpse_male", "x": 19, "y": 12 },
         { "chance": 75, "item": "ammo_casings_bulk", "x": [ 14, 15 ], "y": 14 },
diff --git a/data/json/mapgen/shooting_range.json b/data/json/mapgen/shooting_range.json
index 4b15988a8e53..94050048d143 100644
--- a/data/json/mapgen/shooting_range.json
+++ b/data/json/mapgen/shooting_range.json
@@ -85,7 +85,7 @@
         "s": "f_sign",
         "%": "f_trashcan"
       },
-      "vendingmachines": { "$": { "item_group": "vending_guns", "reinforced": true } },
+      "vendingmachines": { "$": { "item_group": "vending_ammo", "reinforced": true } },
       "place_items": [
         { "chance": 10, "item": "ammo_pistol_common", "x": 6, "y": 9 },
         { "chance": 5, "item": "ammo_pistol_common", "x": 3, "y": 9 },