summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2024-01-04 18:16:32 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2024-01-04 18:16:32 -0800
commitcfba31afd3ee402eba4ce17c35ae5f6416bc229b (patch)
treeb9a25236ffb3de0519b6ab7fff9a38c4ee6b5763
parentUpdated to the august 2023 changes. (diff)
downloadcataclysm-dda-tileset_undeadpeople-cfba31afd3ee402eba4ce17c35ae5f6416bc229b.tar.xz
Fix several silos not using midair overmap tiles.
Fix a typo in applying the midair overmap tiles for isherwood. Reorder the open-air array. Fix industrial center loading bay roof not using open_air tile. Fix a backwards intersection in the mall ring road. Fix industrial center substation not using the roof tile. Remove duplicate mall tile array. Move them to forced roads. Fix several p_resort tiles being duplicated. Also fix p_resort generic tile. Split fire lookout tower array to ground/elevated versions.
-rw-r--r--tile_config.json92
1 files changed, 40 insertions, 52 deletions
diff --git a/tile_config.json b/tile_config.json
index 9b2b997..135b974 100644
--- a/tile_config.json
+++ b/tile_config.json
@@ -17220,8 +17220,8 @@
"fg": 10505,
"rotates": false
},
- { "id": [ "2silos", "ranch_camp_57", "2farm_6", "2farm_6_1", "2farm_6_2", "2farm_6_3" ], "fg": 9773, "rotates": false },
- { "id": [ "2silos_1", "2silos_2", "2silos_roof", "ranch_camp_57_roof", "ranch_camp_57_silo", "ranch_camp_57_silocap" ], "fg": 9774, "bg": 10120, "rotates": false },
+ { "id": [ "2silos", "ranch_camp_57", "2farm_6", "2farm_6_3" ], "fg": 9773, "rotates": false },
+ { "id": [ "2silos_1", "2silos_2", "2silos_roof", "2farm_6_1", "2farm_6_2", "ranch_camp_57_roof", "ranch_camp_57_silo", "ranch_camp_57_silocap" ], "fg": 9774, "bg": 10120, "rotates": false },
{ "id": [ "BotanicalGarden_1a", "horse_farm_9", "horse_farm_isherwood_9" ], "fg": [ 9775, 9778, 9777, 9776 ], "rotates": true },
{ "id": "BotanicalGarden_1b", "fg": [ 9777, 9776, 9775, 9778 ], "rotates": true },
{ "id": [ "BotanicalGarden_1a_roof", "horse_farm_9_roof", "horse_farm_isherwood_9_roof" ], "fg": [ 9779, 9782, 9781, 9780 ], "bg": 10120, "rotates": true },
@@ -17478,10 +17478,10 @@
"farm_dairy_twd_second_floor_4",
"rural_outbuilding_roof",
"smokehouse_roof",
- "house_farm_isherwood_2_roof",
- "house_farm_isherwood_10_roof",
- "house_farm_isherwood_13_2ndfloor",
- "house_farm_isherwood_13_roof"
+ "farm_isherwood_2_roof",
+ "horse_farm_isherwood_10_roof",
+ "horse_farm_isherwood_13_2ndfloor",
+ "horse_farm_isherwood_13_roof"
],
"fg": 9893,
"bg": 10120,
@@ -19837,10 +19837,19 @@
},
{
"id": [
+ "generic_open_sky",
"open_air",
"cs_private_park_roof",
"2farm_roof_15",
"apartments_con_tower_015",
+ "airliner_2a_1",
+ "airliner_2c_1",
+ "bus_stat_1_roof",
+ "helipad2f_sw",
+ "helipad2f_se",
+ "industrial_center_loading_bay_roof",
+ "irradiator_1_7_roof",
+ "irradiator_1_9_roof",
"lab_surface_brick_block2A0",
"lab_surface_brick_block2C2",
"lab_surface_brick_block2A1",
@@ -19885,8 +19894,10 @@
"lab_surface_brick_block5D1",
"lab_surface_brick_block5E0",
"lab_surface_brick_block5E1",
- "airliner_2a_1",
- "airliner_2c_1",
+ "mall_b_10",
+ "mall_b_19",
+ "mall_a_10_roof",
+ "mall_a_19_roof",
"mil_base_1a1",
"mil_base_1b1",
"mil_base_1c1",
@@ -19948,10 +19959,7 @@
"mil_base_8i1",
"mil_base_8j1",
"mil_base_8k1",
- "helipad2f_sw",
- "helipad2f_se",
- "irradiator_1_7_roof",
- "irradiator_1_9_roof",
+ "office_tower_open_air_corner",
"prison_1_2f_2",
"prison_1_2f_3",
"prison_1_3f_2",
@@ -19970,12 +19978,16 @@
"school_4_7",
"school_4_8",
"school_4_9",
+ "ranch_camp_74_roof",
+ "ranch_camp_75_roof",
"robofachq_roof_a0",
"robofachq_roof_a3",
- "office_tower_open_air_corner",
"sewage_treatment_0_0_roof",
- "ranch_camp_74_roof",
- "ranch_camp_75_roof",
+ "steel_mill_0_3_2",
+ "steel_mill_0_3_3",
+ "steel_mill_0_4_2",
+ "steel_mill_0_4_3",
+ "wasp_tower_roof",
"evac_center_1_z1",
"evac_center_2_z1",
"evac_center_3_z1",
@@ -20416,17 +20428,7 @@
"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"
+ "refctr_N5e_z2"
],
"fg": [ 10120, 10123, 10122, 10121 ],
"rotates": false
@@ -20675,8 +20677,8 @@
"fg": 10154,
"rotates": true
},
- { "id": "pwr_sub_s", "fg": 10155, "rotates": false },
- { "id": [ "pwr_sub_s_roof", "small_power_substation_roof" ], "fg": 10156, "bg": 10120, "rotates": false },
+ { "id": [ "pwr_sub_s", "industrial_center_substation" ], "fg": 10155, "rotates": false },
+ { "id": [ "pwr_sub_s_roof", "small_power_substation_roof", "industrial_center_substation_roof" ], "fg": 10156, "bg": 10120, "rotates": false },
{
"id": [
"ranch_camp_11",
@@ -21062,22 +21064,6 @@
"bg": [ ],
"rotates": true
},
- {
- "id": [
- "mall_a_2",
- "mall_a_16",
- "mall_a_17",
- "mall_a_74",
- "mall_a_75",
- "mall_a_76",
- "mall_a_78",
- "mall_a_79",
- "mall_a_80"
- ],
- "fg": [ 10211, 10210, 10211, 10210 ],
- "bg": [ ],
- "rotates": true
- },
{ "id": "evac_center_1", "fg": [ 10206, 10209, 10208, 10207 ], "bg": [ ], "rotates": true },
{ "id": "evac_center_21", "fg": [ 10209, 10208, 10207, 10206 ], "bg": [ ], "rotates": true },
{ "id": "evac_center_25", "fg": [ 10208, 10207, 10206, 10209 ], "bg": [ ], "rotates": true },
@@ -21255,7 +21241,6 @@
{
"id": [
"null_road_forced_NEW_for_specials",
- "mall_a_77",
"necropolis_a_24",
"necropolis_a_40"
],
@@ -21275,6 +21260,7 @@
{
"id": [
"null_road_forced_ESW_for_specials",
+ "mall_a_77",
"necropolis_a_22",
"necropolis_a_41"
],
@@ -21293,6 +21279,7 @@
{
"id": [
"null_road_forced_NESW_for_specials",
+ "industrial_center_sw_road",
"necropolis_a_68"
],
"fg": [ 10284 ],
@@ -22485,8 +22472,6 @@
{
"id": [
"p_resort_1nw",
- "p_resort_0nw",
- "p_resort_0se",
"p_resort_1ee",
"p_resort_1mm",
"p_resort_1ne",
@@ -22504,9 +22489,6 @@
"p_resort_2ss",
"p_resort_2sw",
"p_resort_2ww",
- "p_resort_pe",
- "p_resort_pm",
- "p_resort_pw",
"p_resort_ree",
"p_resort_rmm",
"p_resort_rne",
@@ -22517,7 +22499,7 @@
"p_resort_rsw",
"p_resort_rww"
],
- "fg": 10525,
+ "fg": 10495,
"rotates": false
},
{
@@ -38440,7 +38422,13 @@
{ "id": "cs_car_showroom_2ndfloor", "fg": 19211, "rotates": false },
{ "id": "cs_car_showroom_roof", "fg": 19212, "rotates": false },
{
- "id": [ "ws_fire_lookout_tower_base", "ws_fire_lookout_tower_f1", "ws_fire_lookout_tower_f2", "ws_fire_lookout_tower_f3", "ws_fire_lookout_tower_f4", "ws_fire_lookout_tower_f5" ],
+ "id": [ "ws_fire_lookout_tower_base" ],
+ "fg": 19213,
+ "bg": 18949,
+ "rotates": false
+ },
+ {
+ "id": [ "ws_fire_lookout_tower_f1", "ws_fire_lookout_tower_f2", "ws_fire_lookout_tower_f3", "ws_fire_lookout_tower_f4", "ws_fire_lookout_tower_f5" ],
"fg": 19213,
"bg": 18949,
"rotates": false