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

map fixes #40113

Merged
merged 2 commits into from
May 4, 2020
Merged

map fixes #40113

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
24827f6
map fixes
curstwist May 3, 2020
f3933dc
Update data/json/mapgen/campus/buildings/admin_f0.json
curstwist May 3, 2020
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
32 changes: 16 additions & 16 deletions data/json/mapgen/campus/buildings/admin_f0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@
"__|,,,,,,,,,,,,|________",
"__|,,,,,,,,,,,,|________",
"__|,,,,,,,,,,,,|________",
"bb|,,,,,,,,,,,,||||||||||",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,||||||||",
"bb|,,,,,,,,,,,,|||||||||",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,,,,,,,|",
"..|,,,,,,,,,,,,,,|||||||",
".||,,,,,,,,,,,,,,|.....b",
".|,,,,,,,,,,,,,,,|.....b",
".|,,,,,,,,,,,,,,,|.....b",
Expand Down
32 changes: 16 additions & 16 deletions data/json/mapgen/campus/buildings/admin_f1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@
" |,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,||||||||||",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,||||||||",
" |,,,,,,,,,,,,|||||||||",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,,,,,,,|",
" |,,,,,,,,,,,,,,|||||||",
" ||,,,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,,,,| ",
" |,,,,,,,,,,,,,,,| ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/dumpsite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"........................",
"........................",
"..........^^^^.^........",
".......q^^__^_^_qq.......",
".......q^^__^_^_qq......",
".......q.________^q.....",
".....q^qq^______^^.q....",
"....q^^qq_______^^q.....",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/hotel_tower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"******%c..BB|h..BB|o..BB|o..BB|c..BB|BB..h|BB..c|BB..c|BB..h|BB..c%*****",
"******%....d|th..d|....d|....d|....d|d..ht|d....|dL...|d..ht|d....%*****",
"******%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%%www%%*****",
"*************************************************************************"
"************************************************************************"
],
"palettes": [ "hotel_tower_palette.json" ],
"terrain": { "+": [ "t_door_c", "t_door_c", "t_door_o" ], "w": "t_window_domestic" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house05_ab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
".# | #.",
".# | #.",
".####oo#########oo#####.",
"............^............"
"............^..........."
],
"set": [
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/megastore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2194,7 +2194,7 @@
"########################",
"########################",
"####----------------####",
"####| | ####",
"####| | ###",
"####| -----",
"####|I I ",
"####| ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/steel_mill/steel_mill_z1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"fill_ter": "t_thconc_floor",
"rows": [
"vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv._______,,_______.vvvvvvvvvvvvvvvvvvvvvvvvvvv",
"v..................................................._______,,_______............................v",
"v..................................................._______,,_______...........................v",
"v..................................................___________________________________,,,,,,,,.v",
"v....]]]]]]]]]]]]**]]]**]]**]]**].................____________________________________________.v",
"v....]ee]ee]<< #ch #ch #Sch S]-------------..._____________________________________________.v",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/steel_mill/steel_mill_z2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"object": {
"fill_ter": "t_carpet_concrete",
"rows": [
":::::::::::::::::::::::::::::::1:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::::::::::::::::::::::::::::1::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
"::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
"::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
":::::]]]]]]]]]]]]**]]]**]]**]]**]:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/trailhead.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
";;;...................;;",
";;;...................;;",
";;... ..;;;",
";;... . . . .;;;;",
";;... . . . .;;;",
";;;.. . ;;;;;",
";;;;. . . . ;;;;;",
";;;;; ;;;;;",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/worldgen/black_dragon_lair.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
"X XXXXX XXX XXXXXX << XXXXXXX << XXXX",
"X XXXXX XXX XXXXXXXXXXXXXX XX XXX << XXXX",
"X XXXX XX XXX XXXXXXXXX XX XXXXX XXX",
"X XXX << XX XXX XXXXXX XXXX",
"X XXX << XX XXX XXXXXX XXX",
"X XXX << XX XX XX XXXX XXX",
"X XXX XXX XX XX XXX XXXXXXX XX",
"X XXXX XXX X XXXX XXX XXXXXX XXX X",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/mapspecials_demo/megastore/mega_2brc_01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"########################",
"########################",
"####----------------####",
"####| | ####",
"####| | ###",
"####| -----",
"####|I I ",
"####| ",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/mapspecials_demo/missile_silo/silo_utlca_01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"##............x.########",
"##..............X##..###",
"##.x.X..X............---",
"####...##................",
"####...##...............",
"#############...........",
"############.........~~~",
"##-----#########...~~~~~",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/mapspecials_demo/missile_silo/silo_utlca_02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"#################-------",
"################-|....D.",
"###############-|....c6.",
"###############|6..D...D.",
"###############|6..D..D.",
"##---------####|4.c6....",
"##|...|eee|####|6..D..D.",
"##|.<.|eee|####-|....c6.",
Expand Down