From a3cd933e866112e794ed3c83bb60653878a4c971 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 24 Aug 2020 10:32:22 -0700 Subject: Add missing windshields to config Updates to pages 1 and 19 --- 19_tiles3_32x32_36077-36396.png | Bin 248718 -> 270370 bytes 1_tiles_32x32_0-5199.png | Bin 4725873 -> 4725142 bytes tile_config.diff | 83 ++++++++++++++++++++++++++++++++++------ tile_config.json | 53 ++++++++++++++++++++++++- 4 files changed, 122 insertions(+), 14 deletions(-) diff --git a/19_tiles3_32x32_36077-36396.png b/19_tiles3_32x32_36077-36396.png index f4a7647..b5ff8be 100644 Binary files a/19_tiles3_32x32_36077-36396.png and b/19_tiles3_32x32_36077-36396.png differ diff --git a/1_tiles_32x32_0-5199.png b/1_tiles_32x32_0-5199.png index a6ddd9c..b83771d 100644 Binary files a/1_tiles_32x32_0-5199.png and b/1_tiles_32x32_0-5199.png differ diff --git a/tile_config.diff b/tile_config.diff index ef64397..100b170 100644 --- a/tile_config.diff +++ b/tile_config.diff @@ -1,6 +1,6 @@ ---- a/tile_config.json +--- a/tile_config.json +++ b/tile_config.json -@@ -685,6 +685,9 @@ +@@ -688,6 +688,9 @@ { "id": "gloves_fur", "fg": 378, "rotates": false }, { "id": "gloves_leather", "fg": 379, "rotates": false }, { "id": "gloves_light", "fg": 380, "rotates": false }, @@ -10,7 +10,15 @@ { "id": "gloves_liner", "fg": 381, "rotates": false }, { "id": "thermal_gloves", "fg": 381, "bg": 957, "rotates": false }, { "id": "thermal_gloves_on", "fg": 381, "bg": 957, "rotates": false }, -@@ -1055,6 +1058,9 @@ +@@ -752,6 +755,7 @@ + { "id": "helmet_football", "fg": 425, "rotates": false }, + { "id": "helmet_galea", "fg": 426, "rotates": false }, + { "id": "helmet_lobster", "fg": 426 }, ++ { "id": "helmet_lsurvivor", "fg": 426 }, + { "id": "helmet_survivor", "fg": 426 }, + { "id": "helmet_xlsurvivor", "fg": 426 }, + { "id": "helmet_larmor", "fg": 427 }, +@@ -1057,6 +1061,9 @@ { "id": "overlay_worn_gloves_wsurvivor", "fg": 613, "rotates": false }, { "id": "overlay_worn_gloves_xlsurvivor", "fg": 613, "rotates": false }, { "id": "overlay_worn_gloves_light", "fg": 614, "rotates": false }, @@ -20,7 +28,23 @@ { "id": "overlay_worn_gloves_liner", "fg": 614, "rotates": false }, { "id": "overlay_worn_gloves_wraps", "fg": 614, "rotates": false }, { "id": "overlay_worn_gloves_wraps_wool", "fg": 614, "rotates": false }, -@@ -1185,6 +1191,9 @@ +@@ -1102,6 +1109,7 @@ + { "id": "overlay_worn_helmet_riot", "fg": 648, "rotates": false }, + { "id": "overlay_worn_helmet_scavenger", "fg": 649, "rotates": false }, + { "id": "overlay_worn_helmet_skid", "fg": 650, "rotates": false }, ++ { "id": "overlay_worn_helmet_lsurvivor", "fg": 651, "rotates": false }, + { "id": "overlay_worn_helmet_survivor", "fg": 651, "rotates": false }, + { "id": "overlay_worn_helmet_xlsurvivor", "fg": 652, "rotates": false }, + { "id": "overlay_worn_hmil_armor", "fg": 653, "rotates": false }, +@@ -1119,6 +1127,7 @@ + }, + { "id": [ "overlay_worn_hood_survivor", "overlay_worn_hsurvivor_night_cap01" ], "fg": 658, "rotates": false }, + { "id": "overlay_worn_hood_lsurvivor", "fg": 658, "rotates": false }, ++ { "id": "overlay_worn_hood_hsurvivor", "fg": 658, "rotates": false }, + { "id": "overlay_worn_hood_xlsurvivor", "fg": 658, "rotates": false }, + { "id": "overlay_worn_hood_wsurvivor", "fg": 659, "rotates": false }, + { "id": "overlay_worn_cowl_wool", "fg": 659, "rotates": false }, +@@ -1187,6 +1196,9 @@ { "id": "overlay_worn_loincloth_leather", "fg": 694, "rotates": false }, { "id": "overlay_worn_loincloth_wool", "fg": 694, "rotates": false }, { "id": "overlay_worn_long_glove_white", "fg": 695, "rotates": false }, @@ -30,7 +54,27 @@ { "id": [ "overlay_worn_gauntlets_bone", "overlay_worn_t_gauntlets_take" ], "fg": 695, "rotates": false }, { "id": "overlay_worn_sockmitts", "fg": 695, "rotates": false }, { "id": "overlay_worn_lowtops", "fg": 696, "rotates": false }, -@@ -6198,6 +6207,7 @@ +@@ -1574,6 +1586,7 @@ + { "id": [ "hood_h20survivor", "survivor_night_cap01" ], "fg": 951 }, + { "id": "hood_lsurvivor", "fg": 951 }, + { "id": [ "hood_survivor", "hsurvivor_night_cap01" ], "fg": 951 }, ++ { "id": "hood_hsurvivor", "fg": 951 }, + { "id": "wetsuit_spring", "fg": 952, "bg": 957, "rotates": false }, + { "id": "winter_jacket_army", "fg": 953, "rotates": false }, + { "id": "winter_pants_army", "fg": 954, "rotates": false }, +@@ -4157,9 +4170,11 @@ + { "id": "bio_ads", "fg": 1016, "rotates": false }, + { "id": "bio_alarm", "fg": 1016, "rotates": false }, + { "id": "bio_armor_arms", "fg": 1016, "rotates": false }, ++ { "id": "bio_armor_hands", "fg": 1016, "rotates": false }, + { "id": "bio_armor_eyes", "fg": 1016, "rotates": false }, + { "id": "bio_armor_head", "fg": 1016, "rotates": false }, + { "id": "bio_armor_legs", "fg": 1016, "rotates": false }, ++ { "id": "bio_armor_feet", "fg": 1016, "rotates": false }, + { "id": "bio_armor_torso", "fg": 1016, "rotates": false }, + { "id": "bio_batteries", "fg": 1016, "rotates": false }, + { "id": "bio_sword", "fg": 1016, "rotates": false }, +@@ -6220,6 +6235,7 @@ { "id": "summon_alchemic_golem", "fg": 1222, "rotates": false }, { "id": "blob_gohan", "fg": 157, "rotates": false }, { "id": [ "assassins_throwing_dagger", "makeshift_throwing_knife" ], "fg": 239, "rotates": false }, @@ -38,7 +82,18 @@ { "id": [ "mon_shoggoth_maid", "mini_shoggoth", "res_shoggoth" ], "fg": 4577, "rotates": false }, { "id": [ -@@ -18830,6 +18840,7 @@ +@@ -11695,6 +11711,10 @@ + { "id": "overlay_female_mutation_bio_sunglasses", "fg": 10513, "rotates": false }, + { "id": "overlay_male_mutation_bio_armor_arms", "fg": 10514, "rotates": false }, + { "id": "overlay_female_mutation_bio_armor_arms", "fg": 10515, "rotates": false }, ++ { "id": "overlay_male_mutation_bio_armor_hands", "fg": 0, "rotates": false }, ++ { "id": "overlay_female_mutation_bio_armor_hands", "fg": 0, "rotates": false }, ++ { "id": "overlay_male_mutation_bio_armor_feet", "fg": 0, "rotates": false }, ++ { "id": "overlay_female_mutation_bio_armor_feet", "fg": 0, "rotates": false }, + { "id": "overlay_male_mutation_bio_night", "fg": 10516, "rotates": false }, + { "id": "overlay_female_mutation_bio_night", "fg": 10517, "rotates": false }, + { "id": "overlay_male_mutation_active_bio_night", "fg": 10518, "rotates": false }, +@@ -18959,6 +18979,7 @@ { "id": "kawaii_hat_cotton", "fg": 405, "rotates": false }, { "id": "kawaii_tailskirt_mini", "fg": 495, "rotates": false }, { "id": "kawaii_vest", "fg": 946, "rotates": false }, @@ -46,7 +101,7 @@ { "id": "kawaii_bikini_bottom_black", "fg": 836, "rotates": false }, { "id": "kawaii_bikini_top_black", "fg": 539, "rotates": false }, { "id": "kawaii_maid_hardcase", "fg": 273, "rotates": false }, -@@ -18876,8 +18887,10 @@ +@@ -19005,8 +19026,10 @@ { "id": "kawaii_tights_black", "fg": 22246, "rotates": false }, { "id": "kawaii_tights_white", "fg": 22247, "rotates": false }, { "id": "kawaii_maid_dress_long", "fg": 22248, "rotates": false }, @@ -59,7 +114,7 @@ { "id": [ "kawaii_glass_bow", "t_wakyu_nami", "t_wakyu_nobi" ], "fg": 22251, "rotates": false }, { "id": "kawaii_knife_steak_twin", "fg": 22252, "rotates": false }, { "id": [ "kawaii_sword_steel", "t_kensi" ], "fg": 22253, "rotates": false }, -@@ -18921,6 +18934,7 @@ +@@ -19050,6 +19073,7 @@ { "id": "overlay_worn_kawaii_hat_cotton", "fg": 22204, "rotates": false }, { "id": "overlay_worn_kawaii_tailskirt_mini", "fg": 22205, "rotates": false }, { "id": "overlay_worn_kawaii_vest", "fg": 22206, "rotates": false }, @@ -67,16 +122,20 @@ { "id": "overlay_worn_kawaii_bikini_bottom_black", "fg": 22207, "rotates": false }, { "id": "overlay_worn_kawaii_bikini_top_black", "fg": 22208, "rotates": false }, { "id": "overlay_worn_kawaii_maid_hardcase", "fg": 22209, "rotates": false }, -@@ -18972,6 +18986,8 @@ +@@ -19101,8 +19125,10 @@ { "id": "overlay_worn_kawaii_tights_black", "fg": 22246, "rotates": false }, { "id": "overlay_worn_kawaii_tights_white", "fg": 22247, "rotates": false }, { "id": "overlay_worn_kawaii_maid_dress_long", "fg": 22248, "rotates": false }, +- { "id": "overlay_worn_kawaii_boots_hi", "fg": 22249, "rotates": false }, +- { "id": "overlay_worn_kawaii_shoes_hi", "fg": 22250, "rotates": false }, + { "id": "overlay_worn_kawaii_maid_dress_long_leather", "fg": 22248, "rotates": false }, + { "id": "overlay_worn_kawaii_maid_dress_long_armor", "fg": 22248, "rotates": false }, - { "id": "overlay_worn_kawaii_boots_hi", "fg": 22249, "rotates": false }, - { "id": "overlay_worn_kawaii_shoes_hi", "fg": 22250, "rotates": false }, ++ { "id": "overlay_worn_kawaii_boots_hi", "fg": 22237, "rotates": false }, ++ { "id": "overlay_worn_kawaii_shoes_hi", "fg": 22199, "rotates": false }, { -@@ -19940,6 +19956,9 @@ + "id": [ "overlay_wielded_kawaii_glass_bow", "overlay_wielded_t_wakyu_nami", "overlay_wielded_t_wakyu_nobi" ], + "fg": 22251, +@@ -20069,6 +20095,9 @@ { "id": "overlay_worn_gloves_fsurvivor", "fg": 23133, "rotates": false }, { "id": "overlay_worn_gloves_medical", "fg": 23134, "rotates": false }, { "id": "long_glove_white", "fg": 23135 }, diff --git a/tile_config.json b/tile_config.json index 0638607..3156849 100644 --- a/tile_config.json +++ b/tile_config.json @@ -19127,8 +19127,8 @@ { "id": "overlay_worn_kawaii_maid_dress_long", "fg": 22248, "rotates": false }, { "id": "overlay_worn_kawaii_maid_dress_long_leather", "fg": 22248, "rotates": false }, { "id": "overlay_worn_kawaii_maid_dress_long_armor", "fg": 22248, "rotates": false }, - { "id": "overlay_worn_kawaii_boots_hi", "fg": 22249, "rotates": false }, - { "id": "overlay_worn_kawaii_shoes_hi", "fg": 22250, "rotates": false }, + { "id": "overlay_worn_kawaii_boots_hi", "fg": 22237, "rotates": false }, + { "id": "overlay_worn_kawaii_shoes_hi", "fg": 22199, "rotates": false }, { "id": [ "overlay_wielded_kawaii_glass_bow", "overlay_wielded_t_wakyu_nami", "overlay_wielded_t_wakyu_nobi" ], "fg": 22251, @@ -28373,6 +28373,55 @@ "rotates": true, "multitile": true, "additional_tiles": [ { "id": "broken", "fg": [36343]} ] + }, + { + "id": [ "vp_windshield_vertical_left" ], + "fg": [36344], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36345]} ] + }, + { + "id": [ "vp_windshield_vertical_right" ], + "fg": [36346], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36347]} ] + }, + { + "id": [ "vp_halfboard_vertical_left", "vp_board_vertical_left" ], + "fg": [36348], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36349]} ] + }, + { + "id": [ "vp_halfboard_vertical_right", "vp_board_vertical_right" ], + "fg": [36350], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36351]} ] + }, + { + "id": [ "vp_halfboard_horizontal_front", "vp_board_horizontal_front" ], + "fg": [36352], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36353]} ] + }, + { + "id": [ "vp_halfboard_horizontal_rear", "vp_board_horizontal_rear" ], + "fg": [36354], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36355]} ] + }, + { + "id": [ "vp_halfboard_horizontal", "vp_board_horizontal" ], + "fg": [36356], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36357]} ] } ] }, -- cgit v1.2.1