diff --git a/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_butcher_0.json b/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_butcher_0.json deleted file mode 100644 index 7d9cf78a06..0000000000 --- a/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_butcher_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": "knife_butcher", "fg": ["1598_knife_steak_0"], "bg": [], "rotates": false, "multitile": false} \ No newline at end of file diff --git a/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_butcher_knife_steak.json b/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_butcher_knife_steak.json new file mode 100644 index 0000000000..071ee2b8b0 --- /dev/null +++ b/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_butcher_knife_steak.json @@ -0,0 +1,4 @@ +{ + "id": [ "knife_huge_var_knife_butcher", "knife_small_var_knife_steak" ], + "fg": "1598_knife_steak_0" +} diff --git a/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_steak_0.json b/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_steak_0.json deleted file mode 100644 index 00e48cba3e..0000000000 --- a/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_steak_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": "knife_steak", "fg": ["1598_knife_steak_0"], "bg": [], "rotates": false, "multitile": false} \ No newline at end of file diff --git a/gfx/GiantDays/pngs_items_20x20/items/weaponry/melee/knife_combat.json b/gfx/GiantDays/pngs_items_20x20/items/weaponry/melee/knife_combat.json index fa78cd542b..5f25c4eda3 100644 --- a/gfx/GiantDays/pngs_items_20x20/items/weaponry/melee/knife_combat.json +++ b/gfx/GiantDays/pngs_items_20x20/items/weaponry/melee/knife_combat.json @@ -1,8 +1,8 @@ { "id": [ "knife_combat", - "knife_steak", - "knife_butcher", + "knife_small_var_knife_steak", + "knife_huge_var_knife_butcher", "diveknife", "makeshift_knife", "primitive_knife", diff --git a/gfx/GiantDays/pngs_large_40x40/wielded/overlay_female_wielded_knife_rambo.json b/gfx/GiantDays/pngs_large_40x40/wielded/overlay_female_wielded_knife_rambo.json index 8f08a2e881..d45317e33a 100644 --- a/gfx/GiantDays/pngs_large_40x40/wielded/overlay_female_wielded_knife_rambo.json +++ b/gfx/GiantDays/pngs_large_40x40/wielded/overlay_female_wielded_knife_rambo.json @@ -1 +1,10 @@ -{"id": ["overlay_female_wielded_knife_rambo", "overlay_female_wielded_knife_butcher", "overlay_female_wielded_kris", "overlay_female_wielded_knife_hunting", "overlay_female_wielded_knife_rm42"], "fg": ["overlay_female_wielded_knife_rambo"], "rotates": false} \ No newline at end of file +{ + "id": [ + "overlay_female_wielded_knife_rambo", + "overlay_female_wielded_knife_huge_var_knife_butcher", + "overlay_female_wielded_kris", + "overlay_female_wielded_knife_hunting", + "overlay_female_wielded_knife_rm42" + ], + "fg": "overlay_female_wielded_knife_rambo" +} diff --git a/gfx/GiantDays/pngs_large_40x40/wielded/overlay_male_wielded_knife_rambo.json b/gfx/GiantDays/pngs_large_40x40/wielded/overlay_male_wielded_knife_rambo.json index fe3973d69f..ea9b106548 100644 --- a/gfx/GiantDays/pngs_large_40x40/wielded/overlay_male_wielded_knife_rambo.json +++ b/gfx/GiantDays/pngs_large_40x40/wielded/overlay_male_wielded_knife_rambo.json @@ -1 +1,10 @@ -{"id": ["overlay_male_wielded_knife_rambo", "overlay_male_wielded_knife_butcher", "overlay_male_wielded_kris", "overlay_male_wielded_knife_hunting", "overlay_male_wielded_knife_rm42"], "fg": ["overlay_male_wielded_knife_rambo"], "rotates": false} \ No newline at end of file +{ + "id": [ + "overlay_male_wielded_knife_rambo", + "overlay_male_wielded_knife_huge_var_knife_butcher", + "overlay_male_wielded_kris", + "overlay_male_wielded_knife_hunting", + "overlay_male_wielded_knife_rm42" + ], + "fg": "overlay_male_wielded_knife_rambo" +} diff --git a/gfx/HitButton_iso/pngs_full_iso_16x20/item/cutlass_fake_katana_fake_broadsword_fake_knife_rm42_sword_forged_fencing_epee_fencing_sabre_wakizashi_fake_kris_fake_machete_firemachete_off_cutlass_t_0.json b/gfx/HitButton_iso/pngs_full_iso_16x20/item/cutlass_fake_katana_fake_broadsword_fake_knife_rm42_sword_forged_fencing_epee_fencing_sabre_wakizashi_fake_kris_fake_machete_firemachete_off_cutlass_t_0.json index 43c6c165c3..2e70c2d4fe 100644 --- a/gfx/HitButton_iso/pngs_full_iso_16x20/item/cutlass_fake_katana_fake_broadsword_fake_knife_rm42_sword_forged_fencing_epee_fencing_sabre_wakizashi_fake_kris_fake_machete_firemachete_off_cutlass_t_0.json +++ b/gfx/HitButton_iso/pngs_full_iso_16x20/item/cutlass_fake_katana_fake_broadsword_fake_knife_rm42_sword_forged_fencing_epee_fencing_sabre_wakizashi_fake_kris_fake_machete_firemachete_off_cutlass_t_0.json @@ -1 +1,37 @@ -{"id": ["cutlass_fake", "katana_fake", "broadsword_fake", "knife_rm42", "sword_forged", "fencing_epee", "fencing_sabre", "wakizashi_fake", "kris_fake", "machete", "firemachete_off", "cutlass", "tanto", "kris", "wakizashi", "katana", "broadsword", "broadfire_off", "makeshift_machete", "knife_steak", "knife_butcher", "survivor_machete", "knife_hunting", "makeshift_knife", "knife_combat", "kukri", "knife_rambo", "diveknife", "knife_trench", "firekatana_off", "shishkebab_off", "throwing_knife"], "fg": ["1598_cutlass_fake_0"], "bg": []} \ No newline at end of file +{ + "id": [ + "cutlass_fake", + "katana_fake", + "broadsword_fake", + "knife_rm42", + "sword_forged", + "fencing_epee", + "fencing_sabre", + "wakizashi_fake", + "kris_fake", + "machete", + "firemachete_off", + "cutlass", + "tanto", + "kris", + "wakizashi", + "katana", + "broadsword", + "broadfire_off", + "makeshift_machete", + "knife_small_var_knife_steak", + "knife_huge_var_knife_butcher", + "survivor_machete", + "knife_hunting", + "makeshift_knife", + "knife_combat", + "kukri", + "knife_rambo", + "diveknife", + "knife_trench", + "firekatana_off", + "shishkebab_off", + "throwing_knife" + ], + "fg": "1598_cutlass_fake_0" +} diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_butcher_season_autumn.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_huge_var_knife_butcher_season_autumn.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_butcher_season_autumn.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_huge_var_knife_butcher_season_autumn.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_butcher_season_spring.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_huge_var_knife_butcher_season_spring.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_butcher_season_spring.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_huge_var_knife_butcher_season_spring.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_butcher_season_summer.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_huge_var_knife_butcher_season_summer.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_butcher_season_summer.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_huge_var_knife_butcher_season_summer.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_butcher_season_winter.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_huge_var_knife_butcher_season_winter.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_butcher_season_winter.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_butcher/knife_huge_var_knife_butcher_season_winter.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_chef_season_autumn.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_large_var_knife_chef_season_autumn.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_chef_season_autumn.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_large_var_knife_chef_season_autumn.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_chef_season_spring.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_large_var_knife_chef_season_spring.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_chef_season_spring.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_large_var_knife_chef_season_spring.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_chef_season_summer.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_large_var_knife_chef_season_summer.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_chef_season_summer.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_large_var_knife_chef_season_summer.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_chef_season_winter.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_large_var_knife_chef_season_winter.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_chef_season_winter.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_chef/knife_large_var_knife_chef_season_winter.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_meat_cleaver_season_autumn.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_cleaver_var_knife_meat_cleaver_season_autumn.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_meat_cleaver_season_autumn.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_cleaver_var_knife_meat_cleaver_season_autumn.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_meat_cleaver_season_spring.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_cleaver_var_knife_meat_cleaver_season_spring.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_meat_cleaver_season_spring.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_cleaver_var_knife_meat_cleaver_season_spring.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_meat_cleaver_season_summer.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_cleaver_var_knife_meat_cleaver_season_summer.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_meat_cleaver_season_summer.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_cleaver_var_knife_meat_cleaver_season_summer.png diff --git a/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_meat_cleaver_season_winter.png b/gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_cleaver_var_knife_meat_cleaver_season_winter.png similarity index 100% rename from gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_meat_cleaver_season_winter.png rename to gfx/HollowMoon/pngs_normal_24x24/weapons_melee/knife_meat_cleaver/knife_cleaver_var_knife_meat_cleaver_season_winter.png diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/knife_carving/knife_carving.png b/gfx/MShockXotto+/pngs_small_20x20/items/knife_carving/knife_large_var_knife_carving.png similarity index 100% rename from gfx/MShockXotto+/pngs_small_20x20/items/knife_carving/knife_carving.png rename to gfx/MShockXotto+/pngs_small_20x20/items/knife_carving/knife_large_var_knife_carving.png diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/knife_meat_cleaver.png b/gfx/MShockXotto+/pngs_small_20x20/items/knife_cleaver_var_knife_meat_cleaver.png similarity index 100% rename from gfx/MShockXotto+/pngs_small_20x20/items/knife_meat_cleaver.png rename to gfx/MShockXotto+/pngs_small_20x20/items/knife_cleaver_var_knife_meat_cleaver.png diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/knife_vegetable_cleaver.png b/gfx/MShockXotto+/pngs_small_20x20/items/knife_cleaver_var_knife_vegetable_cleaver.png similarity index 100% rename from gfx/MShockXotto+/pngs_small_20x20/items/knife_vegetable_cleaver.png rename to gfx/MShockXotto+/pngs_small_20x20/items/knife_cleaver_var_knife_vegetable_cleaver.png diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/knife_butcher.png b/gfx/MShockXotto+/pngs_small_20x20/items/knife_huge_var_knife_butcher.png similarity index 100% rename from gfx/MShockXotto+/pngs_small_20x20/items/knife_butcher.png rename to gfx/MShockXotto+/pngs_small_20x20/items/knife_huge_var_knife_butcher.png diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/knife_chef.png b/gfx/MShockXotto+/pngs_small_20x20/items/knife_large_var_knife_chef.png similarity index 100% rename from gfx/MShockXotto+/pngs_small_20x20/items/knife_chef.png rename to gfx/MShockXotto+/pngs_small_20x20/items/knife_large_var_knife_chef.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_carving/overlay_wielded_knife_carving.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_carving/overlay_wielded_knife_large_var_knife_carving.png similarity index 100% rename from gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_carving/overlay_wielded_knife_carving.png rename to gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_carving/overlay_wielded_knife_large_var_knife_carving.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_meat_cleaver.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_cleaver_var_knife_meat_cleaver.png similarity index 100% rename from gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_meat_cleaver.png rename to gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_cleaver_var_knife_meat_cleaver.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_vegetable_cleaver.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_cleaver_var_knife_vegetable_cleaver.png similarity index 100% rename from gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_vegetable_cleaver.png rename to gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_cleaver_var_knife_vegetable_cleaver.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_butcher.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_huge_var_knife_butcher.png similarity index 100% rename from gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_butcher.png rename to gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_huge_var_knife_butcher.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_chef.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_large_var_knife_chef.png similarity index 100% rename from gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_chef.png rename to gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_large_var_knife_chef.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_steak_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_steak_0.json index 470475bf6a..a46a29c747 100644 --- a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_steak_0.json +++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_steak_0.json @@ -1 +1,4 @@ -{"id": "overlay_wielded_knife_steak", "fg": ["3648_overlay_wielded_carver_off_0"], "rotates": false, "bg": []} \ No newline at end of file +{ + "id": "overlay_wielded_knife_small_var_knife_steak", + "fg": "3648_overlay_wielded_carver_off_0" +} diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/knife_paring.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/knife_small_var_knife_paring.png similarity index 100% rename from gfx/MShockXotto+/pngs_tiles_32x32/item/knife_paring.png rename to gfx/MShockXotto+/pngs_tiles_32x32/item/knife_small_var_knife_paring.png diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/knife_steak.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/knife_small_var_knife_steak.png similarity index 100% rename from gfx/MShockXotto+/pngs_tiles_32x32/item/knife_steak.png rename to gfx/MShockXotto+/pngs_tiles_32x32/item/knife_small_var_knife_steak.png diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_knife_rambo.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_knife_rambo.json index 8f08a2e881..d45317e33a 100644 --- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_knife_rambo.json +++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_knife_rambo.json @@ -1 +1,10 @@ -{"id": ["overlay_female_wielded_knife_rambo", "overlay_female_wielded_knife_butcher", "overlay_female_wielded_kris", "overlay_female_wielded_knife_hunting", "overlay_female_wielded_knife_rm42"], "fg": ["overlay_female_wielded_knife_rambo"], "rotates": false} \ No newline at end of file +{ + "id": [ + "overlay_female_wielded_knife_rambo", + "overlay_female_wielded_knife_huge_var_knife_butcher", + "overlay_female_wielded_kris", + "overlay_female_wielded_knife_hunting", + "overlay_female_wielded_knife_rm42" + ], + "fg": "overlay_female_wielded_knife_rambo" +} diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_knife_rambo.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_knife_rambo.json index fe3973d69f..ea9b106548 100644 --- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_knife_rambo.json +++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_knife_rambo.json @@ -1 +1,10 @@ -{"id": ["overlay_male_wielded_knife_rambo", "overlay_male_wielded_knife_butcher", "overlay_male_wielded_kris", "overlay_male_wielded_knife_hunting", "overlay_male_wielded_knife_rm42"], "fg": ["overlay_male_wielded_knife_rambo"], "rotates": false} \ No newline at end of file +{ + "id": [ + "overlay_male_wielded_knife_rambo", + "overlay_male_wielded_knife_huge_var_knife_butcher", + "overlay_male_wielded_kris", + "overlay_male_wielded_knife_hunting", + "overlay_male_wielded_knife_rm42" + ], + "fg": "overlay_male_wielded_knife_rambo" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/melee/knife_combat.json b/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/melee/knife_combat.json index fa78cd542b..5f25c4eda3 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/melee/knife_combat.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/melee/knife_combat.json @@ -1,8 +1,8 @@ { "id": [ "knife_combat", - "knife_steak", - "knife_butcher", + "knife_small_var_knife_steak", + "knife_huge_var_knife_butcher", "diveknife", "makeshift_knife", "primitive_knife", diff --git a/gfx/Retrodays/pngs_tiles_10x10/item/knife_steak_knife_butcher_knife_combat_diveknife_makeshift_knife_primitive_knife_knife_trench_switchblade_kris_knife_hunting_knife_rambo_knife_rm42_ho_0.json b/gfx/Retrodays/pngs_tiles_10x10/item/knife_steak_knife_butcher_knife_combat_diveknife_makeshift_knife_primitive_knife_knife_trench_switchblade_kris_knife_hunting_knife_rambo_knife_rm42_ho_0.json index 51cc85d975..a12c35297e 100644 --- a/gfx/Retrodays/pngs_tiles_10x10/item/knife_steak_knife_butcher_knife_combat_diveknife_makeshift_knife_primitive_knife_knife_trench_switchblade_kris_knife_hunting_knife_rambo_knife_rm42_ho_0.json +++ b/gfx/Retrodays/pngs_tiles_10x10/item/knife_steak_knife_butcher_knife_combat_diveknife_makeshift_knife_primitive_knife_knife_trench_switchblade_kris_knife_hunting_knife_rambo_knife_rm42_ho_0.json @@ -1 +1,21 @@ -{"id": ["knife_steak", "knife_butcher", "knife_combat", "diveknife", "makeshift_knife", "primitive_knife", "knife_trench", "switchblade", "kris", "knife_hunting", "knife_rambo", "knife_rm42", "honey_scraper", "bio_blade_weapon", "kris_fake", "knife_folding"], "fg": ["1193_knife_steak_0"], "rotates": false, "bg": []} \ No newline at end of file +{ + "id": [ + "knife_small_var_knife_steak", + "knife_huge_var_knife_butcher", + "knife_combat", + "diveknife", + "makeshift_knife", + "primitive_knife", + "knife_trench", + "switchblade", + "kris", + "knife_hunting", + "knife_rambo", + "knife_rm42", + "honey_scraper", + "bio_blade_weapon", + "kris_fake", + "knife_folding" + ], + "fg": "1193_knife_steak_0" +} diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/ace_cutting/butcher_knife_mf.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/ace_cutting/overlay_wielded_knife_huge_var_knife_butcher.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/ace_cutting/butcher_knife_mf.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/ace_cutting/overlay_wielded_knife_huge_var_knife_butcher.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/ace_cutting/weapons3.json b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/ace_cutting/weapons3.json index 7f117d1800..492f879b56 100644 --- a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/ace_cutting/weapons3.json +++ b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/ace_cutting/weapons3.json @@ -3,10 +3,6 @@ "id": "overlay_wielded_battleaxe", "fg": "battle_axe_mf" }, - { - "id": "overlay_wielded_knife_butcher", - "fg": "butcher_knife_mf" - }, { "id": "overlay_female_wielded_butterfly_swords", "fg": "butterfly_swords_f" diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/steak_knife/steak_knife_mf.png b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/knifes/overlay_wielded_knife_small_var_knife_steak.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/steak_knife/steak_knife_mf.png rename to gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/knifes/overlay_wielded_knife_small_var_knife_steak.png diff --git a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/steak_knife/steak_knife.json b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/steak_knife/steak_knife.json deleted file mode 100644 index ca9f8c46c1..0000000000 --- a/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/steak_knife/steak_knife.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "id": "overlay_wielded_knife_steak", - "fg": "steak_knife_mf", - "bg": "" - } -] \ No newline at end of file diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_butcher.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_huge_var_knife_butcher.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_butcher.png rename to gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_huge_var_knife_butcher.png diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_bread.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_large_var_knife_bread.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_bread.png rename to gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_large_var_knife_bread.png diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_carving.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_large_var_knife_carving.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_carving.png rename to gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_large_var_knife_carving.png diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_chef.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_large_var_knife_chef.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_chef.png rename to gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_large_var_knife_chef.png diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_paring.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_small_var_knife_paring.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_paring.png rename to gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_small_var_knife_paring.png diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_steak.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_small_var_knife_steak.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_steak.png rename to gfx/UltimateCataclysm/pngs_small_20x20/items/knives/knife_small_var_knife_steak.png diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/meat_cleaver.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_cleaver_var_knife_meat_cleaver.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_small_20x20/items/tools/meat_cleaver.png rename to gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_cleaver_var_knife_meat_cleaver.png diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/vegetable_cleaver.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_cleaver_var_knife_vegetable_cleaver.png similarity index 100% rename from gfx/UltimateCataclysm/pngs_small_20x20/items/tools/vegetable_cleaver.png rename to gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_cleaver_var_knife_vegetable_cleaver.png diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_meat_cleaver.json b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_meat_cleaver.json deleted file mode 100644 index c883001582..0000000000 --- a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_meat_cleaver.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "knife_meat_cleaver", - "fg": "meat_cleaver", - "bg": "" -} diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_vegetable_cleaver.json b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_vegetable_cleaver.json deleted file mode 100644 index af4dc22b5a..0000000000 --- a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/knife_vegetable_cleaver.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": "knife_vegetable_cleaver", - "fg": "vegetable_cleaver", - "bg": "" -}