diff --git a/data/mods/desert_region/desert_special_locations.json b/data/mods/desert_region/desert_special_locations.json index 59107a905ee9b..3aa0fd69e72d6 100644 --- a/data/mods/desert_region/desert_special_locations.json +++ b/data/mods/desert_region/desert_special_locations.json @@ -41,30 +41,18 @@ "type": "overmap_location", "id": "canyon", "terrains": [ - "canyon_2way_v1", - "canyon_3way_v1", - "canyon_edge_v1", - "canyon_corner_v1", - "canyon_2way_v2", - "canyon_3way_v2", - "canyon_edge_v2", - "canyon_corner_v2", - "canyon_2way_ground_v1", - "canyon_3way_ground_v1", - "canyon_edge_ground_v1", - "canyon_corner_ground_v1", - "canyon_2way_ground_v2", - "canyon_3way_ground_v2", - "canyon_edge_ground_v2", - "canyon_corner_ground_v2", - "canyon_2way_v1_bottom", - "canyon_3way_v1_bottom", - "canyon_edge_v1_bottom", - "canyon_corner_v1_bottom", - "canyon_2way_v2_bottom", - "canyon_3way_v2_bottom", - "canyon_edge_v2_bottom", - "canyon_corner_v2_bottom" + "canyon_2way_ground", + "canyon_3way_ground", + "canyon_edge_ground", + "canyon_corner_ground", + "canyon_2way", + "canyon_3way", + "canyon_edge", + "canyon_corner", + "canyon_2way_bottom", + "canyon_3way_bottom", + "canyon_edge_bottom", + "canyon_corner_bottom" ] }, { diff --git a/data/mods/desert_region/mapgen/earth.json b/data/mods/desert_region/mapgen/earth.json index b45c4bd1067d5..273b0c5814b93 100644 --- a/data/mods/desert_region/mapgen/earth.json +++ b/data/mods/desert_region/mapgen/earth.json @@ -308,35 +308,78 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_edge_v1_bottom", "canyon_edge_v2_bottom" ] ], - "//": "Z = -2", + "//": "z0 omts, actual mapgen is done by nests in the z-2 versions", + "om_terrain": [ "canyon_edge_ground", "canyon_corner_ground", "canyon_2way_ground", "canyon_3way_ground" ], + "object": { "fallback_predecessor_mapgen": "field" } + }, + { + "type": "mapgen", + "method": "json", + "//": "z-1 omts, actual mapgen is done by nests in the z-2 versions", + "om_terrain": [ "canyon_edge", "canyon_corner", "canyon_2way", "canyon_3way" ], + "object": { "predecessor_mapgen": "open_air" } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "canyon_edge_bottom", "object": { "predecessor_mapgen": "field", + "parameters": { + "variant": { + "type": "nested_mapgen_id", + "scope": "omt", + "default": { "distribution": [ "24x24_canyon_edge_v1", "24x24_canyon_edge_v2" ] } + } + }, + "place_nested": [ + { "chunks": [ { "param": "variant", "fallback": "24x24_canyon_edge_v1" } ], "x": 0, "y": 0 }, + { "chunks": [ { "param": "variant", "fallback": "24x24_canyon_edge_v1" } ], "x": 0, "y": 0, "z": 1 }, + { + "chunks": [ + { + "switch": { "param": "variant", "fallback": "24x24_canyon_edge_v1" }, + "cases": { "24x24_canyon_edge_v1": "24x24_canyon_edge_ground_v1", "24x24_canyon_edge_v2": "24x24_canyon_edge_ground_v2" } + } + ], + "x": 0, + "y": 0, + "z": 2 + } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_canyon_edge_v1", + "object": { + "mapgensize": [ 24, 24 ], "rows": [ - " ##### ", - "### ################ ##", - "###### ###################### ######", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################" + " ", + "### ####", + "###### ########", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" ], "terrain": { "#": "t_sandstone" } } @@ -344,70 +387,69 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_edge_v1", "canyon_edge_v2" ] ], - "//": "Z = -1", + "nested_mapgen_id": "24x24_canyon_edge_v2", "object": { + "mapgensize": [ 24, 24 ], "rows": [ - " ##### ", - "### ################ ##", - "###### ###################### ######", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################" + " ##### ", + "############ ##", + "############## ######", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" ], - "terrain": { "#": "t_sandstone", " ": "t_open_air" } + "terrain": { "#": "t_sandstone" } } }, { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_edge_ground_v1", "canyon_edge_ground_v2" ] ], - "//": "Z = 0", + "nested_mapgen_id": "24x24_canyon_edge_ground_v1", "object": { - "fallback_predecessor_mapgen": "field", + "mapgensize": [ 24, 24 ], "rows": [ - " ##### ", - "### ################ ##", - "###### ###################### ######", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################" + " ", + "### ####", + "###### ########", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "#": "t_null", " ": "t_open_air" } @@ -416,35 +458,100 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_corner_v1_bottom", "canyon_corner_v2_bottom" ] ], - "//": "Z = -2", + "nested_mapgen_id": "24x24_canyon_edge_ground_v2", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ##### ", + "############ ##", + "############## ######", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################", + "########################" + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { "#": "t_null", " ": "t_open_air" } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "canyon_corner_bottom", "object": { "predecessor_mapgen": "field", + "parameters": { + "variant": { + "type": "nested_mapgen_id", + "scope": "omt", + "default": { "distribution": [ "24x24_canyon_corner_v1", "24x24_canyon_corner_v2" ] } + } + }, + "place_nested": [ + { "chunks": [ { "param": "variant", "fallback": "24x24_canyon_corner_v1" } ], "x": 0, "y": 0 }, + { "chunks": [ { "param": "variant", "fallback": "24x24_canyon_corner_v1" } ], "x": 0, "y": 0, "z": 1 }, + { + "chunks": [ + { + "switch": { "param": "variant", "fallback": "24x24_canyon_corner_v1" }, + "cases": { "24x24_canyon_corner_v1": "24x24_canyon_corner_ground_v1", "24x24_canyon_corner_v2": "24x24_canyon_corner_ground_v2" } + } + ], + "x": 0, + "y": 0, + "z": 2 + } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_canyon_corner_v1", + "object": { + "mapgensize": [ 24, 24 ], "rows": [ - " ", - "### ", - "##### # ", - "######## ## ", - "########## ### ", - "############ #### ", - "############# #### ", - "############## ##### ", - "############## ####### ", - "############### ######## ", - "################ ########## ", - "################# ########### ", - "################### ############ ", - "#################### ############ ", - "#################### ############# ", - "##################### ############## ", - "##################### ############## ", - "##################### ############### ", - "###################### ################ ", - "###################### ################## ", - "###################### ################### ", - "####################### ##################### ", - "####################### ###################### ", - "####################### ###################### " + " ", + "### ", + "##### ", + "######## ", + "########## ", + "############ ", + "############# ", + "############## ", + "############## ", + "############### ", + "################ ", + "################# ", + "################### ", + "#################### ", + "#################### ", + "##################### ", + "##################### ", + "##################### ", + "###################### ", + "###################### ", + "###################### ", + "####################### ", + "####################### ", + "####################### " ], "terrain": { "#": "t_sandstone" } } @@ -452,70 +559,105 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_corner_v1", "canyon_corner_v2" ] ], - "//": "Z = -1", + "nested_mapgen_id": "24x24_canyon_corner_v2", "object": { + "mapgensize": [ 24, 24 ], "rows": [ - " ", - "### ", - "##### # ", - "######## ## ", - "########## ### ", - "############ #### ", - "############# #### ", - "############## ##### ", - "############## ####### ", - "############### ######## ", - "################ ########## ", - "################# ########### ", - "################### ############ ", - "#################### ############ ", - "#################### ############# ", - "##################### ############## ", - "##################### ############## ", - "##################### ############### ", - "###################### ################ ", - "###################### ################## ", - "###################### ################### ", - "####################### ##################### ", - "####################### ###################### ", - "####################### ###################### " + " ", + " ", + "# ", + "## ", + "### ", + "#### ", + "#### ", + "##### ", + "####### ", + "######## ", + "########## ", + "########### ", + "############ ", + "############ ", + "############# ", + "############## ", + "############## ", + "############### ", + "################ ", + "################## ", + "################### ", + "##################### ", + "###################### ", + "###################### " ], - "terrain": { "#": "t_sandstone", " ": "t_open_air" } + "terrain": { "#": "t_sandstone" } } }, { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_corner_ground_v1", "canyon_corner_ground_v2" ] ], - "//": "Z = 0", + "nested_mapgen_id": "24x24_canyon_corner_ground_v1", "object": { - "fallback_predecessor_mapgen": "field", + "mapgensize": [ 24, 24 ], "rows": [ - " ", - "### ", - "##### # ", - "######## ## ", - "########## ### ", - "############ #### ", - "############# #### ", - "############## ##### ", - "############## ####### ", - "############### ######## ", - "################ ########## ", - "################# ########### ", - "################### ############ ", - "#################### ############ ", - "#################### ############# ", - "##################### ############## ", - "##################### ############## ", - "##################### ############### ", - "###################### ################ ", - "###################### ################## ", - "###################### ################### ", - "####################### ##################### ", - "####################### ###################### ", - "####################### ###################### " + " ", + "### ", + "##### ", + "######## ", + "########## ", + "############ ", + "############# ", + "############## ", + "############## ", + "############### ", + "################ ", + "################# ", + "################### ", + "#################### ", + "#################### ", + "##################### ", + "##################### ", + "##################### ", + "###################### ", + "###################### ", + "###################### ", + "####################### ", + "####################### ", + "####################### " + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { "#": "t_null", " ": "t_open_air" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_canyon_corner_ground_v2", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + "# ", + "## ", + "### ", + "#### ", + "#### ", + "##### ", + "####### ", + "######## ", + "########## ", + "########### ", + "############ ", + "############ ", + "############# ", + "############## ", + "############## ", + "############### ", + "################ ", + "################## ", + "################### ", + "##################### ", + "###################### ", + "###################### " ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "#": "t_null", " ": "t_open_air" } @@ -524,35 +666,64 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_2way_v1_bottom", "canyon_2way_v2_bottom" ] ], - "//": "Z = -1", + "om_terrain": "canyon_2way_bottom", "object": { "predecessor_mapgen": "field", + "parameters": { + "variant": { + "type": "nested_mapgen_id", + "scope": "omt", + "default": { "distribution": [ "24x24_canyon_2way_v1", "24x24_canyon_2way_v2" ] } + } + }, + "place_nested": [ + { "chunks": [ { "param": "variant", "fallback": "24x24_canyon_2way_v1" } ], "x": 0, "y": 0 }, + { "chunks": [ { "param": "variant", "fallback": "24x24_canyon_2way_v1" } ], "x": 0, "y": 0, "z": 1 }, + { + "chunks": [ + { + "switch": { "param": "variant", "fallback": "24x24_canyon_2way_v1" }, + "cases": { "24x24_canyon_2way_v1": "24x24_canyon_2way_ground_v1", "24x24_canyon_2way_v2": "24x24_canyon_2way_ground_v2" } + } + ], + "x": 0, + "y": 0, + "z": 2 + } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_canyon_2way_v1", + "object": { + "mapgensize": [ 24, 24 ], "rows": [ - " ###################### ###################### ", - " ###################### ###################### ", - " #################### ##################### ", - " #################### #################### ", - " #################### ################### ", - " ################## ################### ", - " ################## ################### ", - " ################# ################## ", - " ################# ################## ", - " ################# ################# ", - " ################# ################# ", - " ################ ################# ", - " ################# ################ ", - " ################# ################# ", - " ################# ################# ", - " ################## ################# ", - " ################## ################# ", - " ################### ################## ", - " ################### ################## ", - " ################### #################### ", - " #################### #################### ", - " ##################### #################### ", - " ###################### ###################### ", - " ###################### ###################### " + " ###################### ", + " ###################### ", + " #################### ", + " #################### ", + " #################### ", + " ################## ", + " ################## ", + " ################# ", + " ################# ", + " ################# ", + " ################# ", + " ################ ", + " ################# ", + " ################# ", + " ################# ", + " ################## ", + " ################## ", + " ################### ", + " ################### ", + " ################### ", + " #################### ", + " ##################### ", + " ###################### ", + " ###################### " ], "terrain": { "#": "t_sandstone" } } @@ -560,70 +731,105 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_2way_v1", "canyon_2way_v2" ] ], - "//": "Z = -1", + "nested_mapgen_id": "24x24_canyon_2way_v2", "object": { + "mapgensize": [ 24, 24 ], "rows": [ - " ###################### ###################### ", - " ###################### ###################### ", - " #################### ##################### ", - " #################### #################### ", - " #################### ################### ", - " ################## ################### ", - " ################## ################### ", - " ################# ################## ", - " ################# ################## ", - " ################# ################# ", - " ################# ################# ", - " ################ ################# ", - " ################# ################ ", - " ################# ################# ", - " ################# ################# ", - " ################## ################# ", - " ################## ################# ", - " ################### ################## ", - " ################### ################## ", - " ################### #################### ", - " #################### #################### ", - " ##################### #################### ", - " ###################### ###################### ", - " ###################### ###################### " + " ###################### ", + " ###################### ", + " ##################### ", + " #################### ", + " ################### ", + " ################### ", + " ################### ", + " ################## ", + " ################## ", + " ################# ", + " ################# ", + " ################# ", + " ################ ", + " ################# ", + " ################# ", + " ################# ", + " ################# ", + " ################## ", + " ################## ", + " #################### ", + " #################### ", + " #################### ", + " ###################### ", + " ###################### " ], - "terrain": { "#": "t_sandstone", " ": "t_open_air" } + "terrain": { "#": "t_sandstone" } } }, { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_2way_ground_v1", "canyon_2way_ground_v2" ] ], - "//": "Z = 0", + "nested_mapgen_id": "24x24_canyon_2way_ground_v1", "object": { - "fallback_predecessor_mapgen": "field", + "mapgensize": [ 24, 24 ], + "rows": [ + " ###################### ", + " ###################### ", + " #################### ", + " #################### ", + " #################### ", + " ################## ", + " ################## ", + " ################# ", + " ################# ", + " ################# ", + " ################# ", + " ################ ", + " ################# ", + " ################# ", + " ################# ", + " ################## ", + " ################## ", + " ################### ", + " ################### ", + " ################### ", + " #################### ", + " ##################### ", + " ###################### ", + " ###################### " + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { "#": "t_null", " ": "t_open_air" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_canyon_2way_ground_v2", + "object": { + "mapgensize": [ 24, 24 ], "rows": [ - " ###################### ###################### ", - " ###################### ###################### ", - " #################### ##################### ", - " #################### #################### ", - " #################### ################### ", - " ################## ################### ", - " ################## ################### ", - " ################# ################## ", - " ################# ################## ", - " ################# ################# ", - " ################# ################# ", - " ################ ################# ", - " ################# ################ ", - " ################# ################# ", - " ################# ################# ", - " ################## ################# ", - " ################## ################# ", - " ################### ################## ", - " ################### ################## ", - " ################### #################### ", - " #################### #################### ", - " ##################### #################### ", - " ###################### ###################### ", - " ###################### ###################### " + " ###################### ", + " ###################### ", + " ##################### ", + " #################### ", + " ################### ", + " ################### ", + " ################### ", + " ################## ", + " ################## ", + " ################# ", + " ################# ", + " ################# ", + " ################ ", + " ################# ", + " ################# ", + " ################# ", + " ################# ", + " ################## ", + " ################## ", + " #################### ", + " #################### ", + " #################### ", + " ###################### ", + " ###################### " ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "#": "t_null", " ": "t_open_air" } @@ -632,35 +838,64 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_3way_v1_bottom", "canyon_3way_v2_bottom" ] ], - "//": "Z = -2", + "om_terrain": "canyon_3way_bottom", "object": { "predecessor_mapgen": "field", + "parameters": { + "variant": { + "type": "nested_mapgen_id", + "scope": "omt", + "default": { "distribution": [ "24x24_canyon_3way_v1", "24x24_canyon_3way_v2" ] } + } + }, + "place_nested": [ + { "chunks": [ { "param": "variant", "fallback": "24x24_canyon_3way_v1" } ], "x": 0, "y": 0 }, + { "chunks": [ { "param": "variant", "fallback": "24x24_canyon_3way_v1" } ], "x": 0, "y": 0, "z": 1 }, + { + "chunks": [ + { + "switch": { "param": "variant", "fallback": "24x24_canyon_3way_v1" }, + "cases": { "24x24_canyon_3way_v1": "24x24_canyon_3way_ground_v1", "24x24_canyon_3way_v2": "24x24_canyon_3way_ground_v2" } + } + ], + "x": 0, + "y": 0, + "z": 2 + } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_canyon_3way_v1", + "object": { + "mapgensize": [ 24, 24 ], "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " #### ", - " ######### ", - " ########### ###### ", - " ############# ########## ", - " ############## ########### ", - " ################ ############ ", - " ################# ############# ", - " ################## ############## ", - " #################### ################# ", - " ##################### #################### ", - " ##################### ##################### " + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " #### ", + " ######### ", + " ########### ", + " ############# ", + " ############## ", + " ################ ", + " ################# ", + " ################## ", + " #################### ", + " ##################### ", + " ##################### " ], "terrain": { "#": "t_sandstone" } } @@ -668,70 +903,105 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_3way_v1", "canyon_3way_v2" ] ], - "//": "Z = -1", + "nested_mapgen_id": "24x24_canyon_3way_v2", "object": { + "mapgensize": [ 24, 24 ], "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " #### ", - " ######### ", - " ########### ###### ", - " ############# ########## ", - " ############## ########### ", - " ################ ############ ", - " ################# ############# ", - " ################## ############## ", - " #################### ################# ", - " ##################### #################### ", - " ##################### ##################### " + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ###### ", + " ########## ", + " ########### ", + " ############ ", + " ############# ", + " ############## ", + " ################# ", + " #################### ", + " ##################### " ], - "terrain": { "#": "t_sandstone", " ": "t_open_air" } + "terrain": { "#": "t_sandstone" } } }, { "type": "mapgen", "method": "json", - "om_terrain": [ [ "canyon_3way_ground_v1", "canyon_3way_ground_v2" ] ], - "//": "Z = 0", + "nested_mapgen_id": "24x24_canyon_3way_ground_v1", "object": { - "fallback_predecessor_mapgen": "field", + "mapgensize": [ 24, 24 ], "rows": [ - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " #### ", - " ######### ", - " ########### ###### ", - " ############# ########## ", - " ############## ########### ", - " ################ ############ ", - " ################# ############# ", - " ################## ############## ", - " #################### ################# ", - " ##################### #################### ", - " ##################### ##################### " + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " #### ", + " ######### ", + " ########### ", + " ############# ", + " ############## ", + " ################ ", + " ################# ", + " ################## ", + " #################### ", + " ##################### ", + " ##################### " + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "terrain": { "#": "t_null", " ": "t_open_air" } + } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "24x24_canyon_3way_ground_v2", + "object": { + "mapgensize": [ 24, 24 ], + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ###### ", + " ########## ", + " ########### ", + " ############ ", + " ############# ", + " ############## ", + " ################# ", + " #################### ", + " ##################### " ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { "#": "t_null", " ": "t_open_air" } diff --git a/data/mods/desert_region/omt_migration.json b/data/mods/desert_region/omt_migration.json new file mode 100644 index 0000000000000..c0e57cb8ffe3a --- /dev/null +++ b/data/mods/desert_region/omt_migration.json @@ -0,0 +1,104 @@ +[ + { + "type": "oter_id_migration", + "//": "Migrated in 0.I, remove after 0.I stable", + "oter_ids": { + "canyon_2way_v1_north": "canyon_2way_north", + "canyon_3way_v1_north": "canyon_3way_north", + "canyon_edge_v1_north": "canyon_edge_north", + "canyon_corner_v1_north": "canyon_corner_north", + "canyon_2way_v2_north": "canyon_2way_north", + "canyon_3way_v2_north": "canyon_3way_north", + "canyon_edge_v2_north": "canyon_edge_north", + "canyon_corner_v2_north": "canyon_corner_north", + "canyon_2way_v1_bottom_north": "canyon_2way_bottom_north", + "canyon_3way_v1_bottom_north": "canyon_3way_bottom_north", + "canyon_edge_v1_bottom_north": "canyon_edge_bottom_north", + "canyon_corner_v1_bottom_north": "canyon_corner_bottom_north", + "canyon_2way_v2_bottom_north": "canyon_2way_bottom_north", + "canyon_3way_v2_bottom_north": "canyon_3way_bottom_north", + "canyon_edge_v2_bottom_north": "canyon_edge_bottom_north", + "canyon_corner_v2_bottom_north": "canyon_corner_bottom_north", + "canyon_2way_ground_v1_north": "canyon_2way_ground_north", + "canyon_3way_ground_v1_north": "canyon_3way_ground_north", + "canyon_edge_ground_v1_north": "canyon_edge_ground_north", + "canyon_corner_ground_v1_north": "canyon_corner_ground_north", + "canyon_2way_ground_v2_north": "canyon_2way_ground_north", + "canyon_3way_ground_v2_north": "canyon_3way_ground_north", + "canyon_edge_ground_v2_north": "canyon_edge_ground_north", + "canyon_corner_ground_v2_north": "canyon_corner_ground_north", + "canyon_2way_v1_east": "canyon_2way_east", + "canyon_3way_v1_east": "canyon_3way_east", + "canyon_edge_v1_east": "canyon_edge_east", + "canyon_corner_v1_east": "canyon_corner_east", + "canyon_2way_v2_east": "canyon_2way_east", + "canyon_3way_v2_east": "canyon_3way_east", + "canyon_edge_v2_east": "canyon_edge_east", + "canyon_corner_v2_east": "canyon_corner_east", + "canyon_2way_v1_bottom_east": "canyon_2way_bottom_east", + "canyon_3way_v1_bottom_east": "canyon_3way_bottom_east", + "canyon_edge_v1_bottom_east": "canyon_edge_bottom_east", + "canyon_corner_v1_bottom_east": "canyon_corner_bottom_east", + "canyon_2way_v2_bottom_east": "canyon_2way_bottom_east", + "canyon_3way_v2_bottom_east": "canyon_3way_bottom_east", + "canyon_edge_v2_bottom_east": "canyon_edge_bottom_east", + "canyon_corner_v2_bottom_east": "canyon_corner_bottom_east", + "canyon_2way_ground_v1_east": "canyon_2way_ground_east", + "canyon_3way_ground_v1_east": "canyon_3way_ground_east", + "canyon_edge_ground_v1_east": "canyon_edge_ground_east", + "canyon_corner_ground_v1_east": "canyon_corner_ground_east", + "canyon_2way_ground_v2_east": "canyon_2way_ground_east", + "canyon_3way_ground_v2_east": "canyon_3way_ground_east", + "canyon_edge_ground_v2_east": "canyon_edge_ground_east", + "canyon_corner_ground_v2_east": "canyon_corner_ground_east", + "canyon_2way_v1_south": "canyon_2way_south", + "canyon_3way_v1_south": "canyon_3way_south", + "canyon_edge_v1_south": "canyon_edge_south", + "canyon_corner_v1_south": "canyon_corner_south", + "canyon_2way_v2_south": "canyon_2way_south", + "canyon_3way_v2_south": "canyon_3way_south", + "canyon_edge_v2_south": "canyon_edge_south", + "canyon_corner_v2_south": "canyon_corner_south", + "canyon_2way_v1_bottom_south": "canyon_2way_bottom_south", + "canyon_3way_v1_bottom_south": "canyon_3way_bottom_south", + "canyon_edge_v1_bottom_south": "canyon_edge_bottom_south", + "canyon_corner_v1_bottom_south": "canyon_corner_bottom_south", + "canyon_2way_v2_bottom_south": "canyon_2way_bottom_south", + "canyon_3way_v2_bottom_south": "canyon_3way_bottom_south", + "canyon_edge_v2_bottom_south": "canyon_edge_bottom_south", + "canyon_corner_v2_bottom_south": "canyon_corner_bottom_south", + "canyon_2way_ground_v1_south": "canyon_2way_ground_south", + "canyon_3way_ground_v1_south": "canyon_3way_ground_south", + "canyon_edge_ground_v1_south": "canyon_edge_ground_south", + "canyon_corner_ground_v1_south": "canyon_corner_ground_south", + "canyon_2way_ground_v2_south": "canyon_2way_ground_south", + "canyon_3way_ground_v2_south": "canyon_3way_ground_south", + "canyon_edge_ground_v2_south": "canyon_edge_ground_south", + "canyon_corner_ground_v2_south": "canyon_corner_ground_south", + "canyon_2way_v1_west": "canyon_2way_west", + "canyon_3way_v1_west": "canyon_3way_west", + "canyon_edge_v1_west": "canyon_edge_west", + "canyon_corner_v1_west": "canyon_corner_west", + "canyon_2way_v2_west": "canyon_2way_west", + "canyon_3way_v2_west": "canyon_3way_west", + "canyon_edge_v2_west": "canyon_edge_west", + "canyon_corner_v2_west": "canyon_corner_west", + "canyon_2way_v1_bottom_west": "canyon_2way_bottom_west", + "canyon_3way_v1_bottom_west": "canyon_3way_bottom_west", + "canyon_edge_v1_bottom_west": "canyon_edge_bottom_west", + "canyon_corner_v1_bottom_west": "canyon_corner_bottom_west", + "canyon_2way_v2_bottom_west": "canyon_2way_bottom_west", + "canyon_3way_v2_bottom_west": "canyon_3way_bottom_west", + "canyon_edge_v2_bottom_west": "canyon_edge_bottom_west", + "canyon_corner_v2_bottom_west": "canyon_corner_bottom_west", + "canyon_2way_ground_v1_west": "canyon_2way_ground_west", + "canyon_3way_ground_v1_west": "canyon_3way_ground_west", + "canyon_edge_ground_v1_west": "canyon_edge_ground_west", + "canyon_corner_ground_v1_west": "canyon_corner_ground_west", + "canyon_2way_ground_v2_west": "canyon_2way_ground_west", + "canyon_3way_ground_v2_west": "canyon_3way_ground_west", + "canyon_edge_ground_v2_west": "canyon_edge_ground_west", + "canyon_corner_ground_v2_west": "canyon_corner_ground_west" + } + } +] diff --git a/data/mods/desert_region/overmap/desert_overmap_terrain.json b/data/mods/desert_region/overmap/desert_overmap_terrain.json index 875d2783231a5..8bc8fe5444a0c 100644 --- a/data/mods/desert_region/overmap/desert_overmap_terrain.json +++ b/data/mods/desert_region/overmap/desert_overmap_terrain.json @@ -103,24 +103,7 @@ }, { "type": "overmap_terrain", - "id": [ - "canyon_2way_v1", - "canyon_3way_v1", - "canyon_edge_v1", - "canyon_corner_v1", - "canyon_2way_v2", - "canyon_3way_v2", - "canyon_edge_v2", - "canyon_corner_v2", - "canyon_2way_v1_bottom", - "canyon_3way_v1_bottom", - "canyon_edge_v1_bottom", - "canyon_corner_v1_bottom", - "canyon_2way_v2_bottom", - "canyon_3way_v2_bottom", - "canyon_edge_v2_bottom", - "canyon_corner_v2_bottom" - ], + "abstract": "generic_canyon", "name": "canyon", "sym": "V", "color": "light_gray", @@ -129,18 +112,21 @@ { "type": "overmap_terrain", "id": [ - "canyon_2way_ground_v1", - "canyon_3way_ground_v1", - "canyon_edge_ground_v1", - "canyon_corner_ground_v1", - "canyon_2way_ground_v2", - "canyon_3way_ground_v2", - "canyon_edge_ground_v2", - "canyon_corner_ground_v2" + "canyon_2way", + "canyon_3way", + "canyon_edge", + "canyon_corner", + "canyon_2way_bottom", + "canyon_3way_bottom", + "canyon_edge_bottom", + "canyon_corner_bottom" ], - "name": "canyon", - "sym": "V", - "color": "light_gray", + "copy-from": "generic_canyon" + }, + { + "type": "overmap_terrain", + "id": [ "canyon_2way_ground", "canyon_3way_ground", "canyon_edge_ground", "canyon_corner_ground" ], + "copy-from": "generic_canyon", "see_cost": "all_clear", "flags": [ "REQUIRES_PREDECESSOR" ] }, diff --git a/data/mods/desert_region/overmap/mutable/canyon_mutable.json b/data/mods/desert_region/overmap/mutable/canyon_mutable.json index 7a09f47d83a0e..90077ad2af683 100644 --- a/data/mods/desert_region/overmap/mutable/canyon_mutable.json +++ b/data/mods/desert_region/overmap/mutable/canyon_mutable.json @@ -6,6 +6,7 @@ "locations": [ "field", "forest_with_swamp", "subterranean_empty" ], "city_distance": [ 0, -1 ], "city_sizes": [ 0, -1 ], + "priority": 3, "occurrences": [ 0, 3 ], "flags": [ "CLASSIC" ], "check_for_locations_area": [ @@ -36,19 +37,19 @@ "south": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] }, "west": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] } }, - "canyon_edge_ground_v1": { "overmap": "canyon_edge_ground_v1_north", "north": { "id": "canyon_to_canyon" } }, - "canyon_corner_ground_v1": { - "overmap": "canyon_corner_ground_v1_north", + "canyon_edge_ground": { "overmap": "canyon_edge_ground_north", "north": { "id": "canyon_to_canyon" } }, + "canyon_corner_ground": { + "overmap": "canyon_corner_ground_north", "north": { "id": "canyon_to_canyon", "alternatives": [ "canyon_to_edge" ] }, "east": { "id": "canyon_to_canyon", "alternatives": [ "canyon_to_edge" ] } }, - "canyon_2way_ground_v1": { - "overmap": "canyon_2way_ground_v1_east", + "canyon_2way_ground": { + "overmap": "canyon_2way_ground_east", "north": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] }, "south": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] } }, - "canyon_3way_ground_v1": { - "overmap": "canyon_3way_ground_v1_north", + "canyon_3way_ground": { + "overmap": "canyon_3way_ground_north", "north": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] }, "east": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] }, "west": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] } @@ -57,39 +58,14 @@ "canyon_filler": { "overmap": "open_air" }, "canyon_root_filler": { "overmap": "open_air", "above": { "id": "canyon_to_bottom", "alternatives": [ "canyon_to_edge" ] } }, "canyon_bottom": { "overmap": "field" }, - "canyon_edge_v1": { "overmap": "canyon_edge_v1_north" }, - "canyon_corner_v1": { "overmap": "canyon_corner_v1_north" }, - "canyon_2way_v1": { "overmap": "canyon_2way_v1_east" }, - "canyon_3way_v1": { "overmap": "canyon_3way_v1_north" }, - "canyon_edge_v1_bottom": { "overmap": "canyon_edge_v1_bottom_north" }, - "canyon_corner_v1_bottom": { "overmap": "canyon_corner_v1_bottom_north" }, - "canyon_2way_v1_bottom": { "overmap": "canyon_2way_v1_bottom_east" }, - "canyon_3way_v1_bottom": { "overmap": "canyon_3way_v1_bottom_north" }, - "canyon_edge_ground_v2": { "overmap": "canyon_edge_ground_v2_north", "north": { "id": "canyon_to_canyon" } }, - "canyon_corner_ground_v2": { - "overmap": "canyon_corner_ground_v2_north", - "north": { "id": "canyon_to_canyon", "alternatives": [ "canyon_to_edge" ] }, - "east": { "id": "canyon_to_canyon", "alternatives": [ "canyon_to_edge" ] } - }, - "canyon_2way_ground_v2": { - "overmap": "canyon_2way_ground_v2_east", - "north": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] }, - "south": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] } - }, - "canyon_3way_ground_v2": { - "overmap": "canyon_3way_ground_v2_north", - "north": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] }, - "east": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] }, - "west": { "id": "canyon_to_canyon", "type": "available", "alternatives": [ "canyon_to_edge" ] } - }, - "canyon_edge_v2": { "overmap": "canyon_edge_v2_north" }, - "canyon_corner_v2": { "overmap": "canyon_corner_v2_north" }, - "canyon_2way_v2": { "overmap": "canyon_2way_v2_east" }, - "canyon_3way_v2": { "overmap": "canyon_3way_v2_north" }, - "canyon_edge_v2_bottom": { "overmap": "canyon_edge_v2_bottom_north" }, - "canyon_corner_v2_bottom": { "overmap": "canyon_corner_v2_bottom_north" }, - "canyon_2way_v2_bottom": { "overmap": "canyon_2way_v2_bottom_east" }, - "canyon_3way_v2_bottom": { "overmap": "canyon_3way_v2_bottom_north" } + "canyon_edge": { "overmap": "canyon_edge_north" }, + "canyon_corner": { "overmap": "canyon_corner_north" }, + "canyon_2way": { "overmap": "canyon_2way_east" }, + "canyon_3way": { "overmap": "canyon_3way_north" }, + "canyon_edge_bottom": { "overmap": "canyon_edge_bottom_north" }, + "canyon_corner_bottom": { "overmap": "canyon_corner_bottom_north" }, + "canyon_2way_bottom": { "overmap": "canyon_2way_bottom_east" }, + "canyon_3way_bottom": { "overmap": "canyon_3way_bottom_north" } }, "root": "canyon_root", "phases": [ @@ -201,80 +177,44 @@ ], [ { - "name": "canyon edge v1", - "chunk": [ - { "overmap": "canyon_edge_ground_v1", "pos": [ 0, 0, 0 ] }, - { "overmap": "canyon_edge_v1", "pos": [ 0, 0, -1 ] }, - { "overmap": "canyon_edge_v1_bottom", "pos": [ 0, 0, -2 ] } - ], - "weight": 1 - }, - { - "name": "canyon edge v2", + "name": "canyon edge", "chunk": [ - { "overmap": "canyon_edge_ground_v2", "pos": [ 0, 0, 0 ] }, - { "overmap": "canyon_edge_v2", "pos": [ 0, 0, -1 ] }, - { "overmap": "canyon_edge_v2_bottom", "pos": [ 0, 0, -2 ] } + { "overmap": "canyon_edge_ground", "pos": [ 0, 0, 0 ] }, + { "overmap": "canyon_edge", "pos": [ 0, 0, -1 ] }, + { "overmap": "canyon_edge_bottom", "pos": [ 0, 0, -2 ] } ], "weight": 1 } ], [ { - "name": "canyon corner v1", + "name": "canyon corner", "chunk": [ - { "overmap": "canyon_corner_ground_v1", "pos": [ 0, 0, 0 ] }, - { "overmap": "canyon_corner_v1", "pos": [ 0, 0, -1 ] }, - { "overmap": "canyon_corner_v1_bottom", "pos": [ 0, 0, -2 ] } - ], - "weight": 1 - }, - { - "name": "canyon corner v2", - "chunk": [ - { "overmap": "canyon_corner_ground_v2", "pos": [ 0, 0, 0 ] }, - { "overmap": "canyon_corner_v2", "pos": [ 0, 0, -1 ] }, - { "overmap": "canyon_corner_v2_bottom", "pos": [ 0, 0, -2 ] } + { "overmap": "canyon_corner_ground", "pos": [ 0, 0, 0 ] }, + { "overmap": "canyon_corner", "pos": [ 0, 0, -1 ] }, + { "overmap": "canyon_corner_bottom", "pos": [ 0, 0, -2 ] } ], "weight": 1 } ], [ { - "name": "canyon 2way v1", + "name": "canyon 2way", "chunk": [ - { "overmap": "canyon_2way_ground_v1", "pos": [ 0, 0, 0 ] }, - { "overmap": "canyon_2way_v1", "pos": [ 0, 0, -1 ] }, - { "overmap": "canyon_2way_v1_bottom", "pos": [ 0, 0, -2 ] } - ], - "weight": 1 - }, - { - "name": "canyon 2way v2", - "chunk": [ - { "overmap": "canyon_2way_ground_v2", "pos": [ 0, 0, 0 ] }, - { "overmap": "canyon_2way_v2", "pos": [ 0, 0, -1 ] }, - { "overmap": "canyon_2way_v2_bottom", "pos": [ 0, 0, -2 ] } + { "overmap": "canyon_2way_ground", "pos": [ 0, 0, 0 ] }, + { "overmap": "canyon_2way", "pos": [ 0, 0, -1 ] }, + { "overmap": "canyon_2way_bottom", "pos": [ 0, 0, -2 ] } ], "weight": 1 } ], [ { - "name": "canyon 3way v1", - "chunk": [ - { "overmap": "canyon_3way_ground_v1", "pos": [ 0, 0, 0 ] }, - { "overmap": "canyon_3way_v1", "pos": [ 0, 0, -1 ] }, - { "overmap": "canyon_3way_v1_bottom", "pos": [ 0, 0, -2 ] } - ], - "weight": 1 - }, - { - "name": "canyon 3way v2", + "name": "canyon 3way", "chunk": [ - { "overmap": "canyon_3way_ground_v2", "pos": [ 0, 0, 0 ] }, - { "overmap": "canyon_3way_v2", "pos": [ 0, 0, -1 ] }, - { "overmap": "canyon_3way_v2_bottom", "pos": [ 0, 0, -2 ] } + { "overmap": "canyon_3way_ground", "pos": [ 0, 0, 0 ] }, + { "overmap": "canyon_3way", "pos": [ 0, 0, -1 ] }, + { "overmap": "canyon_3way_bottom", "pos": [ 0, 0, -2 ] } ], "weight": 1 }