summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2022-06-20 22:29:32 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2022-06-20 22:29:32 -0700
commitf06af0b0001d0a0983eec3e59a7704ff84b1da44 (patch)
tree53a385b6c792f070f4f4ffef6908871cef34405b
parentConvert more tiles with specific images away from generic tiles. (diff)
downloadcataclysm-dda-tileset_undeadpeople-f06af0b0001d0a0983eec3e59a7704ff84b1da44.tar.xz
Sync with upstream - "GO-Buildings and fixes"
Also include missing png files.
-rw-r--r--Temporary-maptiles.pngbin0 -> 103986 bytes
-rw-r--r--Temporary.pngbin0 -> 88705 bytes
-rw-r--r--large_stuff.pngbin932871 -> 940995 bytes
-rw-r--r--normal_stuff.pngbin1381238 -> 1382298 bytes
-rw-r--r--tile_config.json76
-rw-r--r--zz_more_overmap.pngbin7722 -> 0 bytes
6 files changed, 58 insertions, 18 deletions
diff --git a/Temporary-maptiles.png b/Temporary-maptiles.png
new file mode 100644
index 0000000..c4dadc6
--- /dev/null
+++ b/Temporary-maptiles.png
Binary files differ
diff --git a/Temporary.png b/Temporary.png
new file mode 100644
index 0000000..25ce4c1
--- /dev/null
+++ b/Temporary.png
Binary files differ
diff --git a/large_stuff.png b/large_stuff.png
index afc9e32..a71ae04 100644
--- a/large_stuff.png
+++ b/large_stuff.png
Binary files differ
diff --git a/normal_stuff.png b/normal_stuff.png
index 4bb43bd..ad01b4f 100644
--- a/normal_stuff.png
+++ b/normal_stuff.png
Binary files differ
diff --git a/tile_config.json b/tile_config.json
index 09bb25f..a065af2 100644
--- a/tile_config.json
+++ b/tile_config.json
@@ -15517,7 +15517,7 @@
{"id": ["police", "police_1", "police_2", "necropolis_a_16", "necropolis_a_17"], "fg": 9575, "rotates": false},
{"id": ["pond_field", "pond_forest", "hot_springs", "pond_swamp"], "fg": 9576, "rotates": false},
{"id": ["pool", "pool_1", "pool_2", "pool_3", "pool_4", "pool_5", "pool_6"], "fg": 9577, "rotates": false},
-{"id": ["publicgarden"], "fg": 9578, "rotates": false},
+{"id": ["publicgarden", "cs_gardening_allotment"], "fg": 9578, "rotates": false},
{"id": ["PublicPond_1a"], "fg": [9579, 9580, 9581, 9582], "rotates": true},
{"id": ["PublicPond_1b"], "fg": [9581, 9582, 9579, 9580], "rotates": true},
{"id": ["pump_station_1", "necropolis_a_7"], "fg": [9584, 9585, 9586, 9583], "rotates": true},
@@ -15632,7 +15632,7 @@
{"id": ["ws_survivor_camp"], "fg": 9744, "rotates": false},
{"id": ["yard"], "fg": 9745, "rotates": false},
{"id": ["generic_cemetery", "cemetery_religious_city", "cemetery", "cemetery_religious", "cemetery_small", "crypt1", "crypt2", "gravesite1"], "fg": 9746, "rotates": false},
-{"id": ["generic_city_building", "generic_necropolis_surface_building", "mil_base_2f", "mil_base_3f", "mil_base_3h", "mil_base_7e", "mil_base_8e", "mil_base_7f", "mil_base_5g", "mil_base_6g", "bus_stat_0_roof", "dollarstore", "candy_shop", "s_petstore", "s_petstore_2", "abstorefront", "s_cardealer", "dispensary_2"], "fg": 9747, "rotates": false},
+{"id": ["generic_city_building", "generic_necropolis_surface_building", "mil_base_2f", "mil_base_3f", "mil_base_3h", "mil_base_7e", "mil_base_8e", "mil_base_7f", "mil_base_5g", "mil_base_6g", "s_cardealer"], "fg": 9747, "rotates": false},
{"id": ["generic_city_building_no_sidewalk", "p_resort_1sw", "p_resort_1ww", "p_resort_1nw", "p_resort_1ss", "p_resort_1mm", "p_resort_1nn", "p_resort_1se", "p_resort_1ee", "p_resort_1ne", "p_resort_2ee", "p_resort_2mm", "p_resort_2ne", "p_resort_2nn", "p_resort_2nw", "p_resort_2se", "p_resort_2ss", "p_resort_2sw", "p_resort_2ww", "p_resort_ree", "p_resort_rmm", "p_resort_rne", "p_resort_rnn", "p_resort_rnw", "p_resort_rse", "p_resort_rss", "p_resort_rsw", "p_resort_rww"], "fg": 9748, "rotates": false},
{"id": ["generic_city_house_basement", "bunker_basement", "bunker_basement_1", "lmoe_under", "lmoe_under_empty", "silo_1", "silo_2", "silo_3", "silo_4", "silo_finale", "shelter_under", "p_resort_0nw", "p_resort_0se", "cabin_strange_b", "bunker_shop_b", "crypt1_b1", "crypt2_b1", "mansion_c1d", "mansion_c2d", "mansion_c3d", "mansion_c4d", "mansion_e1d", "mansion_t2d", "mansion_t4d", "mansion_+4d", "cathedral_b_NE", "cathedral_b_NW", "cathedral_b_SE", "cathedral_b_SW"], "fg": 9749, "rotates": false},
{"id": ["generic_cropland"], "fg": 9750, "rotates": false},
@@ -15665,7 +15665,7 @@
{"id": ["megastore_0_0_0", "megastore_1_0_0", "megastore_2_0_0", "megastore_0_1_0", "megastore_1_1_0", "megastore_2_1_0", "megastore_0_2_0", "megastore_2_2_0", "megastore_0_0_1", "megastore_0_1_1", "megastore_0_2_1", "megastore_1_0_1", "megastore_1_1_1", "megastore_1_2_1", "megastore_1_2_0", "megastore_2_0_1", "megastore_2_1_1", "megastore_2_2_1", "megastore_0_0_roof", "megastore_0_1_roof", "megastore_0_2_roof", "megastore_1_0_roof", "megastore_1_2_roof", "megastore_2_0_roof", "megastore_2_1_roof", "megastore_2_2_roof"], "fg": 9776, "rotates": false},
{"id": ["mil_base_tunnels_a", "mil_base_tunnels_b", "mil_base_tunnels_c", "mil_base_tunnels_d", "mil_base_tunnels_e", "mil_base_tunnels_f", "mil_base_tunnels_g", "mil_base_tunnels_h", "mil_base_tunnels_i", "helipad_nw", "helipad_ne", "helipad2f_nw", "helipad2f_ne"], "fg": 9777, "rotates": false},
{"id": ["generic_motel", "motel_twd_1", "motel_entrance", "necropolis_a_48", "necropolis_a_49", "necropolis_a_55", "necropolis_a_57", "motel_twd_2", "motel_twd_second_floor", "motel_entrance_roof", "motel_1_roof", "motel_2_roof", "motel_3_roof", "motel_1", "motel_2", "motel_3"], "fg": 9778, "rotates": false},
-{"id": ["office_tower_ne", "office_tower_nw", "office_tower_sw", "office_tower_se", "office_tower_underground_nw", "office_tower_underground_ne", "office_tower_underground_sw", "office_tower_underground_se", "office_tower_2_a1", "office_tower_2_a2", "office_tower_2_b1", "office_tower_2_b2", "office_tower_2_b3", "loffice_tower_5", "loffice_tower_6", "loffice_tower_7", "loffice_tower_8", "loffice_tower_9", "loffice_tower_9b", "loffice_tower_10", "loffice_tower_10b", "loffice_tower_11", "loffice_tower_12", "loffice_tower_13", "loffice_tower_14", "loffice_tower_15", "loffice_tower_16", "loffice_tower_17", "loffice_tower_18", "loffice_tower_19", "loffice_tower_20", "office_tower_2_a1_tower_lab", "tower_lab", "science_lab_finale", "tower_lab_finale", "hotel_tower_1_4", "hotel_tower_1_5B", "hotel_tower_1_5C", "hotel_tower_1_6", "hotel_tower_1_7", "hotel_tower_1_8", "hotel_tower_1_9", "hotel_tower_flr2_1_4", "hotel_tower_flr2_1_5B", "hotel_tower_flr2_1_5C", "hotel_tower_flr2_1_6", "hotel_tower_flr2_1_7", "hotel_tower_flr2_1_8", "hotel_tower_flr2_1_9", "hotel_tower_flr3_1_4", "hotel_tower_flr3_1_5", "hotel_tower_flr3_1_6", "hotel_tower_flr3_1_7", "hotel_tower_flr3_1_8", "hotel_tower_flr3_1_9", "hotel_tower_flr4_1_4", "hotel_tower_flr4_1_5", "hotel_tower_flr4_1_6", "hotel_tower_flr4_1_7", "hotel_tower_flr4_1_8", "hotel_tower_flr4_1_9", "hotel_tower_roof_1_4", "hotel_tower_roof_1_5", "hotel_tower_roof_1_6", "hotel_tower_roof_1_7", "hotel_tower_roof_1_8", "hotel_tower_roof_1_9"], "fg": 9780, "rotates": false},
+{"id": ["office_tower_ne", "office_tower_nw", "office_tower_sw", "office_tower_se", "office_tower_underground_nw", "office_tower_underground_ne", "office_tower_underground_sw", "office_tower_underground_se", "office_tower_2_a1", "office_tower_2_a2", "office_tower_2_b1", "office_tower_2_b2", "office_tower_2_b3", "office_tower_2_a1_tower_lab", "tower_lab", "science_lab_finale", "tower_lab_finale", "hotel_tower_1_4", "hotel_tower_1_5B", "hotel_tower_1_5C", "hotel_tower_1_6", "hotel_tower_1_7", "hotel_tower_1_8", "hotel_tower_1_9", "hotel_tower_flr2_1_4", "hotel_tower_flr2_1_5B", "hotel_tower_flr2_1_5C", "hotel_tower_flr2_1_6", "hotel_tower_flr2_1_7", "hotel_tower_flr2_1_8", "hotel_tower_flr2_1_9", "hotel_tower_flr3_1_4", "hotel_tower_flr3_1_5", "hotel_tower_flr3_1_6", "hotel_tower_flr3_1_7", "hotel_tower_flr3_1_8", "hotel_tower_flr3_1_9", "hotel_tower_flr4_1_4", "hotel_tower_flr4_1_5", "hotel_tower_flr4_1_6", "hotel_tower_flr4_1_7", "hotel_tower_flr4_1_8", "hotel_tower_flr4_1_9", "hotel_tower_roof_1_4", "hotel_tower_roof_1_5", "hotel_tower_roof_1_6", "hotel_tower_roof_1_7", "hotel_tower_roof_1_8", "hotel_tower_roof_1_9"], "fg": 9780, "rotates": false},
{"id": ["office_tower_2_a3", "lab_surface_brick_blockA0", "school_1_7", "school_1_8", "cs_public_space", "cs_public_art_piece"], "fg": 9779, "rotates": false},
{"id": ["office_tower_collapse_a0", "office_tower_collapse_a1", "office_tower_collapse_a2", "office_tower_collapse_b0", "office_tower_collapse_b1", "office_tower_collapse_b2", "office_tower_collapse_b_a0", "office_tower_collapse_b_a1", "office_tower_collapse_b_a2", "office_tower_collapse_b_b0", "office_tower_collapse_b_b1", "office_tower_collapse_b_b2"], "fg": 9781, "rotates": false},
{"id": ["generic_parking", "s_lot", "loffice_tower_1", "loffice_tower_2", "loffice_tower_3", "loffice_tower_4", "lab_surface_brick_blockA1", "lab_surface_brick_blockB0", "lab_surface_brick_blockB1", "lab_surface_brick_blockC0", "lab_surface_brick_blockC1", "lab_surface_brick_blockC2", "lab_surface_brick_blockD0", "lab_surface_brick_blockD1", "lab_surface_brick_blockE0", "lab_surface_brick_blockE1", "lab_surface_parking_blockA0", "lab_surface_parking_blockB0", "lab_surface_parking_blockC0", "lab_surface_parking_blockD0", "lab_surface_parking_blockE0", "lab_surface_parking_blockA1", "lab_surface_parking_blockB1", "lab_surface_parking_blockC1", "lab_surface_parking_blockD1", "lab_surface_parking_blockE1", "lab_surface_parking_blockA2", "lab_surface_parking_blockE2", "megastore_parking", "parking_2x1_0", "parking_2x1_1", "parking_2x2_0_0", "parking_2x2_0_1", "parking_2x2_1_0", "parking_2x2_1_1", "parking_3x1_0", "parking_3x1_1", "parking_3x1_2", "irradiator_1_7", "irradiator_1_9", "prison_1_2", "prison_1_3", "stadium_0_0", "stadium_1_0", "stadium_2_0", "stadium_3_0", "school_1_3", "robofachq_surface_parking", "mall_a_7", "mall_a_8", "mall_a_9", "hotel_tower_1_1", "hotel_tower_1_2", "hotel_tower_1_3", "bus_stat_1", "cemetery_4square_01", "ws_regional_dump_0_0", "ws_regional_dump_1_0", "ws_regional_dump_0_1", "ws_regional_dump_1_1", "state_park_1_0", "steel_mill_0_4", "zoo_0_0", "zoo_1_0"], "fg": 9782, "rotates": true},
@@ -23088,8 +23088,8 @@
{"id": "fungal_tower", "fg": 18336, "rotates": false},
{"id": ["lighthouse_ground", "lighthouse_z1", "lighthouse_z2", "lighthouse_z3", "lighthouse_z4", "lighthouse_z5", "lighthouse_roof"], "fg": 18337, "rotates": false},
{"id": ["mi-go_scout_tower_1", "mi-go_scout_tower_2", "mi-go_scout_tower_3", "mi-go_scout_tower_4"], "fg": 18338, "bg": 18118, "rotates": false},
-{"id": ["radio_tower", "radio_tower_even", "radio_tower_even_stair_only", "radio_tower_odd", "radio_tower_top", "mil_base_3i", "mil_base_3i1", "mil_base_3i2", "mil_base_3i3", "mil_base_3i4"], "fg": 18339, "rotates": false},
-{"id": ["station_radio", "station_radio_1", "radio_tower_1", "radio_tower_roof_1"], "fg": 18340, "rotates": false},
+{"id": ["radio_tower", "mil_base_3i"], "fg": 18339, "rotates": false},
+{"id": ["radio_tower_1"], "fg": 18340, "rotates": false},
{"id": ["triffid_grove", "triffid_roots", "triffid_finale"], "fg": 18341, "rotates": false},
{"id": ["wasp_tower", "wasp_tower_even_1", "wasp_tower_odd_1", "wasp_tower_even_2", "wasp_tower_odd_2", "wasp_tower_top"], "fg": 18342, "rotates": false},
{"id": ["wasp_tower_1", "wasp_tower_roof_1"], "fg": 18343, "rotates": false},
@@ -23428,7 +23428,15 @@
{"id": "overlay_effect_visuals", "bg": 18652},
{"id": "tr_unfinished_construction", "fg": 18653, "rotates": false},
{"id": "vp_basketlg", "fg": 18654, "rotates": false},
-{"id": "vp_basketlg_cart", "fg": [18655, 18656, 18657, 18658], "rotates": true}],
+{"id": "vp_basketlg_cart", "fg": [18655, 18656, 18657, 18658], "rotates": true},
+{"id": "cs_car_showroom", "fg": 18659, "rotates": false},
+{"id": "cs_car_showroom_2ndfloor", "fg": 18660, "bg":18662, "rotates": false},
+{"id": "cs_car_showroom_roof", "fg": 18661, "bg":18662, "rotates": false},
+{"id": ["loffice_tower_7", "loffice_tower_11", "loffice_tower_15", "loffice_tower_19"], "fg": [18665, 18663, 18664, 18666], "bg":18662, "rotates": true},
+{"id": ["loffice_tower_5", "loffice_tower_9", "loffice_tower_9b", "loffice_tower_13", "loffice_tower_17"], "fg": [18663, 18664, 18666, 18665], "bg":18662, "rotates": true},
+{"id": ["loffice_tower_8", "loffice_tower_12", "loffice_tower_16", "loffice_tower_20"], "fg": [18666, 18665, 18663, 18664], "bg":18662, "rotates": true},
+{"id": ["loffice_tower_6", "loffice_tower_10", "loffice_tower_10b", "loffice_tower_14", "loffice_tower_18"], "fg": [18664, 18666, 18665, 18663], "bg":18662, "rotates": true},
+{"id": ["radio_tower_roof", "radio_tower_roof_1", "radio_tower_even", "radio_tower_even_stair_only", "radio_tower_odd", "radio_tower_top", "mil_base_3i1", "mil_base_3i2", "mil_base_3i3", "mil_base_3i4"], "fg": [18667], "bg":18662, "rotates": false}],
"//": "range 18113 to 18672", "sprite_width": 64, "sprite_height": 80, "sprite_offset_x": -16, "sprite_offset_y": -48},
{"file": "large_terrain.png", "tiles": [
@@ -23950,6 +23958,7 @@
{"id": ["recyclecenter_roof_1"], "fg": 19342, "bg":19346, "rotates": false},
{"id": ["recyclecenter_2"], "fg": 19341, "rotates": false},
{"id": ["recyclecenter_roof_2"], "fg": 19342, "bg":19346, "rotates": false},
+{"id": ["pool_roof"], "fg": 19344, "bg":19346, "rotates": false},
{"id": ["emptycommerciallot"], "fg": 19345, "bg":19346, "rotates": false},
{"id": ["open_air", "cs_private_park_roof", "2farm_roof_15", "lab_surface_brick_block2A0", "lab_surface_brick_block2C2", "lab_surface_brick_block2A1", "lab_surface_brick_block2B0", "lab_surface_brick_block2B1", "lab_surface_brick_block2C0", "lab_surface_brick_block2C1", "lab_surface_brick_block2D0", "lab_surface_brick_block2D1", "lab_surface_brick_block2E0", "lab_surface_brick_block2E1", "lab_surface_brick_block3A0", "lab_surface_brick_block3A1", "lab_surface_brick_block3B0", "lab_surface_brick_block3B1", "lab_surface_brick_block3C0", "lab_surface_brick_block3C1", "lab_surface_brick_block3C2", "lab_surface_brick_block3D0", "lab_surface_brick_block3D1", "lab_surface_brick_block3E0", "lab_surface_brick_block3E1", "lab_surface_brick_block4A0", "lab_surface_brick_block4A1", "lab_surface_brick_block4B0", "lab_surface_brick_block4B1", "lab_surface_brick_block4C0", "lab_surface_brick_block4C1", "lab_surface_brick_block4C2", "lab_surface_brick_block4D0", "lab_surface_brick_block4D1", "lab_surface_brick_block4E0", "lab_surface_brick_block4E1", "lab_surface_brick_block5A0", "lab_surface_brick_block5A1", "lab_surface_brick_block5B0", "lab_surface_brick_block5B1", "lab_surface_brick_block5C0", "lab_surface_brick_block5C1", "lab_surface_brick_block5C2", "lab_surface_brick_block5D0", "lab_surface_brick_block5D1", "lab_surface_brick_block5E0", "lab_surface_brick_block5E1", "airliner_2a_1", "airliner_2c_1", "mil_base_1a1", "mil_base_1d1", "mil_base_1e1", "mil_base_1f1", "mil_base_1h1", "mil_base_1i1", "mil_base_2a1", "mil_base_2b1", "mil_base_2c1", "mil_base_2h1", "mil_base_2i1", "mil_base_2j1", "mil_base_2k1", "mil_base_3a1", "mil_base_3c1", "mil_base_3k1", "mil_base_4a1", "mil_base_4b1", "mil_base_4c1", "mil_base_4d1", "mil_base_4e1", "mil_base_4f1", "mil_base_4g1", "mil_base_4h1", "mil_base_4i1", "mil_base_4j1", "mil_base_5a1", "mil_base_5f1", "mil_base_5j1", "mil_base_6a1", "mil_base_6b1", "mil_base_6f1", "mil_base_6j1", "mil_base_7a1", "mil_base_7b1", "mil_base_7i1", "mil_base_7j1", "mil_base_7g1", "mil_base_7h1", "mil_base_8a1", "mil_base_8c1", "mil_base_8d1", "mil_base_8f1", "mil_base_8h1", "mil_base_8i1", "mil_base_8j1", "helipad2f_sw", "helipad2f_se", "irradiator_1_7_roof", "irradiator_1_9_roof", "school_2_3", "school_2_7", "school_2_8", "school_3_3", "school_3_7", "school_3_8", "school_4_3", "school_4_7", "school_4_8", "school_4_9", "robofachq_roof_a0", "robofachq_roof_a3", "office_tower_open_air_corner", "sewage_treatment_0_0_roof", "sewage_treatment_1_0_roof", "sewage_treatment_1_1_roof", "ranch_camp_74_roof", "ranch_camp_75_roof", "evac_center_1_z1", "evac_center_2_z1", "evac_center_3_z1", "evac_center_4_z1", "evac_center_5_z1", "evac_center_6_z1", "evac_center_7_z1", "evac_center_8_z1", "evac_center_9_z1", "evac_center_10_z1", "evac_center_11_z1", "evac_center_12_z1", "evac_center_13_z1", "evac_center_14_z1", "evac_center_15_z1", "evac_center_16_z1", "evac_center_17_z1", "evac_center_18_z1", "evac_center_19_z1", "evac_center_20_z1", "evac_center_21_z1", "evac_center_22_z1", "evac_center_23_z1", "evac_center_24_z1", "evac_center_25_z1", "evac_center_1_z2", "evac_center_2_z2", "evac_center_3_z2", "evac_center_4_z2", "evac_center_5_z2", "evac_center_6_z2", "evac_center_7_z2", "evac_center_8_z2", "evac_center_9_z2", "evac_center_10_z2", "evac_center_11_z2", "evac_center_12_z2", "evac_center_13_z2", "evac_center_14_z2", "evac_center_15_z2", "evac_center_16_z2", "evac_center_17_z2", "evac_center_18_z2", "evac_center_19_z2", "evac_center_20_z2", "evac_center_21_z2", "evac_center_22_z2", "evac_center_23_z2", "evac_center_24_z2", "evac_center_25_z2", "refctr_S1a_z1", "refctr_S2a_z1", "refctr_S3a_z1", "refctr_S4a_z1", "refctr_S5a_z1", "refctr_S1b_z1", "refctr_S2b_z1", "refctr_S3b_z1", "refctr_S4b_z1", "refctr_S5b_z1", "refctr_S1c_z1", "refctr_S2c_z1", "refctr_S3c_z1", "refctr_S4c_z1", "refctr_S5c_z1", "refctr_S1d_z1", "refctr_S2d_z1", "refctr_S3d_z1", "refctr_S4d_z1", "refctr_S5d_z1", "refctr_S1e_z1", "refctr_S2e_z1", "refctr_S3e_z1", "refctr_S4e_z1", "refctr_S5e_z1", "refctr_S1a_z2", "refctr_S2a_z2", "refctr_S3a_z2", "refctr_S4a_z2", "refctr_S5a_z2", "refctr_S1b_z2", "refctr_S2b_z2", "refctr_S3b_z2", "refctr_S4b_z2", "refctr_S5b_z2", "refctr_S1c_z2", "refctr_S2c_z2", "refctr_S3c_z2", "refctr_S4c_z2", "refctr_S5c_z2", "refctr_S1d_z2", "refctr_S2d_z2", "refctr_S3d_z2", "refctr_S4d_z2", "refctr_S5d_z2", "refctr_S1e_z2", "refctr_S2e_z2", "refctr_S3e_z2", "refctr_S4e_z2", "refctr_S5e_z2", "refctr_SE1a_z1", "refctr_SE2a_z1", "refctr_SE3a_z1", "refctr_SE4a_z1", "refctr_SE5a_z1", "refctr_SE1b_z1", "refctr_SE2b_z1", "refctr_SE3b_z1", "refctr_SE4b_z1", "refctr_SE5b_z1", "refctr_SE1c_z1", "refctr_SE2c_z1", "refctr_SE3c_z1", "refctr_SE4c_z1", "refctr_SE5c_z1", "refctr_SE1d_z1", "refctr_SE2d_z1", "refctr_SE3d_z1", "refctr_SE4d_z1", "refctr_SE5d_z1", "refctr_SE1e_z1", "refctr_SE2e_z1", "refctr_SE3e_z1", "refctr_SE4e_z1", "refctr_SE5e_z1", "refctr_SE1a_z2", "refctr_SE2a_z2", "refctr_SE3a_z2", "refctr_SE4a_z2", "refctr_SE5a_z2", "refctr_SE1b_z2", "refctr_SE2b_z2", "refctr_SE3b_z2", "refctr_SE4b_z2", "refctr_SE5b_z2", "refctr_SE1c_z2", "refctr_SE2c_z2", "refctr_SE3c_z2", "refctr_SE4c_z2", "refctr_SE5c_z2", "refctr_SE1d_z2", "refctr_SE2d_z2", "refctr_SE3d_z2", "refctr_SE4d_z2", "refctr_SE5d_z2", "refctr_SE1e_z2", "refctr_SE2e_z2", "refctr_SE3e_z2", "refctr_SE4e_z2", "refctr_SE5e_z2", "refctr_SW1a_z1", "refctr_SW2a_z1", "refctr_SW3a_z1", "refctr_SW4a_z1", "refctr_SW5a_z1", "refctr_SW1b_z1", "refctr_SW2b_z1", "refctr_SW3b_z1", "refctr_SW4b_z1", "refctr_SW5b_z1", "refctr_SW1c_z1", "refctr_SW2c_z1", "refctr_SW3c_z1", "refctr_SW4c_z1", "refctr_SW5c_z1", "refctr_SW1d_z1", "refctr_SW2d_z1", "refctr_SW3d_z1", "refctr_SW4d_z1", "refctr_SW5d_z1", "refctr_SW1e_z1", "refctr_SW2e_z1", "refctr_SW3e_z1", "refctr_SW4e_z1", "refctr_SW5e_z1", "refctr_SW1a_z2", "refctr_SW2a_z2", "refctr_SW3a_z2", "refctr_SW4a_z2", "refctr_SW5a_z2", "refctr_SW1b_z2", "refctr_SW2b_z2", "refctr_SW3b_z2", "refctr_SW4b_z2", "refctr_SW5b_z2", "refctr_SW1c_z2", "refctr_SW2c_z2", "refctr_SW3c_z2", "refctr_SW4c_z2", "refctr_SW5c_z2", "refctr_SW1d_z2", "refctr_SW2d_z2", "refctr_SW3d_z2", "refctr_SW4d_z2", "refctr_SW5d_z2", "refctr_SW1e_z2", "refctr_SW2e_z2", "refctr_SW3e_z2", "refctr_SW4e_z2", "refctr_SW5e_z2", "refctr_W1a_z1", "refctr_W2a_z1", "refctr_W3a_z1", "refctr_W4a_z1", "refctr_W5a_z1", "refctr_W1b_z1", "refctr_W2b_z1", "refctr_W3b_z1", "refctr_W4b_z1", "refctr_W5b_z1", "refctr_W1c_z1", "refctr_W2c_z1", "refctr_W3c_z1", "refctr_W4c_z1", "refctr_W5c_z1", "refctr_W1d_z1", "refctr_W2d_z1", "refctr_W3d_z1", "refctr_W4d_z1", "refctr_W5d_z1", "refctr_W1e_z1", "refctr_W2e_z1", "refctr_W3e_z1", "refctr_W4e_z1", "refctr_W5e_z1", "refctr_W1a_z2", "refctr_W2a_z2", "refctr_W3a_z2", "refctr_W4a_z2", "refctr_W5a_z2", "refctr_W1b_z2", "refctr_W2b_z2", "refctr_W3b_z2", "refctr_W4b_z2", "refctr_W5b_z2", "refctr_W1c_z2", "refctr_W2c_z2", "refctr_W3c_z2", "refctr_W4c_z2", "refctr_W5c_z2", "refctr_W1d_z2", "refctr_W2d_z2", "refctr_W3d_z2", "refctr_W4d_z2", "refctr_W5d_z2", "refctr_W1e_z2", "refctr_W2e_z2", "refctr_W3e_z2", "refctr_W4e_z2", "refctr_W5e_z2", "refctr_E1a_z1", "refctr_E2a_z1", "refctr_E3a_z1", "refctr_E4a_z1", "refctr_E5a_z1", "refctr_E1b_z1", "refctr_E2b_z1", "refctr_E3b_z1", "refctr_E4b_z1", "refctr_E5b_z1", "refctr_E1c_z1", "refctr_E2c_z1", "refctr_E3c_z1", "refctr_E4c_z1", "refctr_E5c_z1", "refctr_E1d_z1", "refctr_E2d_z1", "refctr_E3d_z1", "refctr_E4d_z1", "refctr_E5d_z1", "refctr_E1e_z1", "refctr_E2e_z1", "refctr_E3e_z1", "refctr_E4e_z1", "refctr_E5e_z1", "refctr_E1a_z2", "refctr_E2a_z2", "refctr_E3a_z2", "refctr_E4a_z2", "refctr_E5a_z2", "refctr_E1b_z2", "refctr_E2b_z2", "refctr_E3b_z2", "refctr_E4b_z2", "refctr_E5b_z2", "refctr_E1c_z2", "refctr_E2c_z2", "refctr_E3c_z2", "refctr_E4c_z2", "refctr_E5c_z2", "refctr_E1d_z2", "refctr_E2d_z2", "refctr_E3d_z2", "refctr_E4d_z2", "refctr_E5d_z2", "refctr_E1e_z2", "refctr_E2e_z2", "refctr_E3e_z2", "refctr_E4e_z2", "refctr_E5e_z2", "refctr_NW1a_z1", "refctr_NW2a_z1", "refctr_NW3a_z1", "refctr_NW4a_z1", "refctr_NW5a_z1", "refctr_NW1b_z1", "refctr_NW2b_z1", "refctr_NW3b_z1", "refctr_NW4b_z1", "refctr_NW5b_z1", "refctr_NW1c_z1", "refctr_NW2c_z1", "refctr_NW3c_z1", "refctr_NW4c_z1", "refctr_NW5c_z1", "refctr_NW1d_z1", "refctr_NW2d_z1", "refctr_NW3d_z1", "refctr_NW4d_z1", "refctr_NW5d_z1", "refctr_NW1e_z1", "refctr_NW2e_z1", "refctr_NW3e_z1", "refctr_NW4e_z1", "refctr_NW5e_z1", "refctr_NW1a_z2", "refctr_NW2a_z2", "refctr_NW3a_z2", "refctr_NW4a_z2", "refctr_NW5a_z2", "refctr_NW1b_z2", "refctr_NW2b_z2", "refctr_NW3b_z2", "refctr_NW4b_z2", "refctr_NW5b_z2", "refctr_NW1c_z2", "refctr_NW2c_z2", "refctr_NW3c_z2", "refctr_NW4c_z2", "refctr_NW5c_z2", "refctr_NW1d_z2", "refctr_NW2d_z2", "refctr_NW3d_z2", "refctr_NW4d_z2", "refctr_NW5d_z2", "refctr_NW1e_z2", "refctr_NW2e_z2", "refctr_NW3e_z2", "refctr_NW4e_z2", "refctr_NW5e_z2", "refctr_NE1a_z1", "refctr_NE2a_z1", "refctr_NE3a_z1", "refctr_NE4a_z1", "refctr_NE5a_z1", "refctr_NE1b_z1", "refctr_NE2b_z1", "refctr_NE3b_z1", "refctr_NE4b_z1", "refctr_NE5b_z1", "refctr_NE1c_z1", "refctr_NE2c_z1", "refctr_NE3c_z1", "refctr_NE4c_z1", "refctr_NE5c_z1", "refctr_NE1d_z1", "refctr_NE2d_z1", "refctr_NE3d_z1", "refctr_NE4d_z1", "refctr_NE5d_z1", "refctr_NE1e_z1", "refctr_NE2e_z1", "refctr_NE3e_z1", "refctr_NE4e_z1", "refctr_NE5e_z1", "refctr_NE1a_z2", "refctr_NE2a_z2", "refctr_NE3a_z2", "refctr_NE4a_z2", "refctr_NE5a_z2", "refctr_NE1b_z2", "refctr_NE2b_z2", "refctr_NE3b_z2", "refctr_NE4b_z2", "refctr_NE5b_z2", "refctr_NE1c_z2", "refctr_NE2c_z2", "refctr_NE3c_z2", "refctr_NE4c_z2", "refctr_NE5c_z2", "refctr_NE1d_z2", "refctr_NE2d_z2", "refctr_NE3d_z2", "refctr_NE4d_z2", "refctr_NE5d_z2", "refctr_NE1e_z2", "refctr_NE2e_z2", "refctr_NE3e_z2", "refctr_NE4e_z2", "refctr_NE5e_z2", "refctr_N1a_z1", "refctr_N2a_z1", "refctr_N3a_z1", "refctr_N4a_z1", "refctr_N5a_z1", "refctr_N1b_z1", "refctr_N2b_z1", "refctr_N3b_z1", "refctr_N4b_z1", "refctr_N5b_z1", "refctr_N1c_z1", "refctr_N2c_z1", "refctr_N3c_z1", "refctr_N4c_z1", "refctr_N5c_z1", "refctr_N1d_z1", "refctr_N2d_z1", "refctr_N3d_z1", "refctr_N4d_z1", "refctr_N5d_z1", "refctr_N1e_z1", "refctr_N2e_z1", "refctr_N3e_z1", "refctr_N4e_z1", "refctr_N5e_z1", "refctr_N1a_z2", "refctr_N2a_z2", "refctr_N3a_z2", "refctr_N4a_z2", "refctr_N5a_z2", "refctr_N1b_z2", "refctr_N2b_z2", "refctr_N3b_z2", "refctr_N4b_z2", "refctr_N5b_z2", "refctr_N1c_z2", "refctr_N2c_z2", "refctr_N3c_z2", "refctr_N4c_z2", "refctr_N5c_z2", "refctr_N1d_z2", "refctr_N2d_z2", "refctr_N3d_z2", "refctr_N4d_z2", "refctr_N5d_z2", "refctr_N1e_z2", "refctr_N2e_z2", "refctr_N3e_z2", "refctr_N4e_z2", "refctr_N5e_z2", "mall_b_10", "mall_b_19", "mall_a_10_roof", "mall_a_19_roof", "bus_stat_1_roof", "steel_mill_0_3_2", "steel_mill_0_3_3", "steel_mill_0_4_2", "steel_mill_0_4_3", "wasp_tower_roof"], "fg": [{"weight": 25, "sprite": 19346},
{"weight": 25, "sprite": 19347},
@@ -23979,8 +23988,7 @@
{"id": ["craft_shop_roof", "craft_shop_upper_roof", "craft_shop_roof_1", "craft_shop_roof_2", "craft_shop_2ndfloor_2"], "fg": 19371, "bg":19346, "rotates": false},
{"id": ["pawn", "pawn_1", "pawn_pf"], "fg": 19372, "rotates": false},
{"id": ["pawn_roof", "pawn_roof_1", "pawn_pf_1"], "fg": 19373, "bg":19346, "rotates": false},
-{"id": ["abstorefront_roof", "abstorefront_roof_1", "abstorefront_roof_2"], "fg": 19374, "bg":19346, "rotates": false},
-{"id": ["generic_city_building_roof", "art_gallery_roof", "bowling_alley_roof", "candy_shop_roof", "cs_car_dealership_roof", "cs_car_showroom_2ndfloor", "cs_car_showroom_roof", "city_block2_flr2_1", "city_block2_flr2_2", "city_block2_flr2_3", "city_block2_flr2_4", "city_block2_roof_1", "city_block2_roof_2", "city_block2_roof_3", "city_block2_roof_4", "dispensary_roof", "dispensary_roof_1", "dispensary_roof_2", "dollarstore_roof", "dollarstore_roof_1", "furniture_roof", "furniture_upper_roof", "garage_gas_roof_1", "s_gas_roof_1", "s_gardening_roof", "cs_gardening_allotment_roof", "icecream_shop_roof", "cs_internet_cafe_roof", "cs_internet_cafe_upper_roof", "junkyard_roof_1a", "junkyard_roof_1b", "landscapingsupplyco_1b_roof", "s_laundromat_roof", "lumberyard_0_0_roof", "lumberyard_0_1_roof", "lumberyard_1_0_roof", "lumberyard_1_1_roof", "lumbermill_0_0_roof", "lumbermill_0_1_roof", "lumbermill_1_0_roof", "lumbermill_1_1_roof", "mil_base_3h1", "mil_base_2f1", "mil_base_3f1", "mil_base_5g1", "mil_base_6g1", "mil_base_7e1", "mil_base_8e1", "mil_base_7f1", "movietheater_roof_0_0", "movietheater_roof_0_1", "movietheater_roof_0_2", "movietheater_roof_1_0", "movietheater_roof_1_1", "movietheater_roof_1_2", "movietheater_roof_2_0", "movietheater_roof_2_1", "movietheater_roof_2_2", "museum_roof", "s_music_roof", "music_venue_1_roof", "music_venue_1_roof_top", "paintball_field_roof", "paintball_field_roof_1", "s_petstore_roof", "s_petstore_roof_1", "s_petstore_roof_2", "s_pharm_roof", "s_pharm_roof_1", "pool_roof", "pool_roof_1", "pool_roof_2", "pool_roof_3", "pool_roof_4", "cs_sex_shop_roof", "station_radio_roof", "station_radio_roof_1", "small_office_roof", "small_office_upper_roof", "smoke_lounge_roof", "s_thrift_roof", "cs_tire_shop_roof", "s_vfw_roof", "veterinarian_roof"], "fg": 19374, "bg":19346, "rotates": false},
+{"id": ["generic_city_building_roof", "art_gallery_roof", "bowling_alley_roof", "cs_car_dealership_roof", "city_block2_flr2_1", "city_block2_flr2_2", "city_block2_flr2_3", "city_block2_flr2_4", "city_block2_roof_1", "city_block2_roof_2", "city_block2_roof_3", "city_block2_roof_4", "furniture_roof", "furniture_upper_roof", "s_gardening_roof", "junkyard_roof_1a", "junkyard_roof_1b", "lumberyard_0_0_roof", "lumberyard_0_1_roof", "lumberyard_1_0_roof", "lumberyard_1_1_roof", "lumbermill_0_0_roof", "lumbermill_0_1_roof", "lumbermill_1_0_roof", "lumbermill_1_1_roof", "mil_base_3h1", "mil_base_2f1", "mil_base_3f1", "mil_base_5g1", "mil_base_6g1", "mil_base_7e1", "mil_base_8e1", "mil_base_7f1", "movietheater_roof_0_0", "movietheater_roof_0_1", "movietheater_roof_0_2", "movietheater_roof_1_0", "movietheater_roof_1_1", "movietheater_roof_1_2", "movietheater_roof_2_0", "movietheater_roof_2_1", "movietheater_roof_2_2", "museum_roof", "s_music_roof", "paintball_field_roof", "paintball_field_roof_1", "s_petstore_roof", "s_petstore_roof_1", "s_petstore_roof_2", "pool_roof", "pool_roof_1", "pool_roof_2", "pool_roof_3", "pool_roof_4", "small_office_roof", "small_office_upper_roof", "smoke_lounge_roof", "s_thrift_roof", "cs_tire_shop_roof", "s_vfw_roof"], "fg": 19374, "bg":19346, "rotates": false},
{"id": ["construction_site"], "fg": 19375, "rotates": false},
{"id": ["BotanicalGarden_1b_roof"], "fg": [19378, 19379, 19376, 19377], "bg":19346, "rotates": true},
{"id": ["BotanicalGarden_1a_roof", "horse_farm_9_roof", "horse_farm_isherwood_9_roof"], "fg": [19376, 19377, 19378, 19379], "bg":19346, "rotates": true},
@@ -24011,8 +24019,8 @@
{"id": ["s_bike_shop", "s_bike_shop_1"], "fg": 19403, "rotates": false},
{"id": ["s_bike_shop_roof", "s_bike_shop_roof_1"], "fg": 19404, "bg":19346, "rotates": false},
{"id": ["skate_park"], "fg": 19405, "rotates": false},
-{"id": ["pavilion", "pavilion_1", "paintball_field"], "fg": 19406, "rotates": false},
-{"id": ["pavilion_roof", "pavilion_roof_1", "paintball_field_roof"], "fg": 19407, "bg":19346, "rotates": false},
+{"id": ["pavilion", "pavilion_1", "paintball_field", "paintball_field_1"], "fg": 19406, "rotates": false},
+{"id": ["pavilion_roof", "pavilion_roof_1", "paintball_field_roof", "paintball_field_roof_1"], "fg": 19407, "bg":19346, "rotates": false},
{"id": ["s_restaurant", "s_restaurant_1", "s_restaurant_2", "s_restaurant_3", "s_restaurant_foodplace", "s_restaurant_fast", "s_restaurant_fast_1"], "fg": 19408, "rotates": false},
{"id": ["s_restaurant_roof", "s_restaurant_roof_1", "s_restaurant_roof_2", "s_restaurant_roof_3", "s_restaurant_foodplace_roof", "s_restaurant_foodplace_upper_roof", "s_restaurant_fast_roof", "s_restaurant_fast_roof_1"], "fg": 19409, "bg":19346, "rotates": false},
{"id": ["s_teashop", "s_teashop_1"], "fg": 19410, "rotates": false},
@@ -24021,14 +24029,14 @@
{"id": ["post_office_roof", "post_office_roof_1"], "fg": 19413, "bg":19346, "rotates": false},
{"id": ["gambling_hall", "gambling_hall_1"], "fg": 19414, "rotates": false},
{"id": ["gambling_hall_roof", "gambling_hall_upper_roof", "gambling_hall_roof_1"], "fg": 19415, "bg":19346, "rotates": false},
-{"id": ["gym_fitness", "gym_fitness_1", "gym"], "fg": 19416, "rotates": false},
-{"id": ["gym_fitness_roof", "gym_fitness_2ndFloor_1", "gym_fitness_roof_1", "gym_roof", "gym_upper_roof"], "fg": 19417, "bg":19346, "rotates": false},
+{"id": ["gym_fitness", "gym_fitness_1"], "fg": 19416, "rotates": false},
+{"id": ["gym_fitness_roof", "gym_fitness_2ndFloor_1", "gym_fitness_roof_1"], "fg": 19417, "bg":19346, "rotates": false},
{"id": ["mortuary"], "fg": 19418, "rotates": false},
{"id": ["mortuary_roof"], "fg": 19419, "bg":19346, "rotates": false},
{"id": ["lancenter", "lancenter_1"], "fg": 19420, "rotates": false},
{"id": ["lancenter_roof", "lancenter_roof_1"], "fg": 19421, "bg":19346, "rotates": false},
-{"id": ["s_arcade"], "fg": 19422, "rotates": false},
-{"id": ["s_arcade_roof"], "fg": 19423, "bg":19346, "rotates": false},
+{"id": ["s_arcade", "cs_internet_cafe", "cs_internet_cafe_upper_roof"], "fg": 19422, "rotates": false},
+{"id": ["s_arcade_roof", "cs_internet_cafe_roof"], "fg": 19423, "bg":19346, "rotates": false},
{"id": ["stripclub", "stripclub_1", "stripclub_2"], "fg": 19424, "rotates": false},
{"id": ["stripclub_roof", "stripclub_roof_1", "stripclub_roof_2"], "fg": 19425, "bg":19346, "rotates": false},
{"id": ["bakery"], "fg": 19426, "rotates": false},
@@ -24043,13 +24051,45 @@
{"id": ["animalpound_roof"], "fg": 19435, "bg":19347, "rotates": false},
{"id": ["warehouse"], "fg": 19436, "rotates": false},
{"id": ["warehouse_roof"], "fg": 19437, "bg":19347, "rotates": false},
-{"id": ["abandonedwarehouse", "abandonedwarehouse_1", "abandonedwarehouse_2", "abandonedwarehouse_4"], "fg": 19438, "rotates": false},
-{"id": ["abandonedwarehouse_roof", "abandonedwarehouse_1_roof", "abandonedwarehouse_2_roof", "abandonedwarehouse_4_roof"], "fg": 19439, "bg":19347, "rotates": false},
+{"id": ["abandonedwarehouse", "abandonedwarehouse_1", "abandonedwarehouse_2", "abandonedwarehouse_3", "abandonedwarehouse_4"], "fg": 19438, "rotates": false},
+{"id": ["abandonedwarehouse_roof", "abandonedwarehouse_1_roof", "abandonedwarehouse_2_roof", "abandonedwarehouse_3_roof", "abandonedwarehouse_4_roof"], "fg": 19439, "bg":19347, "rotates": false},
{"id": ["home_improvement"], "fg": 19440, "rotates": false},
{"id": ["home_improvement_roof"], "fg": 19441, "bg":19347, "rotates": false},
{"id": ["s_jewelry"], "fg": 19442, "rotates": false},
-{"id": ["s_jewelry_roof"], "fg": 19443, "bg":19347, "rotates": false}],
-"//": "range 19337 to 19538" },
+{"id": ["s_jewelry_roof"], "fg": 19443, "bg":19347, "rotates": false},
+{"id": ["garage_gas_roof", "garage_gas_roof_1"], "fg": 19444, "bg":19347, "rotates": false},
+{"id": ["s_gas_roof", "s_gas_roof_1", "s_gas_rural_roof"], "fg": 19445, "bg":19347, "rotates": false},
+{"id": ["station_radio", "station_radio_1"], "fg": 19446, "rotates": false},
+{"id": ["station_radio_roof", "station_radio_roof_1"], "fg": 19447, "bg":19347, "rotates": false},
+{"id": ["veterinarian_roof"], "fg": 19448, "bg":19347, "rotates": false},
+{"id": ["dispensary", "dispensary_1", "dispensary_2"], "fg": 19449, "rotates": false},
+{"id": ["dispensary_roof", "dispensary_roof_1", "dispensary_roof_2"], "fg": 19450, "bg":19347, "rotates": false},
+{"id": ["landscapingsupplyco_1b"], "fg": 19451, "rotates": false},
+{"id": ["landscapingsupplyco_1a"], "fg": 19452, "rotates": false},
+{"id": ["landscapingsupplyco_1b_roof"], "fg": 19453, "bg":19347, "rotates": false},
+{"id": ["s_laundromat_roof", "s_laundromat_roof_1"], "fg": 19454, "bg":19347, "rotates": false},
+{"id": ["s_pharm_roof", "s_pharm_roof_1"], "fg": 19455, "bg":19347, "rotates": false},
+{"id": ["abstorefront", "abstorefront_1", "abstorefront_2"], "fg": 19456, "rotates": false},
+{"id": ["abstorefront_roof", "abstorefront_roof_1", "abstorefront_roof_2"], "fg": 19457, "bg":19347, "rotates": false},
+{"id": ["icecream_shop"], "fg": 19458, "rotates": false},
+{"id": ["icecream_shop_roof"], "fg": 19459, "bg":19347, "rotates": false},
+{"id": ["s_petstore", "s_petstore_1", "s_petstore_2"], "fg": 19460, "rotates": false},
+{"id": ["s_petstore_roof", "s_petstore_roof_1", "s_petstore_roof_2"], "fg": 19461, "bg":19347, "rotates": false},
+{"id": ["animalshelter"], "fg": 19462, "rotates": false},
+{"id": ["animalshelter_roof"], "fg": 19463, "bg":19347, "rotates": false},
+{"id": ["dollarstore", "dollarstore_1"], "fg": 19464, "rotates": false},
+{"id": ["dollarstore_roof", "dollarstore_roof_1"], "fg": 19465, "bg":19347, "rotates": false},
+{"id": ["candy_shop", "candy_shop_1"], "fg": 19466, "rotates": false},
+{"id": ["candy_shop_roof", "candy_shop_roof_1"], "fg": 19467, "bg":19347, "rotates": false},
+{"id": ["cs_market_small"], "fg": 19468, "rotates": false},
+{"id": ["bus_stat_0_roof", "mine_entrance_loading_zone_roof", "cs_gardening_allotment_roof"], "fg": 19469, "bg":19347, "rotates": false},
+{"id": ["mine_entrance_roof"], "fg": 19470, "bg":19347, "rotates": false},
+{"id": ["music_venue", "music_venue_1"], "fg": 19471, "rotates": false},
+{"id": ["music_venue_roof", "music_venue_1_roof", "music_venue_1_roof_top"], "fg": 19472, "bg":19347, "rotates": false},
+{"id": ["gym"], "fg": 19473, "rotates": false},
+{"id": ["gym_roof", "gym_upper_roof"], "fg": 19474, "bg":19347, "rotates": false},
+{"id": ["cs_sexshop_roof"], "fg": 19475, "bg":19347, "rotates": false}],
+"//": "range 19337 to 19538"},
{"file": "fallback.png", "tiles": [], "ascii": [
{"offset": 0, "bold": false, "color": "BLACK"},
diff --git a/zz_more_overmap.png b/zz_more_overmap.png
deleted file mode 100644
index 9c93e1c..0000000
--- a/zz_more_overmap.png
+++ /dev/null
Binary files differ