diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_green.png b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_green.png new file mode 100644 index 0000000000..53afbf8390 Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_green.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_lightblue.png b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_lightblue.png new file mode 100644 index 0000000000..ab06a4b399 Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_lightblue.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_orange.png b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_orange.png new file mode 100644 index 0000000000..21560fbcca Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_orange.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_pink.png b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_pink.png new file mode 100644 index 0000000000..4a17649a62 Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_pink.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_red.png b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_red.png new file mode 100644 index 0000000000..408a0ee350 Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/lab_squares_red.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/labs/labs.json b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/labs.json new file mode 100644 index 0000000000..54625bb3ec --- /dev/null +++ b/gfx/SurveyorsMap/pngs_overmap_24x24/labs/labs.json @@ -0,0 +1,119 @@ +[ + { + "id": [ + "lab_stairs", + "central_lab_stairs", + "microlab_generic_isolated_stairs_odd", + "microlab_generic_isolated_stairs_up", + "microlab_generic_stairs_down", + "microlab_generic_isolated_elevator_pit", + "microlab_generic_isolated_elevator", + "lab_subway_vent_shaft-2", + "lab_subway_vent_shaft-3", + "microlab_generic_vent_shaft_connector", + "microlab_portal_MSU14", + "microlab_portal_MSU14_elevator" + ], + "fg": [ "tower_lab_stairs" ], + "bg": [ "solid_rock" ], + "rotates": true + }, + { + "id": [ "central_lab_shaft", "lab_subway_vent_shaft-1" ], + "fg": [ "tower_lab_stairs" ], + "bg": [ "solid_earth" ], + "rotates": true + }, + { + "id": [ + "lab", + "central_lab", + "central_lab_core", + "lab_escape_entrance", + "lab_escape_cells", + "lab_core", + "microlab_generic_edge", + "microlab_generic", + "microlab_generic_hallway_blind_end", + "microlab_generic_edge_room_connector", + "microlab_generic_firebreak" + ], + "fg": [ "tower_lab" ], + "bg": [ "solid_rock" ], + "rotates": true + }, + { + "id": [ "microlab_sub_station", "microlab_generic_sub_entry" ], + "fg": [ "lab_squares_lightblue" ], + "bg": [ "solid_rock" ], + "rotates": true + }, + { + "id": [ + "lab_finale", + "microlab_portal_dressroom", + "central_lab_hq_1", + "central_lab_hq_2", + "central_lab_hq_3", + "central_lab_hq_4", + "central_lab_hq_5", + "central_lab_hq_6", + "central_lab_hq_7", + "central_lab_hq_8", + "central_lab_hq_9" + ], + "fg": [ "tower_lab_finale" ], + "bg": [ "solid_rock" ], + "rotates": true + }, + { + "id": [ + "microlab_generic_hallway", + "microlab_reactor", + "microlab_reactor_b", + "microlab_portal_elevator", + "microlab_portal_elevator_physics_glass", + "microlab_distorted_hallway", + "microlab_distorted_hallway_end", + "microlab_generic_hallway_end" + ], + "fg": [ "lab_squares_orange" ], + "bg": [ "solid_rock" ], + "rotates": true + }, + { + "id": [ + "microlab_portal_security_hallway1", + "microlab_portal_security_hallway2", + "microlab_portal_security1", + "microlab_portal_security2", + "microlab_portal_security3", + "microlab_portal_security4", + "microlab_portal_security5", + "microlab_portal_security6", + "microlab_portal_security7", + "microlab_portal_security8" + ], + "fg": [ "lab_squares_red" ], + "bg": [ "solid_rock" ], + "rotates": true + }, + { + "id": [ "microlab_distorted", "microlab_distorted_edge" ], + "fg": [ "lab_squares_pink" ], + "bg": [ "solid_rock" ], + "rotates": true + }, + { + "id": [ "microlab_ratkin_sub_entry", "microlab_ratkin_edge", "microlab_ratkin" ], + "fg": [ "lab_squares_green" ], + "bg": [ "solid_earth" ], + "rotates": true + }, + { + "id": [ "microlab_sub_station_ratkin" ], + "fg": [ "sewer_edge_ns", "sewer_edge_ew" ], + "bg": [ "solid_earth" ], + "rotates": true + } +] diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/lumberyard_and_lumbermill/lumberyard.json b/gfx/SurveyorsMap/pngs_overmap_24x24/lumberyard_and_lumbermill/lumberyard.json index 6c75630880..f3bd0b17de 100644 --- a/gfx/SurveyorsMap/pngs_overmap_24x24/lumberyard_and_lumbermill/lumberyard.json +++ b/gfx/SurveyorsMap/pngs_overmap_24x24/lumberyard_and_lumbermill/lumberyard.json @@ -48,13 +48,13 @@ "rotates": true }, { - "id": [ "lumbermill_0_1" ], + "id": [ "lumbermill_0_1", "lumbermill_0_1_ocu" ], "fg": [ "lumbermill_0_1_N", "lumbermill_0_1_W", "lumbermill_0_1_S", "lumbermill_0_1_E" ], "bg": [ "field" ], "rotates": true }, { - "id": [ "lumbermill_0_1_roof", "lumbermill_0_1_ocu" ], + "id": [ "lumbermill_0_1_roof" ], "fg": [ "lumbermill_0_1_roof_N", "lumbermill_0_1_roof_W", "lumbermill_0_1_roof_S", "lumbermill_0_1_roof_E" ], "bg": [ "open_air" ], "rotates": true diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard.json b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard.json index a78b09fafb..481b8e7102 100644 --- a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard.json +++ b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard.json @@ -35,5 +35,11 @@ "fg": [ "orchard_2" ], "bg": [], "rotates": true + }, + { + "id": "orchard_1", + "fg": [ "orchard_N", "orchard_E", "orchard_S", "orchard_W" ], + "bg": "field", + "rotates": true } ] diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_E.png b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_E.png index 3ba0bee155..895edc149a 100644 Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_E.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_E.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_N.png b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_N.png index f531c102d2..c3d7bfacfa 100644 Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_N.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_N.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_S.png b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_S.png index 2dfd9ef89c..7b292460a7 100644 Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_S.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_S.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_W.png b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_W.png index d78f6bdd1f..4a330f4f17 100644 Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_W.png and b/gfx/SurveyorsMap/pngs_overmap_24x24/orchard/orchard_W.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/old_shipwreck.zip b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/old_shipwreck.zip new file mode 100644 index 0000000000..dba1415039 Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/old_shipwreck.zip differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck.json b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck.json index bb0b9af878..7dea102d54 100644 --- a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck.json +++ b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck.json @@ -2,10 +2,10 @@ { "id": [ "shipwreck_river_1" ], "fg": [ - "sw_horiz_left", - "sw_vert_top", - "sw_horiz_left", - "sw_vert_top" + "shipwreck_1_N", + "shipwreck_1_W", + "shipwreck_1_S", + "shipwreck_1_E" ], "bg": [ "field" ], "rotates": true @@ -13,12 +13,34 @@ { "id": [ "shipwreck_river_2" ], "fg": [ - "sw_horiz_right", - "sw_vert_bottom", - "sw_horiz_right", - "sw_vert_bottom" + "shipwreck_2_N", + "shipwreck_2_W", + "shipwreck_2_S", + "shipwreck_2_E" ], "bg": [ "field" ], "rotates": true + }, + { + "id": [ "shipwreck_river_3" ], + "fg": [ + "shipwreck_1_N", + "shipwreck_1_W", + "shipwreck_1_S", + "shipwreck_1_E" + ], + "bg": [ "solid_earth" ], + "rotates": true + }, + { + "id": [ "shipwreck_river_4" ], + "fg": [ + "shipwreck_2_N", + "shipwreck_2_W", + "shipwreck_2_S", + "shipwreck_2_E" + ], + "bg": [ "solid_earth" ], + "rotates": true } ] \ No newline at end of file diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_E.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_E.png new file mode 100644 index 0000000000..be9fc58aec Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_E.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_N.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_N.png new file mode 100644 index 0000000000..a2514d2bda Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_N.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_S.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_S.png new file mode 100644 index 0000000000..e88ffb0a54 Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_S.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_W.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_W.png new file mode 100644 index 0000000000..beadabf1c8 Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_1_W.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_E.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_E.png new file mode 100644 index 0000000000..9e621a35d8 Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_E.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_N.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_N.png new file mode 100644 index 0000000000..fde19a0c6c Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_N.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_S.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_S.png new file mode 100644 index 0000000000..df682aebd3 Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_S.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_W.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_W.png new file mode 100644 index 0000000000..654194196b Binary files /dev/null and b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/shipwreck_2_W.png differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_horiz_left.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_horiz_left.png deleted file mode 100644 index 1a94d0c36d..0000000000 Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_horiz_left.png and /dev/null differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_horiz_right.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_horiz_right.png deleted file mode 100644 index e644a41645..0000000000 Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_horiz_right.png and /dev/null differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_vert_bottom.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_vert_bottom.png deleted file mode 100644 index c3845ff9ed..0000000000 Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_vert_bottom.png and /dev/null differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_vert_top.png b/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_vert_top.png deleted file mode 100644 index 946e0b6d61..0000000000 Binary files a/gfx/SurveyorsMap/pngs_overmap_24x24/shipwreck/sw_vert_top.png and /dev/null differ diff --git a/gfx/SurveyorsMap/pngs_overmap_24x24/terrains/rivers/river.json b/gfx/SurveyorsMap/pngs_overmap_24x24/terrains/rivers/river.json index 9329d30de2..ef068f78ab 100644 --- a/gfx/SurveyorsMap/pngs_overmap_24x24/terrains/rivers/river.json +++ b/gfx/SurveyorsMap/pngs_overmap_24x24/terrains/rivers/river.json @@ -66,15 +66,27 @@ "rotates": true }, { - "id": "bridgehead_ground", - "fg": [ "bridge_head_north", "bridge_head_east", "bridge_head_south", "bridge_head_west" ], + "id": ["bridgehead_ground" ], + "fg": [ "bridge_head_north", "bridge_head_west", "bridge_head_south", "bridge_head_east" ], "bg": "river_center", "rotates": true }, { - "id": "bridge", + "id": [ "bridgehead_ramp" ], + "fg": [ "bridge_head_north", "bridge_head_west", "bridge_head_south", "bridge_head_east" ], + "bg": "open_air", + "rotates": true + }, + { + "id": ["bridge" ], "fg": [ "bridge_vert", "bridge_horiz", "bridge_vert", "bridge_horiz" ], "bg": "deep_river", "rotates": true + }, + { + "id": ["bridge_road" ], + "fg": [ "bridge_vert", "bridge_horiz", "bridge_vert", "bridge_horiz" ], + "bg": "open_air", + "rotates": true } ]