Mapgen fixes for John Candlebury maps

CleverRaven · Feb 8, 2020 · b39f862 · b39f862
1 parent 366db53
commit b39f862
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 27 deletions.
diff --git a/data/json/mapgen/collapsed_tower.json b/data/json/mapgen/collapsed_tower.json
@@ -134,7 +134,7 @@
         "#####|xppppppppppppp||  |#|||||| ##|##########~~#|##~~|###|#   # ##|####",
         "#####|xppCCppppppppp||  |##  ##|   |#########~~~~~####||||||||||###|####",
         "#####||||||||||#pppp|| #|  # 66|# #|#~~~~~~~~~~~~~~~~#|########### |####",
-        "##############|#2{{2||  +     B||  ||######~~t~~~|       ########  |####",
+        "##############|#2{{2||  +     B||  ||######~~~~~~|       ########  |####",
         "################ppppr|# |      |         ##~~~~~~|    |#    ####   |####",
         "#################pppr|33|  ####|###||   ##### ~~~||33||##         #|####",
         "###############pppppp|##||||###|  ########~~~~~~~|#      #   6#####|####",

diff --git a/data/json/mapgen/microlab/microlab_connector.json b/data/json/mapgen/microlab/microlab_connector.json
@@ -126,7 +126,7 @@
         "         c|  |  dd|r c  ",
         " FFFFccccc|  |   h|r c  ",
         "|||||||||||YY|[===||    ",
-        " FF c|^???^       v| c  ",
+        " FF c|^???^       V| c  ",
         "    c|?           V| c  ",
         "    c|? tt         | i  ",
         "    c|             |    ",
@@ -190,7 +190,8 @@
       "items": {
         "l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ],
         "t": { "item": "magazines", "chance": 90 }
-      }
+      },
+      "monster": { "T": { "monster": "mon_turret_rifle" } }
     }
   },
   {
@@ -231,6 +232,7 @@
         "E": "t_elevator_control",
         " ": "t_grass",
         "_": "t_pavement",
+        "S": "t_sidewalk",
         ".": "t_thconc_floor",
         "G": "t_card_science"
       }

diff --git a/data/json/mapgen/microlab/microlab_generic.json b/data/json/mapgen/microlab/microlab_generic.json
@@ -85,7 +85,7 @@
         "|||=[|||| hth =Y ?||||||",
         " c|  |##| hth =Y V|h  = ",
         " c|  |##| hth =  c|dd = ",
-        " c|=[|##| hth =  a|   ] ",
+        " c|=[|##| hth =  a|   [ ",
         "  |  |##|^    [   |   = ",
         "|||  ||||||||||   |=[=||",
         "     2                  ",
@@ -120,7 +120,7 @@
         "|||22||||    |||||||||||",
         " c|  |l 2    2    2 d^= ",
         " c|  ||||    |    | d = ",
-        " c|     2    | cc |   ] ",
+        " c|     2    | cc |   [ ",
         "  2     2    | cc |   = ",
         "|||||||||||22|||||||||||",
         "   |FFccFF|   c   |     ",
@@ -137,7 +137,8 @@
         "  c      ||  |||||||||  ",
         "  c c|c   |  |6hh6|cFc  "
       ],
-      "palettes": [ "microlab" ]
+      "palettes": [ "microlab" ],
+      "monster": { "T": { "monster": "mon_turret_rifle" } }
     }
   },
   {
@@ -155,7 +156,7 @@
         "|||5||||| d   iccc|2===|",
         " c|              c| dh= ",
         " c|cci  cic   iccc| d = ",
-        " c|              c|   ] ",
+        " c|              c|   [ ",
         "  |cci |FFF|66cccc|   = ",
         "2|||||||||||||||||||||||",
         "                        ",
@@ -421,6 +422,7 @@
         "     |c   |  |    |     "
       ],
       "palettes": [ "microlab" ],
+      "terrain": { "G": "t_card_science" },
       "monster": { "T": { "monster": "mon_turret_rifle" }, "M": { "monster": "mon_zombie_bio_op" } }
     }
   },

diff --git a/data/json/mapgen/microlab/microlab_generic_edge.json b/data/json/mapgen/microlab/microlab_generic_edge.json
@@ -493,7 +493,7 @@
         "  c|?  t ? Y^| cc       ",
         "  c|?  t ?  ^| cc  c    ",
         "  c|^       ^|     c    ",
