feat(balance): make more use of small construction vehiclegroups

cataclysmbnteam · Jun 3, 2024 · e3cef8d · e3cef8d
1 parent 7c50572
commit e3cef8d
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 24 deletions.
diff --git a/data/json/mapgen/construction_site.json b/data/json/mapgen/construction_site.json
@@ -354,7 +354,8 @@
         { "item": "paint", "x": 6, "y": 12, "chance": 35 },
         { "item": "tools_earthworking", "x": 19, "y": 14, "chance": 25 },
         { "item": "hardware_trash", "x": [ 19, 20 ], "y": 17, "chance": 35 }
-      ]
+      ],
+      "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 16, "y": 2, "chance": 50, "fuel": 20, "rotation": 0 } ]
     }
   },
   {
@@ -413,16 +414,5 @@
       ],
       "place_vehicles": [ { "vehicle": "small_utility_vehicles", "x": 16, "y": 2, "chance": 50, "fuel": 20, "rotation": 270 } ]
     }
-  },
-  {
-    "id": "small_utility_vehicles",
-    "type": "vehicle_group",
-    "vehicles": [
-      [ "excavator", 100 ],
-      [ "trencher", 80 ],
-      [ "engine_crane", 60 ],
-      [ "welding_cart", 40 ],
-      [ "portable_generator", 20 ]
-    ]
   }
 ]
diff --git a/data/json/mapgen/house/house01.json b/data/json/mapgen/house/house01.json
@@ -253,7 +253,8 @@
         { "chance": 40, "item": "paint", "x": 18, "y": 7 },
         { "chance": 20, "item": "hardware_bulk", "x": 12, "y": 9 },
         { "chance": 20, "item": "hardware_plumbing", "x": 5, "y": 13 }
-      ]
+      ],
+      "place_vehicles": [ { "vehicle": "os_work_vehicles", "chance": 40, "x": [ 6, 14 ], "y": [ 18, 21 ] } ]
     }
   },
   {

diff --git a/data/json/mapgen/house/house02.json b/data/json/mapgen/house/house02.json
@@ -269,7 +269,8 @@
         { "chance": 10, "item": "tools_construction", "x": [ 13, 15 ], "y": 17 },
         { "chance": 25, "item": "hardware", "x": 11, "y": 19 },
         { "chance": 20, "item": "hardware_plumbing", "x": 11, "y": 15 }
-      ]
+      ],
+      "place_vehicles": [ { "vehicle": "os_work_vehicles", "chance": 40, "x": [ 14, 18 ], "y": [ 19, 21 ] } ]
     }
   },
   {

diff --git a/data/json/mapgen/house/house20.json b/data/json/mapgen/house/house20.json
@@ -200,7 +200,8 @@
         { "chance": 10, "item": "hardware", "x": 10, "y": 7 },
         { "chance": 10, "item": "hardware", "x": 10, "y": 5 },
         { "chance": 10, "item": "hardware", "x": 10, "y": 6 }
-      ]
+      ],
+      "place_vehicles": [ { "vehicle": "os_work_vehicles", "chance": 40, "x": [ 6, 20 ], "y": [ 19, 21 ] } ]
     }
   },
   {

diff --git a/data/json/mapgen/house/house21.json b/data/json/mapgen/house/house21.json
@@ -269,7 +269,8 @@
         { "chance": 80, "item": "crate_cleaning", "x": 17, "y": 11 },
         { "chance": 35, "item": "toy_box", "x": 6, "y": 13 }
       ],
-      "place_toilets": [ { "x": 19, "y": 15 } ]
+      "place_toilets": [ { "x": 19, "y": 15 } ],
+      "place_vehicles": [ { "vehicle": "os_work_vehicles", "chance": 40, "x": [ 3, 15 ], "y": [ 3, 5 ] } ]
     }
   },
   {

diff --git a/data/json/mapgen/house/house22_ab.json b/data/json/mapgen/house/house22_ab.json
@@ -52,7 +52,8 @@
         { "chance": 15, "item": "hardware", "x": 2, "y": 11 },
         { "chance": 15, "item": "hardware", "x": 19, "y": 10 },
         { "chance": 25, "item": "hardware_trash", "x": 17, "y": 10 }
-      ]
+      ],
+      "place_vehicles": [ { "vehicle": "os_work_vehicles", "chance": 40, "x": [ 9, 13 ], "y": [ 10, 15 ] } ]
     }
   },
   {
@@ -124,7 +125,8 @@
         { "chance": 25, "item": "hand_tools", "x": 6, "y": 18 },
         { "chance": 25, "item": "hardware_trash", "x": 14, "y": 20 },
         { "chance": 25, "item": "hardware_trash", "x": 16, "y": 10 }
-      ]
+      ],
+      "place_vehicles": [ { "vehicle": "os_work_vehicles", "chance": 40, "x": [ 9, 13 ], "y": [ 10, 15 ] } ]
     }
   }
 ]
