Skip to content

Commit

Permalink
Mapgen fixes for Erk maps
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbytheway
jbytheway committed Feb 8, 2020
1 parent b39f862 commit dcf4d47
Show file tree
Hide file tree
Showing 8 changed files with 81 additions and 39 deletions.
10 changes: 5 additions & 5 deletions data/json/mapgen/basement/basements.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^######################^",
"^#||||||||||||||||||||#^",
"^#|9..|.?..CCCNNNUUUU|#^",
"^#|???+.....?.......U|#^",
"^#|tCS|........?....U|#^",
"^#|9..|....CCCNNNUUUU|#^",
"^#|...+.............U|#^",
"^#|tCS|.............U|#^",
"^#||||||...CCCCCCUUUU|#^",
"^#| ||+|####|||||||#^",
"^#| | << !! |#^",
Expand Down Expand Up @@ -83,8 +83,8 @@
"^######################^",
"^#||||||||||||||||||||#^",
"^#|9..|....CCCNNNUUUU|#^",
"^#|???+...?...?.....U|#^",
"^#|tCS|....?...?....U|#^",
"^#|...+.............U|#^",
"^#|tCS|.............U|#^",
"^#||||||...CCCCCCUUUU|#^",
"^#| ||+|####|||||||#^",
"^#| | |#^",
Expand Down
4 changes: 3 additions & 1 deletion data/json/mapgen/lab/lab_common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
"h": "f_chair",
"f": "f_fridge",
"t": "f_table",
"i": "f_filing_cabinet",
"c": "f_counter",
"S": "f_sink",
"T": "f_toilet",
"#": "f_null",
"]": "f_bookcase"
"]": "f_bookcase",
"^": "f_rubble_rock"
},
"terrain": {
"6": "t_console",
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/lab/lab_surface/lab_surface_nested.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@
"rotation": [ 0, 3 ],
"rows": [
"bb dd",
"bs cX",
"bs cx",
" ",
"bs f",
"bbSDC"
Expand Down Expand Up @@ -1137,7 +1137,7 @@
"mapgensize": [ 11, 11 ],
"rotation": [ 0, 3 ],
"rows": [
"AACttt6c ",
"AACtttUc ",
"t ",
"AACtttU U",
"t U",
Expand Down
3 changes: 2 additions & 1 deletion data/json/mapgen/mansion.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,8 @@
"m": { "item": "tool_common_stack", "chance": 100 },
"n": { "item": "cannedfood", "chance": 30 },
"r": { "item": "mansion_ammo", "chance": 40 },
"v": { "item": "a_television", "chance": 100 }
"v": { "item": "a_television", "chance": 100 },
"{": { "item": "suit_of_armor", "chance": 100 }
},
"place_monsters": [ { "monster": "GROUP_MANSION", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
}
Expand Down
8 changes: 4 additions & 4 deletions data/json/mapgen/mi-go/mi-go_encampment.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@
"__vvvvvv__________vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv",
"__vvvv|||___________vvvvvvvv|||||vvvvvvvvvvvvvvv",
"___v|||i||___________vvvvvv||OOO||vvvppppvvvvvvv",
"____|> <|___________vvvvv||} >|vpp,,,,,,Fvvvv",
"___|| }|______||____vvvv|P i V|vp,,,,,,,,,vvv",
"____|> <|___________vvvvv||{ >|vpp,,,,,,Fvvvv",
"___|| {|______||____vvvv|P i V|vp,,,,,,,,,vvv",
"___|PPPP||______||____vvvv|P |||p,,,,,,,,,,,vv",
"___||||||_____________vvvv|P Y ,,,,,,,,,,,,,vv",
"______________________vvvv|||O Y ,,,,,,,,,,,,,vv",
"___||||||_____________vvvv|P + ,,,,,,,,,,,,,vv",
"______________________vvvv|||O + ,,,,,,,,,,,,,vv",
"_____________________vvvvvvv||||||p,,,,,,,,,,vvv",
"_____________________vvvvvvvvvvvvvppp,,,,,,Fvvvv",
"_____________________vvvvvvvvvvvvvvvvvvvvvvvvvvv",
Expand Down
18 changes: 9 additions & 9 deletions data/json/mapgen/mi-go/mi-go_nested.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@
"....|||PPPP|||....",
"..|||PP #1|||..",
"|||PP i ### ||.",
"|< } #2 |.",
"|< { #2 |.",
"|| VnV i ###||",
"@|i nnn #3|",
"@|i nnn i # |",
"@+ VnV ###||",
"|| i #4 |.",
"|P } ### ###|.",
"|P { ### ###|.",
"+ i # ####5||.",
"|||PPPP #7#6 |||..",
"@@||||||||# ||....",
Expand Down Expand Up @@ -168,7 +168,7 @@
".|+|||||",
"|| ||",
"|V i |",
"|i }i |",
"|i {i |",
"|V +",
"||PPPP||",
".|||||||",
Expand All @@ -191,7 +191,7 @@
"|| ### |",
"|P ###",
"|P iV # ",
"|P i} #|",
"|P i{ #|",
"+ ||",
"|###|+|@",
"|| ||@@@"
Expand Down Expand Up @@ -219,9 +219,9 @@
"|P PPP",
"|P P i ",
"| V ",
"| } ",
"|V } ",
"|||V } ",
"| { ",
"|V { ",
"|||V { ",
"@@|||V ",
"@@@@||||+"
],
Expand Down Expand Up @@ -408,13 +408,13 @@
"vvvv|||PPPP|||vvvv",
"vv|||PP #1|||vv",
"|||PP i ### ||v",
"|< } #2 |v",
"|< { #2 |v",
"|> VnV i ###||",
"@|i nnn #3|",
"@|i nnn i # |",
"@+ VnV ###||",
"|| i #4 |v",
"|P } ### ###|v",
"|P { ### ###|v",
"| i # ####5||v",
"|||PPPP #7#6 |||vv",
"@@||||||||# ||vvvv",
Expand Down
60 changes: 44 additions & 16 deletions data/json/mapgen/nested/shelter_nested.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@
" | =........c..x| ",
" |||||:||+|:||||| "
],
"terrain": { "x": "t_console_broken" },
"terrain": {
":": [ "t_window_frame", "t_window_no_curtains" ],
"+": [ "t_door_c", "t_door_b" ],
"=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ],
"x": "t_console_broken"
},
"furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
"computers": {
"6": {
Expand Down Expand Up @@ -222,15 +227,20 @@
" |...........cc.| ",
" |.bbbbb........| ",
" |.......l|||...| ",
" |.-----.l| =...| ",
" |.|||||.l| =...| ",
" :.......l|||...: ",
" |.b.b.b...c|-+-| ",
" |.b.b.b...c||+|| ",
" |.b.b.b...c|..l| ",
" |.b.b.b...c|..l| ",
" |..........|..l| ",
" |||||:||+|:||||| "
],
"terrain": { "x": "t_console_broken" },
"terrain": {
"x": "t_console_broken",
":": [ "t_window_frame", "t_window" ],
"+": [ "t_door_c", "t_door_b" ],
"=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ]
},
"furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
"computers": {
"6": {
Expand Down Expand Up @@ -275,9 +285,9 @@
" |...........cc.| ",
" |.bbbbb........| ",
" |.......l|||...| ",
" |.-----.l| =...| ",
" |.|||||.l| =...| ",
" :.......l|||...: ",
" |.b.b.b...c|-+-| ",
" |.b.b.b...c||+|| ",
" |.b.b.b...c|..l| ",
" |.b.b.b...c|..l| ",
" |..........|..l| ",
Expand Down Expand Up @@ -333,6 +343,16 @@
],
"terrain": { " ": "t_null" },
"furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
"computers": {
"6": {
"name": "Evac shelter computer",
"options": [
{ "name": "Emergency Message", "action": "emerg_mess" },
{ "name": "Disable External Power", "action": "complete_disable_external_power" },
{ "name": "Contact Us", "action": "emerg_ref_center" }
]
}
},
"items": { "l": { "item": "SUS_evac_shelter_locker", "chance": 70 }, "c": { "item": "SUS_evac_shelter_cabinet", "chance": 50 } }
}
},
Expand All @@ -353,22 +373,28 @@
" |||||||||%......l| ",
" |*|cccc6........l| ",
" |.=.............l| ",
" |--|.............||| ",
" ||||.............||| ",
" |b.....bbbbb...b..b| ",
" :b..b..........b..b: ",
" |b..b...llll...b..b| ",
" |b..b...|--|...b..b| ",
" |b..b...||||...b..b| ",
" |b..b..........b..b| ",
" |b..b..........b..b| ",
" :b..b...|--|...b..b: ",
" :b..b...||||...b..b: ",
" |b..b...llll...b..b| ",
" |b..b..........b..b| ",
" |--.....bbbb.....||| ",
" |||.....bbbb.....||| ",
" |l..............x| ",
" ||||||||||......c| ",
" ||:|+|:|| "
],
"terrain": { "x": "t_console_broken" },
"terrain": {
":": [ "t_window_frame", "t_window_no_curtains" ],
"+": [ "t_door_c", "t_door_b" ],
"=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ],
"*": "t_ladder_up",
"x": "t_console_broken"
},
"furniture": { "b": "f_bench", "c": "f_cupboard", "l": "f_locker", "S": "f_sink", "%": "f_trashcan" },
"computers": {
"6": {
Expand Down Expand Up @@ -410,17 +436,17 @@
" |||||||||%......l| ",
" |*|cccc6........l| ",
" |.=.............l| ",
" |--|.............||| ",
" ||||.............||| ",
" |b.....bbbbb...b..b| ",
" :b..b..........b..b: ",
" |b..b...llll...b..b| ",
" |b..b...|--|...b..b| ",
" |b..b...||||...b..b| ",
" |b..b..........b..b| ",
" |b..b..........b..b| ",
" :b..b...|--|...b..b: ",
" :b..b...||||...b..b: ",
" |b..b..........b..b| ",
" |b..b..........b..b| ",
" |--.....bbbb.....||| ",
" |||.....bbbb.....||| ",
" |l..............x| ",
" ||||||||||......c| ",
" ||:|+|:|| "
Expand All @@ -429,7 +455,9 @@
":": [ "t_window_frame", "t_window" ],
"+": [ "t_door_c", "t_door_b" ],
"=": [ "t_door_b", "t_door_locked_interior", "t_door_c", "t_door_o" ],
"6": [ "t_console", "t_console_broken" ]
"*": "t_ladder_up",
"6": [ "t_console", "t_console_broken" ],
"x": "t_console_broken"
},
"furniture": { "b": "f_bench", "c": "f_cupboard", "l": [ [ "f_locker", 2 ], "f_wreckage" ], "S": "f_sink", "%": "f_trashcan" },
"items": {
Expand Down
13 changes: 12 additions & 1 deletion data/json/mapgen_palettes/mi-go_palette.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,19 @@
{
"type": "palette",
"id": "mi-go_palette",
"//": "Please don't assign numbers in this palette: due to the weird shape of rooms, numbers are used to identify nested map IDs.",
"//": "Due to the weird shape of rooms, numbers (and the letter a) are used to identify nested map IDs, so they have no special meaning in the palette.",
"terrain": {
"0": "t_floor_resin",
"1": "t_floor_resin",
"2": "t_floor_resin",
"3": "t_floor_resin",
"4": "t_floor_resin",
"5": "t_floor_resin",
"6": "t_floor_resin",
"7": "t_floor_resin",
"8": "t_floor_resin",
"9": "t_floor_resin",
"a": "t_floor_resin",
" ": "t_floor_resin",
",": "t_platform_resin",
"|": "t_wall_resin",
Expand Down

0 comments on commit dcf4d47

Please sign in to comment.