From 4235dc972140d226420cf15be297b09a363ebd26 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 7 Jul 2022 00:47:50 -0700 Subject: Sync with upstream --- Temporary.png | Bin 88705 -> 101415 bytes large_stuff.png | Bin 940995 -> 945559 bytes normal_items.png | Bin 3579534 -> 3579311 bytes tile_config.json | 48 +++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/Temporary.png b/Temporary.png index 25ce4c1..50e707a 100644 Binary files a/Temporary.png and b/Temporary.png differ diff --git a/large_stuff.png b/large_stuff.png index a71ae04..b7b9efd 100644 Binary files a/large_stuff.png and b/large_stuff.png differ diff --git a/normal_items.png b/normal_items.png index 27a4fbf..92087cd 100644 Binary files a/normal_items.png and b/normal_items.png differ diff --git a/tile_config.json b/tile_config.json index c49c420..941d77e 100644 --- a/tile_config.json +++ b/tile_config.json @@ -23436,7 +23436,8 @@ {"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}], +{"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}, +{"id": "mon_zombie_nemesis", "fg": 18668, "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": [ @@ -23904,6 +23905,8 @@ {"id": "ap_foot_locker_recharge_station", "fg": 19165, "bg":0, "rotates": true }, {"id": "foot_locker_recharge_station", "fg": 19165, "bg":0, "rotates": true }, {"id": "vp_foot_locker_recharge_station", "fg": 19165, "bg":0, "rotates": true }, +{"id": "mon_zombie_relax_gasbag", "fg":19166, "bg":0, "rotates": true }, +{"id": "f_spinwheel", "fg":19167, "bg":0, "rotates": true }, {"id": "overlay_mutation_EXODII_BODY_1", "fg":19169, "bg":0, "rotates": true }, {"id": "weather_portal_storm", "fg":19170, "bg":0, "rotates": false }, {"id": "mon_feral_sapien_spear", "fg":[{"weight": 111,"sprite":19171}, @@ -23931,16 +23934,47 @@ {"id": "mon_feral_prepper", "fg":[{"weight": 111,"sprite":19204},{"weight": 111,"sprite":19205}], "bg":0, "rotates": true }, {"id": "mon_feral_diver_knife", "fg":[{"weight": 111,"sprite":19206}, {"weight": 111,"sprite":19207}], "bg":0, "rotates": true }, -{"id":"sks", "fg": 19208, "rotates": false}, +{"id": "sks", "fg": 19208, "rotates": false}, {"id": "overlay_wielded_sks", "fg": 19209, "rotates": false}, -{"id":"mosin44", "fg": 19210, "rotates": false}, +{"id": "mosin44", "fg": 19210, "rotates": false}, {"id": "overlay_wielded_mosin44", "fg": 19211, "rotates": false}, -{"id":"mosin91_30", "fg": 19212, "rotates": false}, +{"id": "mosin91_30", "fg": 19212, "rotates": false}, {"id": "overlay_wielded_mosin91_30", "fg": 19213, "rotates": false}, -{"id":"mosin44_ebr", "fg": 19214, "rotates": false}, +{"id": "mosin44_ebr", "fg": 19214, "rotates": false}, {"id": "overlay_wielded_mosin44_ebr", "fg": 19215, "rotates": false}, -{"id":"mosin91_30_ebr", "fg": 19216, "rotates": false}, -{"id": "overlay_wielded_mosin91_30_ebr", "fg": 73217, "rotates": false}], +{"id": "mosin91_30_ebr", "fg": 19216, "rotates": false}, +{"id": "overlay_wielded_mosin91_30_ebr", "fg": 73217, "rotates": false}, +{"id": "mon_feral_jackboot", "fg":[{"weight": 111,"sprite":19218}, +{"weight": 111,"sprite":19219}, +{"weight": 111,"sprite":19220}], "bg":0, "rotates": true }, +{"id": "human_sample", "fg": 19221, "rotates": false}, +{"id": "mouse_sample", "fg": 19221, "rotates": false}, +{"id": "rabbit_sample", "fg": 19221, "rotates": false}, +{"id": "rat_sample", "fg": 19222, "rotates": false}, +{"id": "feline_sample", "fg": 19222, "rotates": false}, +{"id": "lupine_sample", "fg": 19222, "rotates": false}, +{"id": "cattle_sample", "fg": 19222, "rotates": false}, +{"id": "ursine_sample", "fg": 19222, "rotates": false}, +{"id": "cephalopod_sample", "fg": 19223, "rotates": false}, +{"id": "troglobite_sample", "fg": 19223, "rotates": false}, +{"id": "spider_sample", "fg": 19223, "rotates": false}, +{"id": "batrachian_sample", "fg": 19223, "rotates": false}, +{"id": "insect_sample", "fg": 19223, "rotates": false}, +{"id": "gastropod_sample", "fg": 19224, "rotates": false}, +{"id": "beast_sample", "fg": 19224, "rotates": false}, +{"id": "lizard_sample", "fg": 19224, "rotates": false}, +{"id": "fish_sample", "fg": 19225, "rotates": false}, +{"id": "bird_sample", "fg": 19225, "rotates": false}, +{"id": "raptor_sample", "fg": 19225, "rotates": false}, +{"id": "elfa_sample", "fg": 19226, "rotates": false}, +{"id": "plant_sample", "fg": 19226, "rotates": false}, +{"id": "slime_sample", "fg": 19226, "rotates": false}, +{"id": "chimera_sample", "fg": 19227, "rotates": false}, +{"id": "alpha_sample", "fg": 19227, "rotates": false}, +{"id": "medical_sample", "fg": 19227, "rotates": false}, +{"id": "mon_starer_axe", "fg": 19228, "rotates": false}, +{"id": "mon_starer_crowbar", "fg": 19229, "rotates": false}, +{"id": "mon_starer_pipe", "fg": 19230, "rotates": false}], "//": "range 19137 to 19336" }, {"file": "Temporary-maptiles.png", "tiles": [ -- cgit v1.2.1