diff --git a/data/json/mapgen/house/house_vacant.json b/data/json/mapgen/house/house_vacant.json
@@ -84,7 +84,8 @@
         { "chance": 30, "item": "hardware_trash", "x": 3, "y": [ 3, 4 ] },
         { "chance": 10, "item": "tools_construction", "x": 12, "y": 4 },
         { "chance": 20, "item": "construction_worker", "x": 15, "y": 8 }
-      ]
+      ],
+      "place_vehicles": [ { "vehicle": "os_work_vehicles", "chance": 40, "x": [ 2, 21 ], "y": [ 20, 21 ] } ]
     }
   },
   {
@@ -173,7 +174,8 @@
         { "chance": 30, "item": "hardware_trash", "x": 3, "y": [ 3, 4 ] },
         { "chance": 20, "item": "construction_worker", "x": 15, "y": 8 },
         { "chance": 20, "item": "construction_worker", "x": 6, "y": 3 }
-      ]
+      ],
+      "place_vehicles": [ { "vehicle": "os_work_vehicles", "chance": 40, "x": [ 2, 21 ], "y": [ 20, 21 ] } ]
     }
   }
 ]
diff --git a/data/json/mapgen/s_hardware.json b/data/json/mapgen/s_hardware.json
@@ -152,9 +152,9 @@
         "pppppwppppppppppppppppw'",
         "pppppwHHHHHHHppHHHHHHHw'",
         "ppppp|ppppppppppppppppw'",
-        "ppppp|pppppppppHpHpHpHw'",
-        "pppppw1p2p3pMppHpHpHpHw'",
+        "ppppp|pppppppptHpHpHpHw'",
         "pppppw1p2p3pMppHpHpHpHw'",
+        "pppppw1p2p3pMptHpHpHpHw'",
         "'D'D'w1p2p3pMppHpHpHpHw'",
         "'''''WWWWWWWWWWWWWWWWWW'",
         "''''''''''''''''''''''''"
@@ -178,6 +178,7 @@
         "_": "t_floor",
         "p": "t_pavement",
         "r": "t_console_broken",
+        "t": "t_pavement",
         "w": "t_chainfence_v",
         "|": "t_chaingate_c",
         "~": "t_sidewalk",
@@ -226,6 +227,7 @@
       "vehicles": {
         "T": { "vehicle": "handjack", "chance": 2, "status": 1 },
         "V": { "vehicle": "flatbed_truck", "chance": 50, "status": 1, "rotation": 270 },
+        "t": { "vehicle": "os_work_vehicles", "chance": 50, "status": 1, "rotation": 90 },
         "v": { "vehicle": "shopping_cart", "chance": 10, "status": 1 }
       }
     }
@@ -342,7 +344,7 @@
       "place_vendingmachines": [ { "x": 8, "y": 2 }, { "x": 8, "y": 3 } ],
       "toilets": { "t": {  } },
       "place_items": [
-        { "item": "hardware_bulk", "x": 2, "y": [ 2, 7 ], "chance": 90, "repeat": [ 1, 6 ] },
+        { "item": "hardware_bulk", "x": 2, "y": [ 2, 6 ], "chance": 90, "repeat": [ 1, 6 ] },
         { "item": "tools_carpentry", "x": 20, "y": [ 10, 14 ], "chance": 80, "repeat": [ 1, 4 ] },
         { "item": "paint", "x": 17, "y": [ 10, 14 ], "chance": 80, "repeat": [ 1, 8 ] },
         { "item": "hardware", "x": 14, "y": [ 10, 14 ], "chance": 80, "repeat": [ 1, 8 ] },
@@ -362,7 +364,9 @@
         { "vehicle": "shopping_cart", "x": [ 18, 19 ], "y": [ 7, 22 ], "chance": 25 },
         { "vehicle": "shopping_cart", "x": [ 15, 16 ], "y": [ 7, 22 ], "chance": 25 },
         { "vehicle": "shopping_cart", "x": [ 12, 13 ], "y": [ 7, 22 ], "chance": 25 },
-        { "vehicle": "shopping_cart", "x": [ 8, 10 ], "y": [ 5, 16 ], "chance": 25 }
+        { "vehicle": "shopping_cart", "x": [ 8, 10 ], "y": [ 5, 16 ], "chance": 25 },
+        { "vehicle": "os_work_vehicles", "x": 2, "y": 7, "chance": 50, "rotation": 90 },
+        { "vehicle": "os_work_vehicles", "x": 2, "y": 9, "chance": 50, "rotation": 90 }
       ]
     }
   },

diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json
@@ -635,6 +635,19 @@
       [ "pickup_diesel", 20 ]
     ]
   },
+  {
+    "id": "small_utility_vehicles",
+    "type": "vehicle_group",
+    "vehicles": [
+      [ "excavator", 100 ],
+      [ "trencher", 80 ],
+      [ "engine_crane", 60 ],
+      [ "welding_cart", 40 ],
+      [ "oa_work_light", 40 ],
+      [ "wheelbarrow", 30 ],
+      [ "portable_generator", 20 ]
+    ]
+  },
   {
     "type": "vehicle_group",
     "id": "oa_vg_cd_vehicles",