Revert "[i.0] Knife ID Variant Change (I-am-Erk#2452)"

This reverts commit 8ad3715.
harakka · Sep 15, 2024 · bd92974 · bd92974
1 parent 091b0b1
commit bd92974
Show file tree

Hide file tree

Showing 50 changed files with 34 additions and 110 deletions.
diff --git a/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_butcher_0.json b/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_butcher_0.json
@@ -0,0 +1 @@
+{"id": "knife_butcher", "fg": ["1598_knife_steak_0"], "bg": [], "rotates": false, "multitile": false}
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
diff --git a/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_steak_0.json b/gfx/BrownLikeBears/pngs_tiles_20x20/items/knife_steak_0.json
@@ -0,0 +1 @@
+{"id": "knife_steak", "fg": ["1598_knife_steak_0"], "bg": [], "rotates": false, "multitile": false}
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
@@ -1,8 +1,8 @@
 {
   "id": [
     "knife_combat",
-    "knife_small_var_knife_steak",
-    "knife_huge_var_knife_butcher",
+    "knife_steak",
+    "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
@@ -1,10 +1 @@
-{
-  "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"
-}
+{"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}
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
@@ -1,10 +1 @@
-{
-  "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"
-}
+{"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}
diff --git a/...cing_epee_fencing_sabre_wakizashi_fake_kris_fake_machete_firemachete_off_cutlass_t_0.json b/...cing_epee_fencing_sabre_wakizashi_fake_kris_fake_machete_firemachete_off_cutlass_t_0.json
@@ -1,37 +1 @@
-{
-  "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"
-}
+{"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": []}
diff --git a/..._huge_var_knife_butcher_season_autumn.png → ...e_butcher/knife_butcher_season_autumn.png b/..._huge_var_knife_butcher_season_autumn.png → ...e_butcher/knife_butcher_season_autumn.png
diff --git a/..._huge_var_knife_butcher_season_spring.png → ...e_butcher/knife_butcher_season_spring.png b/..._huge_var_knife_butcher_season_spring.png → ...e_butcher/knife_butcher_season_spring.png
diff --git a/..._huge_var_knife_butcher_season_summer.png → ...e_butcher/knife_butcher_season_summer.png b/..._huge_var_knife_butcher_season_summer.png → ...e_butcher/knife_butcher_season_summer.png
diff --git a/..._huge_var_knife_butcher_season_winter.png → ...e_butcher/knife_butcher_season_winter.png b/..._huge_var_knife_butcher_season_winter.png → ...e_butcher/knife_butcher_season_winter.png
diff --git a/...fe_large_var_knife_chef_season_autumn.png → ...e/knife_chef/knife_chef_season_autumn.png b/...fe_large_var_knife_chef_season_autumn.png → ...e/knife_chef/knife_chef_season_autumn.png
diff --git a/...fe_large_var_knife_chef_season_spring.png → ...e/knife_chef/knife_chef_season_spring.png b/...fe_large_var_knife_chef_season_spring.png → ...e/knife_chef/knife_chef_season_spring.png
diff --git a/...fe_large_var_knife_chef_season_summer.png → ...e/knife_chef/knife_chef_season_summer.png b/...fe_large_var_knife_chef_season_summer.png → ...e/knife_chef/knife_chef_season_summer.png
diff --git a/...fe_large_var_knife_chef_season_winter.png → ...e/knife_chef/knife_chef_season_winter.png b/...fe_large_var_knife_chef_season_winter.png → ...e/knife_chef/knife_chef_season_winter.png
diff --git a/..._var_knife_meat_cleaver_season_autumn.png → ...aver/knife_meat_cleaver_season_autumn.png b/..._var_knife_meat_cleaver_season_autumn.png → ...aver/knife_meat_cleaver_season_autumn.png
diff --git a/..._var_knife_meat_cleaver_season_spring.png → ...aver/knife_meat_cleaver_season_spring.png b/..._var_knife_meat_cleaver_season_spring.png → ...aver/knife_meat_cleaver_season_spring.png
diff --git a/..._var_knife_meat_cleaver_season_summer.png → ...aver/knife_meat_cleaver_season_summer.png b/..._var_knife_meat_cleaver_season_summer.png → ...aver/knife_meat_cleaver_season_summer.png
diff --git a/..._var_knife_meat_cleaver_season_winter.png → ...aver/knife_meat_cleaver_season_winter.png b/..._var_knife_meat_cleaver_season_winter.png → ...aver/knife_meat_cleaver_season_winter.png
diff --git a/...20/items/knife_huge_var_knife_butcher.png → .../pngs_small_20x20/items/knife_butcher.png b/...20/items/knife_huge_var_knife_butcher.png → .../pngs_small_20x20/items/knife_butcher.png
diff --git a/...carving/knife_large_var_knife_carving.png → ...x20/items/knife_carving/knife_carving.png b/...carving/knife_large_var_knife_carving.png → ...x20/items/knife_carving/knife_carving.png
diff --git a/...0x20/items/knife_large_var_knife_chef.png → ...to+/pngs_small_20x20/items/knife_chef.png b/...0x20/items/knife_large_var_knife_chef.png → ...to+/pngs_small_20x20/items/knife_chef.png
diff --git a/.../knife_cleaver_var_knife_meat_cleaver.png → ..._small_20x20/items/knife_meat_cleaver.png b/.../knife_cleaver_var_knife_meat_cleaver.png → ..._small_20x20/items/knife_meat_cleaver.png
diff --git a/...e_cleaver_var_knife_vegetable_cleaver.png → ...l_20x20/items/knife_vegetable_cleaver.png b/...e_cleaver_var_knife_vegetable_cleaver.png → ...l_20x20/items/knife_vegetable_cleaver.png
diff --git a/..._wielded_knife_huge_var_knife_butcher.png → ...wielded/overlay_wielded_knife_butcher.png b/..._wielded_knife_huge_var_knife_butcher.png → ...wielded/overlay_wielded_knife_butcher.png
diff --git a/...wielded_knife_large_var_knife_carving.png → ...carving/overlay_wielded_knife_carving.png b/...wielded_knife_large_var_knife_carving.png → ...carving/overlay_wielded_knife_carving.png
diff --git a/...ay_wielded_knife_large_var_knife_chef.png → ...ay/wielded/overlay_wielded_knife_chef.png b/...ay_wielded_knife_large_var_knife_chef.png → ...ay/wielded/overlay_wielded_knife_chef.png
diff --git a/..._knife_cleaver_var_knife_meat_cleaver.png → ...ed/overlay_wielded_knife_meat_cleaver.png b/..._knife_cleaver_var_knife_meat_cleaver.png → ...ed/overlay_wielded_knife_meat_cleaver.png
diff --git a/...ShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_steak_0.json b/...ShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_knife_steak_0.json
@@ -1,4 +1 @@
-{
-  "id": "overlay_wielded_knife_small_var_knife_steak",
-  "fg": "3648_overlay_wielded_carver_off_0"
-}
+{"id": "overlay_wielded_knife_steak", "fg": ["3648_overlay_wielded_carver_off_0"], "rotates": false, "bg": []}
diff --git a/...e_cleaver_var_knife_vegetable_cleaver.png → ...erlay_wielded_knife_vegetable_cleaver.png b/...e_cleaver_var_knife_vegetable_cleaver.png → ...erlay_wielded_knife_vegetable_cleaver.png
diff --git a/...x32/item/knife_small_var_knife_paring.png → ...o+/pngs_tiles_32x32/item/knife_paring.png b/...x32/item/knife_small_var_knife_paring.png → ...o+/pngs_tiles_32x32/item/knife_paring.png
diff --git a/...2x32/item/knife_small_var_knife_steak.png → ...to+/pngs_tiles_32x32/item/knife_steak.png b/...2x32/item/knife_small_var_knife_steak.png → ...to+/pngs_tiles_32x32/item/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
@@ -1,10 +1 @@
-{
-  "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"
-}
+{"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}
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
@@ -1,10 +1 @@
-{
-  "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"
-}
+{"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}
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
@@ -1,8 +1,8 @@
 {
   "id": [
     "knife_combat",
-    "knife_small_var_knife_steak",
-    "knife_huge_var_knife_butcher",
+    "knife_steak",
+    "knife_butcher",
     "diveknife",
     "makeshift_knife",
     "primitive_knife",

diff --git a/...mitive_knife_knife_trench_switchblade_kris_knife_hunting_knife_rambo_knife_rm42_ho_0.json b/...mitive_knife_knife_trench_switchblade_kris_knife_hunting_knife_rambo_knife_rm42_ho_0.json
@@ -1,21 +1 @@
-{
-  "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"
-}
+{"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": []}
diff --git a/..._wielded_knife_huge_var_knife_butcher.png → .../wielded/ace_cutting/butcher_knife_mf.png b/..._wielded_knife_huge_var_knife_butcher.png → .../wielded/ace_cutting/butcher_knife_mf.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
@@ -3,6 +3,10 @@
     "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.json b/gfx/UltimateCataclysm/pngs_human_body_32x36/overlay/wielded/steak_knife/steak_knife.json
@@ -0,0 +1,7 @@
+[
+  {
+    "id": "overlay_wielded_knife_steak",
+    "fg": "steak_knife_mf",
+    "bg": ""
+  }
+]
diff --git a/...y_wielded_knife_small_var_knife_steak.png → ...ay/wielded/steak_knife/steak_knife_mf.png b/...y_wielded_knife_small_var_knife_steak.png → ...ay/wielded/steak_knife/steak_knife_mf.png
diff --git a/...ms/knives/knife_large_var_knife_bread.png → ..._small_20x20/items/knives/knife_bread.png b/...ms/knives/knife_large_var_knife_bread.png → ..._small_20x20/items/knives/knife_bread.png
diff --git a/...s/knives/knife_huge_var_knife_butcher.png → ...mall_20x20/items/knives/knife_butcher.png b/...s/knives/knife_huge_var_knife_butcher.png → ...mall_20x20/items/knives/knife_butcher.png
diff --git a/.../knives/knife_large_var_knife_carving.png → ...mall_20x20/items/knives/knife_carving.png b/.../knives/knife_large_var_knife_carving.png → ...mall_20x20/items/knives/knife_carving.png
diff --git a/...ems/knives/knife_large_var_knife_chef.png → ...s_small_20x20/items/knives/knife_chef.png b/...ems/knives/knife_large_var_knife_chef.png → ...s_small_20x20/items/knives/knife_chef.png
diff --git a/...s/knives/knife_small_var_knife_paring.png → ...small_20x20/items/knives/knife_paring.png b/...s/knives/knife_small_var_knife_paring.png → ...small_20x20/items/knives/knife_paring.png
diff --git a/...ms/knives/knife_small_var_knife_steak.png → ..._small_20x20/items/knives/knife_steak.png b/...ms/knives/knife_small_var_knife_steak.png → ..._small_20x20/items/knives/knife_steak.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
@@ -0,0 +1,5 @@
+{
+  "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
@@ -0,0 +1,5 @@
+{
+  "id": "knife_vegetable_cleaver",
+  "fg": "vegetable_cleaver",
+  "bg": ""
+}
diff --git a/.../knife_cleaver_var_knife_meat_cleaver.png → ..._small_20x20/items/tools/meat_cleaver.png b/.../knife_cleaver_var_knife_meat_cleaver.png → ..._small_20x20/items/tools/meat_cleaver.png
diff --git a/...e_cleaver_var_knife_vegetable_cleaver.png → ...l_20x20/items/tools/vegetable_cleaver.png b/...e_cleaver_var_knife_vegetable_cleaver.png → ...l_20x20/items/tools/vegetable_cleaver.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"id": "knife_butcher", "fg": ["1598_knife_steak_0"], "bg": [], "rotates": false, "multitile": false}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"id": "knife_steak", "fg": ["1598_knife_steak_0"], "bg": [], "rotates": false, "multitile": false}