-        "|2||v       ^|     |((2|",
+        "|2||V       ^|     |((2|",
         "  U|       Y^|22(((|6   ",
         "  U|  ^^   Y^|  666|c   ",
         "  U|2|||2||2||   h |c   ",

diff --git a/data/json/mapgen/microlab/microlab_special_tiles.json b/data/json/mapgen/microlab/microlab_special_tiles.json
@@ -14,7 +14,7 @@
         "|||22||||-   -fYf-||||||",
         " c|  |##|-dd -f f-|hd^= ",
         " c|  ||||-h  -f f-| d = ",
-        " c|    c|-G55-f f-|   ] ",
+        " c|    c|-G55-f f-|   [ ",
         "  2    c|-   --2--|   = ",
         "|||    c|-       -||||||",
         "       ?|-Y  cc c-|     ",
@@ -48,7 +48,7 @@
         "     | cc |  | cc |     ",
         "     2    2  2    | c c ",
         "   F|||||||  |||||||c c ",
-        "   F|m 5  |22|0c7c0|c c ",
+        "   F|m 5  |22|0c6c0|c c ",
         "   F|(((  (  |     |    ",
         "|||||m 5  (  |((2((|  ||",
         "  66|(((  (       c|    ",
@@ -74,6 +74,7 @@
       "terrain": { "0": "t_vat" },
       "monster": { "T": { "monster": "mon_mutant_experimental" } },
       "place_items": [  ],
+      "monsters": { "m": { "monster": "GROUP_NETHER" } },
       "place_monsters": [ { "monster": "GROUP_LAB", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ]
     }
   },
@@ -94,9 +95,9 @@
         "  |-F   cc pt  - h c-|c ",
         "  |-F   cc pp  -cccc-|c ",
         "  |---         -((((-|  ",
-        "2|G            2   7-|||",
+        "2|G            2   t-|||",
         "  5  T----22----  @@-|  ",
-        "  5  T-h       5   7-|  ",
+        "  5  T-h       5   t-|  ",
         "||-lll-66      5    -|||",
         " |-----(((222---------|c",
         " |-0 0 0 0   0 0 0 0 -| ",
@@ -132,8 +133,8 @@
         "|||u ||||-    uuu-||||||",
         " c|ku|##|-DDd  ku-|hd^= ",
         " c|u ||||-      k-| d = ",
-        " c|   uku(   u  c-|   ] ",
-        "  uk   u|-k  A  u-|=]== ",
+        " c|   uku(   u  c-|   [ ",
+        "  uk   u|-k  A  u-|=[== ",
         "|||k    |- ukuu  -|kuk||",
         "          u TAu   u     ",
         " kkuu    k kuAc   2     ",

diff --git a/data/json/mapgen/robofachq_static.json b/data/json/mapgen/robofachq_static.json
@@ -162,8 +162,8 @@
         "#|Y Y Y  |Y                                  Y    5Y          G                    Y  ^|########",
         "#|iii    |====[[||=====|===[=|===[|[==||==[=||2||2|||[=======||  |||=====||||||2|||2||||########",
         "#|||||||||      ^|  hd^|^   H|    |    |^   |f ff f|  d  dh dh|  |Y      Y^|;2Y  |  Y2;|########",
-        "#########|dd     ]   dh|h   t|h h |    | d  |f ff f|  dh d  d |  2  hhhhh ^|||  |||  |||########",
-        "#########| h     ]  hh |6dd H|ddd |6dd |hd  |f ff f| Y       Y|  2  ttttt ^|;2Y i|i Y2;|########",
+        "#########|dd     [   dh|h   t|h h |    | d  |f ff f|  dh d  d |  2  hhhhh ^|||  |||  |||########",
+        "#########| h     [  hh |6dd H|ddd |6dd |hd  |f ff f| Y       Y|  2  ttttt ^|;2Y i|i Y2;|########",
         "#########|dd   dd|Y    |h  YB|Yh  |Yhd |^  Y|f    f|  d  d  dh|  |  hhh h ^|||  i|i  |||########",
         "#########|Yh    h|BBBB^|^^BBB|A6^^|    |BBBB|ffffff|  dh d  d |^^|Y   h  Y^|;2Y i|i Y2;|########",
         "#########|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||########",
