From ac15e556f56f85b9779120a3be78b69fb86b19a9 Mon Sep 17 00:00:00 2001 From: DoctorKompot Date: Fri, 12 Nov 2021 17:40:59 +0200 Subject: [PATCH] added vox files for apple, coconut, collar, mushroom curry and admin tabard, update item image manifest accordingly --- assets/voxygen/item_image_manifest.ron | 56 ++++++++++--------- assets/voxygen/voxel/armor/tabard_admin.vox | 3 + assets/voxygen/voxel/object/apple.vox | 3 + assets/voxygen/voxel/object/coconut.vox | 3 + assets/voxygen/voxel/object/collar.vox | 3 + .../voxygen/voxel/object/mushroom_curry.vox | 3 + 6 files changed, 46 insertions(+), 25 deletions(-) create mode 100644 assets/voxygen/voxel/armor/tabard_admin.vox create mode 100644 assets/voxygen/voxel/object/apple.vox create mode 100644 assets/voxygen/voxel/object/coconut.vox create mode 100644 assets/voxygen/voxel/object/collar.vox create mode 100644 assets/voxygen/voxel/object/mushroom_curry.vox diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index dac7a550b2..3c1699250f 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1108,8 +1108,9 @@ "voxel.object.v-coin", (0.0, 0.0, 0.0), (-10.0, 15.0, 0.0), 0.8, ), - Utility(Collar): Png( - "element.items.collar", + Utility(Collar): VoxTrans( + "voxel.object.collar", + (0.1, 0.0, 0.0), (-60.0, 20.0, 10.0), 0.9, ), // Armor // Starter Parts @@ -2379,8 +2380,9 @@ ), // Tabards - Armor(Tabard("Admin")): Png( - "element.items.tabard_admin", + Armor(Tabard("Admin")): VoxTrans( + "voxel.armor.tabard_admin", + (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9, ), // Heads Armor(Head("Leather")): VoxTrans( @@ -2396,64 +2398,66 @@ (0.0, 15.0, 0.0), (-75.0, 135.0, 0.0), 3.0, ), // Bags - Armor(Bag("RedFace")): VoxTrans ( + Armor(Bag("RedFace")): VoxTrans( "voxel.armor.misc.bag.soulkeeper_cursed", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), - Armor(Bag("BlackHole")): VoxTrans ( + Armor(Bag("BlackHole")): VoxTrans( "voxel.armor.misc.bag.admin_black_hole", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), - Armor(Bag("BlueFace")): VoxTrans ( + Armor(Bag("BlueFace")): VoxTrans( "voxel.armor.misc.bag.soulkeeper_pure", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), - Armor(Bag("PurpleSkull")): VoxTrans ( + Armor(Bag("PurpleSkull")): VoxTrans( "voxel.armor.misc.bag.mindflayer_spellbag", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), - Armor(Bag("GreenLarge")): VoxTrans ( + Armor(Bag("GreenLarge")): VoxTrans( "voxel.armor.misc.bag.troll_hide_pack", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), - Armor(Bag("LeatherLarge")): VoxTrans ( + Armor(Bag("LeatherLarge")): VoxTrans( "voxel.armor.misc.bag.reliable_backpack", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), - Armor(Bag("GreenMid")): VoxTrans ( + Armor(Bag("GreenMid")): VoxTrans( "voxel.armor.misc.bag.liana_kit", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), - Armor(Bag("LeatherSmall")): VoxTrans ( + Armor(Bag("LeatherSmall")): VoxTrans( "voxel.armor.misc.bag.tiny_leather_pouch", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.8, ), - Armor(Bag("RedLarge")): VoxTrans ( + Armor(Bag("RedLarge")): VoxTrans( "voxel.armor.misc.bag.sturdy_red_backpack", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), - Armor(Bag("RedMed")): VoxTrans ( + Armor(Bag("RedMed")): VoxTrans( "voxel.armor.misc.bag.woven_red_bag", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), - Armor(Bag("RedSmall")): VoxTrans ( + Armor(Bag("RedSmall")): VoxTrans( "voxel.armor.misc.bag.knitted_red_pouch", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.8, ), - Armor(Bag("RedTiny")): VoxTrans ( + Armor(Bag("RedTiny")): VoxTrans( "voxel.armor.misc.bag.tiny_red_pouch", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.8, ), - Armor(Bag("BluePouch")): VoxTrans ( + Armor(Bag("BluePouch")): VoxTrans( "voxel.armor.misc.bag.heavy_seabag", (0.0, 0.0, 0.0), (-80.0, 20.0, 5.0), 0.9, ), // Consumables - Consumable("common.items.food.apple"): Png( - "element.items.item_apple", + Consumable("common.items.food.apple"): VoxTrans( + "voxel.object.apple", + (0.0, 0.5, 0.0), (-60.0, 30.0, 20.0), 0.9, ), - Consumable("common.items.food.coconut"): Png( - "element.items.item_coconut", + Consumable("common.items.food.coconut"): VoxTrans( + "voxel.object.coconut", + (0.0, 0.5, 0.0), (-55.0, 30.0, 20.0), 0.9, ), Consumable("common.items.food.cactus_colada"): VoxTrans( "voxel.object.cactus_drink", @@ -2475,8 +2479,9 @@ "voxel.object.potion_red", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, ), - Consumable("common.items.food.cheese"): Png( - "element.items.item_cheese", + Consumable("common.items.food.cheese"): VoxTrans( + "voxel.object.cheese-0", + (0.0, 0.0, 0.0), (-60.0, -10.0, 0.0), 0.8, ), Consumable("common.items.food.blue_cheese"): VoxTrans( "voxel.object.blue_cheese", @@ -2494,8 +2499,9 @@ "voxel.sprite.velorite.velorite_1", (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8, ), - Consumable("common.items.food.apple_mushroom_curry"): Png( - "element.items.item_apple_curry", + Consumable("common.items.food.apple_mushroom_curry"): VoxTrans( + "voxel.object.mushroom_curry", + (-0.3, 2.0, 0.0), (-50.0, 20.0, 17.0), 0.9, ), Consumable("common.items.food.spore_corruption"): VoxTrans( "voxel.sprite.spore.corruption_spore", diff --git a/assets/voxygen/voxel/armor/tabard_admin.vox b/assets/voxygen/voxel/armor/tabard_admin.vox new file mode 100644 index 0000000000..ecbfbb7c2e --- /dev/null +++ b/assets/voxygen/voxel/armor/tabard_admin.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc5fd855c828953085b82fe02643dbba8e3cf2987be3e0ce29c0cf8a725a3f13 +size 57972 diff --git a/assets/voxygen/voxel/object/apple.vox b/assets/voxygen/voxel/object/apple.vox new file mode 100644 index 0000000000..4e16d1ab70 --- /dev/null +++ b/assets/voxygen/voxel/object/apple.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7616be8382963a21f068f72e2c4c3034bd33f8c40bb6c544156eda6512405301 +size 3192 diff --git a/assets/voxygen/voxel/object/coconut.vox b/assets/voxygen/voxel/object/coconut.vox new file mode 100644 index 0000000000..bb4bde1f60 --- /dev/null +++ b/assets/voxygen/voxel/object/coconut.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acd5bed0e9c36399e7eeefb0682df64667f9441a39aaddb6dd0fb047e590b3ab +size 56259 diff --git a/assets/voxygen/voxel/object/collar.vox b/assets/voxygen/voxel/object/collar.vox new file mode 100644 index 0000000000..256c04220b --- /dev/null +++ b/assets/voxygen/voxel/object/collar.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fad24f6450d61d5949aa64a12d35a2a2d5d7adcb1e3097b4dc5e514efc246e1b +size 55936 diff --git a/assets/voxygen/voxel/object/mushroom_curry.vox b/assets/voxygen/voxel/object/mushroom_curry.vox new file mode 100644 index 0000000000..bf3f039bde --- /dev/null +++ b/assets/voxygen/voxel/object/mushroom_curry.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb91306dec47543cea8e5b78dfa0eabe3a5fbcf170953e71552f1c4aa46d9dbb +size 56956