diff --git a/data/json/mapgen/microlab/microlab_connector.json b/data/json/mapgen/microlab/microlab_connector.json index 4a204ef10ae21..61a5ac4075d03 100644 --- a/data/json/mapgen/microlab/microlab_connector.json +++ b/data/json/mapgen/microlab/microlab_connector.json @@ -38,44 +38,7 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "microlab_rock_border" ], - "weight": 1000, - "object": { - "fill_ter": "t_concrete", - "rows": [ - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################", - "########################" - ], - "palettes": [ "microlab" ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "microlab_sub_station", "microlab_sub_station_ratkin" ], - "weight": 1000, + "om_terrain": [ "microlab_sub_station" ], "object": { "fill_ter": "t_strconc_floor", "rows": [ @@ -116,6 +79,70 @@ } } }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "microlab_sub_station_ratkin" ], + "object": { + "fill_ter": "t_strconc_floor", + "rows": [ + "######## ########", + "######## ########", + "######## ########", + "######## ########", + "######## ########", + "######## ########", + "######## ########", + "###||||| ########", + "###|l h ( |#########", + "###|l ( YY |#########", + "###|l ( YY |#########", + "###||2|||| |#########", + "###| | |#########", + "###| hd|G55||#########", + "###| ddd| ^|#########", + "###||5(((| ^|||||||###", + "###|B VV ^^|###", + "###|B YY ?|###", + "###|B dddd YY t ?|###", + "###|B d hd ?|###", + "###|B t? ^^|###", + "###|||||||| ||||||||###", + "##########|22|##########", + "##########| |##########" + ], + "place_nested": [ + { "chunks": [ "ratkin_sewer_entrance" ], "x": 8, "y": 0 }, + { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } + ], + "palettes": [ "microlab_generic" ], + "terrain": { "#": "t_soil", "G": "t_card_science" }, + "items": { + "l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ], + "t": { "item": "magazines", "chance": 90 } + } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "ratkin_sewer_entrance", + "object": { + "mapgensize": [ 8, 8 ], + "rows": [ + "|o-~~-o|", + "|o-~~-o|", + "|o-~~-o|", + "|o-~~-o|", + "|o-~~-o|", + "|o-~~-o|", + "|p-~~-p|", + "||----||" + ], + "palettes": [ "sewers" ] + } + }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen/microlab/microlab_distorted/microlab_distorted.json b/data/json/mapgen/microlab/microlab_distorted/microlab_distorted.json index 1e0b1f3d8235b..d7b18ded5ff01 100644 --- a/data/json/mapgen/microlab/microlab_distorted/microlab_distorted.json +++ b/data/json/mapgen/microlab/microlab_distorted/microlab_distorted.json @@ -26,10 +26,6 @@ { "chunks": [ "microlab_distorted_chunk" ], "x": 12, "y": 0 }, { "chunks": [ "microlab_distorted_chunk" ], "x": 0, "y": 12 }, { "chunks": [ "microlab_distorted_chunk" ], "x": 12, "y": 12 }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, diff --git a/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_hallway.json b/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_hallway.json index e184b727d3f63..ee51e137407f5 100644 --- a/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_hallway.json +++ b/data/json/mapgen/microlab/microlab_distorted/microlab_distorted_hallway.json @@ -11,10 +11,6 @@ { "chunks": [ "microlab_distorted_hallway_chunk" ], "x": 12, "y": 0 }, { "chunks": [ "microlab_distorted_hallway_chunk" ], "x": 0, "y": 12 }, { "chunks": [ "microlab_distorted_hallway_chunk" ], "x": 12, "y": 12 }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, diff --git a/data/json/mapgen/microlab/microlab_generic_edge.json b/data/json/mapgen/microlab/microlab_generic_edge.json index 4b973d72dfb06..8d8e18fa80184 100644 --- a/data/json/mapgen/microlab/microlab_generic_edge.json +++ b/data/json/mapgen/microlab/microlab_generic_edge.json @@ -41,10 +41,6 @@ "x": 0, "y": 0 }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, diff --git a/data/json/mapgen/microlab/microlab_hallway_start.json b/data/json/mapgen/microlab/microlab_hallway_start.json index c48769722a336..26b07500695d3 100644 --- a/data/json/mapgen/microlab/microlab_hallway_start.json +++ b/data/json/mapgen/microlab/microlab_hallway_start.json @@ -7,10 +7,6 @@ "fill_ter": "t_strconc_floor", "place_nested": [ { "chunks": [ "microlab_generic_end_tile" ], "x": 0, "y": 0 }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, @@ -207,8 +203,6 @@ "||||||||||||||||||||||||" ], "place_nested": [ - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }, { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } }, { "else_chunks": [ "concrete_corner" ], "x": 0, "y": 0, "neighbors": { "north_west": "microlab" } }, diff --git a/data/json/mapgen/microlab/microlab_ratkin/microlab_ratkin_generic.json b/data/json/mapgen/microlab/microlab_ratkin/microlab_ratkin_generic.json index 4528472e2b8ea..9db9db6bfd9d3 100644 --- a/data/json/mapgen/microlab/microlab_ratkin/microlab_ratkin_generic.json +++ b/data/json/mapgen/microlab/microlab_ratkin/microlab_ratkin_generic.json @@ -22,10 +22,6 @@ "fill_ter": "t_strconc_floor", "place_nested": [ { "chunks": [ "microlab_generic_edge_tile" ], "x": 0, "y": 0 }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, diff --git a/data/json/obsoletion/migration_oter_ids.json b/data/json/obsoletion/migration_oter_ids.json index dfe32a62b6076..41248bd507290 100644 --- a/data/json/obsoletion/migration_oter_ids.json +++ b/data/json/obsoletion/migration_oter_ids.json @@ -6458,5 +6458,10 @@ "lab_surface_brick_basementD4_west": "special_earth", "lab_surface_brick_basementE4_west": "special_earth" } + }, + { + "type": "oter_id_migration", + "//": "migrated in 0.H", + "oter_ids": { "microlab_rock_border": "special_rock" } } ] diff --git a/data/json/overmap/overmap_mutable/microlab_mutable.json b/data/json/overmap/overmap_mutable/microlab_mutable.json index ee81b86fbd2fe..3ef92c3b7e93b 100644 --- a/data/json/overmap/overmap_mutable/microlab_mutable.json +++ b/data/json/overmap/overmap_mutable/microlab_mutable.json @@ -55,7 +55,7 @@ "south": "microlab_to_microlab", "west": "microlab_to_microlab" }, - "microlab_rock_border": { "overmap": "microlab_rock_border" }, + "special_rock": { "overmap": "special_rock" }, "microlab": { "overmap": "microlab_generic", "north": { "id": "microlab_to_microlab", "alternatives": [ "microlab_to_hallway" ] }, @@ -193,7 +193,7 @@ "north": { "id": "hallway_to_hallway", "alternatives": [ "dhallway_to_dhallway" ] } }, "rock_divisor": { - "overmap": "microlab_rock_border", + "overmap": "special_rock", "north": "microlab_to_microlab", "south": "dmicrolab_to_dmicrolab", "east": { "id": "dmicrolab_to_dmicrolab", "type": "available", "alternatives": [ "microlab_to_microlab" ] }, @@ -238,10 +238,10 @@ "//": "This is the main elevator and core mapgen piece for the portal lab, goes all the way down to hell.", "chunk": [ { "overmap": "microlab_portal_dressroom", "pos": [ 0, 0, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 1, 0, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 2, 0, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ -1, 0, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ -2, 0, 0 ] }, + { "overmap": "special_rock", "pos": [ 1, 0, 0 ] }, + { "overmap": "special_rock", "pos": [ 2, 0, 0 ] }, + { "overmap": "special_rock", "pos": [ -1, 0, 0 ] }, + { "overmap": "special_rock", "pos": [ -2, 0, 0 ] }, { "overmap": "firebreak", "pos": [ 0, 1, 0 ] }, { "overmap": "portal_elevator", "pos": [ 0, 2, 0 ] }, { "overmap": "portal_elevator", "pos": [ 0, 2, -2 ] }, @@ -268,10 +268,10 @@ { "overmap": "nether", "pos": [ -1, 0, -8 ] }, { "overmap": "nether", "pos": [ 0, 0, -8 ] }, { "overmap": "nether", "pos": [ 1, 0, -8 ] }, - { "overmap": "microlab_rock_border", "pos": [ 1, 1, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 2, 1, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ -1, 1, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ -2, 1, 0 ] } + { "overmap": "special_rock", "pos": [ 1, 1, 0 ] }, + { "overmap": "special_rock", "pos": [ 2, 1, 0 ] }, + { "overmap": "special_rock", "pos": [ -1, 1, 0 ] }, + { "overmap": "special_rock", "pos": [ -2, 1, 0 ] } ], "max": 1 } diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index e34717213f497..5743a235c3731 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -3534,40 +3534,40 @@ "overmaps": [ { "point": [ 2, -2, -2 ], "overmap": "microlab_sub_connector_north" }, { "point": [ 2, -1, -2 ], "overmap": "microlab_sub_station_north" }, - { "point": [ 0, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 0, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 0, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 1, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 3, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 4, -1, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 0, -2 ], "overmap": "special_rock" }, { "point": [ 0, 0, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 0, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 0, -2 ], "overmap": "microlab_generic_sub_entry_north" }, { "point": [ 3, 0, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 0, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 1, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 0, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 1, -2 ], "overmap": "special_rock" }, { "point": [ 0, 1, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 1, -2 ], "overmap": "microlab_generic" }, { "point": [ 2, 1, -2 ], "overmap": "microlab_generic" }, { "point": [ 3, 1, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 2, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 1, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 2, -2 ], "overmap": "special_rock" }, { "point": [ 0, 2, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 2, -2 ], "overmap": "microlab_generic" }, { "point": [ 2, 2, -2 ], "overmap": "microlab_generic" }, { "point": [ 3, 2, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 2, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 3, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 2, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 3, -2 ], "overmap": "special_rock" }, { "point": [ 0, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 3, 3, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 3, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 0, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 2, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, 4, -2 ], "overmap": "microlab_rock_border" } + { "point": [ 4, 3, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 0, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 1, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 2, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 3, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 4, 4, -2 ], "overmap": "special_rock" } ], "locations": [ "land" ], "city_distance": [ 5, -1 ], @@ -3596,40 +3596,40 @@ "id": "4x4_microlab_rodent", "overmaps": [ { "point": [ 2, -1, -1 ], "overmap": "microlab_sub_station_ratkin_north" }, - { "point": [ 0, -1, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, -1, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, -1, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, -1, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 0, -1 ], "overmap": "microlab_rock_border" }, + { "point": [ 0, -1, -1 ], "overmap": "special_earth" }, + { "point": [ 1, -1, -1 ], "overmap": "special_earth" }, + { "point": [ 3, -1, -1 ], "overmap": "special_earth" }, + { "point": [ 4, -1, -1 ], "overmap": "special_earth" }, + { "point": [ -1, 0, -1 ], "overmap": "special_earth" }, { "point": [ 0, 0, -1 ], "overmap": "microlab_ratkin_edge" }, { "point": [ 1, 0, -1 ], "overmap": "microlab_ratkin_edge" }, { "point": [ 2, 0, -1 ], "overmap": "microlab_ratkin_sub_entry_north" }, { "point": [ 3, 0, -1 ], "overmap": "microlab_ratkin_edge" }, - { "point": [ 4, 0, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 1, -1 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 0, -1 ], "overmap": "special_earth" }, + { "point": [ -1, 1, -1 ], "overmap": "special_earth" }, { "point": [ 0, 1, -1 ], "overmap": "microlab_ratkin_edge" }, { "point": [ 1, 1, -1 ], "overmap": "microlab_ratkin" }, { "point": [ 2, 1, -1 ], "overmap": "microlab_ratkin" }, { "point": [ 3, 1, -1 ], "overmap": "microlab_ratkin_edge" }, - { "point": [ 4, 1, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 2, -1 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 1, -1 ], "overmap": "special_earth" }, + { "point": [ -1, 2, -1 ], "overmap": "special_earth" }, { "point": [ 0, 2, -1 ], "overmap": "microlab_ratkin_edge" }, { "point": [ 1, 2, -1 ], "overmap": "microlab_ratkin" }, { "point": [ 2, 2, -1 ], "overmap": "microlab_ratkin" }, { "point": [ 3, 2, -1 ], "overmap": "microlab_ratkin_edge" }, - { "point": [ 4, 2, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 3, -1 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 2, -1 ], "overmap": "special_earth" }, + { "point": [ -1, 3, -1 ], "overmap": "special_earth" }, { "point": [ 0, 3, -1 ], "overmap": "microlab_ratkin_edge" }, { "point": [ 1, 3, -1 ], "overmap": "microlab_ratkin_edge" }, { "point": [ 2, 3, -1 ], "overmap": "microlab_ratkin_edge" }, { "point": [ 3, 3, -1 ], "overmap": "microlab_ratkin_edge" }, - { "point": [ 4, 3, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 4, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ 0, 4, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, 4, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ 2, 4, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, 4, -1 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, 4, -1 ], "overmap": "microlab_rock_border" } + { "point": [ 4, 3, -1 ], "overmap": "special_earth" }, + { "point": [ -1, 4, -1 ], "overmap": "special_earth" }, + { "point": [ 0, 4, -1 ], "overmap": "special_earth" }, + { "point": [ 1, 4, -1 ], "overmap": "special_earth" }, + { "point": [ 2, 4, -1 ], "overmap": "special_earth" }, + { "point": [ 3, 4, -1 ], "overmap": "special_earth" }, + { "point": [ 4, 4, -1 ], "overmap": "special_earth" } ], "locations": [ "land" ], "city_distance": [ 5, -1 ], @@ -3645,40 +3645,40 @@ { "point": [ 2, 1, 0 ], "overmap": "microlab_generic_surface_north" }, { "point": [ 2, -2, -2 ], "overmap": "microlab_sub_connector_north" }, { "point": [ 2, -1, -2 ], "overmap": "microlab_sub_station_north" }, - { "point": [ 0, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 0, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 0, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 1, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 3, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 4, -1, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 0, -2 ], "overmap": "special_rock" }, { "point": [ 0, 0, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 0, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 0, -2 ], "overmap": "microlab_generic_sub_entry_north" }, { "point": [ 3, 0, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 0, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 1, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 0, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 1, -2 ], "overmap": "special_rock" }, { "point": [ 0, 1, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 1, -2 ], "overmap": "microlab_generic" }, { "point": [ 2, 1, -2 ], "overmap": "microlab_generic_surface_connector" }, { "point": [ 3, 1, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 2, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 1, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 2, -2 ], "overmap": "special_rock" }, { "point": [ 0, 2, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 2, -2 ], "overmap": "microlab_generic" }, { "point": [ 2, 2, -2 ], "overmap": "microlab_generic" }, { "point": [ 3, 2, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 2, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 3, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 2, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 3, -2 ], "overmap": "special_rock" }, { "point": [ 0, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 3, 3, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 3, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 0, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 2, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, 4, -2 ], "overmap": "microlab_rock_border" } + { "point": [ 4, 3, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 0, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 1, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 2, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 3, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 4, 4, -2 ], "overmap": "special_rock" } ], "connections": [ { "point": [ 2, 0, 0 ], "terrain": "road", "connection": "local_road", "from": [ 2, 1, 0 ] } ], "locations": [ "wilderness" ], @@ -3697,40 +3697,40 @@ { "point": [ 2, 1, -3 ], "overmap": "lab_subway_vent_shaft-3" }, { "point": [ 2, -2, -4 ], "overmap": "microlab_sub_connector_north" }, { "point": [ 2, -1, -4 ], "overmap": "microlab_sub_station_north" }, - { "point": [ 0, -1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, -1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, -1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, -1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 0, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 0, -1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 1, -1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 3, -1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 4, -1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ -1, 0, -4 ], "overmap": "special_deep_rock" }, { "point": [ 0, 0, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 0, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 0, -4 ], "overmap": "microlab_generic_sub_entry_north" }, { "point": [ 3, 0, -4 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 0, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 1, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 0, -4 ], "overmap": "special_deep_rock" }, + { "point": [ -1, 1, -4 ], "overmap": "special_deep_rock" }, { "point": [ 0, 1, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 1, -4 ], "overmap": "microlab_generic" }, { "point": [ 2, 1, -4 ], "overmap": "microlab_generic_vent_shaft_connector" }, { "point": [ 3, 1, -4 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 2, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ -1, 2, -4 ], "overmap": "special_deep_rock" }, { "point": [ 0, 2, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 2, -4 ], "overmap": "microlab_generic" }, { "point": [ 2, 2, -4 ], "overmap": "microlab_generic" }, { "point": [ 3, 2, -4 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 2, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 3, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 2, -4 ], "overmap": "special_deep_rock" }, + { "point": [ -1, 3, -4 ], "overmap": "special_deep_rock" }, { "point": [ 0, 3, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 3, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 3, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 3, 3, -4 ], "overmap": "microlab_generic_edge" }, - { "point": [ 4, 3, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 0, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 2, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, 4, -4 ], "overmap": "microlab_rock_border" } + { "point": [ 4, 3, -4 ], "overmap": "special_deep_rock" }, + { "point": [ -1, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 0, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 1, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 2, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 3, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 4, 4, -4 ], "overmap": "special_deep_rock" } ], "locations": [ "forest" ], "city_distance": [ 10, -1 ], @@ -3743,70 +3743,70 @@ "id": "double_microlab", "overmaps": [ { "point": [ 3, -2, -2 ], "overmap": "microlab_sub_connector_north" }, - { "point": [ 0, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 2, -1, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 0, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 1, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 2, -1, -2 ], "overmap": "special_rock" }, { "point": [ 3, -1, -2 ], "overmap": "microlab_sub_station_north" }, - { "point": [ 4, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 5, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 6, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 0, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 5, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 6, -1, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 0, -2 ], "overmap": "special_rock" }, { "point": [ 0, 0, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 0, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 0, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 3, 0, -2 ], "overmap": "microlab_generic_sub_entry_north" }, { "point": [ 4, 0, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 5, 0, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 6, 0, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 1, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 6, 0, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 1, -2 ], "overmap": "special_rock" }, { "point": [ 0, 1, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 1, -2 ], "overmap": "microlab_generic" }, { "point": [ 2, 1, -2 ], "overmap": "microlab_generic" }, { "point": [ 3, 1, -2 ], "overmap": "microlab_generic_hallway_end_north" }, { "point": [ 4, 1, -2 ], "overmap": "microlab_generic" }, { "point": [ 5, 1, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 6, 1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 2, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 6, 1, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 2, -2 ], "overmap": "special_rock" }, { "point": [ 0, 2, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 2, -2 ], "overmap": "microlab_generic" }, { "point": [ 2, 2, -2 ], "overmap": "microlab_generic" }, { "point": [ 3, 2, -2 ], "overmap": "microlab_generic_hallway_ns" }, { "point": [ 4, 2, -2 ], "overmap": "microlab_generic" }, { "point": [ 5, 2, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 6, 2, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 3, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 6, 2, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 3, -2 ], "overmap": "special_rock" }, { "point": [ 0, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 3, 3, -2 ], "overmap": "microlab_generic_firebreak_north" }, { "point": [ 4, 3, -2 ], "overmap": "microlab_generic_edge" }, { "point": [ 5, 3, -2 ], "overmap": "microlab_generic_edge" }, - { "point": [ 6, 3, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 0, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 2, 4, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 6, 3, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 0, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 1, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 2, 4, -2 ], "overmap": "special_rock" }, { "point": [ 3, 4, -2 ], "overmap": "microlab_generic_stairs_down_north" }, - { "point": [ 4, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 5, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 6, 4, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 5, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 6, 4, -2 ], "overmap": "special_rock" }, { "point": [ 3, 4, -3 ], "overmap": "microlab_generic_isolated_stairs_odd_north" }, { "point": [ 3, -2, -4 ], "overmap": "microlab_sub_connector_north" }, - { "point": [ 0, -1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, -1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 2, -1, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 0, -1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 1, -1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 2, -1, -4 ], "overmap": "special_deep_rock" }, { "point": [ 3, -1, -4 ], "overmap": "microlab_sub_station_north" }, - { "point": [ 4, -1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 5, -1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 6, -1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 0, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, -1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 5, -1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 6, -1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ -1, 0, -4 ], "overmap": "special_deep_rock" }, { "point": [ 0, 0, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 0, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 0, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 3, 0, -4 ], "overmap": "microlab_generic_sub_entry_north" }, { "point": [ 4, 0, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 5, 0, -4 ], "overmap": "microlab_generic_edge" }, - { "point": [ 6, 0, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 6, 0, -4 ], "overmap": "special_deep_rock" }, { "point": [ -1, 1, -4 ], "overmap": "microlab_reactor_west" }, { "point": [ 0, 1, -4 ], "overmap": "microlab_generic_edge_room_connector_west" }, { "point": [ 1, 1, -4 ], "overmap": "microlab_generic" }, @@ -3814,31 +3814,31 @@ { "point": [ 3, 1, -4 ], "overmap": "microlab_generic_hallway_end_north" }, { "point": [ 4, 1, -4 ], "overmap": "microlab_generic" }, { "point": [ 5, 1, -4 ], "overmap": "microlab_generic_edge" }, - { "point": [ 6, 1, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 2, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 6, 1, -4 ], "overmap": "special_deep_rock" }, + { "point": [ -1, 2, -4 ], "overmap": "special_deep_rock" }, { "point": [ 0, 2, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 2, -4 ], "overmap": "microlab_generic" }, { "point": [ 2, 2, -4 ], "overmap": "microlab_generic" }, { "point": [ 3, 2, -4 ], "overmap": "microlab_generic_hallway_ns" }, { "point": [ 4, 2, -4 ], "overmap": "microlab_generic" }, { "point": [ 5, 2, -4 ], "overmap": "microlab_generic_edge" }, - { "point": [ 6, 2, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 3, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 6, 2, -4 ], "overmap": "special_deep_rock" }, + { "point": [ -1, 3, -4 ], "overmap": "special_deep_rock" }, { "point": [ 0, 3, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 1, 3, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 2, 3, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 3, 3, -4 ], "overmap": "microlab_generic_firebreak_north" }, { "point": [ 4, 3, -4 ], "overmap": "microlab_generic_edge" }, { "point": [ 5, 3, -4 ], "overmap": "microlab_generic_edge" }, - { "point": [ 6, 3, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 0, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 2, 4, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 6, 3, -4 ], "overmap": "special_deep_rock" }, + { "point": [ -1, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 0, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 1, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 2, 4, -4 ], "overmap": "special_deep_rock" }, { "point": [ 3, 4, -4 ], "overmap": "microlab_generic_isolated_stairs_up_north" }, - { "point": [ 4, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 5, 4, -4 ], "overmap": "microlab_rock_border" }, - { "point": [ 6, 4, -4 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 5, 4, -4 ], "overmap": "special_deep_rock" }, + { "point": [ 6, 4, -4 ], "overmap": "special_deep_rock" }, { "point": [ 3, 4, -5 ], "overmap": "microlab_generic_isolated_elevator_pit_north" }, { "point": [ -1, 1, -5 ], "overmap": "microlab_reactor_b_west" } ], diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_microlab.json b/data/json/overmap/overmap_terrain/overmap_terrain_microlab.json index 4f456312e6787..bcf731b2a448a 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_microlab.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_microlab.json @@ -8,17 +8,6 @@ "see_cost": 5, "flags": [ "NO_ROTATE", "RISK_HIGH", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, - { - "type": "overmap_terrain", - "id": "microlab_rock_border", - "name": "solid rock", - "looks_like": "empty_rock", - "sym": "%", - "color": "dark_gray", - "see_cost": 5, - "travel_cost_type": "impassable", - "flags": [ "NO_ROTATE", "RISK_HIGH", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] - }, { "type": "overmap_terrain", "id": "microlab_generic_edge", @@ -176,7 +165,7 @@ "id": "microlab_ratkin", "name": "science lab", "sym": "L", - "color": "light_blue", + "color": "green", "spawns": { "group": "GROUP_RATKIN_LAB", "population": [ 12, 25 ], "chance": 80 }, "see_cost": 5, "flags": [ "NO_ROTATE", "RISK_HIGH", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] @@ -201,9 +190,9 @@ { "type": "overmap_terrain", "id": "microlab_sub_station_ratkin", - "name": "subway station?", - "sym": "S", - "color": "light_blue", + "name": "pump station?", + "sym": "P", + "color": "green", "spawns": { "group": "GROUP_RATKIN_LAB", "population": [ 12, 25 ], "chance": 80 }, "see_cost": 5, "flags": [ "RISK_HIGH", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] @@ -213,7 +202,7 @@ "id": "microlab_ratkin_sub_entry", "name": "science lab", "sym": "L", - "color": "light_blue", + "color": "green", "spawns": { "group": "GROUP_RATKIN_LAB", "population": [ 12, 25 ], "chance": 80 }, "see_cost": 5, "flags": [ "RISK_HIGH", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] diff --git a/data/mods/DinoMod/mapgen/microlab_DinoLab.json b/data/mods/DinoMod/mapgen/microlab_DinoLab.json index 42b06cc7f323b..dcaa79d63b932 100644 --- a/data/mods/DinoMod/mapgen/microlab_DinoLab.json +++ b/data/mods/DinoMod/mapgen/microlab_DinoLab.json @@ -870,10 +870,10 @@ " | | " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -911,10 +911,10 @@ " | 5 " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -952,10 +952,10 @@ " |||||| ||||||| " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -993,10 +993,10 @@ " | | | | " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -1034,10 +1034,10 @@ " | | | | " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -1075,10 +1075,10 @@ " | | ||||||| " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -1116,10 +1116,10 @@ " |||||||| ||||||| " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -1157,10 +1157,10 @@ " | | ||||||| " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -1198,10 +1198,10 @@ " | | ||||||| " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -1239,10 +1239,10 @@ " | | ||||||| " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -1280,10 +1280,10 @@ " | | ||||||| " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } @@ -1321,10 +1321,10 @@ " | | ||||||| " ], "place_nested": [ - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } }, - { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } } + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } }, + { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } }, + { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } } ], "palettes": [ "microlab_DinoLab" ] } diff --git a/data/mods/DinoMod/overmap/overmap_specials.json b/data/mods/DinoMod/overmap/overmap_specials.json index 31c3b8c827e0b..d3b166556cf81 100644 --- a/data/mods/DinoMod/overmap/overmap_specials.json +++ b/data/mods/DinoMod/overmap/overmap_specials.json @@ -22,40 +22,40 @@ { "point": [ 2, 1, 0 ], "overmap": "microlab_DinoLab_surface_north" }, { "point": [ 2, -2, -2 ], "overmap": "microlab_sub_connector_north" }, { "point": [ 2, -1, -2 ], "overmap": "microlab_sub_station_north" }, - { "point": [ 0, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, -1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 0, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 0, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 1, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 3, -1, -2 ], "overmap": "special_rock" }, + { "point": [ 4, -1, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 0, -2 ], "overmap": "special_rock" }, { "point": [ 0, 0, -2 ], "overmap": "microlab_DinoLab_edge" }, { "point": [ 1, 0, -2 ], "overmap": "microlab_DinoLab_edge" }, { "point": [ 2, 0, -2 ], "overmap": "microlab_DinoLab_sub_entry_north" }, { "point": [ 3, 0, -2 ], "overmap": "microlab_DinoLab_edge" }, - { "point": [ 4, 0, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 1, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 0, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 1, -2 ], "overmap": "special_rock" }, { "point": [ 0, 1, -2 ], "overmap": "microlab_DinoLab_edge" }, { "point": [ 1, 1, -2 ], "overmap": "microlab_DinoLab" }, { "point": [ 2, 1, -2 ], "overmap": "microlab_DinoLab_surface_connector" }, { "point": [ 3, 1, -2 ], "overmap": "microlab_DinoLab_edge" }, - { "point": [ 4, 1, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 2, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 1, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 2, -2 ], "overmap": "special_rock" }, { "point": [ 0, 2, -2 ], "overmap": "microlab_DinoLab_edge" }, { "point": [ 1, 2, -2 ], "overmap": "microlab_DinoLab" }, { "point": [ 2, 2, -2 ], "overmap": "microlab_DinoLab" }, { "point": [ 3, 2, -2 ], "overmap": "microlab_DinoLab_edge" }, - { "point": [ 4, 2, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 3, -2 ], "overmap": "microlab_rock_border" }, + { "point": [ 4, 2, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 3, -2 ], "overmap": "special_rock" }, { "point": [ 0, 3, -2 ], "overmap": "microlab_DinoLab_edge" }, { "point": [ 1, 3, -2 ], "overmap": "microlab_DinoLab_edge" }, { "point": [ 2, 3, -2 ], "overmap": "microlab_DinoLab_edge" }, { "point": [ 3, 3, -2 ], "overmap": "microlab_DinoLab_edge" }, - { "point": [ 4, 3, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ -1, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 0, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 1, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 2, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 3, 4, -2 ], "overmap": "microlab_rock_border" }, - { "point": [ 4, 4, -2 ], "overmap": "microlab_rock_border" } + { "point": [ 4, 3, -2 ], "overmap": "special_rock" }, + { "point": [ -1, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 0, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 1, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 2, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 3, 4, -2 ], "overmap": "special_rock" }, + { "point": [ 4, 4, -2 ], "overmap": "special_rock" } ], "connections": [ { "point": [ 2, 0, 0 ], "terrain": "road", "connection": "local_road", "from": [ 2, 1, 0 ] } ], "locations": [ "wilderness" ], diff --git a/data/mods/Isolation-Protocol/Map/levels/microlab_small_level.json b/data/mods/Isolation-Protocol/Map/levels/microlab_small_level.json index 30a5b008ad374..99c8e9ec6aedb 100644 --- a/data/mods/Isolation-Protocol/Map/levels/microlab_small_level.json +++ b/data/mods/Isolation-Protocol/Map/levels/microlab_small_level.json @@ -39,7 +39,7 @@ "surface": { "overmap": "nether_glass_impassable_north", "below": "duct_to_surface", "locations": [ "iso_nether" ] }, "iso_elevator": { "overmap": "iso_elevator_north", "above": "duct_to_surface", "north": "hallway_to_hallway" }, "iso_next_level_elevator": { "overmap": "iso_next_level_elevator_north", "north": { "id": "hallway_to_hallway" } }, - "microlab_rock_border": { "overmap": "microlab_rock_border" }, + "special_rock": { "overmap": "special_rock" }, "nether_glass_impassable": { "overmap": "nether_glass_impassable_north" }, "microlab": { "overmap": "microlab_generic", @@ -86,7 +86,7 @@ }, "hallway_blind_end": { "overmap": "microlab_generic_hallway_blind_end_north", "north": { "id": "hallway_to_hallway" } }, "rock_divisor": { - "overmap": "microlab_rock_border", + "overmap": "special_rock", "north": "microlab_to_microlab", "south": "microlab_to_microlab", "east": { "id": "microlab_to_microlab", "type": "available" }, @@ -107,16 +107,16 @@ { "overmap": "firebreak", "pos": [ 0, 0, 0 ], "rot": "east" }, { "overmap": "hallway_straight", "pos": [ 1, 0, 0 ], "rot": "east" }, { "overmap": "hallway_straight", "pos": [ -1, 0, 0 ], "rot": "east" }, - { "overmap": "microlab_rock_border", "pos": [ 0, 1, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 0, 2, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 0, 3, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 0, 4, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 0, 5, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 0, -1, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 0, -2, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 0, -3, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 0, -4, 0 ] }, - { "overmap": "microlab_rock_border", "pos": [ 0, -5, 0 ] } + { "overmap": "special_rock", "pos": [ 0, 1, 0 ] }, + { "overmap": "special_rock", "pos": [ 0, 2, 0 ] }, + { "overmap": "special_rock", "pos": [ 0, 3, 0 ] }, + { "overmap": "special_rock", "pos": [ 0, 4, 0 ] }, + { "overmap": "special_rock", "pos": [ 0, 5, 0 ] }, + { "overmap": "special_rock", "pos": [ 0, -1, 0 ] }, + { "overmap": "special_rock", "pos": [ 0, -2, 0 ] }, + { "overmap": "special_rock", "pos": [ 0, -3, 0 ] }, + { "overmap": "special_rock", "pos": [ 0, -4, 0 ] }, + { "overmap": "special_rock", "pos": [ 0, -5, 0 ] } ], "max": { "poisson": 0.5, "bounds": [ 0, 1 ] } }