@@ -211,6 +211,7 @@
           { "item": "lab_bookshelves", "chance": 55, "repeat": [ 1, 3 ] }
         ]
       },
+      "monster": { "T": { "monster": "mon_turret_rifle" } },
       "npcs": { "G": { "class": "hub_security" }, "Q": { "class": "hub_security_head" } }
     }
   },
@@ -247,7 +248,7 @@
         "####|,,,,=&  ^MMM^  ^MMM^  Y         [eeeeee[CCCC.dG=,,,,,,,= (            [   %  %     r|######",
         "####|,,,,=&  ^MMM^  ^MMM^  Y         [eeeeee[CCCC dh=,,,,,,,=<(            [   AAAA Y Y r|######",
         "####|,,,,[Y                          =Eeeeee|  CC  ^=,,,,,,,=[(      bb   Y=   A        r|######",
-        "####|,,,,= htth htth hth h ^|G     ,,|======|| CC ||====]====     ==========AAAA 1P P P P|######",
+        "####|,,,,= htth htth hth h ^|G     ,,|======|| CC ||====[====     ==========AAAA  P P P P|######",
         "####|,,,,= htth htth     t ^|^bb^  ,,,,,R'''R<YCC           Y    G=,,,,,,,,|Y     P P P P|######",
         "####|,,,,= htth      hth h ^|      ,,,,,R'''R>YCC           Y     =,,,,,,,,|PPPPPPP P P P|######",
         "####|,,,,=       MM          Y          RRRRRR CC ||=========||22||========|||||||||||||||######",
@@ -258,11 +259,11 @@
         "#|||||||||  hth  YY  htth|##|'''''''''''''''(Y   Y|BBBBBBBBBBBBBBBBBBBBBBBB|####################",
         "#|iii    |  |||||||||||||||||||||||||||||||||||22|||||||||||||||||||||||||||||||||||############",
         "#|Y Y Y  |  ^|##|~Y;|~Y;|~Y;|~Y;|~Y;|~Y;|^ t  ^        |~Y;|~Y;|~Y;|~Y;|~Y;|~Y;|~Y;|############",
-        "#|2|2|2| |  ^|##|~ i|~ i|~ i|~ i|~ i|~ i|?   H^   htth |~ i|~ i|~ i|~ i|~ i|~ i|~ i|||||||||||||",
+        "#|2|2|2| |  ^|##|~ i|~ i|~ i|~ i|~ i|~ i|?   a^   htth |~ i|~ i|~ i|~ i|~ i|~ i|~ i|||||||||||||",
         "#|;|;|;|Y   ^|##||2|||2|||2|||2|||2|||2||? t  ^   htth ||2|||2|||2|||2|||2|||2|||2||~2 |@@ D @@|",
-        "#|||||||Y   ^|##|@ D|@ D|@ D|@ D|@ D|@ D|? t H^        |@ D|@ D|@ D|@ D|@ D|@ D|  D||| |D  @  D|",
+        "#|||||||Y   ^|##|@ D|@ D|@ D|@ D|@ D|@ D|? t a^        |@ D|@ D|@ D|@ D|@ D|@ D|  D||| |D  @  D|",
         "#|;|;|;|Y|YY^|##|@ D|@ D|@ D|@ D|@ D|@ D|         htth |@ D|@ D|@ D|@ D|@ D|@ D|  D|~2 |@@ @ @@|",
-        "#|2|2|2| |||||||||5|||5|||5|||5|||5|||2||Ht H          ||5|||5|||5|||5|||5|||5|||5||||2|D     D|",
+        "#|2|2|2| |||||||||5|||5|||5|||5|||5|||2||at a          ||5|||5|||5|||5|||5|||5|||5||||2|D     D|",
         "#|Y Y Y  |###|,,,=Y                   Y                                            2       S @@|",
         "#|iii    |###|,,,=Y                   Y                                            2          D|",
         "#|||||||||###|||||5|||5|||5|||5|||5|||2||G        ? t ?||5|||5|||5|||5|||5|||5|||5||||2|     @@|",
