From b55bc7b00348f2ffccbad31ef10857e4a6e7f3db Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sun, 9 May 2021 01:49:06 -0400 Subject: [PATCH] crafting item partial re-organization, armor recipes, some specific animal drops --- .../crafting_ing/{ => animal_misc}/bone.ron | 0 .../crafting_ing/{ => animal_misc}/claw.ron | 0 .../crafting_ing/{ => animal_misc}/ember.ron | 0 .../crafting_ing/{ => animal_misc}/fang.ron | 0 .../{ => animal_misc}/feather.ron | 0 .../crafting_ing/{ => animal_misc}/fur.ron | 0 .../crafting_ing/animal_misc/grim_eyeball.ron | 9 + .../crafting_ing/{ => animal_misc}/horn.ron | 0 .../{ => animal_misc}/icy_fang.ron | 0 .../{ => animal_misc}/raptor_feather.ron | 0 .../{ => animal_misc}/venomsac.ron | 0 .../crafting_ing/{ => cloth}/cloth_scraps.ron | 0 .../{ => cloth}/cloth_scraps_red.ron | 0 .../crafting_ing/{ => cloth}/lifecoth.ron | 0 .../items/crafting_ing/{ => cloth}/linen.ron | 0 .../crafting_ing/{ => cloth}/moonweave.ron | 0 .../items/crafting_ing/{ => cloth}/silk.ron | 0 .../crafting_ing/{ => cloth}/sunsilk.ron | 0 .../items/crafting_ing/{ => cloth}/wool.ron | 0 .../crafting_ing/{ => hide}/carapace.ron | 0 .../crafting_ing/{ => hide}/dragon_scale.ron | 0 .../crafting_ing/{ => hide}/leather_troll.ron | 0 .../items/crafting_ing/{ => hide}/plate.ron | 0 .../items/crafting_ing/{ => hide}/scales.ron | 0 assets/common/items/crafting_ing/leather.ron | 9 - .../items/crafting_ing/{ => log}/bamboo.ron | 0 .../crafting_ing/{ => log}/eldwood_logs.ron | 0 .../crafting_ing/{ => log}/frostwood_logs.ron | 0 .../crafting_ing/{ => log}/hardwood_logs.ron | 0 .../crafting_ing/{ => log}/ironwood_logs.ron | 0 .../crafting_ing/{ => log}/wood_logs.ron | 0 assets/common/items/crafting_ing/rawhide.ron | 9 - .../gem}/amethyst.ron | 0 .../{crafting_ing => mineral/gem}/diamond.ron | 0 .../{crafting_ing => mineral/gem}/emerald.ron | 0 .../{crafting_ing => mineral/gem}/ruby.ron | 0 .../gem}/sapphire.ron | 0 .../{crafting_ing => mineral/gem}/topaz.ron | 0 .../ingot}/bloodsteel_ingot.ron | 0 .../ingot}/bronze_ingot.ron | 0 .../ingot}/cobalt_ingot.ron | 0 .../ingot}/copper_ingot.ron | 0 .../ingot}/gold_ingot.ron | 0 .../ingot}/iron_ingot.ron | 0 .../ingot}/orichalcum_ingot.ron | 0 .../ingot}/silver_ingot.ron | 0 .../ingot}/steel_ingot.ron | 0 .../ingot}/tin_ingot.ron | 0 .../ore}/bloodstone_ore.ron | 0 .../ore}/cobalt_ore.ron | 0 .../ore}/copper_ore.ron | 0 .../ore}/gold_ore.ron | 0 .../ore}/iron_ore.ron | 0 .../ore}/silver_ore.ron | 0 .../{crafting_ing => mineral/ore}/tin_ore.ron | 0 .../items/{ => mineral}/ore/velorite.ron | 0 .../items/{ => mineral}/ore/veloritefrag.ron | 0 .../stone}/basalt.ron | 0 .../{crafting_ing => mineral/stone}/coal.ron | 0 .../stone}/granite.ron | 0 .../stone}/obsidian.ron | 0 .../common/items/tag_examples/metal_ingot.ron | 14 +- .../creature/biped_large/wendigo.ron | 2 +- .../creature/quad_low/basilisk.ron | 6 + .../creature/quad_low/carapace.ron | 4 + .../loot_tables/creature/quad_low/default.ron | 2 +- .../loot_tables/creature/quad_low/fanged.ron | 6 + .../creature/quad_low/lavadrake.ron | 4 - .../creature/quad_low/venemous.ron | 5 + .../loot_tables/creature/quad_medium/ice.ron | 2 +- .../loot_tables/creature/theropod/default.ron | 2 +- .../loot_tables/creature/theropod/raptor.ron | 2 +- .../common/loot_tables/materials/common.ron | 2 +- assets/common/loot_tables/materials/gems.ron | 12 +- assets/common/loot_tables/trading.ron | 2 +- assets/common/material_stats_manifest.ron | 14 +- assets/common/recipe_book.ron | 322 +++++++++++++++--- common/src/comp/inventory/item/mod.rs | 24 +- server/src/events/entity_manipulation.rs | 14 +- 79 files changed, 358 insertions(+), 108 deletions(-) rename assets/common/items/crafting_ing/{ => animal_misc}/bone.ron (100%) rename assets/common/items/crafting_ing/{ => animal_misc}/claw.ron (100%) rename assets/common/items/crafting_ing/{ => animal_misc}/ember.ron (100%) rename assets/common/items/crafting_ing/{ => animal_misc}/fang.ron (100%) rename assets/common/items/crafting_ing/{ => animal_misc}/feather.ron (100%) rename assets/common/items/crafting_ing/{ => animal_misc}/fur.ron (100%) create mode 100644 assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron rename assets/common/items/crafting_ing/{ => animal_misc}/horn.ron (100%) rename assets/common/items/crafting_ing/{ => animal_misc}/icy_fang.ron (100%) rename assets/common/items/crafting_ing/{ => animal_misc}/raptor_feather.ron (100%) rename assets/common/items/crafting_ing/{ => animal_misc}/venomsac.ron (100%) rename assets/common/items/crafting_ing/{ => cloth}/cloth_scraps.ron (100%) rename assets/common/items/crafting_ing/{ => cloth}/cloth_scraps_red.ron (100%) rename assets/common/items/crafting_ing/{ => cloth}/lifecoth.ron (100%) rename assets/common/items/crafting_ing/{ => cloth}/linen.ron (100%) rename assets/common/items/crafting_ing/{ => cloth}/moonweave.ron (100%) rename assets/common/items/crafting_ing/{ => cloth}/silk.ron (100%) rename assets/common/items/crafting_ing/{ => cloth}/sunsilk.ron (100%) rename assets/common/items/crafting_ing/{ => cloth}/wool.ron (100%) rename assets/common/items/crafting_ing/{ => hide}/carapace.ron (100%) rename assets/common/items/crafting_ing/{ => hide}/dragon_scale.ron (100%) rename assets/common/items/crafting_ing/{ => hide}/leather_troll.ron (100%) rename assets/common/items/crafting_ing/{ => hide}/plate.ron (100%) rename assets/common/items/crafting_ing/{ => hide}/scales.ron (100%) delete mode 100644 assets/common/items/crafting_ing/leather.ron rename assets/common/items/crafting_ing/{ => log}/bamboo.ron (100%) rename assets/common/items/crafting_ing/{ => log}/eldwood_logs.ron (100%) rename assets/common/items/crafting_ing/{ => log}/frostwood_logs.ron (100%) rename assets/common/items/crafting_ing/{ => log}/hardwood_logs.ron (100%) rename assets/common/items/crafting_ing/{ => log}/ironwood_logs.ron (100%) rename assets/common/items/crafting_ing/{ => log}/wood_logs.ron (100%) delete mode 100644 assets/common/items/crafting_ing/rawhide.ron rename assets/common/items/{crafting_ing => mineral/gem}/amethyst.ron (100%) rename assets/common/items/{crafting_ing => mineral/gem}/diamond.ron (100%) rename assets/common/items/{crafting_ing => mineral/gem}/emerald.ron (100%) rename assets/common/items/{crafting_ing => mineral/gem}/ruby.ron (100%) rename assets/common/items/{crafting_ing => mineral/gem}/sapphire.ron (100%) rename assets/common/items/{crafting_ing => mineral/gem}/topaz.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/bloodsteel_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/bronze_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/cobalt_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/copper_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/gold_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/iron_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/orichalcum_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/silver_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/steel_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ingot}/tin_ingot.ron (100%) rename assets/common/items/{crafting_ing => mineral/ore}/bloodstone_ore.ron (100%) rename assets/common/items/{crafting_ing => mineral/ore}/cobalt_ore.ron (100%) rename assets/common/items/{crafting_ing => mineral/ore}/copper_ore.ron (100%) rename assets/common/items/{crafting_ing => mineral/ore}/gold_ore.ron (100%) rename assets/common/items/{crafting_ing => mineral/ore}/iron_ore.ron (100%) rename assets/common/items/{crafting_ing => mineral/ore}/silver_ore.ron (100%) rename assets/common/items/{crafting_ing => mineral/ore}/tin_ore.ron (100%) rename assets/common/items/{ => mineral}/ore/velorite.ron (100%) rename assets/common/items/{ => mineral}/ore/veloritefrag.ron (100%) rename assets/common/items/{crafting_ing => mineral/stone}/basalt.ron (100%) rename assets/common/items/{crafting_ing => mineral/stone}/coal.ron (100%) rename assets/common/items/{crafting_ing => mineral/stone}/granite.ron (100%) rename assets/common/items/{crafting_ing => mineral/stone}/obsidian.ron (100%) create mode 100644 assets/common/loot_tables/creature/quad_low/basilisk.ron create mode 100644 assets/common/loot_tables/creature/quad_low/carapace.ron create mode 100644 assets/common/loot_tables/creature/quad_low/fanged.ron delete mode 100644 assets/common/loot_tables/creature/quad_low/lavadrake.ron create mode 100644 assets/common/loot_tables/creature/quad_low/venemous.ron diff --git a/assets/common/items/crafting_ing/bone.ron b/assets/common/items/crafting_ing/animal_misc/bone.ron similarity index 100% rename from assets/common/items/crafting_ing/bone.ron rename to assets/common/items/crafting_ing/animal_misc/bone.ron diff --git a/assets/common/items/crafting_ing/claw.ron b/assets/common/items/crafting_ing/animal_misc/claw.ron similarity index 100% rename from assets/common/items/crafting_ing/claw.ron rename to assets/common/items/crafting_ing/animal_misc/claw.ron diff --git a/assets/common/items/crafting_ing/ember.ron b/assets/common/items/crafting_ing/animal_misc/ember.ron similarity index 100% rename from assets/common/items/crafting_ing/ember.ron rename to assets/common/items/crafting_ing/animal_misc/ember.ron diff --git a/assets/common/items/crafting_ing/fang.ron b/assets/common/items/crafting_ing/animal_misc/fang.ron similarity index 100% rename from assets/common/items/crafting_ing/fang.ron rename to assets/common/items/crafting_ing/animal_misc/fang.ron diff --git a/assets/common/items/crafting_ing/feather.ron b/assets/common/items/crafting_ing/animal_misc/feather.ron similarity index 100% rename from assets/common/items/crafting_ing/feather.ron rename to assets/common/items/crafting_ing/animal_misc/feather.ron diff --git a/assets/common/items/crafting_ing/fur.ron b/assets/common/items/crafting_ing/animal_misc/fur.ron similarity index 100% rename from assets/common/items/crafting_ing/fur.ron rename to assets/common/items/crafting_ing/animal_misc/fur.ron diff --git a/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron b/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron new file mode 100644 index 0000000000..5aedf2afa1 --- /dev/null +++ b/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Grim Eyeball", + description: "Casts a petrifying gaze.", + kind: Ingredient( + kind: "GrimEyeball", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/crafting_ing/horn.ron b/assets/common/items/crafting_ing/animal_misc/horn.ron similarity index 100% rename from assets/common/items/crafting_ing/horn.ron rename to assets/common/items/crafting_ing/animal_misc/horn.ron diff --git a/assets/common/items/crafting_ing/icy_fang.ron b/assets/common/items/crafting_ing/animal_misc/icy_fang.ron similarity index 100% rename from assets/common/items/crafting_ing/icy_fang.ron rename to assets/common/items/crafting_ing/animal_misc/icy_fang.ron diff --git a/assets/common/items/crafting_ing/raptor_feather.ron b/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron similarity index 100% rename from assets/common/items/crafting_ing/raptor_feather.ron rename to assets/common/items/crafting_ing/animal_misc/raptor_feather.ron diff --git a/assets/common/items/crafting_ing/venomsac.ron b/assets/common/items/crafting_ing/animal_misc/venomsac.ron similarity index 100% rename from assets/common/items/crafting_ing/venomsac.ron rename to assets/common/items/crafting_ing/animal_misc/venomsac.ron diff --git a/assets/common/items/crafting_ing/cloth_scraps.ron b/assets/common/items/crafting_ing/cloth/cloth_scraps.ron similarity index 100% rename from assets/common/items/crafting_ing/cloth_scraps.ron rename to assets/common/items/crafting_ing/cloth/cloth_scraps.ron diff --git a/assets/common/items/crafting_ing/cloth_scraps_red.ron b/assets/common/items/crafting_ing/cloth/cloth_scraps_red.ron similarity index 100% rename from assets/common/items/crafting_ing/cloth_scraps_red.ron rename to assets/common/items/crafting_ing/cloth/cloth_scraps_red.ron diff --git a/assets/common/items/crafting_ing/lifecoth.ron b/assets/common/items/crafting_ing/cloth/lifecoth.ron similarity index 100% rename from assets/common/items/crafting_ing/lifecoth.ron rename to assets/common/items/crafting_ing/cloth/lifecoth.ron diff --git a/assets/common/items/crafting_ing/linen.ron b/assets/common/items/crafting_ing/cloth/linen.ron similarity index 100% rename from assets/common/items/crafting_ing/linen.ron rename to assets/common/items/crafting_ing/cloth/linen.ron diff --git a/assets/common/items/crafting_ing/moonweave.ron b/assets/common/items/crafting_ing/cloth/moonweave.ron similarity index 100% rename from assets/common/items/crafting_ing/moonweave.ron rename to assets/common/items/crafting_ing/cloth/moonweave.ron diff --git a/assets/common/items/crafting_ing/silk.ron b/assets/common/items/crafting_ing/cloth/silk.ron similarity index 100% rename from assets/common/items/crafting_ing/silk.ron rename to assets/common/items/crafting_ing/cloth/silk.ron diff --git a/assets/common/items/crafting_ing/sunsilk.ron b/assets/common/items/crafting_ing/cloth/sunsilk.ron similarity index 100% rename from assets/common/items/crafting_ing/sunsilk.ron rename to assets/common/items/crafting_ing/cloth/sunsilk.ron diff --git a/assets/common/items/crafting_ing/wool.ron b/assets/common/items/crafting_ing/cloth/wool.ron similarity index 100% rename from assets/common/items/crafting_ing/wool.ron rename to assets/common/items/crafting_ing/cloth/wool.ron diff --git a/assets/common/items/crafting_ing/carapace.ron b/assets/common/items/crafting_ing/hide/carapace.ron similarity index 100% rename from assets/common/items/crafting_ing/carapace.ron rename to assets/common/items/crafting_ing/hide/carapace.ron diff --git a/assets/common/items/crafting_ing/dragon_scale.ron b/assets/common/items/crafting_ing/hide/dragon_scale.ron similarity index 100% rename from assets/common/items/crafting_ing/dragon_scale.ron rename to assets/common/items/crafting_ing/hide/dragon_scale.ron diff --git a/assets/common/items/crafting_ing/leather_troll.ron b/assets/common/items/crafting_ing/hide/leather_troll.ron similarity index 100% rename from assets/common/items/crafting_ing/leather_troll.ron rename to assets/common/items/crafting_ing/hide/leather_troll.ron diff --git a/assets/common/items/crafting_ing/plate.ron b/assets/common/items/crafting_ing/hide/plate.ron similarity index 100% rename from assets/common/items/crafting_ing/plate.ron rename to assets/common/items/crafting_ing/hide/plate.ron diff --git a/assets/common/items/crafting_ing/scales.ron b/assets/common/items/crafting_ing/hide/scales.ron similarity index 100% rename from assets/common/items/crafting_ing/scales.ron rename to assets/common/items/crafting_ing/hide/scales.ron diff --git a/assets/common/items/crafting_ing/leather.ron b/assets/common/items/crafting_ing/leather.ron deleted file mode 100644 index f4ab458650..0000000000 --- a/assets/common/items/crafting_ing/leather.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Leather", - description: "A fabric made from animal hides or skins.", - kind: Ingredient( - kind: "Leather", - ), - quality: Common, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/bamboo.ron b/assets/common/items/crafting_ing/log/bamboo.ron similarity index 100% rename from assets/common/items/crafting_ing/bamboo.ron rename to assets/common/items/crafting_ing/log/bamboo.ron diff --git a/assets/common/items/crafting_ing/eldwood_logs.ron b/assets/common/items/crafting_ing/log/eldwood_logs.ron similarity index 100% rename from assets/common/items/crafting_ing/eldwood_logs.ron rename to assets/common/items/crafting_ing/log/eldwood_logs.ron diff --git a/assets/common/items/crafting_ing/frostwood_logs.ron b/assets/common/items/crafting_ing/log/frostwood_logs.ron similarity index 100% rename from assets/common/items/crafting_ing/frostwood_logs.ron rename to assets/common/items/crafting_ing/log/frostwood_logs.ron diff --git a/assets/common/items/crafting_ing/hardwood_logs.ron b/assets/common/items/crafting_ing/log/hardwood_logs.ron similarity index 100% rename from assets/common/items/crafting_ing/hardwood_logs.ron rename to assets/common/items/crafting_ing/log/hardwood_logs.ron diff --git a/assets/common/items/crafting_ing/ironwood_logs.ron b/assets/common/items/crafting_ing/log/ironwood_logs.ron similarity index 100% rename from assets/common/items/crafting_ing/ironwood_logs.ron rename to assets/common/items/crafting_ing/log/ironwood_logs.ron diff --git a/assets/common/items/crafting_ing/wood_logs.ron b/assets/common/items/crafting_ing/log/wood_logs.ron similarity index 100% rename from assets/common/items/crafting_ing/wood_logs.ron rename to assets/common/items/crafting_ing/log/wood_logs.ron diff --git a/assets/common/items/crafting_ing/rawhide.ron b/assets/common/items/crafting_ing/rawhide.ron deleted file mode 100644 index ce406dbf45..0000000000 --- a/assets/common/items/crafting_ing/rawhide.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Rawhide", - description: "A hide that has not been exposed to tanning.", - kind: Ingredient( - kind: "Rawhide", - ), - quality: Low, - tags: [], -) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/amethyst.ron b/assets/common/items/mineral/gem/amethyst.ron similarity index 100% rename from assets/common/items/crafting_ing/amethyst.ron rename to assets/common/items/mineral/gem/amethyst.ron diff --git a/assets/common/items/crafting_ing/diamond.ron b/assets/common/items/mineral/gem/diamond.ron similarity index 100% rename from assets/common/items/crafting_ing/diamond.ron rename to assets/common/items/mineral/gem/diamond.ron diff --git a/assets/common/items/crafting_ing/emerald.ron b/assets/common/items/mineral/gem/emerald.ron similarity index 100% rename from assets/common/items/crafting_ing/emerald.ron rename to assets/common/items/mineral/gem/emerald.ron diff --git a/assets/common/items/crafting_ing/ruby.ron b/assets/common/items/mineral/gem/ruby.ron similarity index 100% rename from assets/common/items/crafting_ing/ruby.ron rename to assets/common/items/mineral/gem/ruby.ron diff --git a/assets/common/items/crafting_ing/sapphire.ron b/assets/common/items/mineral/gem/sapphire.ron similarity index 100% rename from assets/common/items/crafting_ing/sapphire.ron rename to assets/common/items/mineral/gem/sapphire.ron diff --git a/assets/common/items/crafting_ing/topaz.ron b/assets/common/items/mineral/gem/topaz.ron similarity index 100% rename from assets/common/items/crafting_ing/topaz.ron rename to assets/common/items/mineral/gem/topaz.ron diff --git a/assets/common/items/crafting_ing/bloodsteel_ingot.ron b/assets/common/items/mineral/ingot/bloodsteel_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/bloodsteel_ingot.ron rename to assets/common/items/mineral/ingot/bloodsteel_ingot.ron diff --git a/assets/common/items/crafting_ing/bronze_ingot.ron b/assets/common/items/mineral/ingot/bronze_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/bronze_ingot.ron rename to assets/common/items/mineral/ingot/bronze_ingot.ron diff --git a/assets/common/items/crafting_ing/cobalt_ingot.ron b/assets/common/items/mineral/ingot/cobalt_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/cobalt_ingot.ron rename to assets/common/items/mineral/ingot/cobalt_ingot.ron diff --git a/assets/common/items/crafting_ing/copper_ingot.ron b/assets/common/items/mineral/ingot/copper_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/copper_ingot.ron rename to assets/common/items/mineral/ingot/copper_ingot.ron diff --git a/assets/common/items/crafting_ing/gold_ingot.ron b/assets/common/items/mineral/ingot/gold_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/gold_ingot.ron rename to assets/common/items/mineral/ingot/gold_ingot.ron diff --git a/assets/common/items/crafting_ing/iron_ingot.ron b/assets/common/items/mineral/ingot/iron_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/iron_ingot.ron rename to assets/common/items/mineral/ingot/iron_ingot.ron diff --git a/assets/common/items/crafting_ing/orichalcum_ingot.ron b/assets/common/items/mineral/ingot/orichalcum_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/orichalcum_ingot.ron rename to assets/common/items/mineral/ingot/orichalcum_ingot.ron diff --git a/assets/common/items/crafting_ing/silver_ingot.ron b/assets/common/items/mineral/ingot/silver_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/silver_ingot.ron rename to assets/common/items/mineral/ingot/silver_ingot.ron diff --git a/assets/common/items/crafting_ing/steel_ingot.ron b/assets/common/items/mineral/ingot/steel_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/steel_ingot.ron rename to assets/common/items/mineral/ingot/steel_ingot.ron diff --git a/assets/common/items/crafting_ing/tin_ingot.ron b/assets/common/items/mineral/ingot/tin_ingot.ron similarity index 100% rename from assets/common/items/crafting_ing/tin_ingot.ron rename to assets/common/items/mineral/ingot/tin_ingot.ron diff --git a/assets/common/items/crafting_ing/bloodstone_ore.ron b/assets/common/items/mineral/ore/bloodstone_ore.ron similarity index 100% rename from assets/common/items/crafting_ing/bloodstone_ore.ron rename to assets/common/items/mineral/ore/bloodstone_ore.ron diff --git a/assets/common/items/crafting_ing/cobalt_ore.ron b/assets/common/items/mineral/ore/cobalt_ore.ron similarity index 100% rename from assets/common/items/crafting_ing/cobalt_ore.ron rename to assets/common/items/mineral/ore/cobalt_ore.ron diff --git a/assets/common/items/crafting_ing/copper_ore.ron b/assets/common/items/mineral/ore/copper_ore.ron similarity index 100% rename from assets/common/items/crafting_ing/copper_ore.ron rename to assets/common/items/mineral/ore/copper_ore.ron diff --git a/assets/common/items/crafting_ing/gold_ore.ron b/assets/common/items/mineral/ore/gold_ore.ron similarity index 100% rename from assets/common/items/crafting_ing/gold_ore.ron rename to assets/common/items/mineral/ore/gold_ore.ron diff --git a/assets/common/items/crafting_ing/iron_ore.ron b/assets/common/items/mineral/ore/iron_ore.ron similarity index 100% rename from assets/common/items/crafting_ing/iron_ore.ron rename to assets/common/items/mineral/ore/iron_ore.ron diff --git a/assets/common/items/crafting_ing/silver_ore.ron b/assets/common/items/mineral/ore/silver_ore.ron similarity index 100% rename from assets/common/items/crafting_ing/silver_ore.ron rename to assets/common/items/mineral/ore/silver_ore.ron diff --git a/assets/common/items/crafting_ing/tin_ore.ron b/assets/common/items/mineral/ore/tin_ore.ron similarity index 100% rename from assets/common/items/crafting_ing/tin_ore.ron rename to assets/common/items/mineral/ore/tin_ore.ron diff --git a/assets/common/items/ore/velorite.ron b/assets/common/items/mineral/ore/velorite.ron similarity index 100% rename from assets/common/items/ore/velorite.ron rename to assets/common/items/mineral/ore/velorite.ron diff --git a/assets/common/items/ore/veloritefrag.ron b/assets/common/items/mineral/ore/veloritefrag.ron similarity index 100% rename from assets/common/items/ore/veloritefrag.ron rename to assets/common/items/mineral/ore/veloritefrag.ron diff --git a/assets/common/items/crafting_ing/basalt.ron b/assets/common/items/mineral/stone/basalt.ron similarity index 100% rename from assets/common/items/crafting_ing/basalt.ron rename to assets/common/items/mineral/stone/basalt.ron diff --git a/assets/common/items/crafting_ing/coal.ron b/assets/common/items/mineral/stone/coal.ron similarity index 100% rename from assets/common/items/crafting_ing/coal.ron rename to assets/common/items/mineral/stone/coal.ron diff --git a/assets/common/items/crafting_ing/granite.ron b/assets/common/items/mineral/stone/granite.ron similarity index 100% rename from assets/common/items/crafting_ing/granite.ron rename to assets/common/items/mineral/stone/granite.ron diff --git a/assets/common/items/crafting_ing/obsidian.ron b/assets/common/items/mineral/stone/obsidian.ron similarity index 100% rename from assets/common/items/crafting_ing/obsidian.ron rename to assets/common/items/mineral/stone/obsidian.ron diff --git a/assets/common/items/tag_examples/metal_ingot.ron b/assets/common/items/tag_examples/metal_ingot.ron index fe90564b6f..8a69401fbd 100644 --- a/assets/common/items/tag_examples/metal_ingot.ron +++ b/assets/common/items/tag_examples/metal_ingot.ron @@ -3,13 +3,13 @@ ItemDef( description: "Ingots made from various metals.", kind: TagExamples( item_ids: [ - "common.items.crafting_ing.bloodsteel_ingot", - "common.items.crafting_ing.bronze_ingot", - "common.items.crafting_ing.cobalt_ingot", - "common.items.crafting_ing.copper_ingot", - "common.items.crafting_ing.iron_ingot", - "common.items.crafting_ing.steel_ingot", - "common.items.crafting_ing.tin_ingot", + "common.items.mineral.ingot.bloodsteel_ingot", + "common.items.mineral.ingot.bronze_ingot", + "common.items.mineral.ingot.cobalt_ingot", + "common.items.mineral.ingot.copper_ingot", + "common.items.mineral.ingot.iron_ingot", + "common.items.mineral.ingot.steel_ingot", + "common.items.mineral.ingot.tin_ingot", ], ), quality: Common, diff --git a/assets/common/loot_tables/creature/biped_large/wendigo.ron b/assets/common/loot_tables/creature/biped_large/wendigo.ron index bcb2acdda5..aa83360486 100644 --- a/assets/common/loot_tables/creature/biped_large/wendigo.ron +++ b/assets/common/loot_tables/creature/biped_large/wendigo.ron @@ -1,6 +1,6 @@ [ (1.0, LootTable("common.loot_tables.food.prepared")), - (1.0, Item("common.items.crafting_ing.icy_fang")), + (1.0, Item("common.items.crafting_ing.animal_misc.icy_fang")), (1.0, LootTable("common.loot_tables.weapons.tier-2")), (4.0, LootTable("common.loot_tables.cave_large")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/basilisk.ron b/assets/common/loot_tables/creature/quad_low/basilisk.ron new file mode 100644 index 0000000000..c3c206eb06 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/basilisk.ron @@ -0,0 +1,6 @@ +[ + (1.0, Item("common.items.food.meat.tough_raw")), + (2.0, Item("common.items.crafting_ing.hide.plate")), + (2.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), + +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/carapace.ron b/assets/common/loot_tables/creature/quad_low/carapace.ron new file mode 100644 index 0000000000..25c1784e51 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/carapace.ron @@ -0,0 +1,4 @@ +[ + (1.0, Item("common.items.food.meat.tough_raw")), + (3.0, Item("common.items.crafting_ing.hide.carapace")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/default.ron b/assets/common/loot_tables/creature/quad_low/default.ron index 05f8e75b71..dd49230ec2 100644 --- a/assets/common/loot_tables/creature/quad_low/default.ron +++ b/assets/common/loot_tables/creature/quad_low/default.ron @@ -1,4 +1,4 @@ [ (1.0, Item("common.items.food.meat.tough_raw")), - (3.0, Item("common.items.crafting_ing.scales")), + (3.0, Item("common.items.crafting_ing.hide.scales")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/fanged.ron b/assets/common/loot_tables/creature/quad_low/fanged.ron new file mode 100644 index 0000000000..f0fcba6209 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/fanged.ron @@ -0,0 +1,6 @@ +[ + (1.0, Item("common.items.food.meat.tough_raw")), + (2.0, Item("common.items.crafting_ing.hide.scales")), + (2.0, Item("common.items.crafting_ing.animal_misc.fang")), + +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/lavadrake.ron b/assets/common/loot_tables/creature/quad_low/lavadrake.ron deleted file mode 100644 index 9594d282c3..0000000000 --- a/assets/common/loot_tables/creature/quad_low/lavadrake.ron +++ /dev/null @@ -1,4 +0,0 @@ -[ - (1.0, Item("common.items.food.meat.tough_raw")), - (3.0, Item("common.items.crafting_ing.carapace")), -] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/venemous.ron b/assets/common/loot_tables/creature/quad_low/venemous.ron new file mode 100644 index 0000000000..8f47538c65 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/venemous.ron @@ -0,0 +1,5 @@ +[ + (1.0, Item("common.items.food.meat.tough_raw")), + (2.0, Item("common.items.crafting_ing.animal_misc.venomsac")), + (2.0, Item("common.items.crafting_ing.hide.scales")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/ice.ron b/assets/common/loot_tables/creature/quad_medium/ice.ron index 3f21481cfe..4ac8226c7b 100644 --- a/assets/common/loot_tables/creature/quad_medium/ice.ron +++ b/assets/common/loot_tables/creature/quad_medium/ice.ron @@ -1,4 +1,4 @@ [ (1.0, Item("common.items.crafting_ing.hide.tough_hide")), - (1.0, Item("common.items.crafting_ing.icy_fang")), + (1.0, Item("common.items.crafting_ing.animal_misc.icy_fang")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/default.ron b/assets/common/loot_tables/creature/theropod/default.ron index 95e74724bd..14dbec1175 100644 --- a/assets/common/loot_tables/creature/theropod/default.ron +++ b/assets/common/loot_tables/creature/theropod/default.ron @@ -1,3 +1,3 @@ [ - (1.0, Item("common.items.crafting_ing.plate")), + (1.0, Item("common.items.crafting_ing.hide.plate")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/raptor.ron b/assets/common/loot_tables/creature/theropod/raptor.ron index 78fb3cba15..15a31e312a 100644 --- a/assets/common/loot_tables/creature/theropod/raptor.ron +++ b/assets/common/loot_tables/creature/theropod/raptor.ron @@ -1,4 +1,4 @@ [ (1.0, Item("common.items.crafting_ing.hide.tough_hide")), - (1.0, Item("common.items.crafting_ing.raptor_feather")), + (1.0, Item("common.items.crafting_ing.animal_misc.raptor_feather")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/materials/common.ron b/assets/common/loot_tables/materials/common.ron index b1a222d2c3..d6eb5a027d 100644 --- a/assets/common/loot_tables/materials/common.ron +++ b/assets/common/loot_tables/materials/common.ron @@ -1,6 +1,6 @@ [ (1.0, Item("common.items.crafting_ing.bowl")), (1.0, Item("common.items.crafting_ing.empty_vial")), - (2.0, Item("common.items.crafting_ing.cloth_scraps")), + (2.0, Item("common.items.crafting_ing.cloth.cloth_scraps")), (1.0, Item("common.items.crafting_ing.leather.leather_strips")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/materials/gems.ron b/assets/common/loot_tables/materials/gems.ron index ed6df318db..226beed85a 100644 --- a/assets/common/loot_tables/materials/gems.ron +++ b/assets/common/loot_tables/materials/gems.ron @@ -1,8 +1,8 @@ [ - (3.0, Item("common.items.crafting_ing.topaz")), - (3.0, Item("common.items.crafting_ing.amethyst")), - (1.6, Item("common.items.crafting_ing.sapphire")), - (1.2, Item("common.items.crafting_ing.emerald")), - (0.8, Item("common.items.crafting_ing.ruby")), - (0.4, Item("common.items.crafting_ing.diamond")), + (3.0, Item("common.items.mineral.gem.topaz")), + (3.0, Item("common.items.mineral.gem.amethyst")), + (1.6, Item("common.items.mineral.gem.sapphire")), + (1.2, Item("common.items.mineral.gem.emerald")), + (0.8, Item("common.items.mineral.gem.ruby")), + (0.4, Item("common.items.mineral.gem.diamond")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/trading.ron b/assets/common/loot_tables/trading.ron index 17b7bb0a68..4f2eb84909 100644 --- a/assets/common/loot_tables/trading.ron +++ b/assets/common/loot_tables/trading.ron @@ -1,5 +1,5 @@ // Loot table that exists purely for price rationalisation [ (1.0, Item("common.items.crafting_ing.honey")), - (0.5, Item("common.items.crafting_ing.icy_fang")), + (0.5, Item("common.items.crafting_ing.animal_misc.icy_fang")), ] diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index 9fc450422e..81c2683852 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -1,6 +1,6 @@ // Keep in mind that material stats are multiplied by the form stats, not added (e.g. equip_time_secs is most sensitive to this) ({ - "common.items.crafting_ing.bloodsteel_ingot": ( + "common.items.mineral.ingot.bloodsteel_ingot": ( equip_time_secs: 1.0, power: 1.75, poise_strength: 1.75, @@ -8,7 +8,7 @@ crit_chance: 1.75, crit_mult: 1.75, ), - "common.items.crafting_ing.bronze_ingot": ( + "common.items.mineral.ingot.bronze_ingot": ( equip_time_secs: 1.0, power: 0.75, poise_strength: 0.75, @@ -16,7 +16,7 @@ crit_chance: 0.75, crit_mult: 0.75, ), - "common.items.crafting_ing.cobalt_ingot": ( + "common.items.mineral.ingot.cobalt_ingot": ( equip_time_secs: 1.0, power: 1.5, poise_strength: 1.5, @@ -24,7 +24,7 @@ crit_chance: 1.5, crit_mult: 1.5, ), - "common.items.crafting_ing.copper_ingot": ( + "common.items.mineral.ingot.copper_ingot": ( equip_time_secs: 1.0, power: 0.4, poise_strength: 0.4, @@ -32,7 +32,7 @@ crit_chance: 0.4, crit_mult: 0.4, ), - "common.items.crafting_ing.iron_ingot": ( + "common.items.mineral.ingot.iron_ingot": ( equip_time_secs: 1.0, power: 1.0, poise_strength: 1.0, @@ -40,7 +40,7 @@ crit_chance: 1.0, crit_mult: 1.0, ), - "common.items.crafting_ing.steel_ingot": ( + "common.items.mineral.ingot.steel_ingot": ( equip_time_secs: 1.0, power: 1.25, poise_strength: 1.25, @@ -48,7 +48,7 @@ crit_chance: 1.25, crit_mult: 1.25, ), - "common.items.crafting_ing.tin_ingot": ( + "common.items.mineral.ingot.tin_ingot": ( equip_time_secs: 1.0, power: 0.25, poise_strength: 0.25, diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 4038de6a41..dbc75c1f98 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -25,9 +25,9 @@ craft_sprite: Some(CraftingBench), ), "velorite_frag": ( - output: ("common.items.ore.veloritefrag", 2), + output: ("common.items.mineral.ore.veloritefrag", 2), inputs: [ - (Item("common.items.ore.velorite"), 1), + (Item("common.items.mineral.ore.velorite"), 1), (Item("common.items.tool.craftsman_hammer"), 0), ], craft_sprite: Some(Anvil), @@ -45,7 +45,7 @@ output: ("common.items.consumable.potion_med", 1), inputs: [ (Item("common.items.consumable.potion_minor"), 2), - (Item("common.items.ore.veloritefrag"), 4), + (Item("common.items.mineral.ore.veloritefrag"), 4), ], craft_sprite: Some(Cauldron), ), @@ -53,7 +53,7 @@ output: ("common.items.utility.collar", 1), inputs: [ (Item("common.items.crafting_ing.leather.leather_strips"), 5), - (Item("common.items.crafting_ing.ruby"), 1), + (Item("common.items.mineral.gem.ruby"), 1), ], ), "bomb_coconut": ( @@ -61,7 +61,7 @@ inputs: [ (Item("common.items.crafting_ing.stones"), 10), (Item("common.items.food.coconut"), 2), - (Item("common.items.ore.veloritefrag"), 2), + (Item("common.items.mineral.ore.veloritefrag"), 2), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -72,7 +72,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -83,7 +83,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -94,7 +94,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -105,7 +105,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -116,7 +116,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -127,7 +127,7 @@ (Item("common.items.crafting_ing.twigs"), 1), (Item("common.items.crafting_ing.stones"), 1), (Item("common.items.food.coconut"), 1), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], craft_sprite: Some(CraftingBench), @@ -217,7 +217,7 @@ output: ("common.items.food.sunflower_icetea", 4), inputs: [ (Item("common.items.crafting_ing.empty_vial"), 1), - (Item("common.items.crafting_ing.icy_fang"), 1), + (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1), (Item("common.items.flowers.sunflower"), 4), (Item("common.items.crafting_ing.honey"), 1), ], @@ -228,7 +228,7 @@ inputs: [ (Item("common.items.crafting_ing.twigs"), 5), (Item("common.items.crafting_ing.leather.leather_strips"), 5), - (Item("common.items.crafting_ing.cloth_scraps"), 10), + (Item("common.items.crafting_ing.cloth.cloth_scraps"), 10), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -238,7 +238,7 @@ output: ("common.items.glider.glider_basic_red", 1), inputs: [ (Item("common.items.crafting_ing.twigs"), 5), - (Item("common.items.crafting_ing.cloth_scraps_red"), 10), + (Item("common.items.crafting_ing.cloth.cloth_scraps_red"), 10), (Item("common.items.crafting_ing.leather.thick_leather"), 4), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), @@ -250,8 +250,8 @@ inputs: [ (Item("common.items.crafting_ing.twigs"), 5), (Item("common.items.crafting_ing.leather.thick_leather"), 4), - (Item("common.items.crafting_ing.cloth_scraps"), 5), - (Item("common.items.crafting_ing.emerald"), 1), + (Item("common.items.crafting_ing.cloth.cloth_scraps"), 5), + (Item("common.items.mineral.gem.emerald"), 1), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -260,11 +260,11 @@ "Sand Raptor Wings": ( output: ("common.items.glider.glider_sandraptor", 1), inputs: [ - (Item("common.items.crafting_ing.raptor_feather"), 6), + (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.twigs"), 5), (Item("common.items.crafting_ing.leather.thick_leather"), 4), - (Item("common.items.crafting_ing.cloth_scraps"), 5), - (Item("common.items.crafting_ing.ruby"), 1), + (Item("common.items.crafting_ing.cloth.cloth_scraps"), 5), + (Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -273,12 +273,12 @@ "Snow Raptor Wings": ( output: ("common.items.glider.glider_snowraptor", 1), inputs: [ - (Item("common.items.crafting_ing.raptor_feather"), 6), + (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.twigs"), 5), (Item("common.items.crafting_ing.leather.thick_leather"), 4), - (Item("common.items.crafting_ing.cloth_scraps"), 5), - (Item("common.items.crafting_ing.icy_fang"), 1), - (Item("common.items.crafting_ing.ruby"), 1), + (Item("common.items.crafting_ing.cloth.cloth_scraps"), 5), + (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1), + (Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -287,11 +287,11 @@ "Wood Raptor Wings": ( output: ("common.items.glider.glider_woodraptor", 1), inputs: [ - (Item("common.items.crafting_ing.raptor_feather"), 6), + (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.twigs"), 15), (Item("common.items.crafting_ing.leather.leather_strips"), 5), - (Item("common.items.crafting_ing.cloth_scraps"), 5), - (Item("common.items.crafting_ing.ruby"), 1), + (Item("common.items.crafting_ing.cloth.cloth_scraps"), 5), + (Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -301,8 +301,8 @@ output: ("common.items.weapons.sceptre.loops0", 1), inputs: [ (Item("common.items.crafting_ing.twigs"), 20), - (Item("common.items.ore.veloritefrag"), 8), - (Item("common.items.crafting_ing.ruby"), 4), + (Item("common.items.mineral.ore.veloritefrag"), 8), + (Item("common.items.mineral.gem.ruby"), 4), (Item("common.items.tool.craftsman_hammer"), 0), ], ), @@ -320,11 +320,12 @@ inputs: [ (Item("common.items.crafting_ing.leather.leather_strips"), 4), (Item("common.items.crafting_ing.twigs"), 10), - (Item("common.items.ore.veloritefrag"), 1), + (Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.crafting_ing.stones"), 0), ], craft_sprite: Some(Anvil), ), +//ARMOR/LEATHER/ADVENTURER "adventure back": ( output: ("common.items.armor.agile.back", 1), inputs: [ @@ -381,20 +382,249 @@ ], craft_sprite: Some(CraftingBench), ), +//ARMOR/LEATHER/SCALE + "scale back": ( + output: ("common.items.armor.scale.back", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "scale belt": ( + output: ("common.items.armor.scale.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "scale chest": ( + output: ("common.items.armor.scale.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "scale feet": ( + output: ("common.items.armor.scale.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "scale hands": ( + output: ("common.items.armor.scale.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "scale pants": ( + output: ("common.items.armor.scale.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "scale shoulder": ( + output: ("common.items.armor.scale.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.scales"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/LEATHER/CARAPACE + "carapace back": ( + output: ("common.items.armor.carapace.back", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.carapace"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace belt": ( + output: ("common.items.armor.carapace.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.carapace"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace chest": ( + output: ("common.items.armor.carapace.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.carapace"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace feet": ( + output: ("common.items.armor.carapace.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.carapace"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace hands": ( + output: ("common.items.armor.carapace.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.carapace"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace pants": ( + output: ("common.items.armor.carapace.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.carapace"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "carapace shoulder": ( + output: ("common.items.armor.carapace.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.carapace"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/LEATHER/PLATESCALE + "platescale back": ( + output: ("common.items.armor.platescale.back", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "platescale belt": ( + output: ("common.items.armor.platescale.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "platescale chest": ( + output: ("common.items.armor.platescale.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "platescale feet": ( + output: ("common.items.armor.platescale.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "platescale hands": ( + output: ("common.items.armor.platescale.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "platescale pants": ( + output: ("common.items.armor.platescale.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "platescale shoulder": ( + output: ("common.items.armor.platescale.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), +//ARMOR/LEATHER/DRAGONSCALE + "dragonscale back": ( + output: ("common.items.armor.dragonscale.back", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.dragon_scale"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale belt": ( + output: ("common.items.armor.dragonscale.belt", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.dragon_scale"), 2), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale chest": ( + output: ("common.items.armor.dragonscale.chest", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.dragon_scale"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale feet": ( + output: ("common.items.armor.dragonscale.foot", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.dragon_scale"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale hands": ( + output: ("common.items.armor.dragonscale.hand", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.dragon_scale"), 4), + (Item("common.items.crafting_ing.leather.leather_strips"), 2), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale pants": ( + output: ("common.items.armor.dragonscale.pants", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.dragon_scale"), 8), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), + ], + craft_sprite: Some(CraftingBench), + ), + "dragonscale shoulder": ( + output: ("common.items.armor.dragonscale.shoulder", 1), + inputs: [ + (Item("common.items.crafting_ing.hide.dragon_scale"), 10), + (Item("common.items.crafting_ing.leather.leather_strips"), 6), + ], + craft_sprite: Some(CraftingBench), + ), + "Seashell Necklace": ( output: ("common.items.armor.misc.neck.shell", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps"), 2), - (Item("common.items.crafting_ing.sapphire"), 1), + (Item("common.items.crafting_ing.cloth.cloth_scraps"), 2), + (Item("common.items.mineral.gem.sapphire"), 1), (Item("common.items.crafting_ing.seashells"), 3), (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(CraftingBench), ), "red cloth": ( - output: ("common.items.crafting_ing.cloth_scraps_red", 1), + output: ("common.items.crafting_ing.cloth.cloth_scraps_red", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps"), 1), + (Item("common.items.crafting_ing.cloth.cloth_scraps"), 1), (Item("common.items.flowers.red"), 1), (Item("common.items.crafting_tools.mortar_pestle"), 0), ], @@ -402,7 +632,7 @@ "tiny red pouch": ( output: ("common.items.armor.misc.bag.tiny_red_pouch", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps_red"), 3), + (Item("common.items.crafting_ing.cloth.cloth_scraps_red"), 3), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), @@ -416,7 +646,7 @@ "knitted red pouch": ( output: ("common.items.armor.misc.bag.knitted_red_pouch", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps_red"), 3), + (Item("common.items.crafting_ing.cloth.cloth_scraps_red"), 3), (Item("common.items.armor.misc.bag.tiny_red_pouch"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -424,7 +654,7 @@ "woven red bag": ( output: ("common.items.armor.misc.bag.woven_red_bag", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps_red"), 6), + (Item("common.items.crafting_ing.cloth.cloth_scraps_red"), 6), (Item("common.items.armor.misc.bag.knitted_red_pouch"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -432,9 +662,9 @@ "traveler backpack": ( output: ("common.items.armor.misc.back.backpack", 1), inputs: [ - (Item("common.items.crafting_ing.diamond"), 2), + (Item("common.items.mineral.gem.diamond"), 2), (Item("common.items.crafting_ing.twigs"), 2), - (Item("common.items.crafting_ing.cloth_scraps"), 3), + (Item("common.items.crafting_ing.cloth.cloth_scraps"), 3), (Item("common.items.crafting_ing.leather.leather_strips"), 3), (Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), @@ -444,8 +674,8 @@ "sturdy red backpack": ( output: ("common.items.armor.misc.bag.sturdy_red_backpack", 1), inputs: [ - (Item("common.items.crafting_ing.diamond"), 2), - (Item("common.items.crafting_ing.cloth_scraps_red"), 3), + (Item("common.items.mineral.gem.diamond"), 2), + (Item("common.items.crafting_ing.cloth.cloth_scraps_red"), 3), (Item("common.items.crafting_ing.leather.thick_leather"), 3), (Item("common.items.armor.misc.bag.woven_red_bag"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), @@ -454,9 +684,9 @@ "troll hide pack": ( output: ("common.items.armor.misc.bag.troll_hide_pack", 1), inputs: [ - (Item("common.items.crafting_ing.leather_troll"), 10), + (Item("common.items.crafting_ing.hide.leather_troll"), 10), (Item("common.items.crafting_ing.leather.leather_strips"), 10), - (Item("common.items.crafting_ing.diamond"), 1), + (Item("common.items.mineral.gem.diamond"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), @@ -465,15 +695,15 @@ inputs: [ (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1), (Item("common.items.crafting_ing.leather.thick_leather"), 8), - (Item("common.items.crafting_ing.diamond"), 4), - (Item("common.items.ore.veloritefrag"), 10), + (Item("common.items.mineral.gem.diamond"), 4), + (Item("common.items.mineral.ore.veloritefrag"), 10), (Item("common.items.crafting_tools.sewing_set"), 0), ], ), "pickaxe": ( output: ("common.items.tool.pick", 1), inputs: [ - (Item("common.items.crafting_ing.cloth_scraps"), 1), // TODO: Replace with plant fiber when obtainable + (Item("common.items.crafting_ing.cloth.cloth_scraps"), 1), // TODO: Replace with plant fiber when obtainable (Item("common.items.crafting_ing.stones"), 5), // TODO: Replace with iron ingots when obtainable (Item("common.items.crafting_ing.twigs"), 4), (Item("common.items.tool.craftsman_hammer"), 0), @@ -481,7 +711,7 @@ craft_sprite: Some(Anvil), ), "cloth_scraps": ( - output: ("common.items.crafting_ing.cloth_scraps", 1), + output: ("common.items.crafting_ing.cloth.cloth_scraps", 1), inputs: [ (Tag(ClothItem), 1), (Item("common.items.crafting_tools.sewing_set"), 0), diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index f1d4216ed3..c3045d88bf 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -726,18 +726,18 @@ impl Item { SpriteKind::VialEmpty => "common.items.crafting_ing.empty_vial", SpriteKind::Bowl => "common.items.crafting_ing.bowl", SpriteKind::PotionMinor => "common.items.consumable.potion_minor", - SpriteKind::Amethyst => "common.items.crafting_ing.amethyst", - SpriteKind::Ruby => "common.items.crafting_ing.ruby", - SpriteKind::Diamond => "common.items.crafting_ing.diamond", - SpriteKind::Sapphire => "common.items.crafting_ing.sapphire", - SpriteKind::Topaz => "common.items.crafting_ing.topaz", - SpriteKind::Emerald => "common.items.crafting_ing.emerald", - SpriteKind::AmethystSmall => "common.items.crafting_ing.amethyst", - SpriteKind::TopazSmall => "common.items.crafting_ing.topaz", - SpriteKind::DiamondSmall => "common.items.crafting_ing.diamond", - SpriteKind::RubySmall => "common.items.crafting_ing.ruby", - SpriteKind::EmeraldSmall => "common.items.crafting_ing.emerald", - SpriteKind::SapphireSmall => "common.items.crafting_ing.sapphire", + SpriteKind::Amethyst => "common.items.mineral.gem.amethyst", + SpriteKind::Ruby => "common.items.mineral.gem.ruby", + SpriteKind::Diamond => "common.items.mineral.gem.diamond", + SpriteKind::Sapphire => "common.items.mineral.gem.sapphire", + SpriteKind::Topaz => "common.items.mineral.gem.topaz", + SpriteKind::Emerald => "common.items.mineral.emerald", + SpriteKind::AmethystSmall => "common.items.mineral.gem.amethyst", + SpriteKind::TopazSmall => "common.items.mineral.gem.topaz", + SpriteKind::DiamondSmall => "common.items.mineral.gem.diamond", + SpriteKind::RubySmall => "common.items.mineral.gem.ruby", + SpriteKind::EmeraldSmall => "common.items.mineral.emerald", + SpriteKind::SapphireSmall => "common.items.mineral.gem.sapphire", SpriteKind::Seashells => "common.items.crafting_ing.seashells", // Containers // IMPORTANT: Add any new container to `SpriteKind::is_container` diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index c51d5f6fda..5e6ed52000 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -401,7 +401,19 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc "common.loot_tables.creature.quad_low.maneater" }, quadruped_low::Species::Lavadrake => { - "common.loot_tables.creature.quad_low.lavadrake" + "common.loot_tables.creature.quad_low.carapace" + }, + quadruped_low::Species::Rocksnapper => { + "common.loot_tables.creature.quad_low.carapace" + }, + quadruped_low::Species::Asp => { + "common.loot_tables.creature.quad_low.venemous" + }, + quadruped_low::Species::Hakulaq => { + "common.loot_tables.creature.quad_low.fanged" + }, + quadruped_low::Species::Basilisk => { + "common.loot_tables.creature.quad_low.basilisk" }, _ => "common.loot_tables.creature.quad_low.default", }