-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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.
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
Adds military helipad location #36732
Merged
Merged
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e2a131e
Adds military helipad location
CountAlex 229e685
JSON fixes.
CountAlex fcfafc7
Moster placing fix.
CountAlex d12eb26
Terrain id fix.
CountAlex 49ea7e4
Replace mech lifter with a forklift.
CountAlex adcc332
Review changes
CountAlex 06da44a
Set of small fixes - spawns etc.
CountAlex b8c0499
Reduce number of perimeter turrets to 4.
CountAlex File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,215 @@ | ||
| [ | ||
| { | ||
| "method": "json", | ||
| "om_terrain": [ [ "helipad_nw", "helipad_ne" ], [ "helipad_sw", "helipad_se" ] ], | ||
| "type": "mapgen", | ||
| "weight": 500, | ||
| "object": { | ||
| "fill_ter": "t_floor", | ||
| "rows": [ | ||
| "FFF.......pppppppp...........................FFF", | ||
| "FTFFWWWWWF!!!!!!!!FFFFFFFFFFFFFFFFFFFFFFFFFFFFTF", | ||
| "FFG.W4ddw.pppppppp...........................GFF", | ||
| ".F..W-c?w.pppppppp...|||||||||||||||||||||||..F.", | ||
| ".F..WmWWW.pppppppp...|%_____________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___C___B__C__B____|..F.", | ||
| ".F..pppppyppppyppp...|____C___B____________|..F.", | ||
| ".F..pppppyppppypppooom___________B______%__|..F.", | ||
| ".F..pppppyppppyppp...||||||||m|MMMMMMMMM||||..F.", | ||
| ".F..pppppyppppyppp...|_rrrr|y___________%__|..F.", | ||
| ".F..............oo...|_____|_______________|..F.", | ||
| "FFF.............oo...|_rrrr|_____________RR|.FFF", | ||
| "FTG.WwWWwWwwWwwW++WwW|M|||||_____________sR|.GTF", | ||
| "FFF.W----+-----+-----m_____m___IIIIIIIII_75|.FFF", | ||
| ".F..W-?ddWdc--dW--WWW|||||||___IUUUUUUUI___|..F.", | ||
| ".F..Wy-cfWd?f?dW--W&W|_____m___IUUUUUUUI_RR|..F.", | ||
| ".F..WWWWWWWWWWWWy-+-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-y-2W<--WhW|lllll|___IUUUUUUUI%__|..F.", | ||
| ".F..WWwwwWwwwWWW++WWW||||||||m|MMMMMMMMM||||..F.", | ||
| ".F.......3P.....oo...........o.=========6666..F.", | ||
| ".F..========================================..F.", | ||
| ".F..========================================..F.", | ||
| ".F..========================================..F.", | ||
| "FFF.========================================.FFF", | ||
| "FTG..o,,,,,o..o,,,,,,,,,,,,,,,,,,o..o,,,,,o..GTF", | ||
| "FFF..o=====o..o==================o..o=====o..FFF", | ||
| ".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.", | ||
| ".F..==========o==================o==========..F.", | ||
| "FFG............FGF............FGF............GFF", | ||
| "FTFFFFFFFFFFFFFFTFFFFFFFFFFFFFFTFFFFFFFFFFFFFFTF", | ||
| "FFF............FFF............FFF............FFF" | ||
| ], | ||
| "palettes": [ "helipad_palette" ], | ||
| "toilets": { "&": { } }, | ||
| "gaspumps": { "$": { } }, | ||
| "items": { | ||
| "B": { | ||
| "item": { | ||
| "subtype": "distribution", | ||
| "entries": [ | ||
| { "item": "gasoline", "charges": [ 0, 80 ], "container-item": "30gal_drum", "prob": 25 }, | ||
| { "item": "motor_oil", "charges": [ 0, 30 ], "container-item": "jerrycan", "prob": 5 }, | ||
| { "item": "30gal_drum", "prob": 70 } | ||
| ] | ||
| }, | ||
| "chance": 75 | ||
| }, | ||
| "C": { | ||
| "item": { | ||
| "subtype": "distribution", | ||
| "entries": [ | ||
| { "group": "military_patrol_food", "prob": 50 }, | ||
| { "group": "infantry_common_gear", "prob": 5 }, | ||
| { "group": "mil_food", "prob": 40 }, | ||
| { "group": "infantry_medical_gear", "prob": 5 }, | ||
| { "group": "supplies_metal", "prob": 150 }, | ||
| { "group": "supplies_mechanics", "prob": 50 } | ||
| ] | ||
| }, | ||
| "chance": 75, | ||
| "repeat": [ 3, 5 ] | ||
| }, | ||
| "r": { | ||
| "item": { | ||
| "subtype": "distribution", | ||
| "entries": [ { "group": "military_standard_assault_rifles", "prob": 45 }, { "group": "military_standard_shotguns", "prob": 5 } ] | ||
| }, | ||
| "chance": 10 | ||
| }, | ||
| "l": { | ||
| "item": { | ||
| "subtype": "distribution", | ||
| "entries": [ | ||
| { "group": "army_personal_locker", "prob": 50 }, | ||
| { "group": "military_patrol_food", "prob": 25 }, | ||
| { "group": "supplies_plumbing", "prob": 50 } | ||
| ] | ||
| }, | ||
| "chance": 33, | ||
| "repeat": [ 1, 5 ] | ||
| }, | ||
| "L": { "item": "army_personal_locker", "repeat": [ 0, 4 ] }, | ||
| "d": { "item": "SUS_office_desk" }, | ||
| "f": { "item": "SUS_office_filing_cabinet" }, | ||
| "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_fridge" }, | ||
| "O": { "item": "SUS_oven" }, | ||
| "H": { "item": "SUS_spice_collection" } | ||
| }, | ||
| "place_monsters": [ | ||
CountAlex marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { "monster": "GROUP_MIL_WEAK", "x": 32, "y": 15, "density": 0.75 }, | ||
| { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 15 } | ||
| ], | ||
| "monster": { "T": { "monster": "mon_turret_rifle" } }, | ||
| "place_vehicles": [ | ||
| { "vehicle": "forklift", "x": 29, "y": 6, "rotation": 180, "status": 1 }, | ||
| { "vehicle": "parkinglotbasic", "x": 4, "y": 9, "chance": 75, "rotation": 270, "status": -1 }, | ||
| { "vehicle": "flatbed_truck", "x": 11, "y": 4, "chance": 25, "rotation": 90, "status": -1 }, | ||
| { "vehicle": "helicopter_wreck_3a", "x": 5, "y": 34, "chance": 50, "rotation": 90, "status": -1 }, | ||
| { "vehicle": "helicopter_wreck_1a", "x": 18, "y": 34, "chance": 25, "rotation": 270, "status": -1 }, | ||
| { "vehicle": "helicopter_wreck_3a", "x": 32, "y": 34, "chance": 75, "rotation": 90, "status": -1 } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "method": "json", | ||
| "om_terrain": [ [ "helipad2f_nw", "helipad2f_ne" ], [ "helipad2f_sw", "helipad2f_se" ] ], | ||
| "type": "mapgen", | ||
| "weight": 500, | ||
| "object": { | ||
| "fill_ter": "t_floor", | ||
| "rows": [ | ||
| "************************************************", | ||
| "****RRRRR***************************************", | ||
| "****RRRRR***************************************", | ||
| "****RRRRR************=======================****", | ||
| "****RRRRR************=======================****", | ||
| "*********************=======================****", | ||
| "*********************=======================****", | ||
| "*********************=======================****", | ||
| "*********************=======================****", | ||
| "*********************=======================****", | ||
| "*********************=======================****", | ||
| "*********************=======================****", | ||
| "*********************=======================****", | ||
| "*********************=======================****", | ||
| "*********************=======================****", | ||
| "****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=======================****", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************", | ||
| "************************************************" | ||
| ], | ||
| "palettes": [ "helipad_palette_roof" ], | ||
| "toilets": { "&": { } }, | ||
| "items": { | ||
| "t": { "item": "bedroom", "chance": 50, "repeat": [ 0, 4 ] }, | ||
| "b": { "item": "bed", "repeat": [ 0, 3 ] }, | ||
| "h": { "item": "SUS_bathroom_sink" }, | ||
| "L": { "item": "army_personal_locker" }, | ||
| "=": { "item": "roof_trash", "chance": 2 }, | ||
| "&": { "item": "SUS_toilet" } | ||
| }, | ||
| "place_monsters": [ { "monster": "GROUP_MIL_WEAK", "x": 10, "y": 20, "density": 0.5 } ], | ||
| "place_nested": [ | ||
| { | ||
| "chunks": [ [ "roof_2x2_infrastructure", 40 ], [ "roof_2x2_infrastructure_2", 30 ], [ "roof_2x2_utilities", 30 ] ], | ||
| "x": [ 24, 42 ], | ||
| "y": [ 4, 13 ] | ||
| }, | ||
| { | ||
| "chunks": [ [ "roof_2x2_infrastructure", 40 ], [ "roof_2x2_infrastructure_2", 30 ], [ "roof_2x2_utilities", 30 ] ], | ||
| "x": [ 24, 42 ], | ||
| "y": [ 14, 22 ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| [ | ||
| { | ||
| "type": "palette", | ||
| "id": "helipad_palette", | ||
| "terrain": { | ||
| "+": "t_door_c", | ||
| "W": "t_wall_w", | ||
| "-": "t_floor", | ||
| "w": "t_window", | ||
| "G": "t_chaingate_l", | ||
| "|": "t_concrete_wall", | ||
| "F": "t_fence_barbed", | ||
| "!": "t_guardrail", | ||
| "p": "t_pavement", | ||
| "m": "t_door_metal_c", | ||
| "y": "t_pavement_y", | ||
| ".": "t_grass", | ||
CountAlex marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "T": "t_grass", | ||
CountAlex marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "=": "t_concrete", | ||
| "%": "t_gates_mech_control", | ||
| "_": "t_thconc_floor", | ||
| "B": "t_thconc_floor", | ||
| "C": "t_thconc_floor", | ||
| "r": "t_thconc_floor", | ||
| "l": "t_thconc_floor", | ||
| "R": "t_thconc_floor", | ||
| "s": "t_thconc_floor", | ||
| "*": "t_thconc_floor", | ||
| "M": "t_door_metal_locked", | ||
| ",": "t_concrete_y", | ||
| "o": "t_sidewalk", | ||
| "?": "t_console_broken", | ||
| "g": "t_generator_broken", | ||
| "P": "t_water_pump", | ||
| "5": "t_machinery_light", | ||
| "6": "t_bulk_tank", | ||
| "I": "t_thconc_y", | ||
| "U": "t_metal_floor" | ||
| }, | ||
| "furniture": { | ||
| "C": "f_crate_c", | ||
| "r": "f_rack", | ||
| "y": [ "f_indoor_plant_y", "f_indoor_plant" ], | ||
| "L": "f_locker", | ||
| "4": "f_locker", | ||
| "c": "f_chair", | ||
| "s": "f_chair", | ||
| "l": "f_utility_shelf", | ||
| "d": "f_desk", | ||
| "f": "f_filing_cabinet", | ||
| "[": "f_fridge", | ||
| "O": "f_oven", | ||
| "S": "f_sink", | ||
| "t": "f_table", | ||
| "R": "f_workbench", | ||
| "3": "f_standing_tank", | ||
| "H": "f_cupboard", | ||
| "7": "f_drill_press", | ||
| "8": "f_router" | ||
| } | ||
| }, | ||
| { | ||
| "type": "palette", | ||
| "id": "helipad_palette_roof", | ||
| "terrain": { | ||
| "+": "t_door_c", | ||
| "W": "t_wall_w", | ||
| "-": "t_floor", | ||
| "w": "t_window_domestic", | ||
| "*": "t_open_air", | ||
| "=": "t_flat_roof", | ||
| "R": "t_flat_roof" | ||
| }, | ||
| "furniture": { "L": "f_locker", "b": "f_bed", "h": "f_shower", "S": "f_sink", "t": "f_table", "D": "f_small_satelitte_dish" } | ||
| } | ||
| ] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems like something that could be defined in an itemgroup, perhaps in supplies.json. I can see other people having use for drums of gasoline and motor oil
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added it as you suggested. I will give it some test about spawned amounts - I am not sure how charges work with fuels exactly. Besides I'd like to have some opinion on how much fuel spawned barrels should have.
I also think motor oil might need to have different container than plastic jerrycan.