From 121afee36d665c686fb378a376ce65ee135f5c42 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 25 Aug 2020 16:57:36 -0700 Subject: Synced with upstream - car parts and new monsters --- 18_big_things_64x80_35757-36076.png | Bin 705306 -> 707926 bytes 19_tiles3_32x32_36077-36396.png | Bin 270370 -> 356044 bytes 1_tiles_32x32_0-5199.png | Bin 4725142 -> 4725371 bytes 20_bg_temp_32x32_36397-36909.png | Bin 5628 -> 0 bytes tile_config.json | 233 +++++++++++++++++++++++++++++++++--- 5 files changed, 219 insertions(+), 14 deletions(-) delete mode 100644 20_bg_temp_32x32_36397-36909.png diff --git a/18_big_things_64x80_35757-36076.png b/18_big_things_64x80_35757-36076.png index 2d56da7..07cdd30 100644 Binary files a/18_big_things_64x80_35757-36076.png and b/18_big_things_64x80_35757-36076.png differ diff --git a/19_tiles3_32x32_36077-36396.png b/19_tiles3_32x32_36077-36396.png index b5ff8be..60d2513 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 b83771d..87e695d 100644 Binary files a/1_tiles_32x32_0-5199.png and b/1_tiles_32x32_0-5199.png differ diff --git a/20_bg_temp_32x32_36397-36909.png b/20_bg_temp_32x32_36397-36909.png deleted file mode 100644 index 610bc9c..0000000 Binary files a/20_bg_temp_32x32_36397-36909.png and /dev/null differ diff --git a/tile_config.json b/tile_config.json index 3156849..e8a7b0c 100644 --- a/tile_config.json +++ b/tile_config.json @@ -3829,7 +3829,7 @@ "id": "vp_cargo_space", "fg": 3986, "bg": 1005, - "rotates": false, + "rotates": true, "multitile": true, "additional_tiles": [ { "id": "broken", "fg": 3987, "bg": 3986 } ] }, @@ -28038,7 +28038,9 @@ { "id": "mon_zombull", "fg": 36061, "bg": 0, "rotates": false }, { "id": "corpse_mon_zombull", "fg": 36062, "bg": 0, "rotates": false }, { "id": "f_statue", "fg": 36064, "bg": 0, "rotates": false }, - { "id": [ "pike", "pike_fake", "pike_inferior" ], "fg": 36065, "rotates": false } + { "id": [ "pike", "pike_fake", "pike_inferior" ], "fg": 36065, "rotates": false }, + { "id": "mon_zombie_winged", "fg": 36066, "bg": 0, "rotates": false }, + { "id": "mon_zombie_brute_winged", "fg": 36067, "bg": 0, "rotates": false } ] }, @@ -28422,20 +28424,223 @@ "rotates": true, "multitile": true, "additional_tiles": [ { "id": "broken", "fg": [36357]} ] + }, + { + "id": [ "vp_hdhalfboard_horizontal_front", "vp_hdboard_horizontal_front" ], + "fg": [36358], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36359]} ] + }, + { + "id": [ "vp_hdhalfboard_vertical_left", "vp_hdboard_vertical_left" ], + "fg": [36360], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36361]} ] + }, + { + "id": [ "vp_hdhalfboard_vertical_right", "vp_hdboard_vertical_right" ], + "fg": [36362], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36363]} ] + }, + { + "id": [ "vp_hdhalfboard_horizontal_rear", "vp_hdboard_horizontal_rear" ], + "fg": [36364], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36365]} ] + }, + { + "id": [ "vp_hddoor_left" ], + "fg": [36366], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "open", "fg": [36367]}, { "id": "broken", "fg": [36368]} ] + }, + { + "id": [ "vp_hddoor_right" ], + "fg": [36369], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "open", "fg": [36370]}, { "id": "broken", "fg": [36371]} ] + }, + { + "id": [ "vp_reinforced_windshield_nw" ], + "fg": [36372], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36373]} ] + }, + { + "id": [ "vp_reinforced_windshield_horizontal_front" ], + "fg": [36374], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36375]} ] + }, + { + "id": [ "vp_reinforced_windshield_ne" ], + "fg": [36376], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36377]} ] + }, + { + "id": [ "vp_hdframe_horizontal_front" ], + "fg": [36378], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36379]} ] + }, + { + "id": [ "vp_windshield_sw_edge" ], + "fg": [36380], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36381]} ] + }, + { + "id": [ "vp_windshield_se_edge" ], + "fg": [36382], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36383]} ] + }, + { + "id": [ "vp_windshield_horizontal_rear_edge" ], + "fg": [36384], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36385]} ] + }, + { + "id": [ "vp_stowboard_vertical_left" ], + "fg": [36386], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36387]} ] + }, + { + "id": [ "vp_stowboard_vertical_right" ], + "fg": [36388], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36389]} ] + }, + { + "id": [ "vp_hdframe_horizontal_2_front" ], + "fg": [36390], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36391]} ] + }, + { + "id": [ "vp_stowboard_horizontal_rear" ], + "fg": [36392], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36393]} ] + }, + { + "id": [ "vp_stowboard_horizontal" ], + "fg": [36394], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36395]} ] + }, + { "id": "t_metal_floor_olight", "fg": 36396, "bg": 23383}, + { "id": "t_floor_olight", "fg": 36396, "bg": 17155}, + { + "id": "mon_zombie_crawler_pupa", + "animated": true, + "fg": [ + { "weight": 25, "sprite": 36397 }, + { "weight": 25, "sprite": 36398 }, + { "weight": 25, "sprite": 36399 }, + { "weight": 25, "sprite": 36398 } + ], + "rotates": false + }, + { + "id": "corpse_mon_zombie_crawler_pupa", + "fg": 36400, + "rotates": false + }, + { + "id": "mon_smoker_brute", + "fg": 36401, + "rotates": false + }, + { + "id": "corpse_mon_zombie_winged", + "fg": 36402, + "rotates": false + }, + { + "id": "corpse_mon_zombie_brute_winged", + "fg": 36403, + "rotates": false + }, + { + "id": [ "vp_clothboard_vertical_right" ], + "fg": [36404], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36405]} ] + }, + { + "id": [ "vp_clothboard_vertical_left" ], + "fg": [36406], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36407]} ] + }, + { + "id": [ "vp_clothboard_sw" ], + "fg": [36408], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36409]} ] + }, + { + "id": [ "vp_clothboard_se" ], + "fg": [36410], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36411]} ] + }, + { + "id": [ "vp_wing_mirror_left" ], + "fg": [36412], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36413]} ] + }, + { + "id": [ "vp_wing_mirror_right" ], + "fg": [36414], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36415]} ] + }, + { + "id": [ "vp_clothboard_nw" ], + "fg": [36416], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36417]} ] + }, + { + "id": [ "vp_clothboard_ne" ], + "fg": [36418], + "rotates": true, + "multitile": true, + "additional_tiles": [ { "id": "broken", "fg": [36419]} ] } ] - }, - { - "file": "20_bg_temp_32x32_36397-36909.png", - "tiles": [ { "id": "bg_shadow_normal", "fg": 36397 , "rotates": false }, - { "id": "bg_shadow_small", "fg": 36398 , "rotates": false }, - { "id": "bg_shadow_big", "fg": 36399 , "rotates": false }, - { "id": "bg_book", "fg": 36400 , "rotates": false }, - { "id": "bg_book_adv", "fg": 36401 , "rotates": false }, - { "id": "bg_book_manual", "fg": 36402 , "rotates": false }, - { "id": "bg_book_magazine", "fg": 36403 , "rotates": false }, - { "id": "bg_book_encyclopedia", "fg": 36404 , "rotates": false }, - { "id": "bg_shadow_item", "fg": 36405 , "rotates": false } ] } ] } -- cgit v1.2.1