Synced with upstream - Feral Humans

1 files changed, 176 insertions, 16 deletions

diff --git a/tile_config.json b/tile_config.json
index e799f50..b276bdd 100644
--- a/tile_config.json
+++ b/tile_config.json
@@ -486,7 +486,7 @@
         { "id": "solder_wire", "fg": 234, "rotates": false },
         { "id": "steel_chunk", "fg": 235, "rotates": false },
         { "id": "lead_plate", "fg": 235 },
-        { "id": "tripwire", "fg": 3800, "bg": 235 },
+        { "id": "tripwire", "fg": 3800, "bg": 0 },
         { "id": "steel_lump", "fg": 236, "rotates": false },
         { "id": "thread", "fg": 237, "rotates": false },
         { "id": "throwing_axe", "fg": 238, "bg": 957 },
@@ -3081,7 +3081,26 @@
           "bg": 967,
           "rotates": false
         },
-        { "id": "mon_zombie_cop", "fg": 2692, "bg": 967, "rotates": false },
+        { "id": "mon_zombie_cop", "fg": [
+            { "weight": 1, "sprite": 2692 },
+            { "weight": 1, "sprite": 12292 },
+            { "weight": 1, "sprite": 12293 },
+            { "weight": 1, "sprite": 12294 },
+            { "weight": 1, "sprite": 12295 },
+            { "weight": 1, "sprite": 12296 },
+            { "weight": 1, "sprite": 12297 },
+            { "weight": 1, "sprite": 12298 },
+			{ "weight": 1, "sprite": 12299 },
+            { "weight": 1, "sprite": 12300 },
+            { "weight": 1, "sprite": 12301 },
+            { "weight": 1, "sprite": 12302 },
+            { "weight": 1, "sprite": 12303 },
+			{ "weight": 1, "sprite": 12304 },
+            { "weight": 1, "sprite": 12305 },
+            { "weight": 1, "sprite": 12306 },
+            { "weight": 1, "sprite": 12307 }
+          ],
+		"bg": 967, "rotates": false },
         { "id": "mon_zombie_crawler", "fg": 2694, "bg": 967, "rotates": false },
         { "id": "mon_zombie_electric", "fg": 2703, "bg": 967, "rotates": false },
         { "id": "mon_zombie_fireman", "fg": 2713, "bg": 967, "rotates": false },
@@ -3772,8 +3791,6 @@
           ]
         },
         { "id": "tr_beartrap", "bg": 998, "rotates": false },
-        { "id": "tr_beartrap_buried", "fg": 3916, "bg": 998, "rotates": false },
-        { "id": "tr_beartrap_buried_season_winter", "fg": 3917, "bg": 998 },
         {
           "id": "tr_drain",
           "bg": 999,
@@ -4861,7 +4878,7 @@
         { "id": "poppysyrup", "fg": 1379 },
         { "id": [ "yoghurt", "icecream_yogurt" ], "fg": 1382, "rotates": false },
         { "id": "pepto", "fg": 1382, "rotates": false },
-        { "id": "flask_yeast", "fg": 1738, "bg": 1382 },
+        { "id": "flask_yeast", "fg": 1738 },
         { "id": "irradiated_zucchini", "fg": 1383, "rotates": false },
         { "id": "2lcanteen", "fg": 1384, "rotates": false },
         { "id": "30gal_drum", "fg": 1385, "rotates": false },
@@ -8311,7 +8328,7 @@
         { "id": "advanced_ecig", "fg": 3435, "rotates": false },
         { "id": "ecig", "fg": 3435, "rotates": false },
         { "id": "adv_UPS_off", "fg": 3436, "rotates": false },
-        { "id": "battery_ups", "fg": 3820, "bg": 3436 },
+        { "id": "battery_ups", "fg": 3820 },
         { "id": "airhorn", "fg": 3437, "rotates": false },
         { "id": "f_anvil", "fg": 3438, "rotates": false },
         { "id": "beartrap", "fg": 3446, "rotates": false },
@@ -10005,7 +10022,7 @@
           "fg": 4132,
           "rotates": true,
           "multitile": true,
-          "additional_tiles": [ { "id": "broken", "fg": 3987, "bg": 4132 } ]
+          "additional_tiles": [ { "id": "broken", "fg": 36238, "bg": 0 } ]
         },
         {
           "id": "vp_stowboard_horizontal",
@@ -12496,6 +12513,60 @@
             { "weight": 10, "sprite": 12290 }
           ],
           "rotates": false
