summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2024-04-09 14:29:15 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2024-04-09 14:29:15 -0700
commitee6043c20ba440271201bd209fa0b436f0b2aeec (patch)
tree0b4398c7553ee70fd4b73efb691aa3d6f233c223
parentFix missing wielded in overlay_wielded_auger. (diff)
downloadcataclysm-dda-tileset_undeadpeople-ee6043c20ba440271201bd209fa0b436f0b2aeec.tar.xz
Add aliases for rice cooking: sake, brew_sake, sikhye, rice_bran
Add aliases for lobsterfest: -lobster, lobster_cooked, lobster_smoked, lobster_salted, dry_lobster, -lobster_canned, lobster_pickled, lobster_roll, rehydrated_lobster, soup_lobster Add aliases for: egg_insect, mon_wasp_queen Add aliases for: t_thconc_floor_no_roof, assorted bee paper tiles Add aliases for: mon_horse_foal Add missing overmap aliases for: farm_dairy_twd_3_roof, farm_dairy_twd_4_roof, urban_13_1 Add new overmap aliases for: -house_22ab -bungalow27, bungalow28 -nest_dermatik_roof -mil_base_tunnels_j-n -smallscrapyard_ocu -house_fence08, house_fence09 -2StoryModern05, 2StoryModern06 -3Story01 -haz_sar_roof -the new triffid overmaps Fix LAW_Packed
-rw-r--r--tile_config.json143
1 files changed, 101 insertions, 42 deletions
diff --git a/tile_config.json b/tile_config.json
index c7eb345..8fc04a3 100644
--- a/tile_config.json
+++ b/tile_config.json
@@ -5286,8 +5286,8 @@
{ "id": "tequila", "fg": 2779, "rotates": false },
{ "id": "overlay_wielded_triple_sec", "fg": 2780, "rotates": false },
{ "id": "triple_sec", "fg": 2780, "rotates": false },
- { "id": "overlay_wielded_vodka", "fg": 2781, "rotates": false },
- { "id": "vodka", "fg": 2781, "rotates": false },
+ { "id": [ "overlay_wielded_vodka", "overlay_wielded_sake" ], "fg": 2781, "rotates": false },
+ { "id": [ "vodka", "sake" ], "fg": 2781, "rotates": false },
{ "id": "overlay_wielded_whiskey", "fg": 2782 },
{ "id": "whiskey", "fg": 2782 },
{ "id": "overlay_wielded_wine_barley", "fg": 2783, "rotates": false },
@@ -5360,8 +5360,8 @@
{ "id": "overlay_wielded_brew_rum", "fg": 2816 },
{ "id": "brew_vinegar", "fg": 2817 },
{ "id": "overlay_wielded_brew_vinegar", "fg": 2817 },
- { "id": "brew_vodka", "fg": 2818 },
- { "id": "overlay_wielded_brew_vodka", "fg": 2818 },
+ { "id": [ "brew_vodka", "brew_sake" ], "fg": 2818 },
+ { "id": [ "overlay_wielded_brew_vodka", "overlay_wielded_brew_sake" ], "fg": 2818 },
{ "id": "brew_whiskey", "fg": 2819 },
{ "id": "overlay_wielded_brew_whiskey", "fg": 2819 },
{ "id": "gin_mash", "fg": 2820, "rotates": false },
@@ -5418,12 +5418,12 @@
{ "id": "overlay_wielded_fat", "fg": 2844, "rotates": false },
{ "id": "fat_tainted", "fg": 2845, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_fat_tainted", "fg": 2845, "rotates": false },
- { "id": "fish", "fg": 2846, "bg": 9555, "rotates": false },
- { "id": "overlay_wielded_fish", "fg": 2846, "rotates": false },
- { "id": "fish_cooked", "fg": 2847 },
- { "id": "overlay_wielded_fish_cooked", "fg": 2847 },
- { "id": "fish_smoked", "fg": 2848, "bg": 9555, "rotates": false },
- { "id": "overlay_wielded_fish_smoked", "fg": 2848, "rotates": false },
+ { "id": [ "fish", "lobster" ], "fg": 2846, "bg": 9555, "rotates": false },
+ { "id": [ "overlay_wielded_fish", "overlay_wielded_lobster" ], "fg": 2846, "rotates": false },
+ { "id": [ "fish_cooked", "lobster_cooked" ], "fg": 2847 },
+ { "id": [ "overlay_wielded_fish_cooked", "overlay_wielded_lobster_cooked" ], "fg": 2847 },
+ { "id": [ "fish_smoked", "lobster_smoked" ], "fg": 2848, "bg": 9555, "rotates": false },
+ { "id": [ "overlay_wielded_fish_smoked", "overlay_wielded_lobster_smoked" ], "fg": 2848, "rotates": false },
{ "id": "flesh_golem_heart", "fg": 2849, "rotates": true },
{ "id": "overlay_wielded_flesh_golem_heart", "fg": 2850, "rotates": true },
{ "id": "hstomach", "fg": 2851, "bg": 9555, "rotates": false },
@@ -5544,8 +5544,8 @@
{ "id": "raw_tainted_leather", "fg": 2904, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_ruined_chunks", "fg": 2905 },
{ "id": "ruined_chunks", "fg": 2905 },
- { "id": "overlay_wielded_salted_fish", "fg": 2906 },
- { "id": "salted_fish", "fg": 2906 },
+ { "id": [ "overlay_wielded_salted_fish", "overlay_wielded_lobster_salted" ], "fg": 2906 },
+ { "id": [ "salted_fish", "lobster_salted" ], "fg": 2906 },
{ "id": "overlay_wielded_small_demihuman_stomach_boiled", "fg": 2908, "rotates": false },
{ "id": "small_demihuman_stomach_boiled", "fg": 2908, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_small_hstomach_boiled", "fg": 2907, "rotates": false },
@@ -5726,8 +5726,8 @@
{ "id": "rehydration_drink", "fg": 2978, "rotates": false },
{ "id": "overlay_wielded_rootbeer", "fg": 2979, "rotates": false },
{ "id": "rootbeer", "fg": 2979, "rotates": false },
- { "id": "overlay_wielded_soy_milk", "fg": 2980, "rotates": false },
- { "id": "soy_milk", "fg": 2980, "rotates": false },
+ { "id": [ "overlay_wielded_soy_milk", "overlay_wielded_sikhye" ], "fg": 2980, "rotates": false },
+ { "id": [ "soy_milk", "sikhye" ], "fg": 2980, "rotates": false },
{ "id": "overlay_wielded_spezi", "fg": 2981 },
{ "id": "spezi", "fg": 2981 },
{ "id": "overlay_wielded_sports_drink", "fg": 2982, "rotates": false },
@@ -5776,7 +5776,7 @@
{ "id": "sauce_red", "fg": 2999, "rotates": false },
{ "id": "overlay_wielded_vinegar", "fg": 3000, "rotates": false },
{ "id": "vinegar", "fg": 3000, "rotates": false },
- { "id": "ant_egg", "fg": 3001, "bg": 9555, "rotates": false },
+ { "id": [ "ant_egg", "egg_insect" ], "fg": 3001, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_ant_egg", "fg": 3001, "rotates": false },
{ "id": "boiled_egg", "fg": 3002, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_boiled_egg", "fg": 3002, "rotates": false },
@@ -6162,18 +6162,18 @@
{ "id": "overlay_wielded_deluxe_rice", "fg": 3144 },
{ "id": "demihuman_cracklins", "fg": 3138, "rotates": false },
{ "id": "overlay_wielded_demihuman_cracklins", "fg": 3138, "rotates": false },
- { "id": "dry_fish", "fg": 3145, "bg": 9555, "rotates": false },
- { "id": "overlay_wielded_dry_fish", "fg": 3145, "rotates": false },
+ { "id": [ "dry_fish", "dry_lobster" ], "fg": 3145, "bg": 9555, "rotates": false },
+ { "id": [ "overlay_wielded_dry_fish", "overlay_wielded_dry_lobster" ], "fg": 3145, "rotates": false },
{ "id": "dry_meat", "fg": 3146, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_dry_meat", "fg": 3146, "rotates": false },
{ "id": "dry_meat_tainted", "fg": 3147, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_dry_meat_tainted", "fg": 3147, "rotates": false },
- { "id": "fish_canned", "fg": 3148, "rotates": false },
- { "id": "overlay_wielded_fish_canned", "fg": 3148, "rotates": false },
+ { "id": [ "fish_canned", "lobster_canned" ], "fg": 3148, "rotates": false },
+ { "id": [ "overlay_wielded_fish_canned", "overlay_wielded_lobster_canned" ], "fg": 3148, "rotates": false },
{ "id": "fish_fried", "fg": 3149 },
{ "id": "overlay_wielded_fish_fried", "fg": 3149 },
- { "id": "fish_pickled", "fg": 3150, "rotates": false },
- { "id": "overlay_wielded_fish_pickled", "fg": 3150, "rotates": false },
+ { "id": [ "fish_pickled", "lobster_pickled" ], "fg": 3150, "rotates": false },
+ { "id": [ "overlay_wielded_fish_pickled", "overlay_wielded_lobster_pickled" ], "fg": 3150, "rotates": false },
{ "id": "fried_spam", "fg": 3151, "rotates": false },
{ "id": "overlay_wielded_fried_spam", "fg": 3151, "rotates": false },
{ "id": "glazed_tenderloin", "fg": 3152 },
@@ -6210,8 +6210,8 @@
{ "id": "pelmeni", "fg": 3165 },
{ "id": "overlay_wielded_pemmican", "fg": 3166 },
{ "id": "pemmican", "fg": 3166 },
- { "id": "overlay_wielded_pie_meat", "fg": 3167 },
- { "id": "pie_meat", "fg": 3167 },
+ { "id": [ "overlay_wielded_pie_meat", "overlay_wielded_lobster_roll", "fg": 3167 },
+ { "id": [ "pie_meat", "lobster_roll" ], "fg": 3167 },
{ "id": "overlay_wielded_pizza_meat", "fg": 3168, "rotates": false },
{ "id": "pizza_meat", "fg": 3168, "rotates": false },
{ "id": "overlay_wielded_pizza_supreme", "fg": 3169, "rotates": false },
@@ -6220,8 +6220,8 @@
{ "id": "pork_beans", "fg": 3170, "rotates": false },
{ "id": "overlay_wielded_ravioli", "fg": 3171, "rotates": false },
{ "id": "ravioli", "fg": 3171, "rotates": false },
- { "id": "overlay_wielded_rehydrated_fish", "fg": 3172 },
- { "id": "rehydrated_fish", "fg": 3172 },
+ { "id": [ "overlay_wielded_rehydrated_fish", "overlay_wielded_rehydrated_lobster" ], "fg": 3172 },
+ { "id": [ "rehydrated_fish", "rehydrated_lobster" ], "fg": 3172 },
{ "id": "overlay_wielded_rehydrated_meat", "fg": 3173, "rotates": false },
{ "id": "rehydrated_meat", "fg": 3173, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_royal_beef", "fg": 3174 },
@@ -7179,8 +7179,8 @@
{ "id": "soup_cullenskink", "fg": 3597, "rotates": false },
{ "id": "overlay_wielded_soup_dumplings", "fg": 3598, "rotates": false },
{ "id": "soup_dumplings", "fg": 3598, "rotates": false },
- { "id": "overlay_wielded_soup_fish", "fg": 3599, "rotates": false },
- { "id": "soup_fish", "fg": 3599, "rotates": false },
+ { "id": [ "overlay_wielded_soup_fish", "overlay_wielded_soup_lobster" ], "fg": 3599, "rotates": false },
+ { "id": [ "soup_fish", "soup_lobster" ], "fg": 3599, "rotates": false },
{ "id": "overlay_wielded_soup_meat", "fg": 3600 },
{ "id": "soup_meat", "fg": 3600 },
{ "id": "overlay_wielded_soup_mushroom", "fg": 3601, "rotates": false },
@@ -7359,8 +7359,8 @@
{ "id": "overlay_wielded_oatmeal_cooked", "fg": 3687, "rotates": false },
{ "id": "oatmeal_deluxe", "fg": 3688, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_oatmeal_deluxe", "fg": 3688, "rotates": false },
- { "id": "oats", "fg": 3689 },
- { "id": "overlay_wielded_oats", "fg": 3689 },
+ { "id": [ "oats", "rice_bran" ], "fg": 3689 },
+ { "id": [ "overlay_wielded_oats", "overlay_wielded_rice_bran" ], "fg": 3689 },
{ "id": "overlay_wielded_oyster_crackers", "fg": 3690, "rotates": false },
{ "id": "oyster_crackers", "fg": 3690, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_pancakes", "fg": 3691, "rotates": false },
@@ -11975,8 +11975,8 @@
{ "id": "overlay_wielded_EMPbomb", "fg": 6550, "rotates": false },
{ "id": "EMPbomb_act", "fg": 6551, "bg": 9555, "rotates": false },
{ "id": "overlay_wielded_EMPbomb_act", "fg": 6552, "rotates": false },
- { "id": "LAW_Packed", "fg": 6479, "bg": 9555, "rotates": false },
- { "id": "overlay_wielded_LAW_Packed", "fg": 6480, "rotates": false },
+ { "id": "LAW_Packed", "fg": 6553, "bg": 9555, "rotates": false },
+ { "id": "overlay_wielded_LAW_Packed", "fg": 6554, "rotates": false },
{ "id": "overlay_worn_LAW_Packed", "fg": 1974, "rotates": false },
{ "id": "acidbomb", "fg": 6555, "rotates": false },
{ "id": "overlay_wielded_acidbomb", "fg": 6556, "rotates": false },
@@ -14216,7 +14216,7 @@
},
{ "id": "corpse_mon_wasp", "fg": 8029, "rotates": false },
{
- "id": "mon_wasp_guard",
+ "id": [ "mon_wasp_guard", "mon_wasp_queen" ],
"fg": [
{ "weight": 10, "sprite": 8030 },
{ "weight": 10, "sprite": 8031 },
@@ -17478,7 +17478,9 @@
"lake_cabin_boathouse_roof",
"ranch_camp_68_roof",
"farm_dairy_twd_second_floor_3",
+ "farm_dairy_twd_3_roof",
"farm_dairy_twd_second_floor_4",
+ "farm_dairy_twd_4_roof",
"rural_outbuilding_roof",
"smokehouse_roof",
"farm_isherwood_2_roof",
@@ -18961,6 +18963,7 @@
"house_20",
"house_21",
"house_22",
+ "house_22ab",
"house_23",
"house_24",
"house_25",
@@ -19007,6 +19010,8 @@
"bungalow24",
"bungalow25",
"bungalow26",
+ "bungalow27",
+ "bungalow28",
"house_coop01_1",
"house_crack1",
"house_crack2",
@@ -19226,6 +19231,8 @@
"bungalow24_roof",
"bungalow25_roof",
"bungalow26_roof",
+ "bungalow27_roof",
+ "bungalow28_roof",
"house_2story_base_roof",
"house_coop01_roof",
"house_dogs_roof",
@@ -19806,7 +19813,7 @@
},
{ "id": "mx_point_dead_vegetation", "fg": 10114, "rotates": false },
{ "id": "null_mx_pond", "fg": 10139, "rotates": false },
- { "id": [ "mx_nest_dermatik", "mx_nest_wasp", "nest_dermatik" ], "fg": 10115, "rotates": false },
+ { "id": [ "mx_nest_dermatik", "mx_nest_wasp", "nest_dermatik", "nest_dermatik_roof" ], "fg": 10115, "rotates": false },
{
"id": [
"null_placeholder_for_map_notes_to_have_no_overmap_tile",
@@ -20569,6 +20576,11 @@
"mil_base_tunnels_e",
"mil_base_tunnels_g",
"mil_base_tunnels_h",
+ "mil_base_tunnels_j",
+ "mil_base_tunnels_k",
+ "mil_base_tunnels_l",
+ "mil_base_tunnels_m",
+ "mil_base_tunnels_n",
"necropolis_c_1",
"necropolis_c_2",
"necropolis_c_3",
@@ -21706,7 +21718,7 @@
"bg": 10120,
"rotates": false
},
- { "id": "smallscrapyard", "fg": 10444, "rotates": false },
+ { "id": [ "smallscrapyard", "smallscrapyard_ocu" ], "fg": 10444, "rotates": false },
{ "id": "solid_earth", "fg": 10445, "rotates": false },
{ "id": "standing_stones", "fg": 10446, "rotates": false },
{ "id": [ "station_radio", "station_radio_1" ], "fg": 10447, "rotates": false },
@@ -21769,7 +21781,8 @@
"urban_3_2_basement",
"urban_4_2",
"urban_5_2_basement",
- "urban_6_2_basement"
+ "urban_6_2_basement",
+ "urban_13_1"
],
"fg": [
10472,
@@ -21923,8 +21936,15 @@
"house_fence03_basement",
"house_fence05_basement",
"house_fence06_basement",
+ "house_fence08_basement",
+ "house_fence09_basement",
"bungalow26_basement",
+ "bungalow27_basement",
+ "bungalow28_basement",
"2Story02_basement",
+ "2StoryModern05_basement",
+ "2StoryModern06_basement",
+ "3Story01_basement",
"bunker_basement",
"bunker_basement_1",
"shelter_under",
@@ -22122,9 +22142,13 @@
{
"id": [
"haz_sar_1_1",
+ "haz_sar_1_1_roof",
"haz_sar_1_2",
+ "haz_sar_1_2_roof",
"haz_sar_1_3",
+ "haz_sar_1_3_roof",
"haz_sar_1_4",
+ "haz_sar_1_4_roof",
"haz_sar_b_1",
"haz_sar_b_2",
"haz_sar_b_3",
@@ -28216,7 +28240,7 @@
]
},
{
- "id": [ "t_floor_paper", "t_floor_paper_noroof" ],
+ "id": [ "t_floor_paper", "t_floor_paper_noroof", "t_floor_paper_hard", "t_floor_brood_wasp" ],
"fg": 14063,
"bg": 9514,
"rotates": false,
@@ -28474,7 +28498,7 @@
{ "id": "t_scrap_floor", "fg": 14233, "rotates": false },
{ "id": "t_strconc_floor", "fg": 14234, "rotates": false },
{ "id": "t_strconc_floor_halfway", "fg": 14235 },
- { "id": "t_thconc_floor", "fg": 14236, "rotates": false },
+ { "id": [ "t_thconc_floor", "t_thconc_floor_no_roof" ], "fg": 14236, "rotates": false },
{ "id": "t_thconc_floor_olight", "fg": 14237, "bg": 14236, "rotates": false },
{ "id": "t_thconc_y", "fg": 14238, "rotates": false },
{
@@ -32963,7 +32987,7 @@
]
},
{
- "id": [ "t_open_air", "t_open_air_rooved", "t_open_air_rooved_outside" ],
+ "id": [ "t_open_air", "t_open_air_rooved", "t_open_air_rooved_outside", "t_floor_brood_fake" ],
"fg": 16172,
"rotates": false,
"multitile": true,
@@ -33608,7 +33632,7 @@
]
},
{
- "id": "t_paper",
+ "id": [ "t_paper", "t_roof_paper_hard", "t_paper_brood", "t_paper_hard" ],
"fg": 16764,
"bg": 9514,
"rotates": false,
@@ -38472,12 +38496,17 @@
"2storyModern01_first",
"2storyModern02_1",
"2StoryModern03_1",
+ "2StoryModern05_1",
+ "2StoryModern06_1",
"2Story01_1",
"2Story02_1",
+ "3Story01_1",
"house_fence02_1",
"house_fence05_1",
"house_fence06_1",
"house_fence07_1",
+ "house_fence08_1",
+ "house_fence09_1",
"house_w_6"
],
"fg": [ 19222, 19225, 19224, 19223 ],
@@ -38489,12 +38518,17 @@
"2storyModern01_roof",
"2storyModern02_roof",
"2StoryModern03_roof",
+ "2StoryModern05_roof",
+ "2StoryModern06_roof",
"2Story01_roof",
"2Story02_roof",
+ "3Story01_roof",
"house_fence02_roof",
"house_fence05_roof",
"house_fence06_roof",
"house_fence07_roof",
+ "house_fence08_roof",
+ "house_fence09_roof",
"house_w_6_roof"
],
"fg": [ 19226, 19229, 19228, 19227 ],
@@ -38507,13 +38541,19 @@
"2storyModern01_second",
"2storyModern02_2",
"2StoryModern03_2",
+ "2StoryModern05_2",
+ "2StoryModern06_2",
"2Story01_2",
"2Story02_2",
+ "3Story01_2",
+ "3Story01_3",
"house_fence02_2",
"house_fence05_2",
"house_fence06_2",
"house_fence07_2",
"house_fence07_3",
+ "house_fence08_2",
+ "house_fence09_2",
"house_w_6_2ndfloor"
],
"fg": [ 19230, 19233, 19232, 19231 ],
@@ -38584,7 +38624,26 @@
"fg": 19242,
"rotates": false
},
- { "id": [ "triffid_grove", "triffid_roots", "triffid_finale" ], "fg": 19243, "rotates": false },
+ {
+ "id": [
+ "triffid_grove",
+ "triffid_grove_roof",
+ "triffid_grove_z2",
+ "triffid_grove_z3",
+ "triffid_roots",
+ "triffid_rootss",
+ "triffid_rootsn",
+ "triffid_rootse",
+ "triffid_rootsw",
+ "triffid_rootsen",
+ "triffid_rootsnw",
+ "triffid_rootssw",
+ "triffid_rootsse",
+ "triffid_finale"
+ ],
+ "fg": 19243,
+ "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": 19244, "rotates": false },
{ "id": [ "wasp_tower_1", "wasp_tower_roof_1" ], "fg": 19245, "rotates": false },
{ "id": "mon_afs_headless_horror", "fg": 19246, "rotates": false },
@@ -38692,8 +38751,8 @@
{ "id": "rid_mon_cow", "fg": 19326, "rotates": false },
{ "id": "mon_cow_calf", "fg": 19327, "bg": 18951, "rotates": false },
{ "id": "corpse_mon_cow_calf", "fg": 19328, "rotates": false },
- { "id": "mon_horse", "fg": 19329, "bg": 18951, "rotates": false },
- { "id": "corpse_mon_horse", "fg": 19330, "rotates": false },
+ { "id": [ "mon_horse", "mon_horse_foal" ], "fg": 19329, "bg": 18951, "rotates": false },
+ { "id": [ "corpse_mon_horse", "corpse_mon_horse_foal" ], "fg": 19330, "rotates": false },
{ "id": "rid_mon_horse", "fg": 19331, "rotates": false },
{ "id": "mon_moose", "fg": 19332, "bg": 18951, "rotates": false },
{ "id": "corpse_mon_moose", "fg": 19333, "rotates": false },