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

Jsonize hazardous waste sarcophagus #35998

Merged
merged 8 commits into from
Dec 25, 2019
Merged

Jsonize hazardous waste sarcophagus #35998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e33553f
Added json-variant of HWS
Night-Pryanik Dec 10, 2019
c5a2d71
Moved hadcoded varian to obsolete
Night-Pryanik Dec 10, 2019
dc6cbd9
Removed draw_sarcophagus function
Night-Pryanik Dec 10, 2019
fd2ae08
Removed hardcoded overmap special
Night-Pryanik Dec 10, 2019
c5444f6
Added reminders for removal after 0.E.
Night-Pryanik Dec 10, 2019
8556fcd
Lint
Night-Pryanik Dec 10, 2019
e635d0c
Updated mission points
Night-Pryanik Dec 10, 2019
90530c3
Merge branch 'master' into jsonize-hws
ZhilkinSerg Dec 24, 2019
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
324 changes: 324 additions & 0 deletions data/json/mapgen/hazardous_waste_sarcophagus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,324 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "haz_sar_1_2", "haz_sar_1_1" ], [ "haz_sar_1_4", "haz_sar_1_3" ] ],
"weight": 10,
"object": {
"rows": [
" :::::::::::::::: ",
" :::::::::::::::: ",
" :::::::::::::::: ",
" ffffffffffffffffffffffffffffffff:::::::|www- ",
" f ,,,,,,,,,,,,,,,,,,,,,, f:::::::wcdcw ",
" f ,,:::::::::;:::::::::, v f:::::::+.C6w ",
" f ,,:::::::::;:::::::::, |LLLLLLL--+--ff ",
" f ,,:::::::::;:::::::::,,,,,,,,:::::::,,,, f ",
" f ,,::::::::::::::::::::::::::::::::::,,,, f ",
" f ,,::::::::::::::::::::::::::::::::::, f ",
" f ,,::::::::::::::::::::::::::::::::::, f ",
" f ,,::::::::::::::::::::::::::::::::::, f ",
" f ,,::::;::::;::::;::::,,,,,,,,:::::::, f ",
" f ,,::::;::::;::::;::::,,,,,,,,:::::::, f ",
" f ,,::::;::::;::::;::::,,|-+-|-LLLLLLL-| f ",
" f ,,::::;::::;::::;::::,,|4.6|~~~~~~~~~| f ",
" f ,,,,,,,,,,,,,,,,,,,,,,,|4..`~~~~~~~~~| f ",
" f ,,,,,,,,,,,,,,,,,,,,,,,|4..`~~~~~~~~l| f ",
" f |-000--000-0*0|000-000| |4..`~~~~~~~~l| f ",
" f |dddrFFddcW..2|2..Fddd| |s..|~~~~~~~~l| f ",
" f 0dC.....Cc....*....dCr| |4..?~~~~~~~~~| f ",
" f 0............a|b...d..| |4..|~~~~~~~~4| f ",
" f 0..C...|*-|-*-|b......| |4..`::::::::4| f ",
" f |rddd1p|.l|&.s|a36561p| |s..`~~~~~~~~4| f ",
" f |-000--|--|---|-------| |4..`~~~~~~~~~| f ",
" f |4.6|6~~~~~~~~| f ",
" f ////////////////////+///LLLLLLL/// f ",
" f /////////////////////.//6~~~~~~~./// f ",
" f //.......................~~~~~~~~..// f ",
" f //.......||||............~~~~~~~~~..// f ",
" f //........|EE.......A....~~~~~~~~~~..// f ",
" f //...S....|EE......AA...~~~~~~~~~~~.9// f ",
" f //...P....|e.|.....AA..~~~~~~~~~~~~.9// f ",
" f //.``P``...............~~~~~~~~~~~~.9// f ",
" f //.`$$$`.......AAA.....~~~~~~~~~~~~.9// f ",
" f //.`$$$`6......AA......~~~~~~~~~~~~.9// f ",
" f //.`$$$`...............~~~~~~~~~~~~..// f ",
" f //.`$$$`...............~~~~~~~~~~~~..// f ",
" f //.``P``.|G|...........SS6~~~~~~~~~..// f ",
" f //...PPPPPPPPPPPPPPPPPPSS~~~~~~~~~~..// f ",
" f //......|G|..............~~~~~~~~~.// f ",
" f //.........V.V.V...........7788..// f ",
" f ///////////////////////////////// f ",
" f /////////////////////////////// f ",
" f f ",
" f f ",
" ffffffffffffffffffffffffffffffffffffffffffffff ",
" "
],
"terrain": {
" ": [
[ "t_grass", 20 ],
[ "t_grass_dead", 3 ],
[ "t_grass_tall", 5 ],
[ "t_grass_long", 3 ],
[ "t_dirt", 5 ],
[ "t_shrub", 2 ],
[ "t_tree", 1 ]
],
"f": "t_chainfence",
"|": "t_wall",
"-": "t_wall",
"/": "t_concrete_wall",
"+": "t_door_locked",
"*": "t_door_c",
"?": "t_door_locked_alarm",
"w": "t_window_alarm",
"0": [ [ "t_curtains", 10 ], [ "t_window_open", 3 ], [ "t_window_domestic", 5 ] ],
",": "t_sidewalk",
":": "t_pavement",
";": "t_pavement_y",
"1": "t_floor",
"2": "t_floor",
"3": "t_floor",
"4": "t_floor",
"5": "t_console",
"6": "t_console_broken",
"7": "t_floor",
"8": "t_floor",
"9": "t_floor",
"&": "t_floor",
"$": "t_sewage",
".": "t_floor",
"a": "t_floor",
"b": "t_floor",
"r": "t_floor",
"F": "t_floor",
"c": "t_floor",
"C": "t_floor",
"d": "t_floor",
"l": "t_floor",
"p": "t_floor",
"A": "t_floor",
"P": "t_sewage_pipe",
"S": "t_sewage_pump",
"G": "t_grate",
"E": "t_elevator",
"e": "t_elevator_control_off",
"s": "t_floor",
"v": "t_dirt",
"V": "t_vat",
"L": "t_door_metal_locked",
"W": "t_water_dispenser",
"~": "t_thconc_floor",
"`": "t_wall_glass"
},
"furniture": {
"1": "f_shredder",
"2": "f_rack_coat",
"3": "f_server",
"4": "f_utility_shelf",
"7": "f_locker",
"8": "f_utility_shelf",
"9": "f_utility_shelf",
"a": "f_air_conditioner",
"b": "f_bookcase",
"r": "f_trashcan",
"F": "f_filing_cabinet",
"A": "f_crate_c",
"c": "f_counter",
"C": "f_chair",
"d": "f_desk",
"l": "f_locker",
"p": [ "f_indoor_plant", "f_indoor_plant_y" ],
"s": "f_sink",
"v": "f_vent_pipe"
},
"toilets": { "&": { } },
"items": {
"2": { "item": "coat_rack", "chance": 60, "repeat": 2 },
"4": { "item": "toxic_dump_equipment", "chance": 85, "repeat": [ 1, 2 ] },
"7": { "item": "tools_common", "chance": 85, "repeat": [ 1, 2 ] },
"8": { "item": "tools_common", "chance": 85, "repeat": [ 1, 2 ] },
"9": { "item": "cleaning", "chance": 85, "repeat": [ 1, 2 ] },
"r": { "item": "trash_cart", "chance": 50 },
"d": { "item": "office", "chance": 50 },
"c": { "item": "office_supplies", "chance": 60 },
"b": { "item": "lab_bookshelves", "chance": 60, "repeat": 2 },
"l": { "item": "cleaning", "chance": 85, "repeat": 2 },
"F": { "item": "office_paper", "chance": 50 }
},
"place_item": [ { "item": "id_military", "x": 22, "y": 20 }, { "item": "cleansuit", "x": 28, "y": 24 } ],
"set": [ { "square": "radiation", "amount": [ 10, 30 ], "x": 0, "y": 0, "x2": 47, "y2": 47 } ],
"place_monster": [
{ "monster": "mon_hazmatbot", "x": 36, "y": 20 },
{ "monster": "mon_hazmatbot", "x": 13, "y": 29 },
{ "monster": "mon_hazmatbot", "x": 26, "y": 37 },
{ "monster": "mon_hazmatbot", "x": 22, "y": 29 }
],
"//": "There is 4th security reminder with name 'Security Reminder [1058]' and action 'sr4_mess'. Add it when our computer UI will support more than 9 options.",
"computers": {
"5": {
"name": "SRCF Security Terminal",
"security": 5,
"options": [
{ "name": "Security Reminder [1055]", "action": "sr1_mess" },
{ "name": "Security Reminder [1056]", "action": "sr2_mess" },
{ "name": "Security Reminder [1057]", "action": "sr3_mess" },
{ "name": "EPA: Report All Potential Containment Breaches [3873643]", "action": "srcf_1_mess" },
{ "name": "SRCF: Internal Memo, EPA [2918024]", "action": "srcf_2_mess" },
{ "name": "CDC: Internal Memo, Standby [2918115]", "action": "srcf_3_mess" },
{ "name": "USARMY: SEAL SRCF [987167]", "action": "srcf_seal_order" },
{ "name": "COMMAND: REACTIVATE ELEVATOR", "action": "srcf_elevator" },
{ "name": "COMMAND: SEAL SRCF [4423]", "action": "srcf_seal" }
],
"failures": [ { "action": "alarm" } ]
}
},
"place_vehicles": [ { "vehicle": "military_cargo_truck", "x": 37, "y": 35, "chance": 25, "status": 1, "rotation": 90, "fuel": 40 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "haz_sar_b_2", "haz_sar_b_1" ], [ "haz_sar_b_4", "haz_sar_b_3" ] ],
"weight": 10,
"object": {
"rows": [
"###|-------------------|-------------------|####",
"###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####",
"###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####",
"###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####",
"###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####",
"###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####",
"###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####",
"###|~~~~~~~~~~~~~~~~~~~|~~~~~~~~~~~~~~~~~~~|####",
"###|----|~~~~~~~~~|----|----|~~~~~~~~~|----|####",
"########|--LLLLL--|#########|--LLLLL--|#########",
"####### ^ ### #### ^###########",
"###### ###########",
"#### ############",
"### #|---------|",
"# |~~~~~~~~~|",
"## L~~~~~~~~~|",
"## L~~~~~~~~~|",
"# L~~~~~~~~~|",
"## L~~~~~~~~~|",
"### L~~~~~~~~~|",
"## ^|~~~~~~~~~|",
"### #|---------|",
"#### |+%%-| #############",
"#### |....| ^ #############",
"####|-%%%%-|-%%+|-|-LLLLL-| #|---------|",
"####|a....8|a....W|^.....a| |~~~~~~~~~|",
"####|.c5c..*......*.......| L~~~~~~~~~|",
"####|.cC..F|...|--|......8| L~~~~~~~~~|",
"####|.c....%...|99|......8| L~~~~~~~~~|",
"####|......%...+..|......8| L~~~~~~~~~|",
"####|l...C.%...|--|-L-|---| L~~~~~~~~~|",
"####|l.Fddd|...*EE|l..|#### ^|~~~~~~~~~|",
"####|-|----|...*EE|l..|#### #|---------|",
"######|....*...|e||-+-|## ############",
"######|&rsa|...|-|## ### #############",
"######|----|---|#### ##############",
"################### ###############",
"#####|----------|# |----------|####",
"#####|~~~~~~~~~~|^ |~~~~~~~~~~|####",
"#####|~~~~~~~~~~L L~~~~~~~~~~|####",
"#####|~~~~~~~~~~L L~~~~~~~~~~|####",
"#####|~~~~~~~~~~L L~~~~~~~~~~|####",
"#####|~~~~~~~~~~L L~~~~~~~~~~|####",
"#####|~~~~~~~~~~L L~~~~~~~~~~|####",
"#####|~~~~~~~~~~| ^|~~~~~~~~~~|####",
"#####|----------| ###|----------|####",
"####################### ## ####################",
"################################################"
],
"terrain": {
" ": "t_rock_floor",
".": "t_metal_floor",
"&": "t_metal_floor",
"a": "t_metal_floor",
"l": "t_metal_floor",
"s": "t_metal_floor",
"r": "t_metal_floor",
"c": "t_metal_floor",
"C": "t_metal_floor",
"d": "t_metal_floor",
"8": "t_metal_floor",
"9": "t_metal_floor",
"F": "t_metal_floor",
"|": "t_concrete_wall",
"-": "t_concrete_wall",
"+": "t_door_metal_c",
"*": "t_door_metal_c",
"L": "t_door_metal_locked",
"#": "t_rock",
"^": "t_gates_control_concrete",
"%": "t_reinforced_glass",
"E": "t_elevator",
"e": "t_elevator_control_off",
"5": "t_console",
"W": "t_water_dispenser",
"~": [ [ "t_sewage", 55 ], [ "t_dirtfloor", 25 ], [ "t_dirtmound", 20 ] ]
},
"furniture": {
"s": "f_sink",
"r": "f_trashcan",
"d": "f_desk",
"c": "f_counter",
"C": "f_chair",
"l": "f_locker",
"8": "f_utility_shelf",
"9": "f_utility_shelf",
"a": "f_air_conditioner",
"F": "f_filing_cabinet",
"~": [ [ "f_null", 50 ], [ "f_wreckage", 50 ] ]
},
"toilets": { "&": { } },
"items": {
"8": { "item": "mechanics", "chance": 60, "repeat": [ 1, 2 ] },
"9": { "item": "sewage_plant", "chance": 60, "repeat": [ 1, 2 ] },
"r": { "item": "trash_cart", "chance": 50 },
"d": { "item": "office", "chance": 50 },
"c": { "item": "office_supplies", "chance": 60 },
"l": { "item": "cleaning", "chance": 60, "repeat": 2 },
"F": { "item": "office_paper", "chance": 50 },
" ": { "item": "corpse_and_science", "chance": 1 },
"~": [ { "item": "trash", "chance": 50 }, { "item": "sewer", "chance": 50 }, { "item": "nanomaterials", "chance": 3 } ]
},
"place_item": [ { "item": "sarcophagus_access_code", "x": 20, "y": 31 } ],
"set": [ { "square": "radiation", "amount": [ 10, 70 ], "x": 0, "y": 0, "x2": 47, "y2": 47 } ],
"monster": { " ": { "monster": "mon_zombie", "chance": 10 } },
"monsters": { "~": { "monster": "GROUP_VANILLA", "chance": 20, "density": 0.1 } },
"computers": {
"5": {
"name": "SRCF Security Terminal",
"security": 5,
"options": [
{ "name": "Security Reminder [1055]", "action": "sr1_mess" },
{ "name": "Security Reminder [1056]", "action": "sr2_mess" },
{ "name": "Security Reminder [1057]", "action": "sr3_mess" },
{ "name": "Security Reminder [1058]", "action": "sr4_mess" },
{ "name": "EPA: Report All Potential Containment Breaches [3873643]", "action": "srcf_1_mess" },
{ "name": "SRCF: Internal Memo, EPA [2918024]", "action": "srcf_2_mess" },
{ "name": "CDC: Internal Memo, Standby [2918115]", "action": "srcf_3_mess" },
{ "name": "USARMY: SEAL SRCF [987167]", "action": "srcf_seal_order" },
{ "name": "COMMAND: REACTIVATE ELEVATOR", "action": "srcf_elevator" }
],
"failures": [ { "action": "alarm" } ]
}
}
}
},
{
"id": "corpse_and_science",
"type": "item_group",
"subtype": "collection",
"entries": [ { "item": "corpse_generic_human", "prob": 100 }, { "group": "science", "prob": 100 } ]
},
{
"id": "nanomaterials",
"type": "item_group",
"entries": [ { "item": "nanomaterial", "prob": 100 } ]
}
]
4 changes: 2 additions & 2 deletions data/json/npcs/missiondef.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"value": 50000,
"start": {
"effect": [ "follow", { "u_buy_item": "sarcophagus_access_code" } ],
"assign_mission_target": { "om_terrain": "haz_sar", "om_special": "Hazardous Waste Sarcophagus", "reveal_radius": 3 }
"assign_mission_target": { "om_terrain": "haz_sar_1_1", "om_special": "Hazardous Waste Sarcophagus", "reveal_radius": 3 }
},
"origins": [ "ORIGIN_SECONDARY" ],
"destination": "haz_sar_b1",
"destination": "haz_sar_b_1",
"dialogue": {
"describe": "You wouldn't believe what I found...",
"offer": "Holy hell, the crash you recovered the black box from wasn't as old as I thought. Check this out, it was on its approach to pick up a team sent to secure and destroy something called a 'Hazardous Waste Sarcophagus' in the middle of nowhere. If the bird never picked up the team then we may still have a chance to meet up with them. It includes an access code for the elevator and an encoded message for the team leader, I guess. If we want to join up with what remains of the government then now may be our only chance.",
Expand Down
4 changes: 4 additions & 0 deletions data/json/obsolete_terrains.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,10 @@
"dairy_farm_SE",
"megastore",
"megastore_entrance",
"haz_sar_entrance",
"haz_sar",
"haz_sar_entrance_b1",
"haz_sar_b1",
"house_base_north",
"house_base_south",
"house_base_east",
Expand Down
16 changes: 8 additions & 8 deletions data/json/overmap/overmap_special/specials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,14 +1089,14 @@
"id": "Hazardous Waste Sarcophagus",
"overmaps": [
{ "point": [ 1, -1, 0 ], "overmap": "road_end_north" },
{ "point": [ 0, 0, 0 ], "overmap": "haz_sar_north" },
{ "point": [ 1, 0, 0 ], "overmap": "haz_sar_entrance_north" },
{ "point": [ 0, 1, 0 ], "overmap": "haz_sar_north" },
{ "point": [ 1, 1, 0 ], "overmap": "haz_sar_north" },
{ "point": [ 0, 0, -2 ], "overmap": "haz_sar_b1_north" },
{ "point": [ 1, 0, -2 ], "overmap": "haz_sar_entrance_b1_north" },
{ "point": [ 0, 1, -2 ], "overmap": "haz_sar_b1_north" },
{ "point": [ 1, 1, -2 ], "overmap": "haz_sar_b1_north" }
{ "point": [ 1, 0, 0 ], "overmap": "haz_sar_1_1_north" },
{ "point": [ 0, 0, 0 ], "overmap": "haz_sar_1_2_north" },
{ "point": [ 1, 1, 0 ], "overmap": "haz_sar_1_3_north" },
{ "point": [ 0, 1, 0 ], "overmap": "haz_sar_1_4_north" },
{ "point": [ 1, 0, -2 ], "overmap": "haz_sar_b_1_north" },
{ "point": [ 0, 0, -2 ], "overmap": "haz_sar_b_2_north" },
{ "point": [ 1, 1, -2 ], "overmap": "haz_sar_b_3_north" },
{ "point": [ 0, 1, -2 ], "overmap": "haz_sar_b_4_north" }
],
"connections": [ { "point": [ 1, -1, 0 ] } ],
"locations": [ "land" ],
Expand Down
Loading