Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(balance): rebalances for military helipad #4076

Merged
merged 2 commits into from
Jan 9, 2024
+89 −295
Merged

feat(balance): rebalances for military helipad #4076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99f82ef
feat(balance): rebalances for military helipad
chaosvolt Jan 8, 2024
a7e179e
Why must you continue to disappoint me
chaosvolt Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 71 additions & 65 deletions data/json/mapgen/helipad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,48 +8,48 @@
"fill_ter": "t_floor",
"rows": [
"FFF.......pppppppp...........................FFF",
"FTFFWWWWWF!!!!!!!!FFFFFFFFFFFFFFFFFFFFFFFFFFFFTF",
"FFG.W4ddw.ppppppppooo........................GFF",
".F..W-c?w.ppppppppoio|||||||||||||||||||||||..F.",
".F..WmWWW.ppppppppooo|%_____________C__B___|..F.",
"FTFF|||||F!!!!!!!!FFFFFFFFFFFFFFFFFFFFFFFFFFFFTF",
"FFG.|4ddw.ppppppppooo........................GFF",
".F..|-c?w.ppppppppoio|||||||||||||||||||||||..F.",
".F..|m|||.ppppppppooo|%_____________C__B___|..F.",
".F..pppppppppppppppppM___C_________C_CC_B__|..F.",
".F..pppppppppppppppppM____________CCCCC____|..F.",
".F..pppppppppppppppppM_B__C___B__B___C_B___|..F.",
".F..pppppyppppyppppppM________*_________B__|..F.",
".F..pppppyppppyppppppM__________________B__|..F.",
".F..pppppyppppyppppppM__B___C___B__C__B____|..F.",
".F..pppppyppppyppp...|____C___B____________|..F.",
".F..pppppyppppypppooom___________B______%__|..F.",
".F..pppppyppppypppooox___________B______%__|..F.",
".F..pppppyppppyppp...||||||||m|MMMMMMMMM||||..F.",
".F..pppppyppppyppp...|_rrrr|____________%__|..F.",
".F..oooooooooooooo...|_____|_______________|..F.",
".F..............oo...|_rrrr|___IIIIIIIII_RR|..F.",
".F..WwWWwWwwWwwW++WwW|M|||||___IUUUUUUUI_sR|..F.",
".F..W----+-----+-----m_____m___IUUUUUUUI_75|..F.",
".F..W-?ddWdc--dW--WWW|||||||___IUUUUUUUI___|..F.",
".F..Wz-cfWd?f?dW--W&W|_____m___IUUUUUUUI_RR|..F.",
".F..WWWWWWWWWWWWz-+-W|ggggg|___IUUUUUUUI_sR|..F.",
".F..W[[[HH##O#SW--WSW|||||||___IUUUUUUUI_85|..F.",
".F..W----------+--WWW|lllll|___IUUUUUUUI___|..F.",
".F..W-cttc---1WW--+-W|_____M___IUUUUUUUI___|..F.",
".F..W-cttc-z-2W<--WhW|lllll|___IUUUUUUUI%__|..F.",
".F..WWwwwWwwwWWW++WWW||||||||m|MMMMMMMMM||||..F.",
".F..pppppyppppyppp...|rrrr_|____________%__|..F.",
".F..oooooooooooooo...|_____x_______________|..F.",
".F..............oo...|rrrr_|___IIIIIIIII_RR|..F.",
".F../w//w/ww/ww/xx///|||||||___IUUUUUUUI_sR|..F.",
".F../----+-----+--W&W|llll_|___IUUUUUUUI_75|..F.",
".F../-?ddWdc--dW--+-W|_____x___IUUUUUUUI___|..F.",
".F../z-cfWd?f?dW--WSW|llll_|___IUUUUUUUI_RR|..F.",
".F../WWWWWWWWWWWz-WWW|||||||___IUUUUUUUI_sR|..F.",
".F../[[[HH##O#SW--+-W|_____m___IUUUUUUUI_85|..F.",
".F../----------+--WgW|ggggg|___IUUUUUUUI___|..F.",
".F../-cttc---1WW--WWW|||||||___IUUUUUUUI___|..F.",
".F../-cttc-z-2W<-----m_____m___IUUUUUUUI%__|..F.",
".F..//www/www///xx///||||||||x|MMMMMMMMM||||..F.",
".F.......3P.....oo...........o.=========6666..F.",
".F..========================================..F.",
".F..========================================..F.",
".F..========================================..F.",
".F..========================================..F.",
".F..$===============$======$===============$..F.",
".F...o,,,,,o..o,,,,,,,,,,,,,,,,,,o..o,,,,,o...F.",
".F...o=====o..o==================o..o=====o...F.",
".F..$=========o$==,,========,,===o$=========..F.",
".F..==========o===,,========,,===o==========..F.",
".F..=,=====,==o===,,========,,===o=,=====,==..F.",
".F..=,=====,==o===,,========,,===o=,=====,==..F.",
".F..=,=====,==o===,,,,,,,,,,,,===o=,=====,==..F.",
".F..=,,,,,,,==o===,,,,,,,,,,,,===o=,,,,,,,==..F.",
".F..=,,,,,,,==o===,,========,,===o=,,,,,,,==..F.",
".F..=,=====,==o===,,========,,===o=,=====,==..F.",
".F..=,=====,==o===,,========,,===o=,=====,==..F.",
".F..=,=====,==o===,,========,,===o=,=====,==..F.",
".F..==========o===,,========,,===o==========..F.",
".!..=,=====,==o===,,========,,===o==,=====,=..!.",
".!..=,=====,==o===,,========,,===o==,=====,=..!.",
".!..=,=====,==o===,,,,,,,,,,,,===o==,=====,=..!.",
".!..=,,,,,,,==o===,,,,,,,,,,,,===o==,,,,,,,=..!.",
".!..=,,,,,,,==o===,,========,,===o==,,,,,,,=..!.",
".!..=,=====,==o===,,========,,===o==,=====,=..!.",
".!..=,=====,==o===,,========,,===o==,=====,=..!.",
".!..=,=====,==o===,,========,,===o==,=====,=..!.",
".F..==========o==================o==========..F.",
".F..==========o==================o==========..F.",
"FFG..........................................GFF",
Expand Down Expand Up @@ -80,57 +80,63 @@
{ "group": "mil_food", "prob": 40, "count": [ 1, 5 ] },
{ "group": "infantry_medical_gear", "prob": 5, "count": [ 1, 2 ] },
{ "group": "supplies_metal", "prob": 150, "count": [ 2, 6 ] },
{ "group": "supplies_mechanics", "prob": 50, "count": [ 1, 3 ] },
{ "group": "supplies_mechanics_milspec", "prob": 50, "count": [ 1, 3 ] },
{ "group": "military_helicopter_parts", "prob": 75 }
]
},
"chance": 50
"chance": 75
},
"r": {
"l": {
"item": {
"subtype": "distribution",
"entries": [ { "group": "military_standard_assault_rifles", "prob": 45 }, { "group": "military_standard_shotguns", "prob": 5 } ]
"entries": [
{ "group": "military_standard_guns", "prob": 50 },
{ "group": "military_standard_pistols", "prob": 25 },
{ "group": "military_standard_grenades", "prob": 25 },
{ "group": "military_ballistic_armor", "prob": 100 }
]
},
"chance": 10
"chance": 50,
"repeat": 2
},
"l": {
"r": {
"item": {
"subtype": "distribution",
"entries": [
{ "group": "army_personal_locker", "prob": 150 },
{ "group": "military_patrol_food", "prob": 50 },
{ "group": "supplies_plumbing", "prob": 20 },
{ "group": "supplies_electronics", "prob": 20 },
{ "group": "supplies_metal", "prob": 20 },
{ "group": "supplies_mechanics", "prob": 20 },
{ "group": "hardware", "prob": 20 }
{ "group": "supplies_plumbing", "prob": 25 },
{ "group": "supplies_electronics", "prob": 25 },
{ "group": "supplies_metal", "prob": 25 },
{ "group": "supplies_mechanics_milspec", "prob": 100 },
{ "group": "hardware", "prob": 50 }
]
},
"chance": 50,
"repeat": [ 2, 6 ]
"repeat": 4
},
"L": { "item": "army_personal_locker", "chance": 50, "repeat": [ 0, 4 ] },
"d": { "item": "SUS_office_desk", "chance": 50 },
"f": { "item": "SUS_office_filing_cabinet", "chance": 90 },
"4": { "item": "military_standard_shotguns", "chance": 50 },
"#": { "item": "SUS_utensils", "chance": 25, "repeat": [ 1, 3 ] },
"t": { "item": "SUS_dishes", "chance": 50, "repeat": [ 1, 2 ] },
"#": { "item": "SUS_utensils", "chance": 50 },
"t": { "item": "SUS_dishes", "chance": 50 },
"[": { "item": "SUS_fridge", "chance": 50 },
"O": { "item": "SUS_oven", "chance": 75, "repeat": [ 0, 2 ] },
"O": { "item": "SUS_oven", "chance": 75 },
"H": { "item": "SUS_spice_collection", "chance": 75 },
"&": { "item": "SUS_toilet", "chance": 50 }
},
"place_loot": [ { "item": "american_flag", "x": 18, "y": 3, "chance": 75 } ],
"vendingmachines": { "1": { "item_group": "vending_drink" }, "2": { "item_group": "vending_food" } },
"place_monsters": [ { "monster": "GROUP_MIL_STRONG", "x": 36, "y": 15 }, { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 30, "density": 2 } ],
"place_monster": [
{ "group": "GROUP_MIL_STRONG", "x": [ 24, 42 ], "y": [ 5, 10 ], "repeat": [ 1, 3 ] },
{ "group": "GROUP_MIL_WEAK", "x": [ 28, 40 ], "y": [ 14, 22 ], "repeat": [ 3, 6 ] },
{ "group": "GROUP_ROBOTS_MIL", "x": [ 4, 23 ], "y": [ 27, 30 ], "repeat": 2 }
],
"monster": { "T": { "monster": "mon_turret_medium" } },
"place_vehicles": [
{ "vehicle": "forklift", "x": 29, "y": 6, "chance": 95, "rotation": 180, "status": 1 },
{ "vehicle": "parkinglotbasic", "x": 4, "y": 9, "chance": 75, "rotation": 270, "status": -1 },
{ "vehicle": "forklift", "x": 29, "y": 6, "chance": 75, "rotation": 180, "status": 1 },
{ "vehicle": "parkinglotbasic", "x": 6, "y": 9, "chance": 50, "rotation": 270, "status": -1 },
{ "vehicle": "flatbed_truck", "x": 11, "y": 4, "chance": 25, "rotation": 270, "status": -1 },
{ "vehicle": "SmallFlier3_Wreck", "x": 9, "y": 42, "chance": 10, "rotation": 90, "status": -1 },
{ "vehicle": "Smallflier1_Wreck", "x": 18, "y": 34, "chance": 10, "rotation": 270, "status": -1 },
{ "vehicle": "mil_helicopters", "x": 39, "y": 42, "chance": 10, "rotation": 90, "status": -1 }
{ "vehicle": "mil_helicopters", "x": 5, "y": 36, "chance": 50, "rotation": 180, "status": -1 },
{ "vehicle": "mil_helicopters", "x": 42, "y": 36, "chance": 50, "rotation": 0, "status": -1 }
]
}
},
Expand All @@ -157,17 +163,17 @@
"*********************=======================****",
"*********************=======================****",
"*********************=======================****",
"****WWWWWWWWWWWWWWWWW=======================****",
"****WbttbWbttbWSjjWhW=======================****",
"****Wb--bWb--bW-----W=======================****",
"****WL--LWL--LW-LLWhW=======================****",
"****WW+WWWW+WWW+WWWWW=======================****",
"****W-----------W&-SW=======================****",
"****WW+WWWW+WWW-WW+WW=======================****",
"****WL--LWL--LW-----+=======================****",
"****Wb--bWb--bW-WW+WW=======================****",
"****WbttbWbttbW>W&-SW===================DD==****",
"****WWWWWWWWWWWWWWWWW=======================****",
"****/////////////////=======================****",
"****/bttbWbttbWSjjWh/=======================****",
"****/b--bWb--bW-----/=======================****",
"****/L--LWL--LW-LLWh/=======================****",
"****/W+WWWW+WWW+WWWW/=======================****",
"****/-----------W&-S/=======================****",
"****/W+WWWW+WWW-WW+W/=======================****",
"****/L--LWL--LW-----x=======================****",
"****/b--bWb--bW-WW+W/=======================****",
"****/bttbWbttbW>W&-S/===================DD==****",
"****/////////////////=======================****",
"************************************************",
"************************************************",
"************************************************",
Expand Down Expand Up @@ -202,7 +208,7 @@
"=": { "item": "roof_trash", "chance": 2 },
"&": { "item": "SUS_toilet", "chance": 50 }
},
"place_monsters": [ { "monster": "GROUP_MIL_WEAK", "x": 10, "y": 20, "density": 0.5 } ],
"place_monster": [ { "group": "GROUP_MIL_WEAK", "x": [ 6, 17 ], "y": [ 17, 22 ], "repeat": [ 1, 3 ] } ],
"place_nested": [
{
"chunks": [ [ "roof_2x2_infrastructure", 40 ], [ "roof_2x2_infrastructure_2", 30 ], [ "roof_2x2_utilities", 30 ] ],
Expand Down
11 changes: 7 additions & 4 deletions data/json/mapgen_palettes/helipad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
"+": "t_door_c",
"W": "t_wall_w",
"-": "t_floor",
"w": "t_window",
"w": "t_ballistic_glass",
"G": "t_chaingate_c",
"|": "t_concrete_wall",
"/": "t_brick_wall",
"F": "t_chainfence",
"!": "t_guardrail",
"!": "t_chaingate_l",
"p": "t_pavement",
"m": "t_door_metal_c",
"y": "t_pavement_y",
Expand All @@ -25,8 +26,9 @@
"r": "t_thconc_floor",
"l": "t_thconc_floor",
"R": "t_thconc_floor",
"x": "t_door_metal_interior_locked",
"3": "t_concrete",
"s": "t_thconc_floor",
"*": "t_thconc_floor",
"7": "t_thconc_floor",
"8": "t_thconc_floor",
"M": "t_door_metal_locked",
Expand Down Expand Up @@ -70,9 +72,10 @@
"id": "helipad_palette_roof",
"terrain": {
"+": "t_door_c",
"x": "t_door_metal_interior_locked",
"W": "t_wall_w",
"/": "t_brick_wall",
"-": "t_floor",
"w": "t_window_domestic",
"*": "t_open_air",
"=": "t_flat_roof",
"R": "t_flat_roof",
Expand Down
22 changes: 11 additions & 11 deletions data/json/vehicle_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,17 +540,17 @@
[ "Medevac2", 200 ],
[ "Medevac1_Wreck", 200 ],
[ "Medevac2_Wreck", 200 ],
[ "helicopter_apache_1a", 95 ],
[ "helicopter_apache_1b", 380 ],
[ "helicopter_apache_1c", 190 ],
[ "helicopter_atomic", 15 ],
[ "helicopter_atomic_wreck", 90 ],
[ "helicopter_osprey_2a", 95 ],
[ "helicopter_osprey_2b", 380 ],
[ "helicopter_osprey_2c", 190 ],
[ "helicopter_blackhawk_3a", 95 ],
[ "helicopter_blackhawk_3b", 380 ],
[ "helicopter_blackhawk_3c", 190 ]
[ "helicopter_apache_1a", 300 ],
[ "helicopter_apache_1b", 150 ],
[ "helicopter_apache_1c", 150 ],
[ "helicopter_atomic", 50 ],
[ "helicopter_atomic_wreck", 50 ],
[ "helicopter_osprey_2a", 300 ],
[ "helicopter_osprey_2b", 150 ],
[ "helicopter_osprey_2c", 150 ],
[ "helicopter_blackhawk_3a", 300 ],
[ "helicopter_blackhawk_3b", 150 ],
[ "helicopter_blackhawk_3c", 150 ]
]
},
{
Expand Down
Loading
Loading