+        },
+        {
+          "id": "mon_feral_human_pipe",
+          "animated": false,
+          "fg": [
+            { "weight": 10, "sprite": 12308 },
+            { "weight": 10, "sprite": 12309 },
+            { "weight": 10, "sprite": 12310 },
+            { "weight": 10, "sprite": 12311 },
+            { "weight": 10, "sprite": 12312 },
+            { "weight": 10, "sprite": 12313 },
+            { "weight": 10, "sprite": 12314 },
+            { "weight": 10, "sprite": 12315 },
+            { "weight": 10, "sprite": 12316 },
+            { "weight": 10, "sprite": 12317 }
+          ],
+		  "bg": 967,
+          "rotates": false
+        },
+        {
+          "id": "mon_feral_human_axe",
+          "animated": false,
+          "fg": [
+            { "weight": 10, "sprite": 12324 },
+            { "weight": 10, "sprite": 12325 },
+            { "weight": 10, "sprite": 12326 },
+            { "weight": 10, "sprite": 12327 },
+            { "weight": 10, "sprite": 12328 },
+            { "weight": 10, "sprite": 12329 },
+            { "weight": 10, "sprite": 12330 },
+            { "weight": 10, "sprite": 12331 },
+            { "weight": 10, "sprite": 12332 },
+            { "weight": 10, "sprite": 12333 }
+          ],
+		  "bg": 967,
+          "rotates": false
+        },
+        {
+          "id": "mon_feral_human_crowbar",
+          "animated": false,
+          "fg": [
+            { "weight": 10, "sprite": 12340 },
+            { "weight": 10, "sprite": 12341 },
+            { "weight": 10, "sprite": 12342 },
+            { "weight": 10, "sprite": 12343 },
+            { "weight": 10, "sprite": 12344 },
+            { "weight": 10, "sprite": 12345 },
+            { "weight": 10, "sprite": 12346 },
+            { "weight": 10, "sprite": 12347 },
+            { "weight": 10, "sprite": 12348 },
+            { "weight": 10, "sprite": 12349 }
+          ],
+		  "bg": 967,
+          "rotates": false
         }
       ]
     },
@@ -15319,7 +15390,7 @@
             "t_railroad_tie_d2"
           ],
           "fg": 17476,
-          "bg": 22733,
+          "bg": 5131,
           "rotates": false,
           "multitile": true,
           "additional_tiles": [
@@ -15646,12 +15717,12 @@
           "fg": 17652,
           "multitile": true,
           "additional_tiles": [
-            { "id": "center", "fg": 17652, "bg": 23383 },
-            { "id": "corner", "fg": [ 17653, 17654, 17655, 17656 ], "bg": 23383 },
-            { "id": "t_connection", "fg": [ 17657, 17658, 17659, 17660 ], "bg": 23383 },
-            { "id": "edge", "fg": [ 17661, 17662 ], "bg": 23383 },
-            { "id": "end_piece", "fg": [ 17663, 17664, 17665, 17666 ], "bg": 23383 },
-            { "id": "unconnected", "fg": 17667, "bg": 23383 }
+            { "id": "center", "fg": 17652, "bg": 0 },
+            { "id": "corner", "fg": [ 17653, 17654, 17655, 17656 ], "bg": 0 },
+            { "id": "t_connection", "fg": [ 17657, 17658, 17659, 17660 ], "bg": 0 },
+            { "id": "edge", "fg": [ 17661, 17662 ], "bg": 0 },
+            { "id": "end_piece", "fg": [ 17663, 17664, 17665, 17666 ], "bg": 0 },
+            { "id": "unconnected", "fg": 17667, "bg": 0 }
           ],
           "rotates": false
         },
@@ -18677,6 +18748,36 @@
             { "id": "unconnected", "fg": 20899, "bg": 1012 }
           ],
           "rotates": true
+        },
+        {
+          "id": [ "t_concrete_wall_flesh" ],
+          "fg": 20900,
+          "bg": 1012,
+          "multitile": true,
+          "additional_tiles": [
+            { "id": "center", "fg": 20900, "bg": 1012 },
+            { "id": "corner", "fg": [ 20901, 20902, 20903, 20904 ], "bg": 1012 },
+            { "id": "t_connection", "fg": [ 20905, 20906, 20907, 20908 ], "bg": 1012 },
+            { "id": "edge", "fg": [ 20909, 20910 ], "bg": 1012 },
+            { "id": "end_piece", "fg": [ 20911, 20912, 20913, 20914 ], "bg": 1012 },
+            { "id": "unconnected", "fg": 20915, "bg": 1012 }
+          ],
+          "rotates": true
+        },
+        {
+          "id": [ "t_thconc_floor_flesh" ],
+          "fg": 20916,
+          "bg": 1012,
+          "multitile": true,
+          "additional_tiles": [
+            { "id": "center", "fg": 20916, "bg": 1012 },
+            { "id": "corner", "fg": [ 20917, 20918, 20919, 20920 ], "bg": 1012 },
+            { "id": "t_connection", "fg": [ 20921, 20922, 20923, 20924 ], "bg": 1012 },
+            { "id": "edge", "fg": [ 20925, 20926 ], "bg": 1012 },
+            { "id": "end_piece", "fg": [ 20927, 20928, 20929, 20930 ], "bg": 1012 },
+            { "id": "unconnected", "fg": 20931, "bg": 1012 }
+          ],
+          "rotates": true
         }
       ]
     },
