summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2025-09-13 14:34:30 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2025-09-13 14:34:30 -0700
commit49ae063128a31db6813f4a128c83967552e103ec (patch)
treeace462da11f71bdc6120f066272ebf9694ea3c84
parentVarious post-rebase typos and fixes. (diff)
downloadcataclysm-dda-tileset_undeadpeople-master.tar.xz
Add buildings: urban_23 through urban_30, urban_35, urban_36, municipal_reactor, s_bike_shop_1HEADmaster
Fix buildings: urban_9, urban_19, mi-go_camp, necropolis generic underground, sewage_treatment underground Change buildings: lmoe_roof to no longer look like open sky Add items: 556_45_casing, wielded microwave Fix items: wielded lever_shotgun and remington_870
-rw-r--r--tile_config.json166
1 files changed, 123 insertions, 43 deletions
diff --git a/tile_config.json b/tile_config.json
index 756768e..0eca56d 100644
--- a/tile_config.json
+++ b/tile_config.json
@@ -8531,6 +8531,8 @@
{ "id": "overlay_wielded_10mm_casing", "fg": 4344, "rotates": false },
{ "id": "223_casing", "fg": 4345, "rotates": false },
{ "id": "overlay_wielded_223_casing", "fg": 4345, "rotates": false },
+ { "id": "556_45_casing", "fg": 4345, "rotates": false },
+ { "id": "overlay_wielded_556_45_casing", "fg": 4345, "rotates": false },
{ "id": "22_casing", "fg": 4346, "rotates": false },
{ "id": "overlay_wielded_22_casing", "fg": 4346, "rotates": false },
{ "id": "22_casing_new", "fg": 4347, "rotates": false },
@@ -9925,7 +9927,7 @@
{ "id": "overlay_wielded_ksg-25", "fg": 5251, "rotates": false },
{ "id": "overlay_wielded_ksg", "fg": 5252, "rotates": false },
{ "id": "lever_shotgun", "fg": 5269, "rotates": false },
- { "id": "overlay_wielded_lever_shotgun", "fg": 5269, "rotates": false },
+ { "id": "overlay_wielded_lever_shotgun", "fg": 5264, "rotates": false },
{ "id": [ "m1014", "mossberg_930_var_m1014" ], "fg": 5253, "rotates": false },
{ "id": [ "overlay_wielded_m1014", "overlay_wielded_mossberg_930_var_m1014" ], "fg": 5254, "rotates": false },
{ "id": "mossberg_500", "fg": 5255, "rotates": false },
@@ -9951,7 +9953,7 @@
"rotates": false
},
{ "id": "remington_870", "fg": 5269, "rotates": false },
- { "id": "overlay_wielded_remington_870", "fg": 5269, "rotates": false },
+ { "id": "overlay_wielded_remington_870", "fg": 5268, "rotates": false },
{ "id": "remington_870_breacher", "fg": 5270, "rotates": false },
{ "id": "overlay_wielded_remington_870_breacher", "fg": 5271, "rotates": false },
{ "id": "remington_870_express", "fg": 5272, "rotates": false },
@@ -19637,27 +19639,55 @@
"rotates": true
},
{
+ "id": [ "urban_36_9", "urban_36_13", "urban_36_17", "urban_36_21", "urban_36_25", "urban_36_29" ],
+ "fg": [ 11569, 11568, 11567, 11570 ],
+ "bg": 12063,
+ "rotates": true
+ },
+ {
"id": [ "apartments_con_tower_101", "apartments_con_tower_102", "apartments_con_tower_103", "apartments_con_tower_104" ],
"fg": [ 11575, 11578, 11577, 11576 ],
"bg": 12063,
"rotates": true
},
{
+ "id": [ "urban_36_10", "urban_36_14", "urban_36_18", "urban_36_22", "urban_36_26", "urban_36_30" ],
+ "fg": [ 11577, 11576, 11575, 11578 ],
+ "bg": 12063,
+ "rotates": true
+ },
+ {
"id": [ "apartments_con_tower_111", "apartments_con_tower_112", "apartments_con_tower_113", "apartments_con_tower_114" ],
"fg": [ 11579, 11582, 11581, 11580 ],
"bg": 12063,
"rotates": true
},
{
+ "id": [ "urban_36_12", "urban_36_16", "urban_36_20", "urban_36_24", "urban_36_28", "urban_36_32" ],
+ "fg": [ 11581, 11580, 11579, 11582 ],
+ "bg": 12063,
+ "rotates": true
+ },
+ {
"id": [ "apartments_con_tower_011", "apartments_con_tower_012", "apartments_con_tower_013", "apartments_con_tower_014" ],
"fg": [ 11571, 11574, 11573, 11572 ],
"bg": 12063,
"rotates": true
},
+ {
+ "id": [ "urban_36_11", "urban_36_15", "urban_36_19", "urban_36_23", "urban_36_27", "urban_36_31" ],
+ "fg": [ 11573, 11572, 11571, 11574 ],
+ "bg": 12063,
+ "rotates": true
+ },
{ "id": "apartments_mod_tower_000", "fg": [ 11583, 11586, 11585, 11584 ], "rotates": true },
+ { "id": "urban_36_5", "fg": [ 11585, 11584, 11583, 11586 ], "rotates": true },
{ "id": "apartments_mod_tower_100", "fg": [ 11591, 11594, 11593, 11592 ], "rotates": true },
+ { "id": "urban_36_6", "fg": [ 11593, 11592, 11591, 11594 ], "rotates": true },
{ "id": "apartments_mod_tower_110", "fg": [ 11595, 11598, 11597, 11596 ], "rotates": true },
+ { "id": "urban_36_8", "fg": [ 11597, 11596, 11595, 11598 ], "rotates": true },
{ "id": "apartments_mod_tower_010", "fg": [ 11587, 11590, 11589, 11588 ], "rotates": true },
+ { "id": "urban_36_7", "fg": [ 11589, 11588, 11587, 11590 ], "rotates": true },
{
"id": [ "apartments_mod_tower_001", "apartments_mod_tower_002", "apartments_mod_tower_003" ],
"fg": [ 11599, 11602, 11601, 11600 ],
@@ -20930,15 +20960,7 @@
"garden_house_1_floor_1",
"rural_house1",
"rural_house2",
- "urban_8_2",
- "urban_29_3",
- "urban_29_4",
- "urban_29_5",
- "urban_29_6",
- "urban_29_7",
- "urban_29_8",
- "urban_29_9",
- "urban_29_10"
+ "urban_8_2"
],
"fg": [ 11794, 11795, 11796, 11797 ],
"rotates": true
@@ -20946,7 +20968,8 @@
{
"id": [
"null_generic_house_backwards",
- "urban_8_2"
+ "urban_8_2",
+ "urban_9_1", "urban_9_2"
],
"fg": [ 11796, 11797, 11794, 11795 ],
"rotates": true
@@ -21148,14 +21171,6 @@
"urban_8_4", "urban_8_6",
"urban_10_1_roof",
"urban_10_2_roof",
- "urban_29_3_roof",
- "urban_29_4_roof",
- "urban_29_5_roof",
- "urban_29_6_roof",
- "urban_29_7_roof",
- "urban_29_8_roof",
- "urban_29_9_roof",
- "urban_29_10_roof",
"urban_8_3_roof",
"urban_8_4_roof",
"urban_8_6_roof",
@@ -21184,7 +21199,9 @@
{
"id": [
"null_generic_house_roof_backwards",
- "urban_8_4", "urban_8_6"
+ "urban_8_4", "urban_8_6",
+ "urban_9_3", "urban_9_5",
+ "urban_9_4", "urban_9_6"
],
"fg": [ 11800, 11799, 11798, 11801 ],
"bg": 12063,
@@ -21544,7 +21561,7 @@
{ "id": "landscapingsupplyco_1a", "fg": 11842, "rotates": true },
{ "id": "landscapingsupplyco_1b_roof", "fg": 11844, "bg": 12063, "rotates": true },
{ "id": [ "lmoe", "ws_survivor_bunker_f0", "faction_hide_site_0" ], "fg": 11845, "rotates": false },
- { "id": "lmoe_roof", "fg": 12063, "rotates": false },
+ { "id": "lmoe_roof", "fg": 11845, "rotates": false },
{ "id": "lmoe_under_full", "fg": 12863, "rotates": false },
{ "id": "lmoe_prepperquest", "fg": 11845, "rotates": false },
{ "id": "lmoe_under_empty_prepperquest", "fg": 12863, "rotates": false },
@@ -21618,8 +21635,8 @@
"fg": 11856,
"rotates": false
},
- { "id": "mi-go_camp1", "fg": [ 11857, 11858, 11859, 11860 ], "rotates": true },
- { "id": "mi-go_camp2", "fg": [ 11859, 11860, 11857, 11858 ], "rotates": true },
+ { "id": "mi-go_camp1", "fg": [ 11857, 11860, 11859, 11858 ], "rotates": true },
+ { "id": "mi-go_camp2", "fg": [ 11859, 11858, 11857, 11860 ], "rotates": true },
{
"id": [ "mi-go_camp2-1", "mi-go_camp2-2", "mi-go_camp1-1", "mi-go_camp2-3" ],
"fg": 11861,
@@ -22872,6 +22889,8 @@
"id": [
"generic_basement_building_norotate",
"hotel_tower_b_1", "hotel_tower_b_2", "hotel_tower_b_3",
+ "urban_30_1",
+ "urban_35_1", "urban_35_2", "urban_35_3", "urban_35_4",
"mil_base_tunnels_a",
"mil_base_tunnels_b",
"mil_base_tunnels_c",
@@ -22884,6 +22903,7 @@
"mil_base_tunnels_l",
"mil_base_tunnels_m",
"mil_base_tunnels_n",
+ "municipal_reactor_b2",
"necropolis_c_1", "necropolis_c_2", "necropolis_c_3", "necropolis_c_4", "necropolis_c_5",
"necropolis_c_6", "necropolis_c_7", "necropolis_c_8", "necropolis_c_9", "necropolis_c_10",
"necropolis_c_11", "necropolis_c_12", "necropolis_c_13", "necropolis_c_14", "necropolis_c_15",
@@ -22916,7 +22936,7 @@
"necropolis_d_75",
"necropolis_d_77", "necropolis_d_78", "necropolis_d_80"
],
- "fg": 10992,
+ "fg": 12177,
"rotates": false
},
{ "id": [ "pwr_sub_s", "industrial_center_substation" ], "fg": 12178, "rotates": false },
@@ -23645,7 +23665,7 @@
{ "id": "s_baseballfield_a2", "fg": [ 12469, 12472, 12471, 12470 ], "rotates": true },
{ "id": "s_baseballfield_b1", "fg": [ 12473, 12476, 12475, 12474 ], "rotates": true },
{ "id": "s_baseballfield_b2", "fg": [ 12477, 12480, 12479, 12478 ], "rotates": true },
- { "id": "s_bike_shop", "fg": 12481, "rotates": false },
+ { "id": [ "s_bike_shop", "s_bike_shop_1" ], "fg": 12481, "rotates": false },
{ "id": [ "s_bike_shop_roof", "s_bike_shop_roof_1" ], "fg": 12482, "bg": 12063, "rotates": false },
{ "id": [ "s_butcher", "s_butcher_1", "s_butcher_2", "s_butcher_3" ], "fg": 12483, "rotates": false },
{
@@ -23967,7 +23987,7 @@
"sewage_treatment_1_1_-1",
"sewage_treatment_2_1_-1"
],
- "fg": [ 12863, 12866, 12865, 12864 ],
+ "fg": [ 12177 ],
"rotates": false
},
{ "id": "null_sewage_treatment_0_0_roof", "fg": 12596, "bg": 12063, "rotates": false },
@@ -24327,7 +24347,15 @@
},
{ "id": "sub_station", "fg": 12677, "rotates": false },
{ "id": "sewer_sub_station", "fg": 12676, "rotates": false },
- { "id": [ "underground_sub_station", "generic_mall_subway" ], "fg": 12678, "rotates": false },
+ {
+ "id": [
+ "underground_sub_station",
+ "generic_mall_subway",
+ "urban_30_2"
+ ],
+ "fg": 12678,
+ "rotates": false
+ },
{ "id": "sub_station_roof", "fg": 12679, "bg": 12063, "rotates": false },
{ "id": "survivor_forest_camp", "fg": 11793, "rotates": false },
{ "id": [ "temple_stairs", "bloodrune_pedestal" ], "fg": 12680, "rotates": false },
@@ -24460,7 +24488,6 @@
"urban_4_3",
"urban_6_1",
"urban_7_1",
- "urban_9_1",
"urban_10_1",
"urban_11_1",
"urban_12_1",
@@ -24498,7 +24525,14 @@
"urban_14_1",
"urban_18_1",
"urban_19_1",
- "urban_20_1"
+ "urban_20_1",
+ "urban_23_1",
+ "urban_24_1",
+ "urban_25_1",
+ "urban_26_1",
+ "urban_27_1",
+ "urban_28_1",
+ "urban_29_1"
],
"fg": [ 12834, 12837, 12836, 12835 ],
"rotates": true
@@ -24524,7 +24558,14 @@
"urban_14_2",
"urban_18_2",
"urban_19_2",
- "urban_20_2"
+ "urban_20_2",
+ "urban_23_2",
+ "urban_24_2",
+ "urban_25_2",
+ "urban_26_2",
+ "urban_27_2",
+ "urban_28_2",
+ "urban_29_2"
],
"fg": [ 12839, 12838, 12841, 12840 ],
"rotates": true
@@ -24547,7 +24588,6 @@
"urban_4_5", "urban_4_7",
"urban_6_3", "urban_6_5",
"urban_7_3", "urban_7_5",
- "urban_9_3", "urban_9_5",
"urban_10_3", "urban_10_5",
"urban_11_3", "urban_11_5",
"urban_12_3", "urban_12_5",
@@ -24555,7 +24595,7 @@
"urban_16_3",
"urban_17_3",
"urban_18_5", "urban_18_7", "urban_18_9",
- "urban_19_3", "urban_19_5", "urban_19_7", "urban_19_9", "urban_19_11",
+ "urban_19_5", "urban_19_7", "urban_19_9", "urban_19_11",
"urban_20_5", "urban_20_7",
"urban_21_3",
"urban_22_3",
@@ -24585,7 +24625,6 @@
"urban_5_4", "urban_5_6",
"urban_6_4", "urban_6_6",
"urban_7_4", "urban_7_6",
- "urban_9_4", "urban_9_6",
"urban_10_4", "urban_10_6",
"urban_11_4", "urban_11_6",
"urban_12_4", "urban_12_6",
@@ -24623,7 +24662,6 @@
"urban_5_2",
"urban_6_2",
"urban_7_2",
- "urban_9_2",
"urban_10_2",
"urban_11_2",
"urban_12_2",
@@ -24776,7 +24814,8 @@
"necropolis_b_34",
"necropolis_b_54",
"necropolis_b_63",
- "prison_1_b_8"
+ "prison_1_b_8",
+ "urban_36_1", "urban_36_2", "urban_36_3", "urban_36_4"
],
"fg": [
{ "weight": 25, "sprite": 12863 },
@@ -24808,7 +24847,14 @@
"mil_base_6i",
"mil_base_6i1",
"industrial_center_medical_center",
- "industrial_center_medical_center_roof"
+ "industrial_center_medical_center_roof",
+ "urban_35_5", "urban_35_6",
+ "urban_35_7", "urban_35_8",
+ "urban_35_9", "urban_35_10", "urban_35_11", "urban_35_12",
+ "urban_35_13", "urban_35_14", "urban_35_15", "urban_35_16",
+ "urban_35_17", "urban_35_18", "urban_35_19",
+ "urban_35_20",
+ "urban_35_21", "urban_35_22", "urban_35_23"
],
"fg": 12869,
"rotates": false
@@ -24930,7 +24976,9 @@
"haz_sar_b_1",
"haz_sar_b_2",
"haz_sar_b_3",
- "haz_sar_b_4"
+ "haz_sar_b_4",
+ "municipal_reactor_ware_b",
+ "municipal_reactor_b"
],
"fg": 12880,
"rotates": false
@@ -41378,6 +41426,7 @@
{ "id": "large_lcd_screen", "fg": 21672, "rotates": false },
{ "id": "overlay_wielded_large_lcd_screen", "fg": 21673, "rotates": false },
{ "id": "microwave", "fg": 21674, "rotates": false },
+ { "id": "overlay_wielded_microwave", "fg": 21674, "rotates": false },
{ "id": "television", "fg": 21675, "rotates": false },
{ "id": "overlay_wielded_television", "fg": 21676, "rotates": false },
{ "id": "creepy_doll", "fg": 21677, "rotates": false },
@@ -41518,7 +41567,15 @@
"id": [
"null_cityblockshort_right",
"urban_13_3",
- "urban_14_3"
+ "urban_14_3",
+ "urban_23_4",
+ "urban_24_4",
+ "urban_25_4",
+ "urban_26_4",
+ "urban_27_4",
+ "urban_28_4",
+ "urban_29_4",
+ "urban_30_4"
],
"fg": [ 21748, 21751, 21750, 21749 ],
"rotates": true
@@ -41526,8 +41583,16 @@
{
"id": [
"null_cityblockshort_right_elevated",
- "urban_13_5", "urban_13_7", "urban_13_9", "urban_13_11",
- "urban_14_5", "urban_14_7", "urban_14_9", "urban_14_11", "urban_14_13"
+ "urban_13_5", "urban_13_7", "urban_13_9", "urban_13_11",
+ "urban_14_5", "urban_14_7", "urban_14_9", "urban_14_11", "urban_14_13",
+ "urban_23_6", "urban_23_8", "urban_23_10",
+ "urban_24_6", "urban_24_8", "urban_24_10", "urban_24_12", "urban_24_14",
+ "urban_25_6", "urban_25_8", "urban_25_10", "urban_25_12",
+ "urban_26_6", "urban_26_8", "urban_26_10", "urban_26_12",
+ "urban_27_6", "urban_27_8", "urban_27_10", "urban_27_12",
+ "urban_28_6", "urban_28_8", "urban_28_10",
+ "urban_29_6", "urban_29_8", "urban_29_10",
+ "urban_30_6", "urban_30_8", "urban_30_10"
],
"fg": [ 21748, 21751, 21750, 21749 ],
"bg": 21434,
@@ -41588,7 +41653,14 @@
"id": [
"null_cityblockshort_left",
"urban_13_4",
- "urban_14_4"
+ "urban_14_4",
+ "urban_23_3",
+ "urban_24_3",
+ "urban_25_3",
+ "urban_26_3",
+ "urban_27_3",
+ "urban_28_3",
+ "urban_29_3"
],
"fg": [ 21760, 21763, 21762, 21761 ],
"rotates": true
@@ -41597,7 +41669,15 @@
"id": [
"null_cityblockshort_left_elevated",
"urban_13_6", "urban_13_8", "urban_13_10", "urban_13_12",
- "urban_14_6", "urban_14_8", "urban_14_10", "urban_14_12", "urban_14_14"
+ "urban_14_6", "urban_14_8", "urban_14_10", "urban_14_12", "urban_14_14",
+ "urban_23_5", "urban_23_7", "urban_23_9", "urban_23_11",
+ "urban_24_5", "urban_24_7", "urban_24_9", "urban_24_11",
+ "urban_25_5", "urban_25_7", "urban_25_9",
+ "urban_26_5", "urban_26_7", "urban_26_9", "urban_26_11",
+ "urban_27_5", "urban_27_7", "urban_27_9", "urban_27_11", "urban_27_13",
+ "urban_28_5", "urban_28_7", "urban_28_9", "urban_28_11",
+ "urban_29_5", "urban_29_7", "urban_29_9",
+ "urban_30_5", "urban_30_7", "urban_30_9"
],
"fg": [ 21760, 21763, 21762, 21761 ],
"bg": 21434,