@@ -290,6 +291,7 @@
       "furniture": {
         "K": "f_counter",
         "M": "f_counter",
+        "S": "f_table",
         "A": "f_canvas_wall",
         "%": "f_canvas_door",
         "E": "f_ergometer",
@@ -301,6 +303,11 @@
         "p": { "item": { "item": "seed_wheat" }, "furniture": "f_planter_mature" }
       },
       "items": {
+        "S": [
+          { "item": "tools_robotics", "chance": 30, "repeat": [ 1, 3 ] },
+          { "item": "robots", "chance": 50, "repeat": [ 1, 3 ] },
+          { "item": "supplies_electronics", "chance": 50, "repeat": [ 1, 3 ] }
+        ],
         "F": { "item": "fridge", "chance": 80, "repeat": [ 2, 6 ] },
         "@": { "item": "bed", "chance": 80 },
         "M": [
@@ -374,9 +381,9 @@
         "#|||||||Y   ^|||||2|BY   HtH|       G|2||||||        hy|SY G               Y=                 Y|",
         "#|;|;|;|Y|YY^|S    ||||||||||              A          Y|S  SSSSS  hS  hS  sh=                  |",
         "#|2|2|2| |||||Sh    SS6  SSS=             y%          Y||  SSSSS  SS  SS  SS=     SSS t  7966 6|",
-        "#|Y Y Y  |###|S       h     ]             Y%    SSS   Y2Y                G  ]Y   hSSS t  7966 6|",
-        "#|iii    |###|S             2   66         A   h6SS   Y2Y                G Y]Y    688 t       Y|",
-        "#|||||||||###|||||2|========|]=====]=======|AA%AA|AAAAA||yyyyyyyyyyyyyyyyyy =      9  t  &&66 6|",
+        "#|Y Y Y  |###|S       h     [             Y%    SSS   Y2Y                G  [Y   hSSS t  7966 6|",
+        "#|iii    |###|S             2   66         A   h6SS   Y2Y                G Y[Y    688 t       Y|",
+        "#|||||||||###|||||2|========|[=====[=======|AA%AA|AAAAA||yyyyyyyyyyyyyyyyyy =      9  t  &&66 6|",
         "#############|l ll |Sh                 SSSS|h         d|   y6             y =      9     &&66 6|",
         "#############|l l  |SSSSS                 6|        hhdA   y              y =t8898888         7|",
         "#############|l   l|S                    hS|  h      hdA   y              y =Y          6     7|",
@@ -407,6 +414,7 @@
         "A": "f_canvas_wall",
         "%": "f_canvas_door",
         "H": "f_armchair",
+        "M": "f_server",
         "E": "f_ergometer",
         "T": "f_treadmill",
         "X": "f_exercise"
@@ -443,10 +451,10 @@
         "#####################################||||||||||^    ^| h  h|####################################",
         "#####################################|rrrrrrrr|^    ^|     |####################################",
         "#####################################|r      r||    ||||2|||####################################",
-        "#####################################|r  YY   2      (t   G|####################################",
-        "#####################################||||||||||  YY  (thY G|####################################",
-        "#####################################|bbbbbbbb|  YY  (t Y G|####################################",
-        "#####################################|Y      Y2      (    G|####################################",
+        "#####################################|r  YY   2      (t   r|####################################",
+        "#####################################||||||||||  YY  (thY r|####################################",
+        "#####################################|bbbbbbbb|  YY  (t Y r|####################################",
+        "#####################################|Y      Y2      (    r|####################################",
         "#####################################| llllll ||2222||||2|||####################################",
         "#####################################|2||||||2|^         Y^|####################################",
         "#####################################| ~|  |~ |^         Y^|####################################",
@@ -602,6 +610,7 @@
       "terrain": {
         "-": "t_wall_metal",
         "e": "t_elevator",
+        "w": "t_water_pool_shallow",
         "E": "t_elevator_control",
         "Y": "t_thconc_floor_olight",
         "#": "t_rock",

diff --git a/data/json/mapgen_palettes/collapsed_tower.json b/data/json/mapgen_palettes/collapsed_tower.json
@@ -15,11 +15,13 @@
       ">": "t_stairs_down",
       "D": "t_door_metal_locked",
       "E": "t_elevator_control",
+      "T": "t_region_tree_shade",
       "[": "t_fence_v",
       "_": "t_pavement",
       "c": "t_door_locked",
       "e": "t_elevator",
       "l": "t_floor",
+      "r": "t_carpet_red",
       "s": "t_sidewalk",
       "w": "t_door_c",
       "y": "t_pavement_y",