@@ -27843,6 +27944,40 @@
           ],
           "bg": 0,
           "rotates": false
+        },
+        {
+          "id": [ "mon_zombie_scissorlimbs" ],
+          "fg": 36037,
+          "bg": 0,
+          "rotates": false
+        },
+        {
+          "id": [ "mon_zombie_giant_heart" ],
+          "animated": true,
+          "fg": [
+            { "weight": 11, "sprite": 36038 },
+            { "weight": 11, "sprite": 36039 },
+            { "weight": 11, "sprite": 36040 }
+          ],
+          "bg": 0,
+          "rotates": false
+        },
+        {
+          "id": [ "corpse_mon_zombie_giant_heart" ],
+          "fg": 36041,
+          "bg": 0,
+          "rotates": false
+        },
+        {
+          "id": [ "mon_zombie_hanging_innards" ],
+          "animated": true,
+          "fg": [
+            { "weight": 11, "sprite": 36042 },
+            { "weight": 11, "sprite": 36043 },
+            { "weight": 11, "sprite": 36044 }
+          ],
+          "bg": 0,
+          "rotates": false
         }
       ]
     },
@@ -28008,10 +28143,35 @@
         { "id": "broken_exodii_quad", "fg": 36206, "rotates": false },
         { "id": "mon_zomborg", "fg": 36207, "bg": 967, "rotates": false },
         { "id": "corpse_mon_zomborg", "fg": 36208, "rotates": false },
-        { "id": "f_gunsafe_ml", "fg": 36209, "rotates": false },
+        { "id": ["f_gunsafe_ml", "f_gunsafe_mj"], "fg": 36209, "rotates": false },
         { "id": "f_locker", "fg": 36210, "rotates": false },
         { "id": "f_rack", "fg": 36211, "rotates": false },
-        { "id": [ "f_rack_wood" ], "fg": 36212, "bg": 0, "rotates": false }
+        { "id": [ "f_rack_wood" ], "fg": 36212, "bg": 0, "rotates": false },
+        { "id": "rake", "fg": 36213, "rotates": false },
+        { "id": [ "overlay_wielded_rake" ], "fg": 36214, "bg": 0, "rotates": false },
+        { "id": [ "sandpaper" ], "fg": 36215, "bg": 0, "rotates": false },
+        { "id": [ "basic_chemistry" ], "fg": 36216, "bg": 0, "rotates": false },
+        { "id": [ "scots_cookbook", "scots_tailor" ], "fg": 36217, "bg": 0, "rotates": false },
+        { "id": [ "radio_car_box" ], "fg": 36218, "bg": 0, "rotates": false },
+        { "id": [ "mon_tiger" ], "fg": 36219, "bg": 967, "rotates": false },
+        { "id": [ "corpse_mon_tiger" ], "fg": 36220, "bg": 0, "rotates": false },
+        { "id": [ "mon_ziger" ], "fg": 36221, "bg": 967, "rotates": false },
+        { "id": [ "corpse_mon_ziger" ], "fg": 36222, "bg": 0, "rotates": false },
+        { "id": [ "t_ramp_down_high" ], "fg": 36223, "bg": 0, "rotates": false },
+        { "id": [ "t_ramp_down_low" ], "fg": 36224, "bg": 0, "rotates": false },
+        { "id": [ "t_ramp_up_high" ], "fg": 36225, "bg": 0, "rotates": false },
+        { "id": [ "t_ramp_up_low" ], "fg": 36226, "bg": 0, "rotates": false },
+        { "id": [ "t_sidewalk_ramp_down_high" ], "fg": 36227, "bg": 0, "rotates": false },
+        { "id": [ "t_sidewalk_ramp_down_low" ], "fg": 36228, "bg": 0, "rotates": false },
+        { "id": [ "t_sidewalk_ramp_up_high" ], "fg": 36229, "bg": 0, "rotates": false },
+        { "id": [ "t_sidewalk_ramp_up_low" ], "fg": 36230, "bg": 0, "rotates": false },
+        { "id": "tr_beartrap_buried", "fg": 36231, "bg": 0 },
+        { "id": "tr_beartrap_buried_season_winter", "fg": 36232, "bg": 0 },
+        { "id": "laptop_screen_lit", "fg": 36233, "bg": 0 },
+        { "id": "overlay_wielded_laptop_screen_lit", "fg": 36234, "bg": 0 },
+        { "id": "vp_vehicle_dashboard", "fg": 36235, "bg": 0 },
+        { "id": "vehicle_dashboard", "fg": 36236, "bg": 0 },
+        { "id": ["corpse_mon_feral_human_pipe", "corpse_mon_feral_human_crowbar", "corpse_mon_feral_human_axe"], "fg": 36237, "bg": 0 }
       ]
     }
   ]