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

Fix missing mapgen keys for non-blacklisted mods #37845

Merged
merged 1 commit into from
Feb 13, 2020
Merged

Fix missing mapgen keys for non-blacklisted mods #37845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 32 additions & 32 deletions 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 @@ -37,7 +37,7 @@
"..............~~~..e| _>>_ |e~g~~~g~~i~.........",
"...................~ _>>_ ~~g~f~g~~~~.........",
"...................e| ____ |e~g~~~g~............",
".................1`~| |~~~~~.~~............",
".................1~~| |~~~~~.~~............",
"...............~~~~~||| |||~.~i~~..............",
"..............~~i~~~~~a~~a~~...~~...............",
"...............~~.~~.~~~~1~.....................",
Expand Down Expand Up @@ -120,42 +120,42 @@
"rows": [
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXX.......XXXX.........x......XXXXXX.......XXXX",
"XX..........XX..........x.......XXXX..........XX",
"XXXX.......XXXX................XXXXXX.......XXXX",
"XX..........XX..................XXXX..........XX",
"XX....1.....XX.................XXXX.......1...XX",
"XXXX.........XX........>>.......XX............XX",
"XXXXXX........XX.......>>......XX.......>>....XX",
"XXXX..........................XXXX......>>....XX",
"XX......................x......XX.............XX",
"XX......>>..............x......XX.............XX",
"XX......>>..............x......XX.............XX",
"XXXX....................x......XX.............XX",
"XXX.XXXX.............1..x.......XX..........XXXX",
"XXX.XXXXXX..............x......XXXX...1...XXXXXX",
"XXX..XXXXXXX............x.......XXXX.....XXXXXXX",
"XXX..XXXXXX.............x..........XX.....XXXXXX",
"XXXX..XXXX..............x....1......XX.....XXXXX",
"XXXXX.XX................x............XX.....XXXX",
"XXXX....................x.....................XX",
"XX......................x.....................XX",
"XX......................x.................>>..XX",
"XX......................x.................>>..XX",
"XX.............................XX.............XX",
"XX......>>.....................XX.............XX",
"XX......>>.....................XX.............XX",
"XXXX...........................XX.............XX",
"XXX.XXXX.............1..........XX..........XXXX",
"XXX.XXXXXX.....................XXXX...1...XXXXXX",
"XXX..XXXXXXX....................XXXX.....XXXXXXX",
"XXX..XXXXXX........................XX.....XXXXXX",
"XXXX..XXXX...................1......XX.....XXXXX",
"XXXXX.XX.............................XX.....XXXX",
"XXXX..........................................XX",
"XX............................................XX",
"XX........................................>>..XX",
"XX........................................>>..XX",
"XX..........1......... ....................XX",
"XX.................. << ...........1......XX",
"XX.................. << ..................XX",
"XX.................... ....................XX",
"XXXX....................x.....................XX",
"XXXXXX..................x.....................XX",
"XXXXXX..................x.....................XX",
"XXXX.......1............x....................XXX",
"XX......................x.................XXXXXX",
"XX..................1...x................XXXXXXX",
"XX........>>............x...........XXX.XXX1XXXX",
"XX........>>............x...........XXX.XX...XXX",
"XX......................x..........XXXX......XXX",
"XX......................x........XXXXXXXXX...XXX",
"XXXX............2.......x........XXXXXXXXXX.XXXX",
"XXXXXX..................x......XXXXXXXXXXXX.XXXX",
"XXXX..........................................XX",
"XXXXXX........................................XX",
"XXXXXX........................................XX",
"XXXX.......1.................................XXX",
"XX........................................XXXXXX",
"XX..................1....................XXXXXXX",
"XX........>>........................XXX.XXX1XXXX",
"XX........>>........................XXX.XX...XXX",
"XX.................................XXXX......XXX",
"XX...............................XXXXXXXXX...XXX",
"XXXX............2................XXXXXXXXXX.XXXX",
"XXXXXX.........................XXXXXXXXXXXX.XXXX",
"XXXXXXXXX...............X......1......XXXXX..XXX",
"XXXXXXXXXX.............XX...............XXXX.XXX",
"XXXXXXXXXXX.1....XXXXXXXX........>>......XXXXXXX",
Expand Down Expand Up @@ -276,12 +276,12 @@
"XXXX..XXXXXXXX ..........................XXXX",
"XXXXX.XXXXXXX ...........................XXX",
"XXXXX.XXXXX XX...........................XX",
"XXXX...XXXXXX XXXXXX..... `XXXXXXXX...XXXX",
"XXXX...XXXXXX XXXXXX..... XXXXXXXX...XXXX",
"XX.......XXXXX XXXX.... XXXXXXXXX...XXXXX",
"XX........XXXX....XXXXXX.... XXXXXXXXXXX...XXXX",
"XXX........................X XXX>>XXXXX....XXXX",
"XX.......................XXX XX<<XXXX.....XXXX",
"XX.......................... XXXXXXv.XXXXXXXXX",
"XX.......................... XXXXXX..XXXXXXXXX",
"XXXX........XX............ XXXXX..XXX XXXXXX",
"XXXXXXX.... ........... ...XXX..XXX ...XX",
"XXXXX....XXX XXXX....XXXX.........XXXX ...XX",
Expand Down Expand Up @@ -359,7 +359,7 @@
"XX....2...XXXX....XXXXXX....XXXXXXXXXXXXX...XXXX",
"XXX........................XXXXXX>>XXXXX....XXXX",
"XX.......................XXXXXXXX<<XXXX.....XXXX",
"XX..................1.......XXXXXXXXXv.XXXXXXXXX",
"XX..................1.......XXXXXXXXX..XXXXXXXXX",
"XXXX...1....XX............XXXXXXXXXX..XXXXXXXXXX",
"XXXXXXX....XXXXX...........XX...XXX..XXXXXX > XX",
"XXXXX....XXXXXXXXX....XXXX.........XXXXXXXX XX",
Expand Down
1 change: 1 addition & 0 deletions data/mods/Magiclysm/worldgen/used_bookstore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"N": "f_bookcase",
"M": "f_bookcase",
"T": "f_table",
"s": "f_sink",
"O": "f_magic_circle",
"d": "f_dumpster",
"C": "f_counter"
Expand Down
6 changes: 3 additions & 3 deletions data/mods/Salvaged_Robots/robot_additions/robot_dispatch/dispatch_second_01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
"#####PPPPPP#############",
"#####PPPPPP#############",
"#####PPPPPP#############",
"##### #############",
"##### #############",
"##### #############",
"##rrrrrrrrr--ggg-ggg--##",
"##rrrrrrrrr|DDD D6D|##",
"##rrrrrrrrrg c c g##",
Expand Down