diff --git a/assets/common/items/crafting_ing/animal_misc/venomsac.ron b/assets/common/items/crafting_ing/animal_misc/venom_sac.ron similarity index 100% rename from assets/common/items/crafting_ing/animal_misc/venomsac.ron rename to assets/common/items/crafting_ing/animal_misc/venom_sac.ron diff --git a/assets/common/items/crafting_ing/animal_misc/sticky_thread.ron b/assets/common/items/crafting_ing/sticky_thread.ron similarity index 100% rename from assets/common/items/crafting_ing/animal_misc/sticky_thread.ron rename to assets/common/items/crafting_ing/sticky_thread.ron diff --git a/assets/common/items/mineral/ore/coal.ron b/assets/common/items/mineral/ore/coal.ron new file mode 100644 index 0000000000..d3740f0a2f --- /dev/null +++ b/assets/common/items/mineral/ore/coal.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Coal", + description: "A dark, combustible energy source.", + kind: Ingredient( + kind: "Coal", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/loot_tables/creature/quad_low/venemous.ron b/assets/common/loot_tables/creature/quad_low/venemous.ron index 8f47538c65..152ac87559 100644 --- a/assets/common/loot_tables/creature/quad_low/venemous.ron +++ b/assets/common/loot_tables/creature/quad_low/venemous.ron @@ -1,5 +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.animal_misc.venom_sac")), (2.0, Item("common.items.crafting_ing.hide.scales")), ] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 38d0690a9f..943e6863df 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -170,20 +170,131 @@ ], craft_sprite: Some(CookingPot), ), - "simple_leather": ( + "simple leather": ( output: ("common.items.crafting_ing.leather.simple_leather", 1), inputs: [ (Item("common.items.crafting_ing.hide.animal_hide"), 1), ], craft_sprite: Some(CraftingBench), ), - "thick_leather": ( + "thick leather": ( output: ("common.items.crafting_ing.leather.thick_leather", 1), inputs: [ (Item("common.items.crafting_ing.hide.tough_hide"), 1), ], craft_sprite: Some(CraftingBench), ), + "gold ingot": ( + output: ("common.items.mineral.ingot.gold", 1), + inputs: [ + (Item("common.items.mineral.ore.gold_ore"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "silver ingot": ( + output: ("common.items.mineral.ingot.silver", 1), + inputs: [ + (Item("common.items.mineral.ore.silver_ore"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + + "iron ingot": ( + output: ("common.items.mineral.ingot.iron", 1), + inputs: [ + (Item("common.items.mineral.ore.iron_ore"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "cobalt ingot": ( + output: ("common.items.mineral.ingot.cobalt", 1), + inputs: [ + (Item("common.items.mineral.ore.cobalt_ore"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "tin ingot": ( + output: ("common.items.mineral.ingot.tin", 2), + inputs: [ + (Item("common.items.mineral.ore.tin_ore"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "orichalcum ingot": ( + output: ("common.items.mineral.ingot.orichalcum", 2), + inputs: [ + (Item("common.items.mineral.ore.gold_ore"), 1), + (Item("common.items.mineral.ore.silver_ore"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "copper ingot": ( + output: ("common.items.mineral.ingot.copper", 2), + inputs: [ + (Item("common.items.mineral.ore.copper_ore"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "bloodsteel ingot": ( + output: ("common.items.mineral.ingot.bloodsteel", 2), + inputs: [ + (Item("common.items.mineral.ore.bloodstone_ore"), 1), + (Item("common.items.mineral.ore.iron_ore"), 1), + (Item("common.items.mineral.ore.coal"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "steel ingot": ( + output: ("common.items.mineral.ingot.steel", 1), + inputs: [ + (Item("common.items.mineral.ore.iron_ore"), 1), + (Item("common.items.mineral.ore.coal"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "bronze ingot": ( + output: ("common.items.mineral.ingot.bronze", 2), + inputs: [ + (Item("common.items.mineral.ore.copper_ore"), 1), + (Item("common.items.mineral.ore.tin_ore"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "linen": ( + output: ("common.items.crafting_ing.cloth.linen", 1), + inputs: [ + (Item("common.items.crafting_ing.plant_fiber"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "silk": ( + output: ("common.items.crafting_ing.cloth.silk", 1), + inputs: [ + (Item("common.items.crafting_ing.sticky_thread"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "lifecloth": ( + output: ("common.items.crafting_ing.cloth.lifecloth", 1), + inputs: [ + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "moonweave": ( + output: ("common.items.crafting_ing.cloth.moonweave", 1), + inputs: [ + (Item("common.items.flowers.moonbell"), 1), + ], + craft_sprite: Some(CraftingBench), + ), + "sunsilk": ( + output: ("common.items.crafting_ing.cloth.sunsilk", 1), + inputs: [ + (Item("common.items.flowers.pyrebloom"), 1), + ], + craft_sprite: Some(CraftingBench), + ), "salad_plain": ( output: ("common.items.food.plainsalad", 1), inputs: [ diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 64dbd1bb9d..b8f8a832bf 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1250,56 +1250,6 @@ "voxel.armor.leather_plate.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), - //Leather0 Armor - Armor(Chest("Leather")): VoxTrans( - "voxel.armor.hide.leather.chest", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Pants("Leather")): VoxTrans( - "voxel.armor.hide.leather.pants", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Belt("Leather")): VoxTrans( - "voxel.armor.hide.leather.belt", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, - ), - Armor(Foot("Leather")): VoxTrans( - "voxel.armor.hide.leather.foot", - (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, - ), - Armor(Hand("Leather")): VoxTrans( - "voxel.armor.hide.leather.hand", - (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, - ), - Armor(Shoulder("Leather")): VoxTrans( - "voxel.armor.hide.leather.shoulder", - (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, - ), - //Rawhide Armor - Armor(Chest("Rawhide")): VoxTrans( - "voxel.armor.hide.rawhide.chest", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Pants("Rawhide")): VoxTrans( - "voxel.armor.hide.rawhide.pants", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, - ), - Armor(Belt("Rawhide")): VoxTrans( - "voxel.armor.hide.rawhide.belt", - (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, - ), - Armor(Foot("Rawhide")): VoxTrans( - "voxel.armor.hide.rawhide.foot", - (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, - ), - Armor(Hand("Rawhide")): VoxTrans( - "voxel.armor.hide.rawhide.hand", - (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, - ), - Armor(Shoulder("Rawhide")): VoxTrans( - "voxel.armor.hide.rawhide.shoulder", - (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, - ), //Ferocious Armor Armor(Chest("Ferocious")): VoxTrans( "voxel.armor.ferocious.chest", @@ -1620,6 +1570,64 @@ "voxel.armor.warlock.shoulder", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), + //Rawhide Set + Armor(Chest("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, + ), + Armor(Foot("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Rawhide")): VoxTrans( + "voxel.armor.hide.rawhide.back", + (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0, + ), + //Leather set + Armor(Chest("Leather")): VoxTrans( + "voxel.armor.hide.leather.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("Leather")): VoxTrans( + "voxel.armor.hide.leather.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt("Leather")): VoxTrans( + "voxel.armor.hide.leather.belt", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, + ), + Armor(Foot("Leather")): VoxTrans( + "voxel.armor.hide.leather.foot", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("Leather")): VoxTrans( + "voxel.armor.hide.leather.hand", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("Leather")): VoxTrans( + "voxel.armor.hide.leather.shoulder", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Back("Leather")): VoxTrans( + "voxel.armor.hide.leather.back", + (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0, + ), //Scale Set Armor(Chest("Scale")): VoxTrans( "voxel.armor.hide.scale.chest", @@ -2135,10 +2143,6 @@ "voxel.armor.misc.back.dungeon_purple", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0, ), - Armor(Back("Rawhide")): VoxTrans( - "voxel.armor.hide.rawhide.back", - (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0, - ), Armor(Back("LeatherBlue")): VoxTrans( "voxel.armor.leather_blue.back", (0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0, @@ -2441,45 +2445,129 @@ "voxel.sprite.crafting_ing.leather.leather_strips", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), + Ingredient("Plate"): VoxTrans( + "voxel.sprite.crafting_ing.hide.plate", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0, + ), + Ingredient("Carapace"): VoxTrans( + "voxel.sprite.crafting_ing.hide.carapace", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("Scale"): VoxTrans( + "voxel.sprite.crafting_ing.hide.scale", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("DragonScale"): VoxTrans( + "voxel.sprite.crafting_ing.hide.dragon_scale", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), Ingredient("Claw"): VoxTrans( "voxel.sprite.crafting_ing.claw", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("Plate"): VoxTrans( - "voxel.sprite.crafting_ing.plate", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0, - ), - Ingredient("Leather"): VoxTrans( - "voxel.sprite.crafting_ing.leather", + Ingredient("VenomSac"): VoxTrans( + "voxel.sprite.crafting_ing.venom_sac", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("DragonScale"): VoxTrans( - "voxel.sprite.crafting_ing.dragon_scale", + Ingredient("PlantFiber"): VoxTrans( + "voxel.sprite.crafting_ing.plant_fiber", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), + Ingredient("Linen"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.linen", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Wool"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.wool", + (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + ), + Ingredient("Silk"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.silk", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Lifecloth"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.lifecloth", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Moonweave"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.moonweave", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), + Ingredient("Sunsilk"): VoxTrans( + "voxel.sprite.crafting_ing.cloth.sunsilk", + (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, + ), Ingredient("SilverIngot"): VoxTrans( - "voxel.sprite.crafting_ing.silver_ingot", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + "voxel.sprite.mineral.ingot.silver", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), Ingredient("GoldIngot"): VoxTrans( - "voxel.sprite.crafting_ing.gold_ingot", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, - ), - Ingredient("GoldOre"): VoxTrans( - "voxel.sprite.crafting_ing.gold_ore_drop", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, - ), - Ingredient("SilverOre"): VoxTrans( - "voxel.sprite.crafting_ing.silver_ore_drop", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.8, + "voxel.sprite.mineral.ingot.gold", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), Ingredient("OrichalcumIngot"): VoxTrans( - "voxel.sprite.crafting_ing.orichalcum_ingot", + "voxel.sprite.mineral.ingot.orichalcum", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("BloodsteelIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.bloodsteel", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("BronzeIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.bronze", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("CobaltIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.cobalt", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("CopperIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.copper", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("IronIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.iron", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("SteelIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.steel", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("TinIngot"): VoxTrans( + "voxel.sprite.mineral.ingot.tin", + (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, + ), + Ingredient("GoldOre"): VoxTrans( + "voxel.sprite.mineral.ore.gold", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("SilverOre"): VoxTrans( + "voxel.sprite.mineral.ore.silver", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("OrichalcumIngot"): VoxTrans( + "voxel.sprite.mineral.ore.orichalcum", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("Scale"): VoxTrans( - "voxel.sprite.crafting_ing.scale", - (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, + Ingredient("BloodsteelOre"): VoxTrans( + "voxel.sprite.mineral.ore.bloodsteel", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("CobaltOre"): VoxTrans( + "voxel.sprite.mineral.ore.cobalt", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("CopperOre"): VoxTrans( + "voxel.sprite.mineral.ore.copper", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("IronOre"): VoxTrans( + "voxel.sprite.mineral.ore.iron", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, + ), + Ingredient("TinOre"): VoxTrans( + "voxel.sprite.mineral.ore.tin", + (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8, ), Ingredient("Honey"): Png( "element.items.item_honey", @@ -2568,27 +2656,27 @@ ), // Gems Ingredient("Amethyst"): VoxTrans( - "voxel.sprite.gem.amethystgem", + "voxel.sprite.mineral.gem.amethystgem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Ingredient("Topaz"): VoxTrans( - "voxel.sprite.gem.topazgem", + "voxel.sprite.mineral.gem.topazgem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Ingredient("Sapphire"): VoxTrans( - "voxel.sprite.gem.sapphiregem", + "voxel.sprite.mineral.gem.sapphiregem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.6, ), Ingredient("Emerald"): VoxTrans( - "voxel.sprite.gem.emeraldgem", + "voxel.sprite.mineral.gem.emeraldgem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Ingredient("Ruby"): VoxTrans( - "voxel.sprite.gem.rubygem", + "voxel.sprite.mineral.gem.rubygem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Ingredient("Diamond"): VoxTrans( - "voxel.sprite.gem.diamondgem", + "voxel.sprite.mineral.gem.diamondgem", (0.0, 0.0, 0.0), (-55.0, 30.0, 20.0), 0.6, ), ModularComponent("common.items.crafting_ing.modular.damage.sword.tier5"): VoxTrans( diff --git a/assets/voxygen/voxel/sprite/crafting_ing/venom_sac.vox b/assets/voxygen/voxel/sprite/crafting_ing/animal_misc/venom_sac.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/venom_sac.vox rename to assets/voxygen/voxel/sprite/crafting_ing/animal_misc/venom_sac.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/cloth/wool.vox b/assets/voxygen/voxel/sprite/crafting_ing/cloth/wool.vox new file mode 100644 index 0000000000..9b5beb80ac --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/cloth/wool.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:557ae779035b131f117510f8a2ed2448aa13b23a01e2aadf4d591cfb69f9f96e +size 2040 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/hide/carapace.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/carapace.vox new file mode 100644 index 0000000000..114cee75db --- /dev/null +++ b/assets/voxygen/voxel/sprite/crafting_ing/hide/carapace.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c97130d54f374739f8aa182eb10f7aa20d2583525f09f595b561c5035125b37 +size 1352 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/dragon_scale.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/dragon_scale.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/dragon_scale.vox rename to assets/voxygen/voxel/sprite/crafting_ing/hide/dragon_scale.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/plate.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/plate.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/plate.vox rename to assets/voxygen/voxel/sprite/crafting_ing/hide/plate.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/scale.vox b/assets/voxygen/voxel/sprite/crafting_ing/hide/scale.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/scale.vox rename to assets/voxygen/voxel/sprite/crafting_ing/hide/scale.vox diff --git a/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox b/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox index 988c21c22c..fbf810c904 100644 --- a/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox +++ b/assets/voxygen/voxel/sprite/food/meat/tough_raw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71bb21f8756acd87e1c9c2a47653553b17c07cd6b1bc81c2bce0ad9d58922e28 +oid sha256:b91604a31137cef5803bba645bdb12759fbde7ba5e91c270f11dbb705a5cf6a0 size 1816 diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/bloodstone.vox b/assets/voxygen/voxel/sprite/mineral/deposit/bloodstone.vox new file mode 100644 index 0000000000..7ec4dfe872 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/deposit/bloodstone.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8272af67384202ecc9fb0ff0e7dfc7fa1f93105c7da2f1ecf2edb4f46044c096 +size 2228 diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/coal.vox b/assets/voxygen/voxel/sprite/mineral/deposit/coal.vox new file mode 100644 index 0000000000..8036bd718c --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/deposit/coal.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0818816670a55f46edf0cfd730add93e157045102b8928874114657bb70e6f4 +size 2372 diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/cobalt.vox b/assets/voxygen/voxel/sprite/mineral/deposit/cobalt.vox new file mode 100644 index 0000000000..9a66eea5dd --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/deposit/cobalt.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ed9188532a2c2dbcf46dc4dce8f977cff8635e504d94fda918c82cd99702364 +size 2372 diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/copper.vox b/assets/voxygen/voxel/sprite/mineral/deposit/copper.vox new file mode 100644 index 0000000000..61a8056232 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/deposit/copper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d737c3d77bd8a0b89243aeb9bf569496038e4d41a5a247b01499f89eda5fdfc4 +size 2372 diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/iron.vox b/assets/voxygen/voxel/sprite/mineral/deposit/iron.vox new file mode 100644 index 0000000000..36be977765 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/deposit/iron.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55d608a594955b6b2ddddea605d323450b8daa5eed264b8b4afe413d695ce2aa +size 2372 diff --git a/assets/voxygen/voxel/sprite/mineral/deposit/tin.vox b/assets/voxygen/voxel/sprite/mineral/deposit/tin.vox new file mode 100644 index 0000000000..8cfe3fda7a --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/deposit/tin.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:313c16d8b76353ca559140668a209a0c58d47fc4806642979cf810cc508d72a6 +size 2372 diff --git a/assets/voxygen/voxel/sprite/gem/amethyst-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/amethyst-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/amethyst-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/amethyst-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/amethyst_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/amethyst_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/amethyst_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/amethystgem.vox b/assets/voxygen/voxel/sprite/mineral/gem/amethystgem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/amethystgem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/amethystgem.vox diff --git a/assets/voxygen/voxel/sprite/gem/diamond-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/diamond-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/diamond-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/diamond-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/diamond_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/diamond_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/diamond_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/diamond_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/diamondgem.vox b/assets/voxygen/voxel/sprite/mineral/gem/diamondgem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/diamondgem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/diamondgem.vox diff --git a/assets/voxygen/voxel/sprite/gem/emerald-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/emerald-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/emerald-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/emerald-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/emerald_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/emerald_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/emerald_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/emerald_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/emeraldgem.vox b/assets/voxygen/voxel/sprite/mineral/gem/emeraldgem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/emeraldgem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/emeraldgem.vox diff --git a/assets/voxygen/voxel/sprite/gem/gem_blue.vox b/assets/voxygen/voxel/sprite/mineral/gem/gem_blue.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/gem_blue.vox rename to assets/voxygen/voxel/sprite/mineral/gem/gem_blue.vox diff --git a/assets/voxygen/voxel/sprite/gem/gem_green.vox b/assets/voxygen/voxel/sprite/mineral/gem/gem_green.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/gem_green.vox rename to assets/voxygen/voxel/sprite/mineral/gem/gem_green.vox diff --git a/assets/voxygen/voxel/sprite/gem/gem_red.vox b/assets/voxygen/voxel/sprite/mineral/gem/gem_red.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/gem_red.vox rename to assets/voxygen/voxel/sprite/mineral/gem/gem_red.vox diff --git a/assets/voxygen/voxel/sprite/gem/ruby-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/ruby-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/ruby-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/ruby-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/ruby_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/ruby_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/ruby_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/ruby_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/rubygem.vox b/assets/voxygen/voxel/sprite/mineral/gem/rubygem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/rubygem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/rubygem.vox diff --git a/assets/voxygen/voxel/sprite/gem/sapphire-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/sapphire-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/sapphire-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/sapphire-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/sapphire_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/sapphire_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/sapphire_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/sapphiregem.vox b/assets/voxygen/voxel/sprite/mineral/gem/sapphiregem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/sapphiregem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/sapphiregem.vox diff --git a/assets/voxygen/voxel/sprite/gem/topaz-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/topaz-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/topaz-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/topaz-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/topaz_S-0.vox b/assets/voxygen/voxel/sprite/mineral/gem/topaz_S-0.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/topaz_S-0.vox rename to assets/voxygen/voxel/sprite/mineral/gem/topaz_S-0.vox diff --git a/assets/voxygen/voxel/sprite/gem/topazgem.vox b/assets/voxygen/voxel/sprite/mineral/gem/topazgem.vox similarity index 100% rename from assets/voxygen/voxel/sprite/gem/topazgem.vox rename to assets/voxygen/voxel/sprite/mineral/gem/topazgem.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/bloodsteel.vox b/assets/voxygen/voxel/sprite/mineral/ingot/bloodsteel.vox new file mode 100644 index 0000000000..751c105d1f --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ingot/bloodsteel.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97459a86e998c7e1008f02ad01565b282631d125a162ba941878d2fa714c2b2d +size 1280 diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/bronze.vox b/assets/voxygen/voxel/sprite/mineral/ingot/bronze.vox new file mode 100644 index 0000000000..e43312096e --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ingot/bronze.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6eaae5bf5f0ee3deca24e4c8c189a65027586486652bfc65fd20c9eab32b1ede +size 1232 diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/cobalt.vox b/assets/voxygen/voxel/sprite/mineral/ingot/cobalt.vox new file mode 100644 index 0000000000..b8c94e74e9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ingot/cobalt.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d0cf2cceb261911764c4834744a294e4016ca24cf4ebb70620729fc694869f4 +size 1272 diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/copper.vox b/assets/voxygen/voxel/sprite/mineral/ingot/copper.vox new file mode 100644 index 0000000000..400003936d --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ingot/copper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c02b7fa651cba4fb6267c101849347e49471b2c281db5e49b14986c85738c6f4 +size 1192 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/gold_ingot.vox b/assets/voxygen/voxel/sprite/mineral/ingot/gold.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/gold_ingot.vox rename to assets/voxygen/voxel/sprite/mineral/ingot/gold.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/iron.vox b/assets/voxygen/voxel/sprite/mineral/ingot/iron.vox new file mode 100644 index 0000000000..5f87df0628 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ingot/iron.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5a6354364caf3d8cc7a2822e8cf08c37ec2bdb0fdbf2c1573d9a722d4cc18f5 +size 1240 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox b/assets/voxygen/voxel/sprite/mineral/ingot/orichalcum.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/orichalcum_ingot.vox rename to assets/voxygen/voxel/sprite/mineral/ingot/orichalcum.vox diff --git a/assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox b/assets/voxygen/voxel/sprite/mineral/ingot/silver.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/silver_ingot.vox rename to assets/voxygen/voxel/sprite/mineral/ingot/silver.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/steel.vox b/assets/voxygen/voxel/sprite/mineral/ingot/steel.vox new file mode 100644 index 0000000000..5c43b442e4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ingot/steel.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4f72831ad0ff2115b733b2a0e66f55725973fae7b508f3e1bd70d5c8418d296 +size 1272 diff --git a/assets/voxygen/voxel/sprite/mineral/ingot/tin.vox b/assets/voxygen/voxel/sprite/mineral/ingot/tin.vox new file mode 100644 index 0000000000..714debbb6c --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ingot/tin.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae13071c619b041fd57ddaceaede341e184c123e2a477dcc397aa233ec86dfdc +size 1200 diff --git a/assets/voxygen/voxel/sprite/mineral/ore/bloodstone.vox b/assets/voxygen/voxel/sprite/mineral/ore/bloodstone.vox new file mode 100644 index 0000000000..438ebf0444 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ore/bloodstone.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51e1a4f5513ef80b810ed76f7b01f8ff58bb5f19eb7a98fb6a7fde3436273440 +size 1384 diff --git a/assets/voxygen/voxel/sprite/mineral/ore/coal.vox b/assets/voxygen/voxel/sprite/mineral/ore/coal.vox new file mode 100644 index 0000000000..839abed9c7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ore/coal.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bc17b941ab277aae3559764789546a15fa8d56e82a9b849f9310e70fd17f62e +size 1408 diff --git a/assets/voxygen/voxel/sprite/mineral/ore/cobalt.vox b/assets/voxygen/voxel/sprite/mineral/ore/cobalt.vox new file mode 100644 index 0000000000..b92c5aa0a8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ore/cobalt.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a70804b95cb066dd3e46cfd47b27a02958b50e02a67f348d0da39abe5d31c5f +size 1288 diff --git a/assets/voxygen/voxel/sprite/mineral/ore/copper.vox b/assets/voxygen/voxel/sprite/mineral/ore/copper.vox new file mode 100644 index 0000000000..1ae7493f23 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ore/copper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a02a7d874be3e5cf61a84024206650e39aa7f5a90cefb5c133cdd8caa151caf +size 1364 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/gold_ore_drop.vox b/assets/voxygen/voxel/sprite/mineral/ore/gold.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/gold_ore_drop.vox rename to assets/voxygen/voxel/sprite/mineral/ore/gold.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ore/iron.vox b/assets/voxygen/voxel/sprite/mineral/ore/iron.vox new file mode 100644 index 0000000000..5a465f9379 --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ore/iron.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a15e355bdaeba7d25a731a994588161d15ef2370cb4b084a89d54752bff3e704 +size 1304 diff --git a/assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox b/assets/voxygen/voxel/sprite/mineral/ore/silver.vox similarity index 100% rename from assets/voxygen/voxel/sprite/crafting_ing/silver_ore_drop.vox rename to assets/voxygen/voxel/sprite/mineral/ore/silver.vox diff --git a/assets/voxygen/voxel/sprite/mineral/ore/tin.vox b/assets/voxygen/voxel/sprite/mineral/ore/tin.vox new file mode 100644 index 0000000000..c265bc6bcc --- /dev/null +++ b/assets/voxygen/voxel/sprite/mineral/ore/tin.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2306340c1a7a0e2b7b9d9b57c4ef7c56f27e136d626e39cc43073a0f13d2af8e +size 1316 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 0e997614ec..7eb1a01dfc 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -2774,7 +2774,7 @@ Mud: Some(( Amethyst: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.amethyst-0", + model: "voxygen.voxel.sprite.mineral.gem.amethyst-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2785,7 +2785,7 @@ Amethyst: Some(( Ruby: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.ruby-0", + model: "voxygen.voxel.sprite.mineral.gem.ruby-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2796,7 +2796,7 @@ Ruby: Some(( Diamond: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.diamond-0", + model: "voxygen.voxel.sprite.mineral.gem.diamond-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2807,7 +2807,7 @@ Diamond: Some(( Sapphire: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.sapphire-0", + model: "voxygen.voxel.sprite.mineral.gem.sapphire-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2818,7 +2818,7 @@ Sapphire: Some(( Emerald: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.emerald-0", + model: "voxygen.voxel.sprite.mineral.gem.emerald-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2829,7 +2829,7 @@ Emerald: Some(( Topaz: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.topaz-0", + model: "voxygen.voxel.sprite.mineral.gem.topaz-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2840,7 +2840,7 @@ Topaz: Some(( AmethystSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.amethyst_S-0", + model: "voxygen.voxel.sprite.mineral.gem.amethyst_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2851,7 +2851,7 @@ AmethystSmall: Some(( TopazSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.topaz_S-0", + model: "voxygen.voxel.sprite.mineral.gem.topaz_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2862,7 +2862,7 @@ TopazSmall: Some(( RubySmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.ruby_S-0", + model: "voxygen.voxel.sprite.mineral.gem.ruby_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2873,7 +2873,7 @@ RubySmall: Some(( EmeraldSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.emerald_S-0", + model: "voxygen.voxel.sprite.mineral.gem.emerald_S-0", offset: (-5.5, -5.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2884,7 +2884,7 @@ EmeraldSmall: Some(( DiamondSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.diamond_S-0", + model: "voxygen.voxel.sprite.mineral.gem.diamond_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ), @@ -2895,7 +2895,7 @@ DiamondSmall: Some(( SapphireSmall: Some(( variations: [ ( - model: "voxygen.voxel.sprite.gem.sapphire_S-0", + model: "voxygen.voxel.sprite.mineral.gem.sapphire_S-0", offset: (-3.5, -3.5, 0.0), lod_axes: (0.0, 0.0, 0.0), ),