feat(balance): cave entrances can spawn niter and other minerals, san…

…ity-check gunpowder recipe (#5371)
cataclysmbnteam · Sep 18, 2024 · 92bd39c · 92bd39c
1 parent b70f512
commit 92bd39c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -275,9 +275,10 @@
     "id": "cave_minerals",
     "subtype": "distribution",
     "entries": [
-      { "item": "material_niter", "prob": 20 },
-      { "item": "iron_ore", "prob": 10 },
-      { "item": "material_limestone", "prob": 5 }
+      { "item": "material_niter", "prob": 75 },
+      { "item": "material_rocksalt", "prob": 10 },
+      { "item": "chunk_sulfur", "prob": 10 },
+      { "item": "iron_ore", "prob": 5 }
     ]
   },
   {

diff --git a/data/json/mapgen/cave.json b/data/json/mapgen/cave.json
@@ -40,14 +40,7 @@
         ";": "t_dirt",
         "<": "t_slope_down"
       },
-      "furniture": {  },
-      "items": {
-        "O": { "item": "gym", "chance": 30 },
-        "c": { "item": "gym", "chance": 10 },
-        "f": { "item": "vending_drink_items", "chance": 30, "repeat": [ 2, 4 ] },
-        "r": { "item": "snacks", "chance": 20, "repeat": [ 2, 4 ] }
-      },
-      "nested": { "U": { "chunks": [ [ "roof_6x6_garden_1", 50 ], [ "roof_6x6_garden_2", 50 ] ] } }
+      "items": { ",": [ { "item": "cave_minerals", "chance": 5 } ] }
     }
   },
   {
@@ -91,7 +84,8 @@
         ",": "t_rock_roof",
         "<": "t_slope_down"
       },
-      "furniture": {  }
+      "furniture": {  },
+      "items": { ",": [ { "item": "cave_minerals", "chance": 5 } ] }
     }
   },
   {
@@ -138,7 +132,8 @@
       },
       "furniture": {  },
       "fields": { "W": { "field": "fd_web", "intensity": 2, "age": 10 } },
-      "monsters": { "W": { "monster": "GROUP_SPIDER", "chance": 2, "density": 0.01 } }
+      "monsters": { "W": { "monster": "GROUP_SPIDER", "chance": 2, "density": 0.01 } },
+      "items": { ",": [ { "item": "cave_minerals", "chance": 5 } ] }
     }
   },
   {
@@ -184,7 +179,8 @@
         "<": "t_slope_down"
       },
       "fields": { "W": { "field": "fd_web", "intensity": 1, "age": 10 } },
-      "furniture": {  }
+      "furniture": {  },
+      "items": { ",": [ { "item": "cave_minerals", "chance": 5 } ] }
     }
   },
   {
@@ -230,7 +226,8 @@
         "<": "t_slope_down"
       },
       "furniture": {  },
-      "monster": { "B": { "monster": "mon_bat" } }
+      "monster": { "B": { "monster": "mon_bat" } },
+      "items": { ",": [ { "item": "cave_minerals", "chance": 5 } ] }
     }
   },
   {
@@ -278,7 +275,8 @@
       },
       "furniture": {  },
       "fields": { "W": { "field": "fd_web", "intensity": 1, "age": 10 } },
-      "monster": { "B": { "monster": "mon_bear" } }
+      "monster": { "B": { "monster": "mon_bear" } },
+      "items": { ",": [ { "item": "cave_minerals", "chance": 5 } ] }
     }
   },
   {
@@ -325,7 +323,8 @@
         "<": "t_slope_down"
       },
       "fields": { "W": { "field": "fd_web", "intensity": 1, "age": 10 } },
-      "furniture": {  }
+      "furniture": {  },
+      "items": { ",": [ { "item": "cave_minerals", "chance": 5 } ] }
     }
   },
   {
@@ -373,7 +372,8 @@
       },
       "furniture": {  },
       "fields": { "W": { "field": "fd_web", "intensity": 1, "age": 10 } },
-      "monster": { "B": { "monster": "mon_cougar" } }
+      "monster": { "B": { "monster": "mon_cougar" } },
+      "items": { ",": [ { "item": "cave_minerals", "chance": 5 } ] }
     }
   },
   {

diff --git a/data/json/recipes/ammo/components.json b/data/json/recipes/ammo/components.json
@@ -16,11 +16,10 @@
       [ "book_icef", 5 ],
       [ "reference_cooking", 5 ]
     ],
-    "charges": 10,
+    "//": "Roughly consistent by weight, about 70 grams of material.",
+    "charges": 35,
     "qualities": [ { "id": "CONTAIN", "level": 1 } ],
-    "//": "Roughly consistent by weight, saltpeter is in smaller stack sizes than most chems, so much less is used.",
-    "//2": "Charcoal is in excess of the amount required however, due to even smaller stack size.",
-    "components": [ [ [ "chem_saltpetre", 2 ] ], [ [ "chem_sulphur", 5 ] ], [ [ "charcoal", 1 ], [ "coal_lump", 1 ] ] ]
+    "components": [ [ [ "chem_saltpetre", 10 ] ], [ [ "chem_sulphur", 20 ] ], [ [ "charcoal", 1 ], [ "coal_lump", 1 ] ] ]
   },
   {
     "type": "recipe",