From 23434117a3cfd8223eb8da170ed614532eed5e9e Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Wed, 3 Nov 2021 00:37:59 +0100
Subject: [PATCH 01/39] + Updating item_image_manifest to Master (was behind)

---
 assets/voxygen/item_image_manifest.ron | 4778 ++++++++++--------------
 1 file changed, 1889 insertions(+), 2889 deletions(-)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 117d8b69f0..6e7a0d6c9d 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1,2891 +1,1891 @@
-//  Png(specifier),
-//  Vox(specier),
-//  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
-({
-    // Crafting Stations
-    Tool("Anvil"): VoxTrans(
-        "voxel.sprite.anvil.anvil-0",
-        (0.5, 0.5, 0.0), (0.0, 60.0, 90.0), 1.0,
-    ),
-    Tool("Cauldron"): VoxTrans(
-        "voxel.sprite.cauldron.cauldron-0",
-        (0.0, 0.0, 0.0), (-50.0, 40.0, 30.0), 1.0,
-    ),
-    Tool("CookingPot"): VoxTrans(
-        "voxel.sprite.cooking_pot.pot-0",
-        (0.0, 0.0, 0.0), (0.0, 90.0, 90.0), 1.2,
-    ),
-    Tool("CraftingBench"): VoxTrans(
-        "voxel.sprite.crafting_bench.crafting_bench-0",
-       (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0,
-    ),
-    Tool("Forge"): VoxTrans(
-        "voxel.object.forge",
-       (0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0,
-    ),
-    Tool("Loom"): VoxTrans(
-        "voxel.object.loom",
-       (0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0,
-    ),
-    Tool("SpinningWheel"): VoxTrans(
-        "voxel.object.spinning_wheel",
-       (0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0,
-    ),
-    Tool("TanningRack"): VoxTrans(
-        "voxel.object.tanning_rack",
-       (0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0,
-    ),
-    Tool("DismantlingBench"): VoxTrans(
-        "voxel.sprite.salvaging_station.salvaging_station-0",
-       (0.0, 0.0, 0.0), (-50.0, 40.0, 30.0), 0.9,
-    ),
-    // Weapons
-    // Diary Example Images
-    Tool("example_utility"): VoxTrans(
-        "voxel.weapon.projectile.fireworks_green-0",
-        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Tool("example_sword"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_dullahan",
-        (0.0, 0.0, 0.0), (90.0, 80.0, 0.0), 1.0,
-    ),
-    Tool("example_axe"): VoxTrans(
-        "voxel.weapon.axe.2haxe_bloodsteel-0",
-       (0.0, 0.0, 0.0), (-90.0, 70.0, 0.0), 1.0,
-    ),
-    Tool("example_hammer"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_ramshead",
-        (-1.0, 0.0, 0.0), (-70.0, 55.0, 0.0), 1.0,
-    ),
-    Tool("example_bow"): VoxTrans(
-        "voxel.weapon.bow.velorite",
-        (-1.0, 0.0, 0.0), (90.0, 60.0, 0.0), 1.0,
-    ),
-    Tool("example_staff_fire"): VoxTrans(
-        "voxel.weapon.staff.firestaff_saurok",
-        (-1.0, 0.0, 0.0), (-100.0, -140.0, 0.0), 1.0,
-    ),
-    Tool("example_sceptre"): VoxTrans(
-        "voxel.weapon.sceptre.wood-nature",
-        (-1.0, 0.0, 0.0), (-90.0, 55.0, 0.0), 1.0,
-    ),
-    Tool("example_pick"): VoxTrans(
-        "voxel.weapon.tool.pickaxe_green-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("example_dagger"): VoxTrans(
-        "voxel.weapon.dagger.dagger_basic-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("example_shield"): VoxTrans(
-        "voxel.weapon.shield.wood-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("example_general_combat_left"): VoxTrans(
-        "voxel.weapon.sword.long_2h_saurok",
-        (0.0, 0.0, 0.0), (85.0, -90.0, -40.0), 1.0,
-    ),
-    Tool("example_general_combat_right"): VoxTrans(
-        "voxel.weapon.sword.long_2h_saurok",
-        (0.0, 0.0, 0.0), (125.0, 90.0, 80.0), 1.0,
-    ),
-    // Bows
-    Tool("common.items.weapons.bow.bone-0"): VoxTrans(
-        "voxel.weapon.bow.bone-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.bone-1"): VoxTrans(
-        "voxel.weapon.bow.bone-1",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.bone-2"): VoxTrans(
-        "voxel.weapon.bow.bone-2",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.bone-3"): VoxTrans(
-        "voxel.weapon.bow.bone-3",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.eldwood-0"): VoxTrans(
-        "voxel.weapon.bow.eldwood-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.eldwood-1"): VoxTrans(
-        "voxel.weapon.bow.eldwood-1",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.eldwood-2"): VoxTrans(
-        "voxel.weapon.bow.eldwood-2",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.frostwood-0"): VoxTrans(
-        "voxel.weapon.bow.frostwood-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.frostwood-1"): VoxTrans(
-        "voxel.weapon.bow.frostwood-1",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.frostwood-2"): VoxTrans(
-        "voxel.weapon.bow.frostwood-2",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.hardwood-0"): VoxTrans(
-        "voxel.weapon.bow.hardwood-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.hardwood-1"): VoxTrans(
-        "voxel.weapon.bow.hardwood-1",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.hardwood-2"): VoxTrans(
-        "voxel.weapon.bow.hardwood-2",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.hardwood-3"): VoxTrans(
-        "voxel.weapon.bow.hardwood-3",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.hardwood-4"): VoxTrans(
-        "voxel.weapon.bow.hardwood-4",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.hardwood-5"): VoxTrans(
-        "voxel.weapon.bow.hardwood-5",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.metal-0"): VoxTrans(
-        "voxel.weapon.bow.metal-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.metal-1"): VoxTrans(
-        "voxel.weapon.bow.metal-1",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.metal-2"): VoxTrans(
-        "voxel.weapon.bow.metal-2",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.metal-3"): VoxTrans(
-        "voxel.weapon.bow.metal-3",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.metal-4"): VoxTrans(
-        "voxel.weapon.bow.metal-4",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.rawwood-0"): VoxTrans(
-        "voxel.weapon.bow.rawwood-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.rawwood-1"): VoxTrans(
-        "voxel.weapon.bow.rawwood-1",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.sagitta"): VoxTrans(
-        "voxel.weapon.bow.sagitta",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.starter"): VoxTrans(
-        "voxel.weapon.bow.starter",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.velorite"): VoxTrans(
-        "voxel.weapon.bow.velorite",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.debug.velorite_bow_debug"): VoxTrans(
-        "voxel.weapon.bow.velorite",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.wood-0"): VoxTrans(
-        "voxel.weapon.bow.wood-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.wood-1"): VoxTrans(
-        "voxel.weapon.bow.wood-1",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.wood-2"): VoxTrans(
-        "voxel.weapon.bow.wood-2",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.wood-3"): VoxTrans(
-        "voxel.weapon.bow.wood-3",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.bow.wood-4"): VoxTrans(
-        "voxel.weapon.bow.wood-4",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
-    ),
-    // Daggers
-    Tool("common.items.weapons.dagger.starter_dagger"): VoxTrans(
-        "voxel.weapon.dagger.dagger_rusty",
-        (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.dagger.basic_0"): VoxTrans(
-        "voxel.weapon.dagger.dagger_basic-0",
-        (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.dagger.cultist_0"): VoxTrans(
-        "voxel.weapon.dagger.dagger_cult-0",
-        (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
-    ),
-    // Swords
-    Tool("common.items.weapons.sword.bloodsteel-0"): VoxTrans(
-        "voxel.weapon.sword.bloodsteel-0",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.bloodsteel-1"): VoxTrans(
-        "voxel.weapon.sword.bloodsteel-1",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.bloodsteel-2"): VoxTrans(
-        "voxel.weapon.sword.bloodsteel-2",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.bronze-0"): VoxTrans(
-        "voxel.weapon.sword.bronze-0",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.bronze-1"): VoxTrans(
-        "voxel.weapon.sword.bronze-1",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.bronze-2"): VoxTrans(
-        "voxel.weapon.sword.bronze-2",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.caladbolg"): VoxTrans(
-        "voxel.weapon.sword.caladbolg",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.cobalt-0"): VoxTrans(
-        "voxel.weapon.sword.cobalt-0",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.cobalt-1"): VoxTrans(
-        "voxel.weapon.sword.cobalt-1",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.cobalt-2"): VoxTrans(
-        "voxel.weapon.sword.cobalt-2",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.cobalt-3"): VoxTrans(
-        "voxel.weapon.sword.cobalt-3",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.cultist"): VoxTrans(
-        "voxel.weapon.sword.cultist",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.frost-0"): VoxTrans(
-        "voxel.weapon.sword.frost-0",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.frost-1"): VoxTrans(
-        "voxel.weapon.sword.frost-1",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-0"): VoxTrans(
-        "voxel.weapon.sword.iron-0",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-1"): VoxTrans(
-        "voxel.weapon.sword.iron-1",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-10"): VoxTrans(
-        "voxel.weapon.sword.iron-10",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-2"): VoxTrans(
-        "voxel.weapon.sword.iron-2",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-3"): VoxTrans(
-        "voxel.weapon.sword.iron-3",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-4"): VoxTrans(
-        "voxel.weapon.sword.iron-4",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-5"): VoxTrans(
-        "voxel.weapon.sword.iron-5",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-6"): VoxTrans(
-        "voxel.weapon.sword.iron-6",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-7"): VoxTrans(
-        "voxel.weapon.sword.iron-7",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-8"): VoxTrans(
-        "voxel.weapon.sword.iron-8",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.iron-9"): VoxTrans(
-        "voxel.weapon.sword.iron-9",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.starter"): VoxTrans(
-        "voxel.weapon.sword.starter",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.steel-0"): VoxTrans(
-        "voxel.weapon.sword.steel-0",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.steel-1"): VoxTrans(
-        "voxel.weapon.sword.steel-1",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.steel-2"): VoxTrans(
-        "voxel.weapon.sword.steel-2",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.steel-3"): VoxTrans(
-        "voxel.weapon.sword.steel-3",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.steel-4"): VoxTrans(
-        "voxel.weapon.sword.steel-4",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.steel-5"): VoxTrans(
-        "voxel.weapon.sword.steel-5",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.steel-6"): VoxTrans(
-        "voxel.weapon.sword.steel-6",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.steel-7"): VoxTrans(
-        "voxel.weapon.sword.steel-7",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.steel-8"): VoxTrans(
-        "voxel.weapon.sword.steel-8",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.stone-0"): VoxTrans(
-        "voxel.weapon.sword.stone-0",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.stone-1"): VoxTrans(
-        "voxel.weapon.sword.stone-1",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.stone-2"): VoxTrans(
-        "voxel.weapon.sword.stone-2",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.wood-0"): VoxTrans(
-        "voxel.weapon.sword.wood-0",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.wood-1"): VoxTrans(
-        "voxel.weapon.sword.wood-1",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.wood-2"): VoxTrans(
-        "voxel.weapon.sword.wood-2",
-        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.debug.admin_sword"): VoxTrans(
-        "voxel.weapon.sword.frost-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
-    ),
-    // 1h Swords
-    Tool("common.items.weapons.sword_1h.bloodsteel-0"): VoxTrans(
-        "voxel.weapon.sword_1h.bloodsteel-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.bloodsteel-1"): VoxTrans(
-        "voxel.weapon.sword_1h.bloodsteel-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.bloodsteel-2"): VoxTrans(
-        "voxel.weapon.sword_1h.bloodsteel-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.bronze-0"): VoxTrans(
-        "voxel.weapon.sword_1h.bronze-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.bronze-1"): VoxTrans(
-        "voxel.weapon.sword_1h.bronze-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.bronze-2"): VoxTrans(
-        "voxel.weapon.sword_1h.bronze-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.cobalt-0"): VoxTrans(
-        "voxel.weapon.sword_1h.cobalt-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.cobalt-1"): VoxTrans(
-        "voxel.weapon.sword_1h.cobalt-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.cobalt-2"): VoxTrans(
-        "voxel.weapon.sword_1h.cobalt-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.cobalt-3"): VoxTrans(
-        "voxel.weapon.sword_1h.cobalt-3",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.starter"): VoxTrans(
-        "voxel.weapon.sword_1h.starter",
-        (-1.0, 1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.iron-0"): VoxTrans(
-        "voxel.weapon.sword_1h.iron-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.iron-1"): VoxTrans(
-        "voxel.weapon.sword_1h.iron-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.iron-2"): VoxTrans(
-        "voxel.weapon.sword_1h.iron-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.iron-3"): VoxTrans(
-        "voxel.weapon.sword_1h.iron-3",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.iron-4"): VoxTrans(
-        "voxel.weapon.sword_1h.iron-4",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.obsidian-0"): VoxTrans(
-        "voxel.weapon.sword_1h.obsidian-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.orichalcum-0"): VoxTrans(
-        "voxel.weapon.sword_1h.orichalcum-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.orichalcum-1"): VoxTrans(
-        "voxel.weapon.sword_1h.orichalcum-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.steel-0"): VoxTrans(
-        "voxel.weapon.sword_1h.steel-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.steel-1"): VoxTrans(
-        "voxel.weapon.sword_1h.steel-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.steel-2"): VoxTrans(
-        "voxel.weapon.sword_1h.steel-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sword_1h.steel-3"): VoxTrans(
-        "voxel.weapon.sword_1h.steel-3",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    // Axes
-    Tool("common.items.weapons.axe.starter_axe"): VoxTrans(
-        "voxel.weapon.axe.2haxe_rusty",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.orc_axe-0"): VoxTrans(
-        "voxel.weapon.axe.2haxe_orc-0",
-        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.13,
-    ),
-    Tool("common.items.weapons.axe.bronze_axe-0"): VoxTrans(
-        "voxel.weapon.axe.2haxe_bronze-0",
-        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.bronze_axe-1"): VoxTrans(
-        "voxel.weapon.axe.2haxe_bronze-1",
-        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.bronze_axe-2"): VoxTrans(
-        "voxel.weapon.axe.2haxe_bronze-2",
-        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-0"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.05,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-1"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-2"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-3"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-3",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-4"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-4",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.05,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-5"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-5",
-        (1.0, -0.5, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-6"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-6",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-7"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-7",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-8"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-8",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.13,
-    ),
-    Tool("common.items.weapons.axe.iron_axe-9"): VoxTrans(
-        "voxel.weapon.axe.2haxe_iron-9",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.steel_axe-0"): VoxTrans(
-        "voxel.weapon.axe.2haxe_steel-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.steel_axe-1"): VoxTrans(
-        "voxel.weapon.axe.2haxe_steel-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.steel_axe-2"): VoxTrans(
-        "voxel.weapon.axe.2haxe_steel-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.steel_axe-3"): VoxTrans(
-        "voxel.weapon.axe.2haxe_steel-3",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.steel_axe-4"): VoxTrans(
-        "voxel.weapon.axe.2haxe_steel-4",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.steel_axe-5"): VoxTrans(
-        "voxel.weapon.axe.2haxe_steel-5",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.steel_axe-6"): VoxTrans(
-        "voxel.weapon.axe.2haxe_steel-6",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.bloodsteel_axe-0"): VoxTrans(
-        "voxel.weapon.axe.2haxe_bloodsteel-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.15,
-    ),
-    Tool("common.items.weapons.axe.bloodsteel_axe-1"): VoxTrans(
-        "voxel.weapon.axe.2haxe_bloodsteel-1",
-        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.bloodsteel_axe-2"): VoxTrans(
-        "voxel.weapon.axe.2haxe_bloodsteel-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.cobalt_axe-0"): VoxTrans(
-        "voxel.weapon.axe.2haxe_cobalt-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.cobalt_axe-1"): VoxTrans(
-        "voxel.weapon.axe.2haxe_cobalt-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.malachite_axe-0"): VoxTrans(
-        "voxel.weapon.axe.2haxe_malachite-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.axe.parashu"): VoxTrans(
-        "voxel.weapon.axe.parashu",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    // 1h Axes
-    Tool("common.items.weapons.axe_1h.bloodsteel-0"): VoxTrans(
-        "voxel.weapon.axe_1h.bloodsteel-0",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.bloodsteel-1"): VoxTrans(
-        "voxel.weapon.axe_1h.bloodsteel-1",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.bronze-0"): VoxTrans(
-        "voxel.weapon.axe_1h.bronze-0",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.bronze-1"): VoxTrans(
-        "voxel.weapon.axe_1h.bronze-1",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.cobalt-0"): VoxTrans(
-        "voxel.weapon.axe_1h.cobalt-0",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.cobalt-1"): VoxTrans(
-        "voxel.weapon.axe_1h.cobalt-1",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.iron-0"): VoxTrans(
-        "voxel.weapon.axe_1h.iron-0",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.iron-1"): VoxTrans(
-        "voxel.weapon.axe_1h.iron-1",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.iron-2"): VoxTrans(
-        "voxel.weapon.axe_1h.iron-2",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.iron-3"): VoxTrans(
-        "voxel.weapon.axe_1h.iron-3",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.orichalcum-0"): VoxTrans(
-        "voxel.weapon.axe_1h.orichalcum-0",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.steel-0"): VoxTrans(
-        "voxel.weapon.axe_1h.steel-0",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.steel-1"): VoxTrans(
-        "voxel.weapon.axe_1h.steel-1",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.steel-2"): VoxTrans(
-        "voxel.weapon.axe_1h.steel-2",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.stone-0"): VoxTrans(
-        "voxel.weapon.axe_1h.stone-0",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.stone-1"): VoxTrans(
-        "voxel.weapon.axe_1h.stone-1",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.wood-0"): VoxTrans(
-        "voxel.weapon.axe_1h.wood-0",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Tool("common.items.weapons.axe_1h.wood-1"): VoxTrans(
-        "voxel.weapon.axe_1h.wood-1",
-        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    // Hammers
-    Tool("common.items.weapons.hammer.hammer_1"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_rusty",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.starter_hammer"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_rusty",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.wood_hammer-0"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_wood-0",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.flimsy_hammer"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_flimsy",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.stone_hammer-0"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_stone-0",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.stone_hammer-1"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_stone-1",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.stone_hammer-2"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_stone-2",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.stone_hammer-3"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_stone-3",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.bronze_hammer-0"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_bronze-0",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.bronze_hammer-1"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_bronze-1",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.iron_hammer-0"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_iron-0",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.iron_hammer-1"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_iron-1",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.iron_hammer-2"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_iron-2",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.iron_hammer-3"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_iron-3",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.iron_hammer-4"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_iron-4",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.iron_hammer-5"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_iron-5",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.iron_hammer-6"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_iron-6",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.iron_hammer-7"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_iron-7",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.iron_hammer-8"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_iron-8",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.steel_hammer-0"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_steel-0",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.steel_hammer-1"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_steel-1",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.steel_hammer-2"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_steel-2",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.steel_hammer-3"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_steel-3",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.steel_hammer-4"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_steel-4",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.steel_hammer-5"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_steel-5",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.cobalt_hammer-0"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_cobalt-0",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.cobalt_hammer-1"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_cobalt-1",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.runic_hammer"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_runic",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.ramshead_hammer"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_ramshead",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.mjolnir"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_mjolnir",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.cultist_purp_2h-0"): VoxTrans(
-        "voxel.weapon.hammer.cult_purp-0",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.burnt_drumstick"): VoxTrans(
-        "voxel.weapon.hammer.burnt_drumstick",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    // 1h Hammers
-    Tool("common.items.weapons.hammer_1h.bloodsteel-0"): VoxTrans(
-        "voxel.weapon.hammer_1h.bloodsteel-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.bloodsteel-1"): VoxTrans(
-        "voxel.weapon.hammer_1h.bloodsteel-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.bronze-0"): VoxTrans(
-        "voxel.weapon.hammer_1h.bronze-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.bronze-1"): VoxTrans(
-        "voxel.weapon.hammer_1h.bronze-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.cobalt-0"): VoxTrans(
-        "voxel.weapon.hammer_1h.cobalt-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.cobalt-1"): VoxTrans(
-        "voxel.weapon.hammer_1h.cobalt-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.iron-0"): VoxTrans(
-        "voxel.weapon.hammer_1h.iron-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.iron-1"): VoxTrans(
-        "voxel.weapon.hammer_1h.iron-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.iron-2"): VoxTrans(
-        "voxel.weapon.hammer_1h.iron-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.orichalcum-0"): VoxTrans(
-        "voxel.weapon.hammer_1h.orichalcum-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.steel-0"): VoxTrans(
-        "voxel.weapon.hammer_1h.steel-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.steel-1"): VoxTrans(
-        "voxel.weapon.hammer_1h.steel-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.steel-2"): VoxTrans(
-        "voxel.weapon.hammer_1h.steel-2",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.stone-0"): VoxTrans(
-        "voxel.weapon.hammer_1h.stone-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.stone-1"): VoxTrans(
-        "voxel.weapon.hammer_1h.stone-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.wood-0"): VoxTrans(
-        "voxel.weapon.hammer_1h.wood-0",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.hammer_1h.wood-1"): VoxTrans(
-        "voxel.weapon.hammer_1h.wood-1",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    // Staffs
-    Tool("common.items.weapons.staff.staff_1"): VoxTrans(
-        "voxel.weapon.staff.firestaff_starter",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.starter_staff"): VoxTrans(
-        "voxel.weapon.staff.firestaff_starter",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.bone_staff"): VoxTrans(
-        "voxel.weapon.staff.bone_staff",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.crimson_eye"): VoxTrans(
-        "voxel.weapon.staff.crimson_eye",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.cultist_staff"): VoxTrans(
-        "voxel.weapon.staff.firestaff_cultist",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.phoenix"): VoxTrans(
-        "voxel.weapon.staff.phoenix",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.aurora"): VoxTrans(
-        "voxel.weapon.staff.aurora",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.infused_tower"): VoxTrans(
-        "voxel.weapon.staff.infused_tower",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.flamethrower_0"): VoxTrans(
-        "voxel.weapon.staff.unstable_thrower",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.ley_seeker"): VoxTrans(
-        "voxel.weapon.staff.ley_seeker",
-        (2.0, 0.0, 1.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.lava_rod"): VoxTrans(
-        "voxel.weapon.staff.lava_rod",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.fiery_wishing_rod"): VoxTrans(
-        "voxel.weapon.staff.fiery_wishing_rod",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.orc_iron"): VoxTrans(
-        "voxel.weapon.staff.orcish_branding_iron",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.bent_fuse"): VoxTrans(
-        "voxel.weapon.staff.bent_fuse",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.staff.heated_arm"): VoxTrans(
-        "voxel.weapon.staff.heated_arm",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.frostwood_torch"): VoxTrans(
-        "voxel.weapon.staff.frostwood_torch",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.golden_khakkara"): VoxTrans(
-        "voxel.weapon.staff.golden_khakkara",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.laevateinn"): VoxTrans(
-        "voxel.weapon.staff.laevateinn",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.ruby_rod"): VoxTrans(
-        "voxel.weapon.staff.ruby_rod",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.dragon_tongue"): VoxTrans(
-        "voxel.weapon.staff.dragon_tongue",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.staff.solar"): VoxTrans(
-        "voxel.weapon.staff.solar",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    // Healing Sceptres
-    Tool("common.items.weapons.sceptre.starter_sceptre"): VoxTrans(
-        "voxel.weapon.sceptre.wood-simple",
-        (0.0, -0.0, 0.0), (-130., 90.0, 0.0), 1.25,
-    ),
-    Tool("common.items.weapons.sceptre.moon0"): VoxTrans(
-        "voxel.weapon.sceptre.moon",
-        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sceptre.staff_nature"): VoxTrans(
-        "voxel.weapon.sceptre.wood-nature",
-        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sceptre.totem_green"): VoxTrans(
-        "voxel.weapon.sceptre.totem_green",
-        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sceptre.root_green0"): VoxTrans(
-        "voxel.weapon.sceptre.root_green",
-        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sceptre.fork0"): VoxTrans(
-        "voxel.weapon.sceptre.fork",
-        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sceptre.loops0"): VoxTrans(
-        "voxel.weapon.sceptre.loops",
-        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sceptre.root_evil"): VoxTrans(
-        "voxel.weapon.sceptre.root_evil",
-        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-     Tool("common.items.weapons.sceptre.sceptre_velorite_0"): VoxTrans(
-        "voxel.weapon.sceptre.ore-nature",
-        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15,
-    ),
-    Tool("common.items.weapons.sceptre.caduceus"): VoxTrans(
-        "voxel.weapon.sceptre.caduceus",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sceptre.coralline_cane"): VoxTrans(
-        "voxel.weapon.sceptre.coralline_cane",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.sceptre.divine_gohei"): VoxTrans(
-        "voxel.weapon.sceptre.divine_gohei",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.15,
-    ),
-    Tool("common.items.weapons.sceptre.emerald"): VoxTrans(
-        "voxel.weapon.sceptre.emerald",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.12,
-    ),
-    Tool("common.items.weapons.sceptre.druids_arbor"): VoxTrans(
-        "voxel.weapon.sceptre.druids_arbor",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.12,
-    ),
-    Tool("common.items.weapons.sceptre.amethyst"): VoxTrans(
-        "voxel.weapon.sceptre.amethyst",
-        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.12,
-    ),
-    // Shields
-    Tool("common.items.weapons.shield.shield_1"): VoxTrans(
-        "voxel.weapon.shield.wood-0",
-        (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
-    ),
-    // Lanterns
-    Lantern("Black0"): Png(
-        "element.items.lantern_black-0",
-    ),
-    Lantern("Green0"): Png(
-        "element.items.lantern_green-0",
-    ),
-    Lantern("Blue0"): Png(
-        "element.items.lantern_blue-0",
-    ),
-    Lantern("Red0"): Png(
-        "element.items.lantern_red-0",
-    ),
-    Lantern("GeodePurp"): VoxTrans(
-        "voxel.lantern.geode_purp",
-        (0.0, 0.0, 0.0), (-90.0, 120.0, 0.0), 0.9,
-    ),
-    Lantern("PumpkinLantern"): VoxTrans(
-        "voxel.lantern.pumpkin",
-        (0.0, 0.0, 0.0), (-90.0, 120.0, 0.0), 0.9,
-    ),
-    // Farming Equipment
-    Tool("common.items.weapons.tool.broom"): VoxTrans(
-        "voxel.weapon.tool.broom-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.tool.hoe"): VoxTrans(
-        "voxel.weapon.tool.hoe_green",
-        (0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
-    ),
-    Tool("common.items.weapons.tool.pitchfork"): VoxTrans(
-        "voxel.weapon.tool.pitchfork-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.tool.rake"): VoxTrans(
-        "voxel.weapon.tool.rake-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.tool.fishing_rod"): VoxTrans(
-        "voxel.weapon.tool.fishing_rod_blue-0",
-        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.5,
-    ),
-    Tool("common.items.weapons.tool.pickaxe"): VoxTrans(
-        "voxel.weapon.tool.pickaxe_green-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.weapons.tool.shovel-0"): VoxTrans(
-        "voxel.weapon.tool.shovel_green",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-    Tool("common.items.weapons.tool.shovel-1"): VoxTrans(
-        "voxel.weapon.tool.shovel_gold",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
-	// Picks
-    Tool("common.items.tool.pickaxe_stone"): VoxTrans(
-        "voxel.weapon.tool.pickaxe_green-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
-    ),
-    Tool("common.items.tool.pickaxe_steel"): VoxTrans(
-        "voxel.weapon.tool.pickaxe_green-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
-    ),
-    // Other
-    Utility(Coins): VoxTrans(
-        "voxel.object.v-coin",
-        (0.0, 0.0, 0.0), (-10.0, 15.0, 0.0), 0.8,
-    ),
-    Utility(Collar): Png(
-        "element.items.collar",
-    ),
-    // Armor
-    // Starter Parts
-    Armor(Foot("Sandal")): VoxTrans(
-        "voxel.armor.misc.foot.cloth_sandal",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Pants("Rugged")): VoxTrans(
-        "voxel.armor.rugged.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Chest("Rugged")): VoxTrans(
-        "voxel.armor.rugged.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerPurpBrown")): VoxTrans(
-        "voxel.armor.misc.chest.worker_purp_brown",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("WorkerBrown")): VoxTrans(
-        "voxel.armor.misc.pants.worker_brown",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    // Cultist Clothing
-    Armor(Chest("Cultist")): VoxTrans(
-        "voxel.armor.cultist.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Cultist")): VoxTrans(
-        "voxel.armor.cultist.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Cultist")): VoxTrans(
-        "voxel.armor.cultist.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Cultist")): VoxTrans(
-        "voxel.armor.cultist.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Cultist")): VoxTrans(
-        "voxel.armor.cultist.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Cultist")): VoxTrans(
-        "voxel.armor.cultist.shoulder",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("Cultist")): VoxTrans(
-        "voxel.armor.cultist.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Cultist")): VoxTrans(
-        "voxel.armor.cultist.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Cultist")): VoxTrans(
-        "voxel.armor.cultist.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Cultist")): VoxTrans(
-        "voxel.armor.cultist.shoulder",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Head("Cultist")): VoxTrans(
-        "voxel.armor.cultist.bandana",
-        (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9,
-    ),
-    // Villager Clothing
-    Armor(Pants("WorkerBlue")): VoxTrans(
-        "voxel.armor.misc.pants.worker_blue",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Chest("WorkerGreen0")): VoxTrans(
-        "voxel.armor.misc.chest.worker_green",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerGreen1")): VoxTrans(
-        "voxel.armor.misc.chest.shirt_white",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerRed0")): VoxTrans(
-        "voxel.armor.misc.chest.worker_green",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerRed1")): VoxTrans(
-        "voxel.armor.misc.chest.shirt_white",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerPurple0")): VoxTrans(
-        "voxel.armor.misc.chest.worker_green",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerPurple1")): VoxTrans(
-        "voxel.armor.misc.chest.shirt_white",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerYellow0")): VoxTrans(
-        "voxel.armor.misc.chest.worker_green",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerYellow1")): VoxTrans(
-        "voxel.armor.misc.chest.shirt_white",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerOrange0")): VoxTrans(
-        "voxel.armor.misc.chest.worker_green",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Chest("WorkerOrange1")): VoxTrans(
-        "voxel.armor.misc.chest.shirt_white",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    // Velorite Battlemage Set
-    Armor(Chest("VeloriteMage")): VoxTrans(
-        "voxel.armor.velorite_battlemage.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("VeloriteMage")): VoxTrans(
-        "voxel.armor.velorite_battlemage.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("VeloriteMage")): VoxTrans(
-        "voxel.armor.velorite_battlemage.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("VeloriteMage")): VoxTrans(
-        "voxel.armor.velorite_battlemage.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("VeloriteMage")): VoxTrans(
-        "voxel.armor.velorite_battlemage.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("VeloriteMage")): VoxTrans(
-        "voxel.armor.velorite_battlemage.shoulder",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Back("VeloriteMage")): VoxTrans(
-        "voxel.armor.velorite_battlemage.back",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    // Assassin Set
-    Armor(Chest("Assassin")): VoxTrans(
-        "voxel.armor.assassin.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Assassin")): VoxTrans(
-        "voxel.armor.assassin.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Assassin")): VoxTrans(
-        "voxel.armor.assassin.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Assassin")): VoxTrans(
-        "voxel.armor.assassin.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Assassin")): VoxTrans(
-        "voxel.armor.assassin.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Assassin")): VoxTrans(
-        "voxel.armor.assassin.shoulder",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    //PlateLeather Armor
-    Armor(Chest("LeatherPlate")): VoxTrans(
-        "voxel.armor.leather_plate.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("LeatherPlate")): VoxTrans(
-        "voxel.armor.leather_plate.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("LeatherPlate")): VoxTrans(
-        "voxel.armor.leather_plate.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("LeatherPlate")): VoxTrans(
-        "voxel.armor.leather_plate.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("LeatherPlate")): VoxTrans(
-        "voxel.armor.leather_plate.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("LeatherPlate")): VoxTrans(
-        "voxel.armor.leather_plate.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    //Ferocious Armor
-    Armor(Chest("Ferocious")): VoxTrans(
-        "voxel.armor.ferocious.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Ferocious")): VoxTrans(
-        "voxel.armor.ferocious.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Ferocious")): VoxTrans(
-        "voxel.armor.ferocious.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Ferocious")): VoxTrans(
-        "voxel.armor.ferocious.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Ferocious")): VoxTrans(
-        "voxel.armor.ferocious.hand",
-        (0.0, 0.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
-    ),
-    Armor(Shoulder("Ferocious")): VoxTrans(
-        "voxel.armor.ferocious.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Ferocious")): VoxTrans(
-        "voxel.armor.ferocious.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Blue Leather Armor
-    Armor(Chest("BlueLeather")): VoxTrans(
-        "voxel.armor.leather_blue.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("BlueLeather")): VoxTrans(
-        "voxel.armor.leather_blue.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Linen Cloth
-    Armor(Chest("ClothBlue")): VoxTrans(
-        "voxel.armor.cloth_blue.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("ClothBlue")): VoxTrans(
-        "voxel.armor.cloth_blue.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("ClothBlue")): VoxTrans(
-        "voxel.armor.cloth_blue.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("ClothBlue")): VoxTrans(
-        "voxel.armor.cloth_blue.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("ClothBlue")): VoxTrans(
-        "voxel.armor.cloth_blue.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("ClothBlue0")): VoxTrans(
-        "voxel.armor.cloth_blue.shoulder_0",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Shoulder("ClothBlue1")): VoxTrans(
-        "voxel.armor.cloth_blue.shoulder_1",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    //////////////
-    Armor(Chest("ClothGreen")): VoxTrans(
-        "voxel.armor.cloth_green.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("ClothGreen")): VoxTrans(
-        "voxel.armor.cloth_green.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("ClothGreen")): VoxTrans(
-        "voxel.armor.cloth_green.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("ClothGreen")): VoxTrans(
-        "voxel.armor.cloth_green.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("ClothGreen")): VoxTrans(
-        "voxel.armor.cloth_green.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("ClothGreen")): VoxTrans(
-        "voxel.armor.cloth_green.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    //////
-    Armor(Chest("ClothPurple")): VoxTrans(
-        "voxel.armor.cloth_purple.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("ClothPurple")): VoxTrans(
-        "voxel.armor.cloth_purple.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("ClothPurple")): VoxTrans(
-        "voxel.armor.cloth_purple.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("ClothPurple")): VoxTrans(
-        "voxel.armor.cloth_purple.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("ClothPurple")): VoxTrans(
-        "voxel.armor.cloth_purple.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("ClothPurple")): VoxTrans(
-        "voxel.armor.cloth_purple.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Shoulder("IronSpikes")): VoxTrans(
-        "voxel.armor.misc.shoulder.iron_spikes",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Shoulder("IronLeather3")): VoxTrans(
-        "voxel.armor.misc.shoulder.leather_iron_3",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Shoulder("IronLeather2")): VoxTrans(
-        "voxel.armor.misc.shoulder.leather_iron_2",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Shoulder("IronLeather1")): VoxTrans(
-        "voxel.armor.misc.shoulder.leather_iron_1",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Shoulder("IronLeather0")): VoxTrans(
-        "voxel.armor.misc.shoulder.leather_iron_0",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Shoulder("LeatherStrip")): VoxTrans(
-        "voxel.armor.misc.shoulder.leather_strip",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Foot("Jackalope")): VoxTrans(
-        "voxel.armor.misc.foot.jackalope",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Twig Set
-    Armor(Chest("Twigs")): VoxTrans(
-        "voxel.armor.twigs.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Twigs")): VoxTrans(
-        "voxel.armor.twigs.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Twigs")): VoxTrans(
-        "voxel.armor.twigs.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Twigs")): VoxTrans(
-        "voxel.armor.twigs.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Twigs")): VoxTrans(
-        "voxel.armor.twigs.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Twigs")): VoxTrans(
-        "voxel.armor.twigs.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-        ),
-    //TwigsLeaves Set
-    Armor(Chest("TwigsLeaves")): VoxTrans(
-        "voxel.armor.twigsleaves.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("TwigsLeaves")): VoxTrans(
-        "voxel.armor.twigsleaves.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("TwigsLeaves")): VoxTrans(
-        "voxel.armor.twigsleaves.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("TwigsLeaves")): VoxTrans(
-        "voxel.armor.twigsleaves.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("TwigsLeaves")): VoxTrans(
-        "voxel.armor.twigsleaves.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("TwigsLeaves")): VoxTrans(
-        "voxel.armor.twigsleaves.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    //TwigsFlowers Set
-    Armor(Chest("TwigsFlowers")): VoxTrans(
-        "voxel.armor.twigsflowers.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("TwigsFlowers")): VoxTrans(
-        "voxel.armor.twigsflowers.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("TwigsFlowers")): VoxTrans(
-        "voxel.armor.twigsflowers.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("TwigsFlowers")): VoxTrans(
-        "voxel.armor.twigsflowers.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("TwigsFlowers")): VoxTrans(
-        "voxel.armor.twigsflowers.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("TwigsFlowers")): VoxTrans(
-        "voxel.armor.twigsflowers.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    //Tarasque Set
-    Armor(Chest("Tarasque")): VoxTrans(
-        "voxel.armor.tarasque.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Tarasque")): VoxTrans(
-        "voxel.armor.tarasque.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Tarasque")): VoxTrans(
-        "voxel.armor.tarasque.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Tarasque")): VoxTrans(
-        "voxel.armor.tarasque.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Tarasque")): VoxTrans(
-        "voxel.armor.tarasque.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Tarasque")): VoxTrans(
-        "voxel.armor.tarasque.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    //Bonerattler Set
-    Armor(Chest("Bonerattler")): VoxTrans(
-        "voxel.armor.bonerattler.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Bonerattler")): VoxTrans(
-        "voxel.armor.bonerattler.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Bonerattler")): VoxTrans(
-        "voxel.armor.bonerattler.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Bonerattler")): VoxTrans(
-        "voxel.armor.bonerattler.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Bonerattler")): VoxTrans(
-        "voxel.armor.bonerattler.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Bonerattler")): VoxTrans(
-        "voxel.armor.bonerattler.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    //Rawhide Set
-    Armor(Chest("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Rawhide")): VoxTrans(
-        "voxel.armor.hide.rawhide.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Leather set
-    Armor(Chest("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Leather")): VoxTrans(
-        "voxel.armor.hide.leather.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Scale Set
-    Armor(Chest("Scale")): VoxTrans(
-        "voxel.armor.hide.scale.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Scale")): VoxTrans(
-        "voxel.armor.hide.scale.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Scale")): VoxTrans(
-        "voxel.armor.hide.scale.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Scale")): VoxTrans(
-        "voxel.armor.hide.scale.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Scale")): VoxTrans(
-        "voxel.armor.hide.scale.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Scale")): VoxTrans(
-        "voxel.armor.hide.scale.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Scale")): VoxTrans(
-        "voxel.armor.hide.scale.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Carapace Set
-    Armor(Chest("Carapace")): VoxTrans(
-        "voxel.armor.hide.carapace.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Carapace")): VoxTrans(
-        "voxel.armor.hide.carapace.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Carapace")): VoxTrans(
-        "voxel.armor.hide.carapace.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Carapace")): VoxTrans(
-        "voxel.armor.hide.carapace.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Carapace")): VoxTrans(
-        "voxel.armor.hide.carapace.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Carapace")): VoxTrans(
-        "voxel.armor.hide.carapace.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Carapace")): VoxTrans(
-        "voxel.armor.hide.carapace.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Primal Set
-    Armor(Chest("Primal")): VoxTrans(
-        "voxel.armor.hide.primal.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Primal")): VoxTrans(
-        "voxel.armor.hide.primal.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Primal")): VoxTrans(
-        "voxel.armor.hide.primal.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Primal")): VoxTrans(
-        "voxel.armor.hide.primal.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Primal")): VoxTrans(
-        "voxel.armor.hide.primal.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Primal")): VoxTrans(
-        "voxel.armor.hide.primal.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Primal")): VoxTrans(
-        "voxel.armor.hide.primal.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Dragonscale Set
-    Armor(Chest("Dragonscale")): VoxTrans(
-        "voxel.armor.hide.dragonscale.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Dragonscale")): VoxTrans(
-        "voxel.armor.hide.dragonscale.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Dragonscale")): VoxTrans(
-        "voxel.armor.hide.dragonscale.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Dragonscale")): VoxTrans(
-        "voxel.armor.hide.dragonscale.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Dragonscale")): VoxTrans(
-        "voxel.armor.hide.dragonscale.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Dragonscale")): VoxTrans(
-        "voxel.armor.hide.dragonscale.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Dragonscale")): VoxTrans(
-        "voxel.armor.hide.dragonscale.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Savage Set
-    Armor(Chest("Savage")): VoxTrans(
-        "voxel.armor.savage.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Savage")): VoxTrans(
-        "voxel.armor.savage.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Savage")): VoxTrans(
-        "voxel.armor.savage.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Savage")): VoxTrans(
-        "voxel.armor.savage.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Savage")): VoxTrans(
-        "voxel.armor.savage.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Savage")): VoxTrans(
-        "voxel.armor.savage.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Savage")): VoxTrans(
-        "voxel.armor.savage.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Linen Set
-    Armor(Chest("Linen")): VoxTrans(
-        "voxel.armor.cloth.linen.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Linen")): VoxTrans(
-        "voxel.armor.cloth.linen.pants",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Linen")): VoxTrans(
-        "voxel.armor.cloth.linen.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Linen")): VoxTrans(
-        "voxel.armor.cloth.linen.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Linen")): VoxTrans(
-        "voxel.armor.cloth.linen.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Linen")): VoxTrans(
-        "voxel.armor.cloth.linen.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Linen")): VoxTrans(
-        "voxel.armor.cloth.linen.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Woolen Set
-    Armor(Chest("Woolen")): VoxTrans(
-        "voxel.armor.cloth.woolen.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Woolen")): VoxTrans(
-        "voxel.armor.cloth.woolen.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Woolen")): VoxTrans(
-        "voxel.armor.cloth.woolen.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Woolen")): VoxTrans(
-        "voxel.armor.cloth.woolen.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Woolen")): VoxTrans(
-        "voxel.armor.cloth.woolen.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Woolen")): VoxTrans(
-        "voxel.armor.cloth.woolen.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Woolen")): VoxTrans(
-        "voxel.armor.cloth.woolen.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Silken Set
-    Armor(Chest("Silken")): VoxTrans(
-        "voxel.armor.cloth.silken.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Silken")): VoxTrans(
-        "voxel.armor.cloth.silken.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Silken")): VoxTrans(
-        "voxel.armor.cloth.silken.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Silken")): VoxTrans(
-        "voxel.armor.cloth.silken.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Silken")): VoxTrans(
-        "voxel.armor.cloth.silken.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Silken")): VoxTrans(
-        "voxel.armor.cloth.silken.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Silken")): VoxTrans(
-        "voxel.armor.cloth.silken.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Druid Set
-    Armor(Chest("Druid")): VoxTrans(
-        "voxel.armor.cloth.druid.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Druid")): VoxTrans(
-        "voxel.armor.cloth.druid.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Druid")): VoxTrans(
-        "voxel.armor.cloth.druid.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Druid")): VoxTrans(
-        "voxel.armor.cloth.druid.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Druid")): VoxTrans(
-        "voxel.armor.cloth.druid.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Druid")): VoxTrans(
-        "voxel.armor.cloth.druid.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Druid")): VoxTrans(
-        "voxel.armor.cloth.druid.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Moonweave Set
-    Armor(Chest("Moonweave")): VoxTrans(
-        "voxel.armor.cloth.moonweave.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Moonweave")): VoxTrans(
-        "voxel.armor.cloth.moonweave.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Moonweave")): VoxTrans(
-        "voxel.armor.cloth.moonweave.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Moonweave")): VoxTrans(
-        "voxel.armor.cloth.moonweave.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Moonweave")): VoxTrans(
-        "voxel.armor.cloth.moonweave.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Moonweave")): VoxTrans(
-        "voxel.armor.cloth.moonweave.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Moonweave")): VoxTrans(
-        "voxel.armor.cloth.moonweave.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Sunsilk Set
-    Armor(Chest("Sunsilk")): VoxTrans(
-        "voxel.armor.cloth.sunsilk.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Sunsilk")): VoxTrans(
-        "voxel.armor.cloth.sunsilk.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Sunsilk")): VoxTrans(
-        "voxel.armor.cloth.sunsilk.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Sunsilk")): VoxTrans(
-        "voxel.armor.cloth.sunsilk.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Sunsilk")): VoxTrans(
-        "voxel.armor.cloth.sunsilk.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Sunsilk")): VoxTrans(
-        "voxel.armor.cloth.sunsilk.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Sunsilk")): VoxTrans(
-        "voxel.armor.cloth.sunsilk.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Bronze Set
-    Armor(Chest("Bronze")): VoxTrans(
-        "voxel.armor.mail.bronze.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Bronze")): VoxTrans(
-        "voxel.armor.mail.bronze.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Bronze")): VoxTrans(
-        "voxel.armor.mail.bronze.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Bronze")): VoxTrans(
-        "voxel.armor.mail.bronze.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Bronze")): VoxTrans(
-        "voxel.armor.mail.bronze.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Bronze")): VoxTrans(
-        "voxel.armor.mail.bronze.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Bronze")): VoxTrans(
-        "voxel.armor.mail.bronze.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Iron Set
-    Armor(Chest("Iron")): VoxTrans(
-        "voxel.armor.mail.iron.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Iron")): VoxTrans(
-        "voxel.armor.mail.iron.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Iron")): VoxTrans(
-        "voxel.armor.mail.iron.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Iron")): VoxTrans(
-        "voxel.armor.mail.iron.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Iron")): VoxTrans(
-        "voxel.armor.mail.iron.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Iron")): VoxTrans(
-        "voxel.armor.mail.iron.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Iron")): VoxTrans(
-        "voxel.armor.mail.iron.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Steel Set
-    Armor(Chest("Steel")): VoxTrans(
-        "voxel.armor.mail.steel.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Steel")): VoxTrans(
-        "voxel.armor.mail.steel.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Steel")): VoxTrans(
-        "voxel.armor.mail.steel.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Steel")): VoxTrans(
-        "voxel.armor.mail.steel.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Steel")): VoxTrans(
-        "voxel.armor.mail.steel.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Steel")): VoxTrans(
-        "voxel.armor.mail.steel.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Steel")): VoxTrans(
-        "voxel.armor.mail.steel.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Cobalt Set
-    Armor(Chest("Cobalt")): VoxTrans(
-        "voxel.armor.mail.cobalt.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Cobalt")): VoxTrans(
-        "voxel.armor.mail.cobalt.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Cobalt")): VoxTrans(
-        "voxel.armor.mail.cobalt.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Cobalt")): VoxTrans(
-        "voxel.armor.mail.cobalt.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Cobalt")): VoxTrans(
-        "voxel.armor.mail.cobalt.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Cobalt")): VoxTrans(
-        "voxel.armor.mail.cobalt.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Cobalt")): VoxTrans(
-        "voxel.armor.mail.cobalt.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Bloodsteel Set
-    Armor(Chest("Bloodsteel")): VoxTrans(
-        "voxel.armor.mail.bloodsteel.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Bloodsteel")): VoxTrans(
-        "voxel.armor.mail.bloodsteel.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Bloodsteel")): VoxTrans(
-        "voxel.armor.mail.bloodsteel.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Bloodsteel")): VoxTrans(
-        "voxel.armor.mail.bloodsteel.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Bloodsteel")): VoxTrans(
-        "voxel.armor.mail.bloodsteel.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Bloodsteel")): VoxTrans(
-        "voxel.armor.mail.bloodsteel.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Bloodsteel")): VoxTrans(
-        "voxel.armor.mail.bloodsteel.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Orichalcum Set
-    Armor(Chest("Orichalcum")): VoxTrans(
-        "voxel.armor.mail.orichalcum.chest",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
-    ),
-    Armor(Pants("Orichalcum")): VoxTrans(
-        "voxel.armor.mail.orichalcum.pants",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Belt("Orichalcum")): VoxTrans(
-        "voxel.armor.mail.orichalcum.belt",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Foot("Orichalcum")): VoxTrans(
-        "voxel.armor.mail.orichalcum.foot",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Hand("Orichalcum")): VoxTrans(
-        "voxel.armor.mail.orichalcum.hand",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Shoulder("Orichalcum")): VoxTrans(
-        "voxel.armor.mail.orichalcum.shoulder",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Back("Orichalcum")): VoxTrans(
-        "voxel.armor.mail.orichalcum.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //misc
-     Armor(Pants("Hunting")): VoxTrans(
-        "voxel.armor.misc.pants.grayscale",
-        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    // Backs
-    Armor(Back("Short0")): VoxTrans(
-        "voxel.armor.misc.back.short-0",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Back("Short1")): VoxTrans(
-        "voxel.armor.misc.back.short-1",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Back("Admin")): VoxTrans(
-        "voxel.armor.misc.back.admin",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Back("DungeonPurple")): VoxTrans(
-        "voxel.armor.misc.back.dungeon_purple",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Back("LeatherBlue")): VoxTrans(
-        "voxel.armor.leather_blue.back",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Back("Backpack")): VoxTrans(
-        "voxel.armor.misc.back.backpack",
-        (0.0, 0.0, 0.0), (-75.0, 45.0,0.0), 0.9,
-    ),
-    Armor(Back("BackpackBlue")): VoxTrans(
-        "voxel.armor.misc.back.backpack",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    //Hats
-    Armor(Head("Witch")): VoxTrans(
-        "voxel.armor.witch.hat",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Head("Pirate")): VoxTrans(
-        "voxel.armor.pirate.hat",
-        (1.0, 2.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-    ),
-    Armor(Head("Thief")): VoxTrans(
-        "voxel.armor.misc.head.bandana.thief",
-        (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9,
-    ),
-    Armor(Head("Red")): VoxTrans(
-        "voxel.armor.misc.head.bandana.red",
-        (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9,
-    ),
-    Armor(Head("Straw")): VoxTrans(
-        "voxel.armor.misc.head.straw",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
-    ),
-    Armor(Head("Hood")): VoxTrans(
-        "voxel.armor.misc.head.hood",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3,
-    ),
-    Armor(Head("Crown")): VoxTrans(
-        "voxel.armor.misc.head.crown",
-        (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3,
-    ),
-    Armor(Head("Mitre")): VoxTrans(
-        "voxel.armor.misc.head.mitre",
-        (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3,
-    ),
-    Armor(Head("Spikeguard")): VoxTrans(
-        "voxel.armor.misc.head.spikeguard",
-        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3,
-    ),
-    // Rings
-    Armor(Ring("Scratched")): VoxTrans(
-        "voxel.armor.misc.ring.scratched",
-        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
-    ),
-    Armor(Ring("Gold")): VoxTrans(
-        "voxel.armor.misc.ring.gold",
-        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
-    ),
-    Armor(Ring("Topaz")): VoxTrans(
-        "voxel.armor.misc.ring.topaz",
-        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
-    ),
-    Armor(Ring("Amethyst")): VoxTrans(
-        "voxel.armor.misc.ring.amethyst",
-        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
-    ),
-    Armor(Ring("Sapphire")): VoxTrans(
-        "voxel.armor.misc.ring.sapphire",
-        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
-    ),
-    Armor(Ring("Emerald")): VoxTrans(
-        "voxel.armor.misc.ring.emerald",
-        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
-    ),
-    Armor(Ring("Ruby")): VoxTrans(
-        "voxel.armor.misc.ring.ruby",
-        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
-    ),
-    Armor(Ring("Diamond")): VoxTrans(
-        "voxel.armor.misc.ring.diamond",
-        (0.0, 0.0, 0.0), (45.0, 20.0, 0.0), 0.9,
-    ),
-    Armor(Ring("Cultist")): VoxTrans(
-        "voxel.armor.cultist.ring",
-        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
-    ),
-    
-    // Necks
-    Armor(Neck("Ankh")): VoxTrans(
-        "voxel.armor.misc.neck.ankh_of_life",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Carcanet")): VoxTrans(
-        "voxel.armor.misc.neck.carcanet_of_wrath",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Fang")): VoxTrans(
-        "voxel.armor.misc.neck.fang",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Honeycomb")): VoxTrans(
-        "voxel.armor.misc.neck.honeycomb_pendant",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Haniwa")): VoxTrans(
-        "voxel.armor.misc.neck.haniwa_talisman",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Pendant")): VoxTrans(
-        "voxel.armor.misc.neck.pendant_of_protection",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("ResilienceGem")): VoxTrans(
-        "voxel.armor.misc.neck.resilience_gem",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Shell")): VoxTrans(
-        "voxel.armor.misc.neck.shell",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Amethyst")): VoxTrans(
-        "voxel.armor.misc.neck.amethyst",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Diamond")): VoxTrans(
-        "voxel.armor.misc.neck.diamond",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Cultist")): VoxTrans(
-        "voxel.armor.cultist.necklace",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Ruby")): VoxTrans(
-        "voxel.armor.misc.neck.ruby",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Topaz")): VoxTrans(
-        "voxel.armor.misc.neck.topaz",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Emerald")): VoxTrans(
-        "voxel.armor.misc.neck.emerald",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Gold")): VoxTrans(
-        "voxel.armor.misc.neck.gold",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Sapphire")): VoxTrans(
-        "voxel.armor.misc.neck.sapphire",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
-    ),
-    Armor(Neck("Scratched")): VoxTrans(
-        "voxel.armor.misc.neck.scratched",
-        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+{
+    "crafting_hammer": (
+        output: ("common.items.tool.craftsman_hammer", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 6),
+            (Item("common.items.crafting_ing.stones"), 6),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "mortar_pestle": (
+        output: ("common.items.crafting_tools.mortar_pestle", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.stones"), 6),
+            (Item("common.items.crafting_ing.bowl"), 1),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "sewing_set": (
+        output: ("common.items.crafting_tools.sewing_set", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 1),
+            (Item("common.items.mineral.ingot.tin"), 1),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "velorite_frag": (
+        output: ("common.items.mineral.ore.veloritefrag", 2),
+        inputs: [
+            (Item("common.items.mineral.ore.velorite"), 1),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "potion_s": (
+        output: ("common.items.consumable.potion_minor", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.empty_vial"), 1),
+            (Item("common.items.food.apple"), 4),
+            (Item("common.items.crafting_ing.honey"), 1),
+        ],
+        craft_sprite: Some(Cauldron),
+    ),
+    "potion_m": (
+        output: ("common.items.consumable.potion_med", 1),
+        inputs: [
+            (Item("common.items.consumable.potion_minor"), 2),
+            (Item("common.items.mineral.ore.veloritefrag"), 4),
+        ],
+        craft_sprite: Some(Cauldron),
+    ),
+    "cactus_colada": (
+        output: ("common.items.food.cactus_colada", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.empty_vial"), 1),
+            (Item("common.items.crafting_ing.cactus"), 8),
+        ],
+        craft_sprite: Some(Cauldron),
+    ),
+    "collar_basic": (
+        output: ("common.items.utility.collar", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.leather_strips"), 5),
+            (Item("common.items.mineral.gem.ruby"), 1),
+        ],
+        craft_sprite: None,
+    ),
+    "bomb_coconut": (
+        output: ("common.items.utility.bomb", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.stones"), 10),
+            (Item("common.items.food.coconut"), 2),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.mortar_pestle"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "firework_blue": (
+        output: ("common.items.utility.firework_blue", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 1),
+            (Item("common.items.crafting_ing.stones"), 1),
+            (Item("common.items.food.coconut"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
+            (Item("common.items.crafting_tools.mortar_pestle"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "firework_green": (
+        output: ("common.items.utility.firework_green", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 1),
+            (Item("common.items.crafting_ing.stones"), 1),
+            (Item("common.items.food.coconut"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
+            (Item("common.items.crafting_tools.mortar_pestle"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "firework_purple": (
+        output: ("common.items.utility.firework_purple", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 1),
+            (Item("common.items.crafting_ing.stones"), 1),
+            (Item("common.items.food.coconut"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
+            (Item("common.items.crafting_tools.mortar_pestle"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "firework_red": (
+        output: ("common.items.utility.firework_red", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 1),
+            (Item("common.items.crafting_ing.stones"), 1),
+            (Item("common.items.food.coconut"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
+            (Item("common.items.crafting_tools.mortar_pestle"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "firework_white": (
+        output: ("common.items.utility.firework_white", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 1),
+            (Item("common.items.crafting_ing.stones"), 1),
+            (Item("common.items.food.coconut"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
+            (Item("common.items.crafting_tools.mortar_pestle"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "firework_yellow": (
+        output: ("common.items.utility.firework_yellow", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 1),
+            (Item("common.items.crafting_ing.stones"), 1),
+            (Item("common.items.food.coconut"), 1),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
+            (Item("common.items.crafting_tools.mortar_pestle"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "apple_shroom_curry": (
+        output: ("common.items.food.apple_mushroom_curry", 1),
+        inputs: [
+            (Item("common.items.food.mushroom"), 8),
+            (Item("common.items.food.coconut"), 1),
+            (Item("common.items.food.apple"), 4),
+            (Item("common.items.crafting_tools.mortar_pestle"), 0),
+        ],
+        craft_sprite: Some(CookingPot),
+    ),
+    "fish_cooked": (
+        output: ("common.items.food.meat.fish_cooked", 1),
+        inputs: [
+            (Item("common.items.food.meat.fish_raw"), 1),
+        ],
+        craft_sprite: Some(CookingPot),
+    ),
+    "bird_cooked": (
+        output: ("common.items.food.meat.bird_cooked", 1),
+        inputs: [
+            (Item("common.items.food.meat.bird_raw"), 1),
+        ],
+        craft_sprite: Some(CookingPot),
+    ),
+    "bird_large_cooked": (
+        output: ("common.items.food.meat.bird_large_cooked", 1),
+        inputs: [
+            (Item("common.items.food.meat.bird_large_raw"), 1),
+        ],
+        craft_sprite: Some(CookingPot),
+    ),
+    "beast_small_cooked": (
+        output: ("common.items.food.meat.beast_small_cooked", 1),
+        inputs: [
+            (Item("common.items.food.meat.beast_small_raw"), 1),
+        ],
+        craft_sprite: Some(CookingPot),
+    ),
+    "beast_large_cooked": (
+        output: ("common.items.food.meat.beast_large_cooked", 1),
+        inputs: [
+            (Item("common.items.food.meat.beast_large_raw"), 1),
+        ],
+        craft_sprite: Some(CookingPot),
+    ),
+    "tough_cooked": (
+        output: ("common.items.food.meat.tough_cooked", 1),
+        inputs: [
+            (Item("common.items.food.meat.tough_raw"), 1),
+        ],
+        craft_sprite: Some(CookingPot),
+    ),
+    "leather strips": (
+        output: ("common.items.crafting_ing.leather.leather_strips", 4),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 1),
+        ],
+        craft_sprite: Some(TanningRack),
+    ),
+    "simple leather": (
+        output: ("common.items.crafting_ing.leather.simple_leather", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.animal_hide"), 1),
+        ],
+        craft_sprite: Some(TanningRack),
+    ),
+    "thick leather": (
+        output: ("common.items.crafting_ing.leather.thick_leather", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.tough_hide"), 1),
+        ],
+        craft_sprite: Some(TanningRack),
+    ),
+    "rigid leather": (
+        output: ("common.items.crafting_ing.leather.rigid_leather", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.rugged_hide"), 1),
+        ],
+        craft_sprite: Some(TanningRack),
+    ),
+    "gold ingot": (
+        output: ("common.items.mineral.ingot.gold", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.gold"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "silver ingot": (
+        output: ("common.items.mineral.ingot.silver", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.silver"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "iron ingot": (
+        output: ("common.items.mineral.ingot.iron", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.iron"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "cobalt ingot": (
+        output: ("common.items.mineral.ingot.cobalt", 1),
+        inputs: [
+            (Item("common.items.mineral.ore.cobalt"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "tin ingot": (
+        output: ("common.items.mineral.ingot.tin", 2),
+        inputs: [
+            (Item("common.items.mineral.ore.tin"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "orichalcum ingot": (
+        output: ("common.items.mineral.ingot.orichalcum", 2),
+        inputs: [
+            (Item("common.items.mineral.ingot.gold"), 1),
+            (Item("common.items.mineral.ingot.silver"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "copper ingot": (
+        output: ("common.items.mineral.ingot.copper", 2),
+        inputs: [
+            (Item("common.items.mineral.ore.copper"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "bloodsteel ingot": (
+        output: ("common.items.mineral.ingot.bloodsteel", 2),
+        inputs: [
+            (Item("common.items.mineral.ore.bloodstone"), 1),
+            (Item("common.items.mineral.ingot.iron"), 1),
+            (Item("common.items.mineral.ore.coal"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "steel ingot": (
+        output: ("common.items.mineral.ingot.steel", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 1),
+            (Item("common.items.mineral.ore.coal"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "bronze ingot": (
+        output: ("common.items.mineral.ingot.bronze", 2),
+        inputs: [
+            (Item("common.items.mineral.ingot.copper"), 1),
+            (Item("common.items.mineral.ingot.tin"), 1),
+        ],
+        craft_sprite: Some(Forge),
+    ),
+    "cotton": (
+        output: ("common.items.crafting_ing.cloth.cotton", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cotton_boll"), 1),
+        ],
+        craft_sprite: Some(SpinningWheel),
+    ),
+    "linen_flax": (
+        output: ("common.items.crafting_ing.cloth.linen", 1),
+        inputs: [
+            (Item("common.items.flowers.wild_flax"), 1),
+        ],
+        craft_sprite: Some(SpinningWheel),
+    ),
+    "silk": (
+        output: ("common.items.crafting_ing.cloth.silk", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.sticky_thread"), 1),
+        ],
+        craft_sprite: Some(SpinningWheel),
+    ),
+    "lifecloth": (
+        output: ("common.items.crafting_ing.cloth.lifecloth", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.animal_misc.lively_vine"), 1),
+            (Item("common.items.crafting_ing.cloth.cotton"), 1),
+        ],
+        craft_sprite: Some(SpinningWheel),
+    ),
+    "moonweave": (
+        output: ("common.items.crafting_ing.cloth.moonweave", 1),
+        inputs: [
+            (Item("common.items.flowers.moonbell"), 1),
+        ],
+        craft_sprite: Some(SpinningWheel),
+    ),
+    "sunsilk": (
+        output: ("common.items.crafting_ing.cloth.sunsilk", 1),
+        inputs: [
+            (Item("common.items.flowers.pyrebloom"), 1),
+        ],
+        craft_sprite: Some(SpinningWheel),
+    ),
+    "salad_plain": (
+        output: ("common.items.food.plainsalad", 1),
+        inputs: [
+            (Item("common.items.food.lettuce"), 1),
+            (Item("common.items.crafting_ing.bowl"), 1),
+        ],
+        craft_sprite: None,
+    ),
+    "salad_tomato": (
+        output: ("common.items.food.tomatosalad", 1),
+        inputs: [
+            (Item("common.items.food.lettuce"), 1),
+            (Item("common.items.food.tomato"), 2),
+            (Item("common.items.crafting_ing.bowl"), 1),
+        ],
+        craft_sprite: None,
+    ),
+    "apples_stick": (
+        output: ("common.items.food.apple_stick", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 2),
+            (Item("common.items.food.apple"), 2),
+        ],
+        craft_sprite: None,
+    ),
+    "mushroom_stick": (
+        output: ("common.items.food.mushroom_stick", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 2),
+            (Item("common.items.food.mushroom"), 3),
+        ],
+        craft_sprite: None,
+    ),
+    "sunflower_icetea": (
+        output: ("common.items.food.sunflower_icetea", 4),
+        inputs: [
+            (Item("common.items.crafting_ing.empty_vial"), 1),
+            (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1),
+            (Item("common.items.flowers.sunflower"), 4),
+            (Item("common.items.crafting_ing.honey"), 1),
+        ],
+        craft_sprite: Some(Cauldron),
+    ),
+    "Plain Cloth Glider": (
+        output: ("common.items.glider.basic_white", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 5),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 5),
+            (Item("common.items.crafting_ing.cloth.linen"), 10),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "Red Cloth Glider": (
+        output: ("common.items.glider.basic_red", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 5),
+            (Item("common.items.crafting_ing.cloth.linen_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),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "Leaves Glider": (
+        output: ("common.items.glider.leaves", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 5),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
+            (Item("common.items.crafting_ing.cloth.linen"), 5),
+            (Item("common.items.mineral.gem.emerald"), 1),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "Sand Raptor Wings": (
+        output: ("common.items.glider.sandraptor", 1),
+        inputs: [
+            (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.wool"), 5),
+            (Item("common.items.mineral.gem.sapphire"), 1),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "Snow Raptor Wings": (
+        output: ("common.items.glider.snowraptor", 1),
+        inputs: [
+            (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.silk"), 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),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "Wood Raptor Wings": (
+        output: ("common.items.glider.woodraptor", 1),
+        inputs: [
+            (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.lifecloth"), 5),
+            (Item("common.items.mineral.gem.emerald"), 1),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "Moonlit Love": (
+        output: ("common.items.glider.butterfly3", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.moonweave"), 20),
+            (Item("common.items.crafting_ing.twigs"), 5),
+            (Item("common.items.flowers.red"), 6),
+            (Item("common.items.crafting_ing.sticky_thread"), 8),
+            (Item("common.items.mineral.gem.diamond"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "Horizon": (
+        output: ("common.items.glider.sunset", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 20),
+            (Item("common.items.crafting_ing.twigs"), 5),
+            (Item("common.items.crafting_ing.cactus"), 8),
+            (Item("common.items.mineral.gem.topaz"), 6),
+            (Item("common.items.mineral.gem.ruby"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "Healing Sceptre": (
+        output: ("common.items.weapons.sceptre.starter_sceptre", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 10),
+            (Item("common.items.crafting_ing.stones"), 0),
+        ],
+        craft_sprite: None,
+    ),
+    "Soothing Loop": (
+        output: ("common.items.weapons.sceptre.loops0", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.twigs"), 20),
+            (Item("common.items.mineral.ore.veloritefrag"), 8),
+            (Item("common.items.mineral.gem.ruby"), 4),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "Hunting Bow": (
+        output: ("common.items.weapons.bow.wood-2", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.leather_strips"), 8),
+            (Item("common.items.crafting_ing.twigs"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "Forest Spirit": (
+        output: ("common.items.weapons.sword.wood-2", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.twigs"), 10),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "Burnt Drumstick": (
+        output: ("common.items.weapons.hammer.burnt_drumstick", 1),
+        inputs: [
+            (Item("common.items.food.meat.bird_large_cooked"), 1),
+        ],
+        craft_sprite: Some(CookingPot),
+    ),
+    //ARMOR/HIDE/RAWHIDE
+    "rawhide back": (
+        output: ("common.items.armor.hide.rawhide.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "rawhide belt": (
+        output: ("common.items.armor.hide.rawhide.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "rawhide chest": (
+        output: ("common.items.armor.hide.rawhide.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "rawhide feet": (
+        output: ("common.items.armor.hide.rawhide.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "rawhide hands": (
+        output: ("common.items.armor.hide.rawhide.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "rawhide pants": (
+        output: ("common.items.armor.hide.rawhide.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "rawhide shoulder": (
+        output: ("common.items.armor.hide.rawhide.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.simple_leather"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    //ARMOR/HIDE/LEATHER
+    "leather back": (
+        output: ("common.items.armor.hide.leather.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "leather belt": (
+        output: ("common.items.armor.hide.leather.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "leather chest": (
+        output: ("common.items.armor.hide.leather.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.thick_leather"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "leather feet": (
+        output: ("common.items.armor.hide.leather.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "leather hands": (
+        output: ("common.items.armor.hide.leather.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "leather pants": (
+        output: ("common.items.armor.hide.leather.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.thick_leather"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "leather shoulder": (
+        output: ("common.items.armor.hide.leather.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.thick_leather"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    //ARMOR/HIDE/SCALE
+    "scale back": (
+        output: ("common.items.armor.hide.scale.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "scale belt": (
+        output: ("common.items.armor.hide.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.hide.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.hide.scale.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "scale hands": (
+        output: ("common.items.armor.hide.scale.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "scale pants": (
+        output: ("common.items.armor.hide.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.hide.scale.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.scales"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    //ARMOR/HIDE/CARAPACE
+    "carapace back": (
+        output: ("common.items.armor.hide.carapace.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 3),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace belt": (
+        output: ("common.items.armor.hide.carapace.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 2),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace chest": (
+        output: ("common.items.armor.hide.carapace.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 10),
+            (Item("common.items.mineral.ingot.steel"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace feet": (
+        output: ("common.items.armor.hide.carapace.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 3),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace hands": (
+        output: ("common.items.armor.hide.carapace.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 3),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace pants": (
+        output: ("common.items.armor.hide.carapace.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 8),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "carapace shoulder": (
+        output: ("common.items.armor.hide.carapace.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.carapace"), 8),
+            (Item("common.items.mineral.ingot.steel"), 1),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    //ARMOR/HIDE/PRIMAL
+    "primal back": (
+        output: ("common.items.armor.hide.primal.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "primal belt": (
+        output: ("common.items.armor.hide.primal.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 2),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "primal chest": (
+        output: ("common.items.armor.hide.primal.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 10),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "primal feet": (
+        output: ("common.items.armor.hide.primal.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "primal hands": (
+        output: ("common.items.armor.hide.primal.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "primal pants": (
+        output: ("common.items.armor.hide.primal.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 8),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "primal shoulder": (
+        output: ("common.items.armor.hide.primal.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.plate"), 8),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 2),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    //ARMOR/HIDE/DRAGONSCALE
+    "dragonscale back": (
+        output: ("common.items.armor.hide.dragonscale.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
+            (Item("common.items.mineral.ingot.bloodsteel"), 2),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 1),
+            (Item("common.items.crafting_ing.hide.scales"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale belt": (
+        output: ("common.items.armor.hide.dragonscale.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 2),
+            (Item("common.items.mineral.ingot.bloodsteel"), 2),
+            (Item("common.items.crafting_ing.hide.scales"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale chest": (
+        output: ("common.items.armor.hide.dragonscale.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 10),
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
+            (Item("common.items.crafting_ing.hide.scales"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale feet": (
+        output: ("common.items.armor.hide.dragonscale.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
+            (Item("common.items.mineral.ingot.bloodsteel"), 2),
+            (Item("common.items.crafting_ing.hide.scales"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale hands": (
+        output: ("common.items.armor.hide.dragonscale.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
+            (Item("common.items.mineral.ingot.bloodsteel"), 2),
+            (Item("common.items.crafting_ing.hide.scales"), 2),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale pants": (
+        output: ("common.items.armor.hide.dragonscale.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 8),
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 1),
+            (Item("common.items.crafting_ing.hide.scales"), 4),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "dragonscale shoulder": (
+        output: ("common.items.armor.hide.dragonscale.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.dragon_scale"), 8),
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
+            (Item("common.items.crafting_ing.hide.scales"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    //ARMOR/CLOTH/LINEN
+    "linen back": (
+        output: ("common.items.armor.cloth.linen.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 3),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "linen belt": (
+        output: ("common.items.armor.cloth.linen.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 2),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "linen chest": (
+        output: ("common.items.armor.cloth.linen.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 10),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "linen feet": (
+        output: ("common.items.armor.cloth.linen.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 3),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "linen hands": (
+        output: ("common.items.armor.cloth.linen.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 3),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "linen pants": (
+        output: ("common.items.armor.cloth.linen.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 8),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "linen shoulder": (
+        output: ("common.items.armor.cloth.linen.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 8),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    //ARMOR/CLOTH/WOOLEN
+    "woolen back": (
+        output: ("common.items.armor.cloth.woolen.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.wool"), 3),
+            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "woolen belt": (
+        output: ("common.items.armor.cloth.woolen.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.wool"), 1),
+            (Item("common.items.crafting_ing.cloth.cotton"), 1),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "woolen chest": (
+        output: ("common.items.armor.cloth.woolen.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.wool"), 8),
+            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "woolen feet": (
+        output: ("common.items.armor.cloth.woolen.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.wool"), 2),
+            (Item("common.items.crafting_ing.cloth.cotton"), 1),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "woolen hands": (
+        output: ("common.items.armor.cloth.woolen.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.wool"), 2),
+            (Item("common.items.crafting_ing.cloth.cotton"), 1),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "woolen pants": (
+        output: ("common.items.armor.cloth.woolen.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.wool"), 6),
+            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "woolen shoulder": (
+        output: ("common.items.armor.cloth.woolen.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.wool"), 6),
+            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.animal_misc.fur"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    //ARMOR/CLOTH/SILKEN
+    "silken back": (
+        output: ("common.items.armor.cloth.silken.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "silken belt": (
+        output: ("common.items.armor.cloth.silken.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.silk"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "silken chest": (
+        output: ("common.items.armor.cloth.silken.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.silk"), 10),
+            (Item("common.items.mineral.gem.amethyst"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "silken feet": (
+        output: ("common.items.armor.cloth.silken.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "silken hands": (
+        output: ("common.items.armor.cloth.silken.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "silken pants": (
+        output: ("common.items.armor.cloth.silken.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.silk"), 8),
+            (Item("common.items.mineral.gem.amethyst"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "silken shoulder": (
+        output: ("common.items.armor.cloth.silken.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.silk"), 8),
+            (Item("common.items.mineral.gem.amethyst"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    //ARMOR/CLOTH/DRUID
+    "druid back": (
+        output: ("common.items.armor.cloth.druid.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "druid belt": (
+        output: ("common.items.armor.cloth.druid.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
+            (Item("common.items.mineral.ore.veloritefrag"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "druid chest": (
+        output: ("common.items.armor.cloth.druid.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 10),
+            (Item("common.items.mineral.ore.veloritefrag"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "druid feet": (
+        output: ("common.items.armor.cloth.druid.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "druid hands": (
+        output: ("common.items.armor.cloth.druid.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "druid pants": (
+        output: ("common.items.armor.cloth.druid.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 8),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "druid shoulder": (
+        output: ("common.items.armor.cloth.druid.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 8),
+            (Item("common.items.mineral.ore.veloritefrag"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    //ARMOR/CLOTH/MOONWEAVE
+    "moonweave back": (
+        output: ("common.items.armor.cloth.moonweave.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.moonweave"), 3),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 3),
+            (Item("common.items.mineral.ingot.silver"), 1),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "moonweave belt": (
+        output: ("common.items.armor.cloth.moonweave.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.moonweave"), 2),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 2),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "moonweave chest": (
+        output: ("common.items.armor.cloth.moonweave.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.moonweave"), 10),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 5),
+            (Item("common.items.mineral.ingot.silver"), 1),
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "moonweave feet": (
+        output: ("common.items.armor.cloth.moonweave.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.moonweave"), 3),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 2),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "moonweave hands": (
+        output: ("common.items.armor.cloth.moonweave.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.moonweave"), 3),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 2),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "moonweave pants": (
+        output: ("common.items.armor.cloth.moonweave.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.moonweave"), 8),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 3),
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "moonweave shoulder": (
+        output: ("common.items.armor.cloth.moonweave.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.moonweave"), 8),
+            (Item("common.items.crafting_ing.hide.leather_troll"), 3),
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    //ARMOR/CLOTH/SUNSILK
+    "sunsilk back": (
+        output: ("common.items.armor.cloth.sunsilk.back", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
+            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 1),
+            (Item("common.items.mineral.ingot.gold"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "sunsilk belt": (
+        output: ("common.items.armor.cloth.sunsilk.belt", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 2),
+            (Item("common.items.mineral.ingot.gold"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "sunsilk chest": (
+        output: ("common.items.armor.cloth.sunsilk.chest", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 10),
+            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
+            (Item("common.items.mineral.ingot.gold"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "sunsilk feet": (
+        output: ("common.items.armor.cloth.sunsilk.foot", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
+            (Item("common.items.mineral.ingot.gold"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "sunsilk hands": (
+        output: ("common.items.armor.cloth.sunsilk.hand", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
+            (Item("common.items.mineral.ingot.gold"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "sunsilk pants": (
+        output: ("common.items.armor.cloth.sunsilk.pants", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 8),
+            (Item("common.items.mineral.ingot.gold"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    "sunsilk shoulder": (
+        output: ("common.items.armor.cloth.sunsilk.shoulder", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.sunsilk"), 8),
+            (Item("common.items.mineral.ingot.gold"), 3),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: Some(Loom),
+    ),
+    //ARMOR/MAIL/BRONZE
+    "bronze back": (
+        output: ("common.items.armor.mail.bronze.back", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bronze"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bronze belt": (
+        output: ("common.items.armor.mail.bronze.belt", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bronze"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bronze chest": (
+        output: ("common.items.armor.mail.bronze.chest", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bronze"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bronze feet": (
+        output: ("common.items.armor.mail.bronze.foot", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bronze"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bronze hands": (
+        output: ("common.items.armor.mail.bronze.hand", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bronze"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bronze pants": (
+        output: ("common.items.armor.mail.bronze.pants", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bronze"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bronze shoulder": (
+        output: ("common.items.armor.mail.bronze.shoulder", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bronze"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    //ARMOR/MAIL/IRON
+    "iron back": (
+        output: ("common.items.armor.mail.iron.back", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "iron belt": (
+        output: ("common.items.armor.mail.iron.belt", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 2),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "iron chest": (
+        output: ("common.items.armor.mail.iron.chest", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "iron feet": (
+        output: ("common.items.armor.mail.iron.foot", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "iron hands": (
+        output: ("common.items.armor.mail.iron.hand", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 3),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "iron pants": (
+        output: ("common.items.armor.mail.iron.pants", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "iron shoulder": (
+        output: ("common.items.armor.mail.iron.shoulder", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 8),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    //ARMOR/MAIL/STEEL
+    "steel back": (
+        output: ("common.items.armor.mail.steel.back", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.steel"), 3),
+            (Item("common.items.crafting_ing.cloth.linen"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "steel belt": (
+        output: ("common.items.armor.mail.steel.belt", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.steel"), 2),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "steel chest": (
+        output: ("common.items.armor.mail.steel.chest", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.steel"), 10),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "steel feet": (
+        output: ("common.items.armor.mail.steel.foot", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.steel"), 3),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "steel hands": (
+        output: ("common.items.armor.mail.steel.hand", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.steel"), 3),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "steel pants": (
+        output: ("common.items.armor.mail.steel.pants", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.steel"), 8),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "steel shoulder": (
+        output: ("common.items.armor.mail.steel.shoulder", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.steel"), 8),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 6),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    //ARMOR/MAIL/COBALT
+    "cobalt back": (
+        output: ("common.items.armor.mail.cobalt.back", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_ing.cloth.silk"), 4),
+            (Item("common.items.mineral.gem.sapphire"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "cobalt belt": (
+        output: ("common.items.armor.mail.cobalt.belt", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_ing.cloth.silk"), 2),
+            (Item("common.items.mineral.gem.sapphire"), 1),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "cobalt chest": (
+        output: ("common.items.armor.mail.cobalt.chest", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 10),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.mineral.gem.sapphire"), 3),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "cobalt feet": (
+        output: ("common.items.armor.mail.cobalt.foot", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "cobalt hands": (
+        output: ("common.items.armor.mail.cobalt.hand", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 3),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "cobalt pants": (
+        output: ("common.items.armor.mail.cobalt.pants", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 8),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.mineral.gem.sapphire"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "cobalt shoulder": (
+        output: ("common.items.armor.mail.cobalt.shoulder", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 8),
+            (Item("common.items.crafting_ing.cloth.silk"), 3),
+            (Item("common.items.mineral.gem.sapphire"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    //ARMOR/MAIL/BLOODSTEEL
+    "bloodsteel back": (
+        output: ("common.items.armor.mail.bloodsteel.back", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.hide.carapace"), 1),
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
+            (Item("common.items.mineral.gem.ruby"), 1),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bloodsteel belt": (
+        output: ("common.items.armor.mail.bloodsteel.belt", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 2),
+            (Item("common.items.crafting_ing.hide.carapace"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bloodsteel chest": (
+        output: ("common.items.armor.mail.bloodsteel.chest", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 10),
+            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.mineral.gem.diamond"), 2),
+            (Item("common.items.mineral.gem.ruby"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bloodsteel feet": (
+        output: ("common.items.armor.mail.bloodsteel.foot", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.hide.carapace"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bloodsteel hands": (
+        output: ("common.items.armor.mail.bloodsteel.hand", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 3),
+            (Item("common.items.crafting_ing.hide.carapace"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bloodsteel pants": (
+        output: ("common.items.armor.mail.bloodsteel.pants", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 8),
+            (Item("common.items.crafting_ing.hide.carapace"), 3),
+            (Item("common.items.mineral.gem.ruby"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "bloodsteel shoulder": (
+        output: ("common.items.armor.mail.bloodsteel.shoulder", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.bloodsteel"), 8),
+            (Item("common.items.crafting_ing.hide.carapace"), 4),
+            (Item("common.items.mineral.gem.ruby"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    //ARMOR/MAIL/ORICHALCUM
+    "orichalcum back": (
+        output: ("common.items.armor.mail.orichalcum.back", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.orichalcum"), 3),
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.crafting_ing.cloth.moonweave"), 2),
+            (Item("common.items.mineral.gem.diamond"), 2),
+            (Item("common.items.mineral.gem.sapphire"), 1),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "orichalcum belt": (
+        output: ("common.items.armor.mail.orichalcum.belt", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.orichalcum"), 2),
+            (Item("common.items.crafting_ing.hide.plate"), 2),
+            (Item("common.items.mineral.gem.diamond"), 2),
+            (Item("common.items.mineral.gem.sapphire"), 1),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "orichalcum chest": (
+        output: ("common.items.armor.mail.orichalcum.chest", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.orichalcum"), 10),
+            (Item("common.items.mineral.ingot.cobalt"), 2),
+            (Item("common.items.crafting_ing.hide.plate"), 4),
+            (Item("common.items.mineral.gem.diamond"), 3),
+            (Item("common.items.mineral.gem.sapphire"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "orichalcum feet": (
+        output: ("common.items.armor.mail.orichalcum.foot", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.orichalcum"), 3),
+            (Item("common.items.crafting_ing.hide.plate"), 2),
+            (Item("common.items.mineral.gem.diamond"), 1),
+            (Item("common.items.mineral.gem.sapphire"), 1),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "orichalcum hands": (
+        output: ("common.items.armor.mail.orichalcum.hand", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.orichalcum"), 3),
+            (Item("common.items.crafting_ing.hide.plate"), 2),
+            (Item("common.items.mineral.gem.diamond"), 1),
+            (Item("common.items.mineral.gem.sapphire"), 1),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "orichalcum pants": (
+        output: ("common.items.armor.mail.orichalcum.pants", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.orichalcum"), 8),
+            (Item("common.items.mineral.ingot.cobalt"), 1),
+            (Item("common.items.crafting_ing.hide.plate"), 3),
+            (Item("common.items.mineral.gem.diamond"), 2),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "orichalcum shoulder": (
+        output: ("common.items.armor.mail.orichalcum.shoulder", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.orichalcum"), 8),
+            (Item("common.items.crafting_ing.hide.plate"), 4),
+            (Item("common.items.mineral.gem.sapphire"), 2),
+        ],
+        craft_sprite: Some(Anvil),
     ),
 
-    // Tabards
-    Armor(Tabard("Admin")): Png(
-        "element.items.tabard_admin",
-    ),
-    // Heads
-    Armor(Head("Leather")): VoxTrans(
-        "voxel.armor.misc.head.leather-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
-    ),
-    Armor(Head("Assassin")): VoxTrans(
-        "voxel.armor.misc.head.assa_mask-0",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
-    ),
-    Armor(Head("Exclamation")): VoxTrans(
-        "voxel.armor.misc.head.exclamation",
-        (0.0, 15.0, 0.0), (-75.0, 135.0, 0.0), 3.0,
-    ),
-    // Bags
-    Armor(Bag("RedFace")): Png (
-        "element.items.item_bag_red_face",
-    ),
-    Armor(Bag("BlackHole")): Png (
-        "element.items.item_bag_brown_face",
-    ),
-    Armor(Bag("BlueFace")): Png (
-        "element.items.item_bag_blue_face",
-    ),
-    Armor(Bag("PurpleSkull")): Png (
-        "element.items.item_bag_skull",
-    ),
-    Armor(Bag("GreenLarge")): Png (
-        "element.items.item_bag_green_large",
-    ),
-    Armor(Bag("LeatherLarge")): Png (
-        "element.items.item_bag_leather_large",
-    ),
-    Armor(Bag("GreenMid")): Png (
-        "element.items.item_bag_green_mid",
-    ),
-    Armor(Bag("LeatherSmall")): Png (
-        "element.items.item_bag_leather_small",
-    ),
-    Armor(Bag("RedLarge")): Png (
-        "element.items.item_bag_large",
-    ),
-    Armor(Bag("RedMed")): Png (
-        "element.items.item_bag_med",
-    ),
-    Armor(Bag("RedSmall")): Png (
-        "element.items.item_bag_small",
-    ),
-    Armor(Bag("RedTiny")): Png (
-        "element.items.item_bag_tiny",
-    ),
-    Armor(Bag("BluePouch")): Png (
-        "element.items.item_bag_blue",
-    ),
-    // Consumables
-    Consumable("common.items.food.apple"): Png(
-        "element.items.item_apple",
-    ),
-    Consumable("common.items.food.coconut"): Png(
-        "element.items.item_coconut",
-    ),
-    Consumable("common.items.food.cactus_colada"): VoxTrans(
-        "voxel.object.cactus_drink",
-        (-1.0, 1.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
-    ),
-    Consumable("common.items.consumable.potion_med"): VoxTrans(
-        "voxel.object.potion_red",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
-    ),
-    Consumable("common.items.consumable.potion_minor"): VoxTrans(
-        "voxel.object.potion_red",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.5,
-    ),
-    Consumable("common.items.consumable.potion_big"): VoxTrans(
-        "voxel.object.potion_red",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
-    ),
-    Consumable("common.items.boss_drops.potions"): VoxTrans(
-        "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.mushroom"): VoxTrans(
-        "voxel.sprite.mushrooms.mushroom-10",
-        (0.0, 0.0, 0.0), (-50.0, 70.0, 40.0), 1.0,
-    ),
-    Ingredient("Velorite"): VoxTrans(
-        "voxel.sprite.velorite.velorite_ore",
-        (0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Ingredient("VeloriteFrag"): VoxTrans(
-        "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.spore_corruption"): VoxTrans(
-        "voxel.sprite.spore.corruption_spore",
-        (0.0, 0.0, 0.0), (-30.0, 30.0, 20.0), 0.8,
-    ),
-    Consumable("common.items.food.apple_stick"): Png(
-        "element.items.item_apple_stick",
-    ),
-    Consumable("common.items.food.mushroom_stick"): Png(
-        "element.items.item_shroom_stick",
-    ),
-    Consumable("common.items.food.sunflower_icetea"): Png(
-        "element.items.item_sunflower_tea",
-    ),
-    Consumable("common.items.food.carrot"): VoxTrans(
-        "voxel.sprite.carrot.carrot",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Consumable("common.items.food.tomato"): VoxTrans(
-        "voxel.sprite.tomato.tomato",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
-    ),
-    Consumable("common.items.food.lettuce"): VoxTrans(
-        "voxel.sprite.cabbage.cabbage",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
-    ),
-    Consumable("common.items.food.meat.fish_raw"): VoxTrans(
-        "voxel.sprite.food.meat.fish_raw",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Consumable("common.items.food.meat.fish_cooked"): VoxTrans(
-        "voxel.sprite.food.meat.fish_cooked",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Consumable("common.items.food.meat.bird_raw"): VoxTrans(
-        "voxel.sprite.food.meat.bird_raw",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Consumable("common.items.food.meat.bird_cooked"): VoxTrans(
-        "voxel.sprite.food.meat.bird_cooked",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Consumable("common.items.food.meat.bird_large_raw"): VoxTrans(
-        "voxel.sprite.food.meat.bird_large_raw",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Consumable("common.items.food.meat.bird_large_cooked"): VoxTrans(
-        "voxel.sprite.food.meat.bird_large_cooked",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Consumable("common.items.food.meat.beast_small_raw"): VoxTrans(
-        "voxel.sprite.food.meat.beast_small_raw",
-        (0.0, 0.0, 0.0), (-50.0, 10.0, 0.0), 1.0,
-    ),
-    Consumable("common.items.food.meat.beast_small_cooked"): VoxTrans(
-        "voxel.sprite.food.meat.beast_small_cooked",
-        (0.0, 0.0, 0.0), (-50.0, 20.0, 0.0), 1.0,
-    ),
-    Consumable("common.items.food.meat.tough_raw"): VoxTrans(
-        "voxel.sprite.food.meat.tough_raw",
-        (0.0, 0.0, 0.0), (-50.0, 10.0, 0.0), 1.0,
-    ),
-    Consumable("common.items.food.meat.tough_cooked"): VoxTrans(
-        "voxel.sprite.food.meat.tough_cooked",
-        (0.0, 0.0, 0.0), (-50.0, 20.0, 0.0), 1.0,
-    ),
-    Consumable("common.items.food.meat.beast_large_raw"): VoxTrans(
-        "voxel.sprite.food.meat.beast_large_raw",
-        (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8,
-    ),
-    Consumable("common.items.food.meat.beast_large_cooked"): VoxTrans(
-        "voxel.sprite.food.meat.beast_large_cooked",
-        (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8,
-    ),
-    Consumable("common.items.food.plainsalad"): VoxTrans(
-        "voxel.sprite.food.salad_plain",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
-    ),
-    Consumable("common.items.food.tomatosalad"): VoxTrans(
-        "voxel.sprite.food.salad_tomato",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
-    ),
-    // Throwables
-    Throwable(Bomb): VoxTrans(
-        "voxel.object.bomb",
-        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Throwable(Firework(Blue)): VoxTrans(
-        "voxel.weapon.projectile.fireworks_blue-0",
-        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Throwable(Firework(Green)): VoxTrans(
-        "voxel.weapon.projectile.fireworks_green-0",
-        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Throwable(Firework(Purple)): VoxTrans(
-        "voxel.weapon.projectile.fireworks_purple-0",
-        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Throwable(Firework(Red)): VoxTrans(
-        "voxel.weapon.projectile.fireworks_red-0",
-        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Throwable(Firework(White)): VoxTrans(
-        "voxel.weapon.projectile.fireworks_white-0",
-        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Throwable(Firework(Yellow)): VoxTrans(
-        "voxel.weapon.projectile.fireworks_yellow-0",
-        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Throwable(TrainingDummy): VoxTrans(
-        "voxel.object.training_dummy",
-        (0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    // Ingredients
-    Tool("common.items.tool.craftsman_hammer"): VoxTrans(
-        "voxel.weapon.hammer.craftsman",
-        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
-    ),
-    Ingredient("SewingSet"): Png(
-        "element.items.sewing_set",
-    ),
-    Ingredient("Flower"): VoxTrans(
-        "voxel.sprite.flowers.sunflower_1",
-        (-2.0, -0.5, -1.0), (-60.0, 40.0, 20.0), 1.1,
-    ),
-    Ingredient("FlowerRed"): VoxTrans(
-        "voxel.sprite.flowers.flower_red-4",
-        (0.0, 0.5, 0.0), (-70.0, 10.0, 0.0), 0.8,
-    ),
-    Ingredient("Sunflower"): VoxTrans(
-        "voxel.sprite.flowers.sunflower_1",
-        (0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Ingredient("Grass"): VoxTrans(
-        "voxel.sprite.grass.grass_long_5",
-        (0.0, 0.0, 0.0), (-90.0, 50.0, 0.0), 1.0,
-    ),
-    Ingredient("Stones"): VoxTrans(
-        "voxel.sprite.rocks.rock-0",
-        (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Ingredient("Cactus"): VoxTrans(
-        "voxel.sprite.cacti.flat_cactus_med",
-        (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.9,
-    ),
-    Ingredient("Seashells"): VoxTrans(
-        "voxel.sprite.seashells.shell-0",
-        (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
-    ),
-    Ingredient("IcyShard"): Png(
-        "element.items.item_ice_shard",
-    ),
-    Ingredient("FlayerBagDamaged"): Png(
-        "element.items.item_flayer_soul",
-    ),
-    Ingredient("RaptorFeather"): Png(
-        "element.items.item_raptor_feather",
-    ),
-    Ingredient("Twigs"): VoxTrans(
-        "voxel.sprite.twigs.twigs-0",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("AnimalHide"): VoxTrans(
-        "voxel.sprite.crafting_ing.hide.animal_hide",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("ToughHide"): VoxTrans(
-        "voxel.sprite.crafting_ing.hide.tough_hide",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("RuggedHide"): VoxTrans(
-        "voxel.sprite.crafting_ing.hide.rugged_hide",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("SimpleLeather"): VoxTrans(
-        "voxel.sprite.crafting_ing.leather.simple_leather",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("ThickLeather"): VoxTrans(
-        "voxel.sprite.crafting_ing.leather.thick_leather",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("RigidLeather"): VoxTrans(
-        "voxel.sprite.crafting_ing.leather.rigid_leather",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("TrollLeather"): VoxTrans(
-        "voxel.sprite.crafting_ing.hide.troll_hide",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("LeatherStrips"): VoxTrans(
-        "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.8,
-    ),
-    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.animal_misc.claw",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("VenomSac"): VoxTrans(
-        "voxel.sprite.crafting_ing.animal_misc.venom_sac",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("LivelyVine"): VoxTrans(
-        "voxel.sprite.crafting_ing.animal_misc.lively_vine",
-        (0.0, 0.0, 0.0), (-40.0, -40.0, 20.0), 1.2,
-    ),
-    Ingredient("SharpFang"): VoxTrans(
-        "voxel.sprite.crafting_ing.animal_misc.sharp_fang",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0,
-    ),
-    Ingredient("Fur"): VoxTrans(
-        "voxel.sprite.crafting_ing.animal_misc.fur",
-        (0.0, 0.0, 0.0), (-40.0, -10.0, 10.0), 1.0,
-    ),
-    Ingredient("LargeHorn"): VoxTrans(
-        "voxel.sprite.crafting_ing.animal_misc.large_horn",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("GrimEyeball"): VoxTrans(
-        "voxel.sprite.crafting_ing.animal_misc.grim_eyeball",
-        (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
-    ),
-    Ingredient("PlantFiber"): VoxTrans(
-        "voxel.sprite.crafting_ing.plant_fiber",
-        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
-    ),
-    Ingredient("Moonbell"): VoxTrans(
-        "voxel.sprite.flowers.moonbell",
-        (0.0, 0.0, 0.0), (-65.0, 40.0, 20.0), 0.9,
-    ),
-    Ingredient("Pyrebloom"): VoxTrans(
-        "voxel.sprite.flowers.pyrebloom",
-        (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.9,
-    ),
-    Ingredient("WildFlax"): VoxTrans(
-        "voxel.sprite.flowers.flax",
-        (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.8,
-    ),
-    Ingredient("CottonBoll"): VoxTrans(
-        "voxel.sprite.crafting_ing.cotton_boll",
-        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
-    ),
-    Ingredient("Cotton"): VoxTrans(
-        "voxel.sprite.crafting_ing.cloth.cotton",
-        (0.0, 0.0, 0.0), (-65.0, 0.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("LinenRed"): VoxTrans(
-        "voxel.sprite.crafting_ing.cloth.linen_red",
-        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
-    ),
-    Ingredient("StickyThread"): VoxTrans(
-        "voxel.sprite.crafting_ing.sticky_thread",
-        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
-    ),
-    Ingredient("SilverIngot"): VoxTrans(
-        "voxel.sprite.mineral.ingot.silver",
-        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
-    ),
-    Ingredient("GoldIngot"): VoxTrans(
-        "voxel.sprite.mineral.ingot.gold",
-        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
-    ),
-    Ingredient("OrichalcumIngot"): VoxTrans(
-        "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, 15.0), 0.9,
-    ),
-    Ingredient("SilverOre"): VoxTrans(
-        "voxel.sprite.mineral.ore.silver",
-        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
-    ),
-    Ingredient("BloodstoneOre"): VoxTrans(
-        "voxel.sprite.mineral.ore.bloodstone",
-        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
-    ),
-    Ingredient("CobaltOre"): VoxTrans(
-        "voxel.sprite.mineral.ore.cobalt",
-        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
-    ),
-    Ingredient("CopperOre"): VoxTrans(
-        "voxel.sprite.mineral.ore.copper",
-        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
-    ),
-    Ingredient("IronOre"): VoxTrans(
-        "voxel.sprite.mineral.ore.iron",
-        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
-    ),
-    Ingredient("TinOre"): VoxTrans(
-        "voxel.sprite.mineral.ore.tin",
-        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
-    ),
-    Ingredient("Coal"): VoxTrans(
-        "voxel.sprite.mineral.ore.coal",
-        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
-    ),
-    Ingredient("Honey"): Png(
-        "element.items.item_honey",
-    ),
-    Ingredient("MortarPestle"): Png(
-        "element.items.item_mortarpestlecoco",
-    ),
-    Ingredient("EmptyVial"): VoxTrans(
-        "voxel.object.potion_empty",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
-    ),
-    Ingredient("Bowl"): VoxTrans(
-        "voxel.sprite.crafting_ing.bowl",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
-    ),
-    Ingredient("Oil"): VoxTrans(
-        "voxel.sprite.crafting_ing.oil",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
-    ),
-    Ingredient("ViscousOoze"): VoxTrans(
-        "voxel.sprite.crafting_ing.animal_misc.viscous_ooze",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
-    ),
-    Ingredient("PhoenixFeather"): VoxTrans(
-        "voxel.sprite.crafting_ing.animal_misc.phoenix_feather",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.2,
-    ),
-    // Gliders
-    Glider("Starter"): VoxTrans(
-        "voxel.glider.starter",
-        (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
-    ),
-    Glider("PlainCloth"): VoxTrans(
-        "voxel.glider.basic_white",
-        (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
-    ),
-    Glider("RedCloth"): VoxTrans(
-        "voxel.glider.basic_red",
-        (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
-    ),
-    Glider("Blue0"): VoxTrans(
-        "voxel.glider.blue",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("ButterflyMorpho"): VoxTrans(
-        "voxel.glider.butterfly1",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("ButterflyMonarch"): VoxTrans(
-        "voxel.glider.butterfly2",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("ButterflyLove"): VoxTrans(
-        "voxel.glider.butterfly3",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("MothLuna"): VoxTrans(
-        "voxel.glider.moth",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("SandRaptor"): VoxTrans(
-        "voxel.glider.sandraptor",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("SnowRaptor"): VoxTrans(
-        "voxel.glider.snowraptor",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("WoodRaptor"): VoxTrans(
-        "voxel.glider.woodraptor",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("Sunset"): VoxTrans(
-        "voxel.glider.sunset",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("Moonrise"): VoxTrans(
-        "voxel.glider.moonrise",
-        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("Purple0"): VoxTrans(
-        "voxel.glider.cultists",
-        (5.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    Glider("Leaves"): VoxTrans(
-        "voxel.glider.leaves",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
-    ),
-    // Debug Items
-    Tool("common.items.debug.admin_stick"): VoxTrans(
-        "voxel.weapon.tool.broom_belzeshrub_purple",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    // Gems
-    Ingredient("Amethyst"): VoxTrans(
-        "voxel.sprite.mineral.gem.amethystgem",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
-    ),
-    Ingredient("Topaz"): VoxTrans(
-        "voxel.sprite.mineral.gem.topazgem",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
-    ),
-    Ingredient("Sapphire"): VoxTrans(
-        "voxel.sprite.mineral.gem.sapphiregem",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.6,
-    ),
-    Ingredient("Emerald"): VoxTrans(
-        "voxel.sprite.mineral.gem.emeraldgem",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
-    ),
-    Ingredient("Ruby"): VoxTrans(
-        "voxel.sprite.mineral.gem.rubygem",
-        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
-    ),
-    Ingredient("Diamond"): VoxTrans(
-        "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(
-        "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_blade",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
-    ),
-    ModularComponent("common.items.crafting_ing.modular.held.sword.tier5"): VoxTrans(
-        "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
-    ),
-})
+    "Seashell Necklace": (
+        output: ("common.items.armor.misc.neck.shell", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 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.linen_red", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen"), 1),
+            (Item("common.items.flowers.red"), 1),
+            (Item("common.items.crafting_tools.mortar_pestle"), 0),
+        ],
+        craft_sprite: None,
+    ),
+    "tiny red pouch": (
+        output: ("common.items.armor.misc.bag.tiny_red_pouch", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.linen_red"), 3),
+        ],
+        craft_sprite: None,
+    ),
+    "tiny leather pouch": (
+        output: ("common.items.armor.misc.bag.tiny_leather_pouch", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.leather_strips"), 12),
+        ],
+        craft_sprite: None,
+    ),
+    "knitted red pouch": (
+        output: ("common.items.armor.misc.bag.knitted_red_pouch", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.wool"), 6),
+            (Item("common.items.armor.misc.bag.tiny_red_pouch"), 2),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: None,
+    ),
+    "woven red bag": (
+        output: ("common.items.armor.misc.bag.woven_red_bag", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.silk"), 6),
+            (Item("common.items.armor.misc.bag.knitted_red_pouch"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: None,
+    ),
+    "traveler backpack": (
+        output: ("common.items.armor.misc.back.backpack", 1),
+        inputs: [
+            (Item("common.items.mineral.gem.diamond"), 2),
+            (Item("common.items.crafting_ing.twigs"), 2),
+            (Item("common.items.crafting_ing.cloth.silk"), 4),
+            (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),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "sturdy red backpack": (
+        output: ("common.items.armor.misc.bag.sturdy_red_backpack", 1),
+        inputs: [
+            (Item("common.items.mineral.gem.amethyst"), 2),
+            (Item("common.items.crafting_ing.cloth.linen_red"), 3),
+            (Item("common.items.crafting_ing.leather.thick_leather"), 6),
+            (Item("common.items.armor.misc.bag.woven_red_bag"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: None,
+    ),
+    "troll hide pack": (
+        output: ("common.items.armor.misc.bag.troll_hide_pack", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.hide.leather_troll"), 10),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 10),
+            (Item("common.items.mineral.gem.diamond"), 1),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: None,
+    ),
+    "Mindflayer Spellbag": (
+        output: ("common.items.armor.misc.bag.mindflayer_spellbag", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1),
+            (Item("common.items.crafting_ing.leather.rigid_leather"), 8),
+            (Item("common.items.mineral.gem.diamond"), 4),
+            (Item("common.items.mineral.ore.veloritefrag"), 10),
+            (Item("common.items.crafting_tools.sewing_set"), 0),
+        ],
+        craft_sprite: None,
+    ),
+    "tin pickaxe": (
+        output: ("common.items.tool.pickaxe_stone", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
+            (Item("common.items.crafting_ing.stones"), 5),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "steel pickaxe": (
+        output: ("common.items.tool.pickaxe_steel", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
+            (Item("common.items.mineral.ingot.steel"), 5),
+            (Item("common.items.tool.craftsman_hammer"), 0),
+        ],
+        craft_sprite: Some(Anvil),
+    ),
+    "fang necklace": (
+        output: ("common.items.armor.misc.neck.fang", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.leather_strips"), 3),
+            (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 15),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "honeycomb pendant": (
+        output: ("common.items.armor.misc.neck.honeycomb_pendant", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.sticky_thread"), 3),
+            (Item("common.items.crafting_ing.honey"), 15),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "diamond ring": (
+        output: ("common.items.armor.misc.ring.diamond", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.gold"), 1),
+            (Item("common.items.mineral.gem.diamond"), 1),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "diamond necklace": (
+        output: ("common.items.armor.misc.neck.diamond", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.gold"), 4),
+            (Item("common.items.mineral.gem.diamond"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "ruby ring": (
+        output: ("common.items.armor.misc.ring.ruby", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.silver"), 1),
+            (Item("common.items.mineral.gem.ruby"), 1),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "ruby necklace": (
+        output: ("common.items.armor.misc.neck.ruby", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.silver"), 4),
+            (Item("common.items.mineral.gem.ruby"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "emerald ring": (
+        output: ("common.items.armor.misc.ring.emerald", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 1),
+            (Item("common.items.mineral.gem.emerald"), 1),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "emerald necklace": (
+        output: ("common.items.armor.misc.neck.emerald", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 4),
+            (Item("common.items.mineral.gem.emerald"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "sapphire ring": (
+        output: ("common.items.armor.misc.ring.sapphire", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 1),
+            (Item("common.items.mineral.gem.sapphire"), 1),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "sapphire necklace": (
+        output: ("common.items.armor.misc.neck.sapphire", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 2),
+            (Item("common.items.mineral.gem.sapphire"), 3),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "topaz ring": (
+        output: ("common.items.armor.misc.ring.topaz", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.copper"), 1),
+            (Item("common.items.mineral.gem.topaz"), 1),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "topaz necklace": (
+        output: ("common.items.armor.misc.neck.topaz", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.copper"), 2),
+            (Item("common.items.mineral.gem.topaz"), 3),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "amethyst ring": (
+        output: ("common.items.armor.misc.ring.amethyst", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.tin"), 1),
+            (Item("common.items.mineral.gem.amethyst"), 1),
+        ],
+        craft_sprite: Some(CraftingBench),
+    ),
+    "amethyst necklace": (
+        output: ("common.items.armor.misc.neck.amethyst", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.tin"), 2),
+            (Item("common.items.mineral.gem.amethyst"), 3),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    //"metal_blade": (
+    //    output: ("common.items.crafting_ing.modular.damage.sword.metal_blade", 1),
+    //    inputs: [
+    //        (Tag(MetalIngot), 5),
+    //        (Item("common.items.tool.craftsman_hammer"), 0),
+    //    ],
+    //    craft_sprite: Some(Anvil),
+    //    is_recycling: false,
+    //),
+}

From e9602141d9261c7ecfd31516434c5edbaab5b621 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Wed, 3 Nov 2021 00:40:02 +0100
Subject: [PATCH 02/39] + Updating item_image_manifest to Master (was behind)

---
 assets/voxygen/item_image_manifest.ron | 4726 ++++++++++++++----------
 1 file changed, 2863 insertions(+), 1863 deletions(-)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 6e7a0d6c9d..fbd6c212fe 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1,1891 +1,2891 @@
-{
-    "crafting_hammer": (
-        output: ("common.items.tool.craftsman_hammer", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 6),
-            (Item("common.items.crafting_ing.stones"), 6),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "mortar_pestle": (
-        output: ("common.items.crafting_tools.mortar_pestle", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.stones"), 6),
-            (Item("common.items.crafting_ing.bowl"), 1),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "sewing_set": (
-        output: ("common.items.crafting_tools.sewing_set", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 1),
-            (Item("common.items.mineral.ingot.tin"), 1),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "velorite_frag": (
-        output: ("common.items.mineral.ore.veloritefrag", 2),
-        inputs: [
-            (Item("common.items.mineral.ore.velorite"), 1),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "potion_s": (
-        output: ("common.items.consumable.potion_minor", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.empty_vial"), 1),
-            (Item("common.items.food.apple"), 4),
-            (Item("common.items.crafting_ing.honey"), 1),
-        ],
-        craft_sprite: Some(Cauldron),
-    ),
-    "potion_m": (
-        output: ("common.items.consumable.potion_med", 1),
-        inputs: [
-            (Item("common.items.consumable.potion_minor"), 2),
-            (Item("common.items.mineral.ore.veloritefrag"), 4),
-        ],
-        craft_sprite: Some(Cauldron),
-    ),
-    "cactus_colada": (
-        output: ("common.items.food.cactus_colada", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.empty_vial"), 1),
-            (Item("common.items.crafting_ing.cactus"), 8),
-        ],
-        craft_sprite: Some(Cauldron),
-    ),
-    "collar_basic": (
-        output: ("common.items.utility.collar", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.leather_strips"), 5),
-            (Item("common.items.mineral.gem.ruby"), 1),
-        ],
-        craft_sprite: None,
-    ),
-    "bomb_coconut": (
-        output: ("common.items.utility.bomb", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.stones"), 10),
-            (Item("common.items.food.coconut"), 2),
-            (Item("common.items.mineral.ore.veloritefrag"), 2),
-            (Item("common.items.crafting_tools.mortar_pestle"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "firework_blue": (
-        output: ("common.items.utility.firework_blue", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 1),
-            (Item("common.items.crafting_ing.stones"), 1),
-            (Item("common.items.food.coconut"), 1),
-            (Item("common.items.mineral.ore.veloritefrag"), 1),
-            (Item("common.items.crafting_tools.mortar_pestle"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "firework_green": (
-        output: ("common.items.utility.firework_green", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 1),
-            (Item("common.items.crafting_ing.stones"), 1),
-            (Item("common.items.food.coconut"), 1),
-            (Item("common.items.mineral.ore.veloritefrag"), 1),
-            (Item("common.items.crafting_tools.mortar_pestle"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "firework_purple": (
-        output: ("common.items.utility.firework_purple", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 1),
-            (Item("common.items.crafting_ing.stones"), 1),
-            (Item("common.items.food.coconut"), 1),
-            (Item("common.items.mineral.ore.veloritefrag"), 1),
-            (Item("common.items.crafting_tools.mortar_pestle"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "firework_red": (
-        output: ("common.items.utility.firework_red", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 1),
-            (Item("common.items.crafting_ing.stones"), 1),
-            (Item("common.items.food.coconut"), 1),
-            (Item("common.items.mineral.ore.veloritefrag"), 1),
-            (Item("common.items.crafting_tools.mortar_pestle"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "firework_white": (
-        output: ("common.items.utility.firework_white", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 1),
-            (Item("common.items.crafting_ing.stones"), 1),
-            (Item("common.items.food.coconut"), 1),
-            (Item("common.items.mineral.ore.veloritefrag"), 1),
-            (Item("common.items.crafting_tools.mortar_pestle"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "firework_yellow": (
-        output: ("common.items.utility.firework_yellow", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 1),
-            (Item("common.items.crafting_ing.stones"), 1),
-            (Item("common.items.food.coconut"), 1),
-            (Item("common.items.mineral.ore.veloritefrag"), 1),
-            (Item("common.items.crafting_tools.mortar_pestle"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "apple_shroom_curry": (
-        output: ("common.items.food.apple_mushroom_curry", 1),
-        inputs: [
-            (Item("common.items.food.mushroom"), 8),
-            (Item("common.items.food.coconut"), 1),
-            (Item("common.items.food.apple"), 4),
-            (Item("common.items.crafting_tools.mortar_pestle"), 0),
-        ],
-        craft_sprite: Some(CookingPot),
-    ),
-    "fish_cooked": (
-        output: ("common.items.food.meat.fish_cooked", 1),
-        inputs: [
-            (Item("common.items.food.meat.fish_raw"), 1),
-        ],
-        craft_sprite: Some(CookingPot),
-    ),
-    "bird_cooked": (
-        output: ("common.items.food.meat.bird_cooked", 1),
-        inputs: [
-            (Item("common.items.food.meat.bird_raw"), 1),
-        ],
-        craft_sprite: Some(CookingPot),
-    ),
-    "bird_large_cooked": (
-        output: ("common.items.food.meat.bird_large_cooked", 1),
-        inputs: [
-            (Item("common.items.food.meat.bird_large_raw"), 1),
-        ],
-        craft_sprite: Some(CookingPot),
-    ),
-    "beast_small_cooked": (
-        output: ("common.items.food.meat.beast_small_cooked", 1),
-        inputs: [
-            (Item("common.items.food.meat.beast_small_raw"), 1),
-        ],
-        craft_sprite: Some(CookingPot),
-    ),
-    "beast_large_cooked": (
-        output: ("common.items.food.meat.beast_large_cooked", 1),
-        inputs: [
-            (Item("common.items.food.meat.beast_large_raw"), 1),
-        ],
-        craft_sprite: Some(CookingPot),
-    ),
-    "tough_cooked": (
-        output: ("common.items.food.meat.tough_cooked", 1),
-        inputs: [
-            (Item("common.items.food.meat.tough_raw"), 1),
-        ],
-        craft_sprite: Some(CookingPot),
-    ),
-    "leather strips": (
-        output: ("common.items.crafting_ing.leather.leather_strips", 4),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 1),
-        ],
-        craft_sprite: Some(TanningRack),
-    ),
-    "simple leather": (
-        output: ("common.items.crafting_ing.leather.simple_leather", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.animal_hide"), 1),
-        ],
-        craft_sprite: Some(TanningRack),
-    ),
-    "thick leather": (
-        output: ("common.items.crafting_ing.leather.thick_leather", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.tough_hide"), 1),
-        ],
-        craft_sprite: Some(TanningRack),
-    ),
-    "rigid leather": (
-        output: ("common.items.crafting_ing.leather.rigid_leather", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.rugged_hide"), 1),
-        ],
-        craft_sprite: Some(TanningRack),
-    ),
-    "gold ingot": (
-        output: ("common.items.mineral.ingot.gold", 1),
-        inputs: [
-            (Item("common.items.mineral.ore.gold"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "silver ingot": (
-        output: ("common.items.mineral.ingot.silver", 1),
-        inputs: [
-            (Item("common.items.mineral.ore.silver"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "iron ingot": (
-        output: ("common.items.mineral.ingot.iron", 1),
-        inputs: [
-            (Item("common.items.mineral.ore.iron"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "cobalt ingot": (
-        output: ("common.items.mineral.ingot.cobalt", 1),
-        inputs: [
-            (Item("common.items.mineral.ore.cobalt"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "tin ingot": (
-        output: ("common.items.mineral.ingot.tin", 2),
-        inputs: [
-            (Item("common.items.mineral.ore.tin"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "orichalcum ingot": (
-        output: ("common.items.mineral.ingot.orichalcum", 2),
-        inputs: [
-            (Item("common.items.mineral.ingot.gold"), 1),
-            (Item("common.items.mineral.ingot.silver"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "copper ingot": (
-        output: ("common.items.mineral.ingot.copper", 2),
-        inputs: [
-            (Item("common.items.mineral.ore.copper"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "bloodsteel ingot": (
-        output: ("common.items.mineral.ingot.bloodsteel", 2),
-        inputs: [
-            (Item("common.items.mineral.ore.bloodstone"), 1),
-            (Item("common.items.mineral.ingot.iron"), 1),
-            (Item("common.items.mineral.ore.coal"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "steel ingot": (
-        output: ("common.items.mineral.ingot.steel", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 1),
-            (Item("common.items.mineral.ore.coal"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "bronze ingot": (
-        output: ("common.items.mineral.ingot.bronze", 2),
-        inputs: [
-            (Item("common.items.mineral.ingot.copper"), 1),
-            (Item("common.items.mineral.ingot.tin"), 1),
-        ],
-        craft_sprite: Some(Forge),
-    ),
-    "cotton": (
-        output: ("common.items.crafting_ing.cloth.cotton", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cotton_boll"), 1),
-        ],
-        craft_sprite: Some(SpinningWheel),
-    ),
-    "linen_flax": (
-        output: ("common.items.crafting_ing.cloth.linen", 1),
-        inputs: [
-            (Item("common.items.flowers.wild_flax"), 1),
-        ],
-        craft_sprite: Some(SpinningWheel),
-    ),
-    "silk": (
-        output: ("common.items.crafting_ing.cloth.silk", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.sticky_thread"), 1),
-        ],
-        craft_sprite: Some(SpinningWheel),
-    ),
-    "lifecloth": (
-        output: ("common.items.crafting_ing.cloth.lifecloth", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.animal_misc.lively_vine"), 1),
-            (Item("common.items.crafting_ing.cloth.cotton"), 1),
-        ],
-        craft_sprite: Some(SpinningWheel),
-    ),
-    "moonweave": (
-        output: ("common.items.crafting_ing.cloth.moonweave", 1),
-        inputs: [
-            (Item("common.items.flowers.moonbell"), 1),
-        ],
-        craft_sprite: Some(SpinningWheel),
-    ),
-    "sunsilk": (
-        output: ("common.items.crafting_ing.cloth.sunsilk", 1),
-        inputs: [
-            (Item("common.items.flowers.pyrebloom"), 1),
-        ],
-        craft_sprite: Some(SpinningWheel),
-    ),
-    "salad_plain": (
-        output: ("common.items.food.plainsalad", 1),
-        inputs: [
-            (Item("common.items.food.lettuce"), 1),
-            (Item("common.items.crafting_ing.bowl"), 1),
-        ],
-        craft_sprite: None,
-    ),
-    "salad_tomato": (
-        output: ("common.items.food.tomatosalad", 1),
-        inputs: [
-            (Item("common.items.food.lettuce"), 1),
-            (Item("common.items.food.tomato"), 2),
-            (Item("common.items.crafting_ing.bowl"), 1),
-        ],
-        craft_sprite: None,
-    ),
-    "apples_stick": (
-        output: ("common.items.food.apple_stick", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 2),
-            (Item("common.items.food.apple"), 2),
-        ],
-        craft_sprite: None,
-    ),
-    "mushroom_stick": (
-        output: ("common.items.food.mushroom_stick", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 2),
-            (Item("common.items.food.mushroom"), 3),
-        ],
-        craft_sprite: None,
-    ),
-    "sunflower_icetea": (
-        output: ("common.items.food.sunflower_icetea", 4),
-        inputs: [
-            (Item("common.items.crafting_ing.empty_vial"), 1),
-            (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1),
-            (Item("common.items.flowers.sunflower"), 4),
-            (Item("common.items.crafting_ing.honey"), 1),
-        ],
-        craft_sprite: Some(Cauldron),
-    ),
-    "Plain Cloth Glider": (
-        output: ("common.items.glider.basic_white", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 5),
-            (Item("common.items.crafting_ing.cloth.linen"), 10),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "Red Cloth Glider": (
-        output: ("common.items.glider.basic_red", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.crafting_ing.cloth.linen_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),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "Leaves Glider": (
-        output: ("common.items.glider.leaves", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
-            (Item("common.items.crafting_ing.cloth.linen"), 5),
-            (Item("common.items.mineral.gem.emerald"), 1),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "Sand Raptor Wings": (
-        output: ("common.items.glider.sandraptor", 1),
-        inputs: [
-            (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.wool"), 5),
-            (Item("common.items.mineral.gem.sapphire"), 1),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "Snow Raptor Wings": (
-        output: ("common.items.glider.snowraptor", 1),
-        inputs: [
-            (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.silk"), 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),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "Wood Raptor Wings": (
-        output: ("common.items.glider.woodraptor", 1),
-        inputs: [
-            (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.lifecloth"), 5),
-            (Item("common.items.mineral.gem.emerald"), 1),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "Moonlit Love": (
-        output: ("common.items.glider.butterfly3", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 20),
-            (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.flowers.red"), 6),
-            (Item("common.items.crafting_ing.sticky_thread"), 8),
-            (Item("common.items.mineral.gem.diamond"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
-    ),
-    "Horizon": (
-        output: ("common.items.glider.sunset", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 20),
-            (Item("common.items.crafting_ing.twigs"), 5),
-            (Item("common.items.crafting_ing.cactus"), 8),
-            (Item("common.items.mineral.gem.topaz"), 6),
-            (Item("common.items.mineral.gem.ruby"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
-    ),
-    "Healing Sceptre": (
-        output: ("common.items.weapons.sceptre.starter_sceptre", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 10),
-            (Item("common.items.crafting_ing.stones"), 0),
-        ],
-        craft_sprite: None,
-    ),
-    "Soothing Loop": (
-        output: ("common.items.weapons.sceptre.loops0", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.twigs"), 20),
-            (Item("common.items.mineral.ore.veloritefrag"), 8),
-            (Item("common.items.mineral.gem.ruby"), 4),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "Hunting Bow": (
-        output: ("common.items.weapons.bow.wood-2", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.leather_strips"), 8),
-            (Item("common.items.crafting_ing.twigs"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "Forest Spirit": (
-        output: ("common.items.weapons.sword.wood-2", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-            (Item("common.items.crafting_ing.twigs"), 10),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "Burnt Drumstick": (
-        output: ("common.items.weapons.hammer.burnt_drumstick", 1),
-        inputs: [
-            (Item("common.items.food.meat.bird_large_cooked"), 1),
-        ],
-        craft_sprite: Some(CookingPot),
-    ),
-    //ARMOR/HIDE/RAWHIDE
-    "rawhide back": (
-        output: ("common.items.armor.hide.rawhide.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "rawhide belt": (
-        output: ("common.items.armor.hide.rawhide.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "rawhide chest": (
-        output: ("common.items.armor.hide.rawhide.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "rawhide feet": (
-        output: ("common.items.armor.hide.rawhide.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "rawhide hands": (
-        output: ("common.items.armor.hide.rawhide.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "rawhide pants": (
-        output: ("common.items.armor.hide.rawhide.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "rawhide shoulder": (
-        output: ("common.items.armor.hide.rawhide.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.simple_leather"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    //ARMOR/HIDE/LEATHER
-    "leather back": (
-        output: ("common.items.armor.hide.leather.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "leather belt": (
-        output: ("common.items.armor.hide.leather.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "leather chest": (
-        output: ("common.items.armor.hide.leather.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "leather feet": (
-        output: ("common.items.armor.hide.leather.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "leather hands": (
-        output: ("common.items.armor.hide.leather.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "leather pants": (
-        output: ("common.items.armor.hide.leather.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "leather shoulder": (
-        output: ("common.items.armor.hide.leather.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.thick_leather"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    //ARMOR/HIDE/SCALE
-    "scale back": (
-        output: ("common.items.armor.hide.scale.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.scales"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "scale belt": (
-        output: ("common.items.armor.hide.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.hide.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.hide.scale.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.scales"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "scale hands": (
-        output: ("common.items.armor.hide.scale.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.scales"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "scale pants": (
-        output: ("common.items.armor.hide.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.hide.scale.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.scales"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    //ARMOR/HIDE/CARAPACE
-    "carapace back": (
-        output: ("common.items.armor.hide.carapace.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 3),
-            (Item("common.items.mineral.ingot.steel"), 1),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "carapace belt": (
-        output: ("common.items.armor.hide.carapace.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 2),
-            (Item("common.items.mineral.ingot.steel"), 1),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "carapace chest": (
-        output: ("common.items.armor.hide.carapace.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 10),
-            (Item("common.items.mineral.ingot.steel"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "carapace feet": (
-        output: ("common.items.armor.hide.carapace.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 3),
-            (Item("common.items.mineral.ingot.steel"), 1),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "carapace hands": (
-        output: ("common.items.armor.hide.carapace.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 3),
-            (Item("common.items.mineral.ingot.steel"), 1),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "carapace pants": (
-        output: ("common.items.armor.hide.carapace.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 8),
-            (Item("common.items.mineral.ingot.steel"), 1),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "carapace shoulder": (
-        output: ("common.items.armor.hide.carapace.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.carapace"), 8),
-            (Item("common.items.mineral.ingot.steel"), 1),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    //ARMOR/HIDE/PRIMAL
-    "primal back": (
-        output: ("common.items.armor.hide.primal.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 3),
-            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "primal belt": (
-        output: ("common.items.armor.hide.primal.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 2),
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "primal chest": (
-        output: ("common.items.armor.hide.primal.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 10),
-            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "primal feet": (
-        output: ("common.items.armor.hide.primal.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 3),
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "primal hands": (
-        output: ("common.items.armor.hide.primal.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 3),
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "primal pants": (
-        output: ("common.items.armor.hide.primal.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 8),
-            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "primal shoulder": (
-        output: ("common.items.armor.hide.primal.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.plate"), 8),
-            (Item("common.items.crafting_ing.animal_misc.large_horn"), 2),
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    //ARMOR/HIDE/DRAGONSCALE
-    "dragonscale back": (
-        output: ("common.items.armor.hide.dragonscale.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
-            (Item("common.items.mineral.ingot.bloodsteel"), 2),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 1),
-            (Item("common.items.crafting_ing.hide.scales"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "dragonscale belt": (
-        output: ("common.items.armor.hide.dragonscale.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 2),
-            (Item("common.items.mineral.ingot.bloodsteel"), 2),
-            (Item("common.items.crafting_ing.hide.scales"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "dragonscale chest": (
-        output: ("common.items.armor.hide.dragonscale.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 10),
-            (Item("common.items.mineral.ingot.bloodsteel"), 3),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
-            (Item("common.items.crafting_ing.hide.scales"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "dragonscale feet": (
-        output: ("common.items.armor.hide.dragonscale.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
-            (Item("common.items.mineral.ingot.bloodsteel"), 2),
-            (Item("common.items.crafting_ing.hide.scales"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "dragonscale hands": (
-        output: ("common.items.armor.hide.dragonscale.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
-            (Item("common.items.mineral.ingot.bloodsteel"), 2),
-            (Item("common.items.crafting_ing.hide.scales"), 2),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "dragonscale pants": (
-        output: ("common.items.armor.hide.dragonscale.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 8),
-            (Item("common.items.mineral.ingot.bloodsteel"), 3),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 1),
-            (Item("common.items.crafting_ing.hide.scales"), 4),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    "dragonscale shoulder": (
-        output: ("common.items.armor.hide.dragonscale.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.dragon_scale"), 8),
-            (Item("common.items.mineral.ingot.bloodsteel"), 3),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
-            (Item("common.items.crafting_ing.hide.scales"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-    ),
-    //ARMOR/CLOTH/LINEN
-    "linen back": (
-        output: ("common.items.armor.cloth.linen.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 3),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "linen belt": (
-        output: ("common.items.armor.cloth.linen.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 2),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "linen chest": (
-        output: ("common.items.armor.cloth.linen.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 10),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "linen feet": (
-        output: ("common.items.armor.cloth.linen.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 3),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "linen hands": (
-        output: ("common.items.armor.cloth.linen.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 3),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "linen pants": (
-        output: ("common.items.armor.cloth.linen.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 8),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "linen shoulder": (
-        output: ("common.items.armor.cloth.linen.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 8),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    //ARMOR/CLOTH/WOOLEN
-    "woolen back": (
-        output: ("common.items.armor.cloth.woolen.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 3),
-            (Item("common.items.crafting_ing.cloth.cotton"), 2),
-            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "woolen belt": (
-        output: ("common.items.armor.cloth.woolen.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 1),
-            (Item("common.items.crafting_ing.cloth.cotton"), 1),
-            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "woolen chest": (
-        output: ("common.items.armor.cloth.woolen.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 8),
-            (Item("common.items.crafting_ing.cloth.cotton"), 2),
-            (Item("common.items.crafting_ing.animal_misc.fur"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "woolen feet": (
-        output: ("common.items.armor.cloth.woolen.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 2),
-            (Item("common.items.crafting_ing.cloth.cotton"), 1),
-            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "woolen hands": (
-        output: ("common.items.armor.cloth.woolen.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 2),
-            (Item("common.items.crafting_ing.cloth.cotton"), 1),
-            (Item("common.items.crafting_ing.animal_misc.fur"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "woolen pants": (
-        output: ("common.items.armor.cloth.woolen.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 6),
-            (Item("common.items.crafting_ing.cloth.cotton"), 2),
-            (Item("common.items.crafting_ing.animal_misc.fur"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "woolen shoulder": (
-        output: ("common.items.armor.cloth.woolen.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 6),
-            (Item("common.items.crafting_ing.cloth.cotton"), 2),
-            (Item("common.items.crafting_ing.animal_misc.fur"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    //ARMOR/CLOTH/SILKEN
-    "silken back": (
-        output: ("common.items.armor.cloth.silken.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 3),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "silken belt": (
-        output: ("common.items.armor.cloth.silken.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "silken chest": (
-        output: ("common.items.armor.cloth.silken.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 10),
-            (Item("common.items.mineral.gem.amethyst"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "silken feet": (
-        output: ("common.items.armor.cloth.silken.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 3),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "silken hands": (
-        output: ("common.items.armor.cloth.silken.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 3),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "silken pants": (
-        output: ("common.items.armor.cloth.silken.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 8),
-            (Item("common.items.mineral.gem.amethyst"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "silken shoulder": (
-        output: ("common.items.armor.cloth.silken.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 8),
-            (Item("common.items.mineral.gem.amethyst"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    //ARMOR/CLOTH/DRUID
-    "druid back": (
-        output: ("common.items.armor.cloth.druid.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
-            (Item("common.items.mineral.ore.veloritefrag"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "druid belt": (
-        output: ("common.items.armor.cloth.druid.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
-            (Item("common.items.mineral.ore.veloritefrag"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "druid chest": (
-        output: ("common.items.armor.cloth.druid.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 10),
-            (Item("common.items.mineral.ore.veloritefrag"), 3),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "druid feet": (
-        output: ("common.items.armor.cloth.druid.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
-            (Item("common.items.mineral.ore.veloritefrag"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "druid hands": (
-        output: ("common.items.armor.cloth.druid.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
-            (Item("common.items.mineral.ore.veloritefrag"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "druid pants": (
-        output: ("common.items.armor.cloth.druid.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 8),
-            (Item("common.items.mineral.ore.veloritefrag"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "druid shoulder": (
-        output: ("common.items.armor.cloth.druid.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 8),
-            (Item("common.items.mineral.ore.veloritefrag"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    //ARMOR/CLOTH/MOONWEAVE
-    "moonweave back": (
-        output: ("common.items.armor.cloth.moonweave.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 3),
-            (Item("common.items.crafting_ing.hide.leather_troll"), 3),
-            (Item("common.items.mineral.ingot.silver"), 1),
-            (Item("common.items.mineral.ingot.cobalt"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "moonweave belt": (
-        output: ("common.items.armor.cloth.moonweave.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 2),
-            (Item("common.items.crafting_ing.hide.leather_troll"), 2),
-            (Item("common.items.mineral.ingot.cobalt"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "moonweave chest": (
-        output: ("common.items.armor.cloth.moonweave.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 10),
-            (Item("common.items.crafting_ing.hide.leather_troll"), 5),
-            (Item("common.items.mineral.ingot.silver"), 1),
-            (Item("common.items.mineral.ingot.cobalt"), 3),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "moonweave feet": (
-        output: ("common.items.armor.cloth.moonweave.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 3),
-            (Item("common.items.crafting_ing.hide.leather_troll"), 2),
-            (Item("common.items.mineral.ingot.cobalt"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "moonweave hands": (
-        output: ("common.items.armor.cloth.moonweave.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 3),
-            (Item("common.items.crafting_ing.hide.leather_troll"), 2),
-            (Item("common.items.mineral.ingot.cobalt"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "moonweave pants": (
-        output: ("common.items.armor.cloth.moonweave.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 8),
-            (Item("common.items.crafting_ing.hide.leather_troll"), 3),
-            (Item("common.items.mineral.ingot.cobalt"), 3),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "moonweave shoulder": (
-        output: ("common.items.armor.cloth.moonweave.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.moonweave"), 8),
-            (Item("common.items.crafting_ing.hide.leather_troll"), 3),
-            (Item("common.items.mineral.ingot.cobalt"), 3),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    //ARMOR/CLOTH/SUNSILK
-    "sunsilk back": (
-        output: ("common.items.armor.cloth.sunsilk.back", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
-            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 1),
-            (Item("common.items.mineral.ingot.gold"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "sunsilk belt": (
-        output: ("common.items.armor.cloth.sunsilk.belt", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 2),
-            (Item("common.items.mineral.ingot.gold"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "sunsilk chest": (
-        output: ("common.items.armor.cloth.sunsilk.chest", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 10),
-            (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
-            (Item("common.items.mineral.ingot.gold"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "sunsilk feet": (
-        output: ("common.items.armor.cloth.sunsilk.foot", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
-            (Item("common.items.mineral.ingot.gold"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "sunsilk hands": (
-        output: ("common.items.armor.cloth.sunsilk.hand", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
-            (Item("common.items.mineral.ingot.gold"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "sunsilk pants": (
-        output: ("common.items.armor.cloth.sunsilk.pants", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 8),
-            (Item("common.items.mineral.ingot.gold"), 3),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    "sunsilk shoulder": (
-        output: ("common.items.armor.cloth.sunsilk.shoulder", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.sunsilk"), 8),
-            (Item("common.items.mineral.ingot.gold"), 3),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: Some(Loom),
-    ),
-    //ARMOR/MAIL/BRONZE
-    "bronze back": (
-        output: ("common.items.armor.mail.bronze.back", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bronze belt": (
-        output: ("common.items.armor.mail.bronze.belt", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bronze chest": (
-        output: ("common.items.armor.mail.bronze.chest", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bronze feet": (
-        output: ("common.items.armor.mail.bronze.foot", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bronze hands": (
-        output: ("common.items.armor.mail.bronze.hand", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bronze pants": (
-        output: ("common.items.armor.mail.bronze.pants", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bronze shoulder": (
-        output: ("common.items.armor.mail.bronze.shoulder", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bronze"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    //ARMOR/MAIL/IRON
-    "iron back": (
-        output: ("common.items.armor.mail.iron.back", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "iron belt": (
-        output: ("common.items.armor.mail.iron.belt", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 2),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "iron chest": (
-        output: ("common.items.armor.mail.iron.chest", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "iron feet": (
-        output: ("common.items.armor.mail.iron.foot", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "iron hands": (
-        output: ("common.items.armor.mail.iron.hand", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 3),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "iron pants": (
-        output: ("common.items.armor.mail.iron.pants", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "iron shoulder": (
-        output: ("common.items.armor.mail.iron.shoulder", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 8),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 6),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    //ARMOR/MAIL/STEEL
-    "steel back": (
-        output: ("common.items.armor.mail.steel.back", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.steel"), 3),
-            (Item("common.items.crafting_ing.cloth.linen"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "steel belt": (
-        output: ("common.items.armor.mail.steel.belt", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.steel"), 2),
-            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "steel chest": (
-        output: ("common.items.armor.mail.steel.chest", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.steel"), 10),
-            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "steel feet": (
-        output: ("common.items.armor.mail.steel.foot", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.steel"), 3),
-            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "steel hands": (
-        output: ("common.items.armor.mail.steel.hand", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.steel"), 3),
-            (Item("common.items.crafting_ing.leather.thick_leather"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "steel pants": (
-        output: ("common.items.armor.mail.steel.pants", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.steel"), 8),
-            (Item("common.items.crafting_ing.leather.thick_leather"), 4),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "steel shoulder": (
-        output: ("common.items.armor.mail.steel.shoulder", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.steel"), 8),
-            (Item("common.items.crafting_ing.leather.thick_leather"), 6),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    //ARMOR/MAIL/COBALT
-    "cobalt back": (
-        output: ("common.items.armor.mail.cobalt.back", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 3),
-            (Item("common.items.crafting_ing.cloth.silk"), 4),
-            (Item("common.items.mineral.gem.sapphire"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "cobalt belt": (
-        output: ("common.items.armor.mail.cobalt.belt", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 2),
-            (Item("common.items.crafting_ing.cloth.silk"), 2),
-            (Item("common.items.mineral.gem.sapphire"), 1),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "cobalt chest": (
-        output: ("common.items.armor.mail.cobalt.chest", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 10),
-            (Item("common.items.crafting_ing.cloth.silk"), 3),
-            (Item("common.items.mineral.gem.sapphire"), 3),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "cobalt feet": (
-        output: ("common.items.armor.mail.cobalt.foot", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 3),
-            (Item("common.items.crafting_ing.cloth.silk"), 3),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "cobalt hands": (
-        output: ("common.items.armor.mail.cobalt.hand", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 3),
-            (Item("common.items.crafting_ing.cloth.silk"), 3),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "cobalt pants": (
-        output: ("common.items.armor.mail.cobalt.pants", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 8),
-            (Item("common.items.crafting_ing.cloth.silk"), 3),
-            (Item("common.items.mineral.gem.sapphire"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "cobalt shoulder": (
-        output: ("common.items.armor.mail.cobalt.shoulder", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 8),
-            (Item("common.items.crafting_ing.cloth.silk"), 3),
-            (Item("common.items.mineral.gem.sapphire"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    //ARMOR/MAIL/BLOODSTEEL
-    "bloodsteel back": (
-        output: ("common.items.armor.mail.bloodsteel.back", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 3),
-            (Item("common.items.crafting_ing.hide.carapace"), 1),
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 3),
-            (Item("common.items.mineral.gem.ruby"), 1),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bloodsteel belt": (
-        output: ("common.items.armor.mail.bloodsteel.belt", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 2),
-            (Item("common.items.crafting_ing.hide.carapace"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bloodsteel chest": (
-        output: ("common.items.armor.mail.bloodsteel.chest", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 10),
-            (Item("common.items.crafting_ing.hide.carapace"), 4),
-            (Item("common.items.mineral.gem.diamond"), 2),
-            (Item("common.items.mineral.gem.ruby"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bloodsteel feet": (
-        output: ("common.items.armor.mail.bloodsteel.foot", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 3),
-            (Item("common.items.crafting_ing.hide.carapace"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bloodsteel hands": (
-        output: ("common.items.armor.mail.bloodsteel.hand", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 3),
-            (Item("common.items.crafting_ing.hide.carapace"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bloodsteel pants": (
-        output: ("common.items.armor.mail.bloodsteel.pants", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 8),
-            (Item("common.items.crafting_ing.hide.carapace"), 3),
-            (Item("common.items.mineral.gem.ruby"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "bloodsteel shoulder": (
-        output: ("common.items.armor.mail.bloodsteel.shoulder", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.bloodsteel"), 8),
-            (Item("common.items.crafting_ing.hide.carapace"), 4),
-            (Item("common.items.mineral.gem.ruby"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    //ARMOR/MAIL/ORICHALCUM
-    "orichalcum back": (
-        output: ("common.items.armor.mail.orichalcum.back", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 3),
-            (Item("common.items.crafting_ing.hide.plate"), 3),
-            (Item("common.items.crafting_ing.cloth.moonweave"), 2),
-            (Item("common.items.mineral.gem.diamond"), 2),
-            (Item("common.items.mineral.gem.sapphire"), 1),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "orichalcum belt": (
-        output: ("common.items.armor.mail.orichalcum.belt", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 2),
-            (Item("common.items.crafting_ing.hide.plate"), 2),
-            (Item("common.items.mineral.gem.diamond"), 2),
-            (Item("common.items.mineral.gem.sapphire"), 1),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "orichalcum chest": (
-        output: ("common.items.armor.mail.orichalcum.chest", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 10),
-            (Item("common.items.mineral.ingot.cobalt"), 2),
-            (Item("common.items.crafting_ing.hide.plate"), 4),
-            (Item("common.items.mineral.gem.diamond"), 3),
-            (Item("common.items.mineral.gem.sapphire"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "orichalcum feet": (
-        output: ("common.items.armor.mail.orichalcum.foot", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 3),
-            (Item("common.items.crafting_ing.hide.plate"), 2),
-            (Item("common.items.mineral.gem.diamond"), 1),
-            (Item("common.items.mineral.gem.sapphire"), 1),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "orichalcum hands": (
-        output: ("common.items.armor.mail.orichalcum.hand", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 3),
-            (Item("common.items.crafting_ing.hide.plate"), 2),
-            (Item("common.items.mineral.gem.diamond"), 1),
-            (Item("common.items.mineral.gem.sapphire"), 1),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "orichalcum pants": (
-        output: ("common.items.armor.mail.orichalcum.pants", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 8),
-            (Item("common.items.mineral.ingot.cobalt"), 1),
-            (Item("common.items.crafting_ing.hide.plate"), 3),
-            (Item("common.items.mineral.gem.diamond"), 2),
-        ],
-        craft_sprite: Some(Anvil),
-    ),
-    "orichalcum shoulder": (
-        output: ("common.items.armor.mail.orichalcum.shoulder", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.orichalcum"), 8),
-            (Item("common.items.crafting_ing.hide.plate"), 4),
-            (Item("common.items.mineral.gem.sapphire"), 2),
-        ],
-        craft_sprite: Some(Anvil),
+//  Png(specifier),
+//  Vox(specier),
+//  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
+({
+    // Crafting Stations
+    Tool("Anvil"): VoxTrans(
+        "voxel.sprite.anvil.anvil-0",
+        (0.5, 0.5, 0.0), (0.0, 60.0, 90.0), 1.0,
+    ),
+    Tool("Cauldron"): VoxTrans(
+        "voxel.sprite.cauldron.cauldron-0",
+        (0.0, 0.0, 0.0), (-50.0, 40.0, 30.0), 1.0,
+    ),
+    Tool("CookingPot"): VoxTrans(
+        "voxel.sprite.cooking_pot.pot-0",
+        (0.0, 0.0, 0.0), (0.0, 90.0, 90.0), 1.2,
+    ),
+    Tool("CraftingBench"): VoxTrans(
+        "voxel.sprite.crafting_bench.crafting_bench-0",
+       (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0,
+    ),
+    Tool("Forge"): VoxTrans(
+        "voxel.object.forge",
+       (0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0,
+    ),
+    Tool("Loom"): VoxTrans(
+        "voxel.object.loom",
+       (0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0,
+    ),
+    Tool("SpinningWheel"): VoxTrans(
+        "voxel.object.spinning_wheel",
+       (0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0,
+    ),
+    Tool("TanningRack"): VoxTrans(
+        "voxel.object.tanning_rack",
+       (0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0,
+    ),
+    Tool("DismantlingBench"): VoxTrans(
+        "voxel.sprite.salvaging_station.salvaging_station-0",
+       (0.0, 0.0, 0.0), (-50.0, 40.0, 30.0), 0.9,
+    ),
+    // Weapons
+    // Diary Example Images
+    Tool("example_utility"): VoxTrans(
+        "voxel.weapon.projectile.fireworks_green-0",
+        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Tool("example_sword"): VoxTrans(
+        "voxel.weapon.sword.greatsword_2h_dullahan",
+        (0.0, 0.0, 0.0), (90.0, 80.0, 0.0), 1.0,
+    ),
+    Tool("example_axe"): VoxTrans(
+        "voxel.weapon.axe.2haxe_bloodsteel-0",
+       (0.0, 0.0, 0.0), (-90.0, 70.0, 0.0), 1.0,
+    ),
+    Tool("example_hammer"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_ramshead",
+        (-1.0, 0.0, 0.0), (-70.0, 55.0, 0.0), 1.0,
+    ),
+    Tool("example_bow"): VoxTrans(
+        "voxel.weapon.bow.velorite",
+        (-1.0, 0.0, 0.0), (90.0, 60.0, 0.0), 1.0,
+    ),
+    Tool("example_staff_fire"): VoxTrans(
+        "voxel.weapon.staff.firestaff_saurok",
+        (-1.0, 0.0, 0.0), (-100.0, -140.0, 0.0), 1.0,
+    ),
+    Tool("example_sceptre"): VoxTrans(
+        "voxel.weapon.sceptre.wood-nature",
+        (-1.0, 0.0, 0.0), (-90.0, 55.0, 0.0), 1.0,
+    ),
+    Tool("example_pick"): VoxTrans(
+        "voxel.weapon.tool.pickaxe_green-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("example_dagger"): VoxTrans(
+        "voxel.weapon.dagger.dagger_basic-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("example_shield"): VoxTrans(
+        "voxel.weapon.shield.wood-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("example_general_combat_left"): VoxTrans(
+        "voxel.weapon.sword.long_2h_saurok",
+        (0.0, 0.0, 0.0), (85.0, -90.0, -40.0), 1.0,
+    ),
+    Tool("example_general_combat_right"): VoxTrans(
+        "voxel.weapon.sword.long_2h_saurok",
+        (0.0, 0.0, 0.0), (125.0, 90.0, 80.0), 1.0,
+    ),
+    // Bows
+    Tool("common.items.weapons.bow.bone-0"): VoxTrans(
+        "voxel.weapon.bow.bone-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.bone-1"): VoxTrans(
+        "voxel.weapon.bow.bone-1",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.bone-2"): VoxTrans(
+        "voxel.weapon.bow.bone-2",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.bone-3"): VoxTrans(
+        "voxel.weapon.bow.bone-3",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.eldwood-0"): VoxTrans(
+        "voxel.weapon.bow.eldwood-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.eldwood-1"): VoxTrans(
+        "voxel.weapon.bow.eldwood-1",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.eldwood-2"): VoxTrans(
+        "voxel.weapon.bow.eldwood-2",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.frostwood-0"): VoxTrans(
+        "voxel.weapon.bow.frostwood-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.frostwood-1"): VoxTrans(
+        "voxel.weapon.bow.frostwood-1",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.frostwood-2"): VoxTrans(
+        "voxel.weapon.bow.frostwood-2",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.hardwood-0"): VoxTrans(
+        "voxel.weapon.bow.hardwood-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.hardwood-1"): VoxTrans(
+        "voxel.weapon.bow.hardwood-1",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.hardwood-2"): VoxTrans(
+        "voxel.weapon.bow.hardwood-2",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.hardwood-3"): VoxTrans(
+        "voxel.weapon.bow.hardwood-3",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.hardwood-4"): VoxTrans(
+        "voxel.weapon.bow.hardwood-4",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.hardwood-5"): VoxTrans(
+        "voxel.weapon.bow.hardwood-5",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.metal-0"): VoxTrans(
+        "voxel.weapon.bow.metal-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.metal-1"): VoxTrans(
+        "voxel.weapon.bow.metal-1",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.metal-2"): VoxTrans(
+        "voxel.weapon.bow.metal-2",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.metal-3"): VoxTrans(
+        "voxel.weapon.bow.metal-3",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.metal-4"): VoxTrans(
+        "voxel.weapon.bow.metal-4",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.rawwood-0"): VoxTrans(
+        "voxel.weapon.bow.rawwood-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.rawwood-1"): VoxTrans(
+        "voxel.weapon.bow.rawwood-1",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.sagitta"): VoxTrans(
+        "voxel.weapon.bow.sagitta",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.starter"): VoxTrans(
+        "voxel.weapon.bow.starter",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.velorite"): VoxTrans(
+        "voxel.weapon.bow.velorite",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.debug.velorite_bow_debug"): VoxTrans(
+        "voxel.weapon.bow.velorite",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.wood-0"): VoxTrans(
+        "voxel.weapon.bow.wood-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.wood-1"): VoxTrans(
+        "voxel.weapon.bow.wood-1",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.wood-2"): VoxTrans(
+        "voxel.weapon.bow.wood-2",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.wood-3"): VoxTrans(
+        "voxel.weapon.bow.wood-3",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.bow.wood-4"): VoxTrans(
+        "voxel.weapon.bow.wood-4",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0,
+    ),
+    // Daggers
+    Tool("common.items.weapons.dagger.starter_dagger"): VoxTrans(
+        "voxel.weapon.dagger.dagger_rusty",
+        (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.dagger.basic_0"): VoxTrans(
+        "voxel.weapon.dagger.dagger_basic-0",
+        (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.dagger.cultist_0"): VoxTrans(
+        "voxel.weapon.dagger.dagger_cult-0",
+        (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
+    ),
+    // Swords
+    Tool("common.items.weapons.sword.bloodsteel-0"): VoxTrans(
+        "voxel.weapon.sword.bloodsteel-0",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.bloodsteel-1"): VoxTrans(
+        "voxel.weapon.sword.bloodsteel-1",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.bloodsteel-2"): VoxTrans(
+        "voxel.weapon.sword.bloodsteel-2",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.bronze-0"): VoxTrans(
+        "voxel.weapon.sword.bronze-0",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.bronze-1"): VoxTrans(
+        "voxel.weapon.sword.bronze-1",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.bronze-2"): VoxTrans(
+        "voxel.weapon.sword.bronze-2",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.caladbolg"): VoxTrans(
+        "voxel.weapon.sword.caladbolg",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.cobalt-0"): VoxTrans(
+        "voxel.weapon.sword.cobalt-0",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.cobalt-1"): VoxTrans(
+        "voxel.weapon.sword.cobalt-1",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.cobalt-2"): VoxTrans(
+        "voxel.weapon.sword.cobalt-2",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.cobalt-3"): VoxTrans(
+        "voxel.weapon.sword.cobalt-3",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.cultist"): VoxTrans(
+        "voxel.weapon.sword.cultist",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.frost-0"): VoxTrans(
+        "voxel.weapon.sword.frost-0",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.frost-1"): VoxTrans(
+        "voxel.weapon.sword.frost-1",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-0"): VoxTrans(
+        "voxel.weapon.sword.iron-0",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-1"): VoxTrans(
+        "voxel.weapon.sword.iron-1",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-10"): VoxTrans(
+        "voxel.weapon.sword.iron-10",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-2"): VoxTrans(
+        "voxel.weapon.sword.iron-2",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-3"): VoxTrans(
+        "voxel.weapon.sword.iron-3",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-4"): VoxTrans(
+        "voxel.weapon.sword.iron-4",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-5"): VoxTrans(
+        "voxel.weapon.sword.iron-5",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-6"): VoxTrans(
+        "voxel.weapon.sword.iron-6",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-7"): VoxTrans(
+        "voxel.weapon.sword.iron-7",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-8"): VoxTrans(
+        "voxel.weapon.sword.iron-8",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.iron-9"): VoxTrans(
+        "voxel.weapon.sword.iron-9",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.starter"): VoxTrans(
+        "voxel.weapon.sword.starter",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.steel-0"): VoxTrans(
+        "voxel.weapon.sword.steel-0",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.steel-1"): VoxTrans(
+        "voxel.weapon.sword.steel-1",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.steel-2"): VoxTrans(
+        "voxel.weapon.sword.steel-2",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.steel-3"): VoxTrans(
+        "voxel.weapon.sword.steel-3",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.steel-4"): VoxTrans(
+        "voxel.weapon.sword.steel-4",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.steel-5"): VoxTrans(
+        "voxel.weapon.sword.steel-5",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.steel-6"): VoxTrans(
+        "voxel.weapon.sword.steel-6",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.steel-7"): VoxTrans(
+        "voxel.weapon.sword.steel-7",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.steel-8"): VoxTrans(
+        "voxel.weapon.sword.steel-8",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.stone-0"): VoxTrans(
+        "voxel.weapon.sword.stone-0",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.stone-1"): VoxTrans(
+        "voxel.weapon.sword.stone-1",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.stone-2"): VoxTrans(
+        "voxel.weapon.sword.stone-2",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.wood-0"): VoxTrans(
+        "voxel.weapon.sword.wood-0",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.wood-1"): VoxTrans(
+        "voxel.weapon.sword.wood-1",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sword.wood-2"): VoxTrans(
+        "voxel.weapon.sword.wood-2",
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.debug.admin_sword"): VoxTrans(
+        "voxel.weapon.sword.frost-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    // 1h Swords
+    Tool("common.items.weapons.sword_1h.bloodsteel-0"): VoxTrans(
+        "voxel.weapon.sword_1h.bloodsteel-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.bloodsteel-1"): VoxTrans(
+        "voxel.weapon.sword_1h.bloodsteel-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.bloodsteel-2"): VoxTrans(
+        "voxel.weapon.sword_1h.bloodsteel-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.bronze-0"): VoxTrans(
+        "voxel.weapon.sword_1h.bronze-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.bronze-1"): VoxTrans(
+        "voxel.weapon.sword_1h.bronze-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.bronze-2"): VoxTrans(
+        "voxel.weapon.sword_1h.bronze-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.cobalt-0"): VoxTrans(
+        "voxel.weapon.sword_1h.cobalt-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.cobalt-1"): VoxTrans(
+        "voxel.weapon.sword_1h.cobalt-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.cobalt-2"): VoxTrans(
+        "voxel.weapon.sword_1h.cobalt-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.cobalt-3"): VoxTrans(
+        "voxel.weapon.sword_1h.cobalt-3",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.starter"): VoxTrans(
+        "voxel.weapon.sword_1h.starter",
+        (-1.0, 1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.iron-0"): VoxTrans(
+        "voxel.weapon.sword_1h.iron-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.iron-1"): VoxTrans(
+        "voxel.weapon.sword_1h.iron-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.iron-2"): VoxTrans(
+        "voxel.weapon.sword_1h.iron-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.iron-3"): VoxTrans(
+        "voxel.weapon.sword_1h.iron-3",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.iron-4"): VoxTrans(
+        "voxel.weapon.sword_1h.iron-4",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.obsidian-0"): VoxTrans(
+        "voxel.weapon.sword_1h.obsidian-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.orichalcum-0"): VoxTrans(
+        "voxel.weapon.sword_1h.orichalcum-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.orichalcum-1"): VoxTrans(
+        "voxel.weapon.sword_1h.orichalcum-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.steel-0"): VoxTrans(
+        "voxel.weapon.sword_1h.steel-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.steel-1"): VoxTrans(
+        "voxel.weapon.sword_1h.steel-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.steel-2"): VoxTrans(
+        "voxel.weapon.sword_1h.steel-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sword_1h.steel-3"): VoxTrans(
+        "voxel.weapon.sword_1h.steel-3",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    // Axes
+    Tool("common.items.weapons.axe.starter_axe"): VoxTrans(
+        "voxel.weapon.axe.2haxe_rusty",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.orc_axe-0"): VoxTrans(
+        "voxel.weapon.axe.2haxe_orc-0",
+        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.13,
+    ),
+    Tool("common.items.weapons.axe.bronze_axe-0"): VoxTrans(
+        "voxel.weapon.axe.2haxe_bronze-0",
+        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.bronze_axe-1"): VoxTrans(
+        "voxel.weapon.axe.2haxe_bronze-1",
+        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.bronze_axe-2"): VoxTrans(
+        "voxel.weapon.axe.2haxe_bronze-2",
+        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-0"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.05,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-1"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-2"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-3"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-3",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-4"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-4",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.05,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-5"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-5",
+        (1.0, -0.5, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-6"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-6",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-7"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-7",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-8"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-8",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.13,
+    ),
+    Tool("common.items.weapons.axe.iron_axe-9"): VoxTrans(
+        "voxel.weapon.axe.2haxe_iron-9",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.steel_axe-0"): VoxTrans(
+        "voxel.weapon.axe.2haxe_steel-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.steel_axe-1"): VoxTrans(
+        "voxel.weapon.axe.2haxe_steel-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.steel_axe-2"): VoxTrans(
+        "voxel.weapon.axe.2haxe_steel-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.steel_axe-3"): VoxTrans(
+        "voxel.weapon.axe.2haxe_steel-3",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.steel_axe-4"): VoxTrans(
+        "voxel.weapon.axe.2haxe_steel-4",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.steel_axe-5"): VoxTrans(
+        "voxel.weapon.axe.2haxe_steel-5",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.steel_axe-6"): VoxTrans(
+        "voxel.weapon.axe.2haxe_steel-6",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.bloodsteel_axe-0"): VoxTrans(
+        "voxel.weapon.axe.2haxe_bloodsteel-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.15,
+    ),
+    Tool("common.items.weapons.axe.bloodsteel_axe-1"): VoxTrans(
+        "voxel.weapon.axe.2haxe_bloodsteel-1",
+        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.bloodsteel_axe-2"): VoxTrans(
+        "voxel.weapon.axe.2haxe_bloodsteel-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.cobalt_axe-0"): VoxTrans(
+        "voxel.weapon.axe.2haxe_cobalt-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.cobalt_axe-1"): VoxTrans(
+        "voxel.weapon.axe.2haxe_cobalt-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.axe.malachite_axe-0"): VoxTrans(
+        "voxel.weapon.axe.2haxe_malachite-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe.parashu"): VoxTrans(
+        "voxel.weapon.axe.parashu",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    // 1h Axes
+    Tool("common.items.weapons.axe_1h.bloodsteel-0"): VoxTrans(
+        "voxel.weapon.axe_1h.bloodsteel-0",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.bloodsteel-1"): VoxTrans(
+        "voxel.weapon.axe_1h.bloodsteel-1",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.bronze-0"): VoxTrans(
+        "voxel.weapon.axe_1h.bronze-0",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.bronze-1"): VoxTrans(
+        "voxel.weapon.axe_1h.bronze-1",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.cobalt-0"): VoxTrans(
+        "voxel.weapon.axe_1h.cobalt-0",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.cobalt-1"): VoxTrans(
+        "voxel.weapon.axe_1h.cobalt-1",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.iron-0"): VoxTrans(
+        "voxel.weapon.axe_1h.iron-0",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.iron-1"): VoxTrans(
+        "voxel.weapon.axe_1h.iron-1",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.iron-2"): VoxTrans(
+        "voxel.weapon.axe_1h.iron-2",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.iron-3"): VoxTrans(
+        "voxel.weapon.axe_1h.iron-3",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.orichalcum-0"): VoxTrans(
+        "voxel.weapon.axe_1h.orichalcum-0",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.steel-0"): VoxTrans(
+        "voxel.weapon.axe_1h.steel-0",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.steel-1"): VoxTrans(
+        "voxel.weapon.axe_1h.steel-1",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.steel-2"): VoxTrans(
+        "voxel.weapon.axe_1h.steel-2",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.stone-0"): VoxTrans(
+        "voxel.weapon.axe_1h.stone-0",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.stone-1"): VoxTrans(
+        "voxel.weapon.axe_1h.stone-1",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.wood-0"): VoxTrans(
+        "voxel.weapon.axe_1h.wood-0",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Tool("common.items.weapons.axe_1h.wood-1"): VoxTrans(
+        "voxel.weapon.axe_1h.wood-1",
+        (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    // Hammers
+    Tool("common.items.weapons.hammer.hammer_1"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_rusty",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.starter_hammer"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_rusty",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.wood_hammer-0"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_wood-0",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.flimsy_hammer"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_flimsy",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.stone_hammer-0"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_stone-0",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.stone_hammer-1"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_stone-1",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.stone_hammer-2"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_stone-2",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.stone_hammer-3"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_stone-3",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.bronze_hammer-0"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_bronze-0",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.bronze_hammer-1"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_bronze-1",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.iron_hammer-0"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_iron-0",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.iron_hammer-1"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_iron-1",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.iron_hammer-2"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_iron-2",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.iron_hammer-3"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_iron-3",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.iron_hammer-4"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_iron-4",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.iron_hammer-5"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_iron-5",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.iron_hammer-6"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_iron-6",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.iron_hammer-7"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_iron-7",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.iron_hammer-8"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_iron-8",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.steel_hammer-0"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_steel-0",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.steel_hammer-1"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_steel-1",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.steel_hammer-2"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_steel-2",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.steel_hammer-3"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_steel-3",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.steel_hammer-4"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_steel-4",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.steel_hammer-5"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_steel-5",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.cobalt_hammer-0"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_cobalt-0",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.cobalt_hammer-1"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_cobalt-1",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.runic_hammer"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_runic",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.ramshead_hammer"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_ramshead",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.mjolnir"): VoxTrans(
+        "voxel.weapon.hammer.2hhammer_mjolnir",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.cultist_purp_2h-0"): VoxTrans(
+        "voxel.weapon.hammer.cult_purp-0",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.hammer.burnt_drumstick"): VoxTrans(
+        "voxel.weapon.hammer.burnt_drumstick",
+        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    // 1h Hammers
+    Tool("common.items.weapons.hammer_1h.bloodsteel-0"): VoxTrans(
+        "voxel.weapon.hammer_1h.bloodsteel-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.bloodsteel-1"): VoxTrans(
+        "voxel.weapon.hammer_1h.bloodsteel-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.bronze-0"): VoxTrans(
+        "voxel.weapon.hammer_1h.bronze-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.bronze-1"): VoxTrans(
+        "voxel.weapon.hammer_1h.bronze-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.cobalt-0"): VoxTrans(
+        "voxel.weapon.hammer_1h.cobalt-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.cobalt-1"): VoxTrans(
+        "voxel.weapon.hammer_1h.cobalt-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.iron-0"): VoxTrans(
+        "voxel.weapon.hammer_1h.iron-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.iron-1"): VoxTrans(
+        "voxel.weapon.hammer_1h.iron-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.iron-2"): VoxTrans(
+        "voxel.weapon.hammer_1h.iron-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.orichalcum-0"): VoxTrans(
+        "voxel.weapon.hammer_1h.orichalcum-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.steel-0"): VoxTrans(
+        "voxel.weapon.hammer_1h.steel-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.steel-1"): VoxTrans(
+        "voxel.weapon.hammer_1h.steel-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.steel-2"): VoxTrans(
+        "voxel.weapon.hammer_1h.steel-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.stone-0"): VoxTrans(
+        "voxel.weapon.hammer_1h.stone-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.stone-1"): VoxTrans(
+        "voxel.weapon.hammer_1h.stone-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.wood-0"): VoxTrans(
+        "voxel.weapon.hammer_1h.wood-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.hammer_1h.wood-1"): VoxTrans(
+        "voxel.weapon.hammer_1h.wood-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    // Staffs
+    Tool("common.items.weapons.staff.staff_1"): VoxTrans(
+        "voxel.weapon.staff.firestaff_starter",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.starter_staff"): VoxTrans(
+        "voxel.weapon.staff.firestaff_starter",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.bone_staff"): VoxTrans(
+        "voxel.weapon.staff.bone_staff",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.crimson_eye"): VoxTrans(
+        "voxel.weapon.staff.crimson_eye",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.cultist_staff"): VoxTrans(
+        "voxel.weapon.staff.firestaff_cultist",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.phoenix"): VoxTrans(
+        "voxel.weapon.staff.phoenix",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.aurora"): VoxTrans(
+        "voxel.weapon.staff.aurora",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.infused_tower"): VoxTrans(
+        "voxel.weapon.staff.infused_tower",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.flamethrower_0"): VoxTrans(
+        "voxel.weapon.staff.unstable_thrower",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.ley_seeker"): VoxTrans(
+        "voxel.weapon.staff.ley_seeker",
+        (2.0, 0.0, 1.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.lava_rod"): VoxTrans(
+        "voxel.weapon.staff.lava_rod",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.fiery_wishing_rod"): VoxTrans(
+        "voxel.weapon.staff.fiery_wishing_rod",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.orc_iron"): VoxTrans(
+        "voxel.weapon.staff.orcish_branding_iron",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.bent_fuse"): VoxTrans(
+        "voxel.weapon.staff.bent_fuse",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.staff.heated_arm"): VoxTrans(
+        "voxel.weapon.staff.heated_arm",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.frostwood_torch"): VoxTrans(
+        "voxel.weapon.staff.frostwood_torch",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.golden_khakkara"): VoxTrans(
+        "voxel.weapon.staff.golden_khakkara",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.laevateinn"): VoxTrans(
+        "voxel.weapon.staff.laevateinn",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.ruby_rod"): VoxTrans(
+        "voxel.weapon.staff.ruby_rod",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.dragon_tongue"): VoxTrans(
+        "voxel.weapon.staff.dragon_tongue",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.staff.solar"): VoxTrans(
+        "voxel.weapon.staff.solar",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    // Healing Sceptres
+    Tool("common.items.weapons.sceptre.starter_sceptre"): VoxTrans(
+        "voxel.weapon.sceptre.wood-simple",
+        (0.0, -0.0, 0.0), (-130., 90.0, 0.0), 1.25,
+    ),
+    Tool("common.items.weapons.sceptre.moon0"): VoxTrans(
+        "voxel.weapon.sceptre.moon",
+        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sceptre.staff_nature"): VoxTrans(
+        "voxel.weapon.sceptre.wood-nature",
+        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sceptre.totem_green"): VoxTrans(
+        "voxel.weapon.sceptre.totem_green",
+        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sceptre.root_green0"): VoxTrans(
+        "voxel.weapon.sceptre.root_green",
+        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sceptre.fork0"): VoxTrans(
+        "voxel.weapon.sceptre.fork",
+        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sceptre.loops0"): VoxTrans(
+        "voxel.weapon.sceptre.loops",
+        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sceptre.root_evil"): VoxTrans(
+        "voxel.weapon.sceptre.root_evil",
+        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+     Tool("common.items.weapons.sceptre.sceptre_velorite_0"): VoxTrans(
+        "voxel.weapon.sceptre.ore-nature",
+        (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15,
+    ),
+    Tool("common.items.weapons.sceptre.caduceus"): VoxTrans(
+        "voxel.weapon.sceptre.caduceus",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.sceptre.coralline_cane"): VoxTrans(
+        "voxel.weapon.sceptre.coralline_cane",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.sceptre.divine_gohei"): VoxTrans(
+        "voxel.weapon.sceptre.divine_gohei",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.15,
+    ),
+    Tool("common.items.weapons.sceptre.emerald"): VoxTrans(
+        "voxel.weapon.sceptre.emerald",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.12,
+    ),
+    Tool("common.items.weapons.sceptre.druids_arbor"): VoxTrans(
+        "voxel.weapon.sceptre.druids_arbor",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.12,
+    ),
+    Tool("common.items.weapons.sceptre.amethyst"): VoxTrans(
+        "voxel.weapon.sceptre.amethyst",
+        (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.12,
+    ),
+    // Shields
+    Tool("common.items.weapons.shield.shield_1"): VoxTrans(
+        "voxel.weapon.shield.wood-0",
+        (0.0, 0.0, 0.0), (-90.0, 90.0, 0.0), 2.4,
+    ),
+    // Lanterns
+    Lantern("Black0"): Png(
+        "element.items.lantern_black-0",
+    ),
+    Lantern("Green0"): Png(
+        "element.items.lantern_green-0",
+    ),
+    Lantern("Blue0"): Png(
+        "element.items.lantern_blue-0",
+    ),
+    Lantern("Red0"): Png(
+        "element.items.lantern_red-0",
+    ),
+    Lantern("GeodePurp"): VoxTrans(
+        "voxel.lantern.geode_purp",
+        (0.0, 0.0, 0.0), (-90.0, 120.0, 0.0), 0.9,
+    ),
+    Lantern("PumpkinLantern"): VoxTrans(
+        "voxel.lantern.pumpkin",
+        (0.0, 0.0, 0.0), (-90.0, 120.0, 0.0), 0.9,
+    ),
+    // Farming Equipment
+    Tool("common.items.weapons.tool.broom"): VoxTrans(
+        "voxel.weapon.tool.broom-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.tool.hoe"): VoxTrans(
+        "voxel.weapon.tool.hoe_green",
+        (0.0, 0.0, 0.0), (130.0, 35.0, 180.0), 1.0,
+    ),
+    Tool("common.items.weapons.tool.pitchfork"): VoxTrans(
+        "voxel.weapon.tool.pitchfork-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    Tool("common.items.weapons.tool.rake"): VoxTrans(
+        "voxel.weapon.tool.rake-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.tool.fishing_rod"): VoxTrans(
+        "voxel.weapon.tool.fishing_rod_blue-0",
+        (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.5,
+    ),
+    Tool("common.items.weapons.tool.pickaxe"): VoxTrans(
+        "voxel.weapon.tool.pickaxe_green-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.weapons.tool.shovel-0"): VoxTrans(
+        "voxel.weapon.tool.shovel_green",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.tool.shovel-1"): VoxTrans(
+        "voxel.weapon.tool.shovel_gold",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+	// Picks
+    Tool("common.items.tool.pickaxe_stone"): VoxTrans(
+        "voxel.weapon.tool.pickaxe_green-0",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
+    ),
+    Tool("common.items.tool.pickaxe_steel"): VoxTrans(
+        "voxel.weapon.tool.pickaxe_green-1",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
+    ),
+    // Other
+    Utility(Coins): VoxTrans(
+        "voxel.object.v-coin",
+        (0.0, 0.0, 0.0), (-10.0, 15.0, 0.0), 0.8,
+    ),
+    Utility(Collar): Png(
+        "element.items.collar",
+    ),
+    // Armor
+    // Starter Parts
+    Armor(Foot("Sandal")): VoxTrans(
+        "voxel.armor.misc.foot.cloth_sandal",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Pants("Rugged")): VoxTrans(
+        "voxel.armor.rugged.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Chest("Rugged")): VoxTrans(
+        "voxel.armor.rugged.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerPurpBrown")): VoxTrans(
+        "voxel.armor.misc.chest.worker_purp_brown",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("WorkerBrown")): VoxTrans(
+        "voxel.armor.misc.pants.worker_brown",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    // Cultist Clothing
+    Armor(Chest("Cultist")): VoxTrans(
+        "voxel.armor.cultist.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Cultist")): VoxTrans(
+        "voxel.armor.cultist.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Cultist")): VoxTrans(
+        "voxel.armor.cultist.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Cultist")): VoxTrans(
+        "voxel.armor.cultist.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Cultist")): VoxTrans(
+        "voxel.armor.cultist.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Cultist")): VoxTrans(
+        "voxel.armor.cultist.shoulder",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("Cultist")): VoxTrans(
+        "voxel.armor.cultist.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Cultist")): VoxTrans(
+        "voxel.armor.cultist.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Cultist")): VoxTrans(
+        "voxel.armor.cultist.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Cultist")): VoxTrans(
+        "voxel.armor.cultist.shoulder",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Head("Cultist")): VoxTrans(
+        "voxel.armor.cultist.bandana",
+        (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9,
+    ),
+    // Villager Clothing
+    Armor(Pants("WorkerBlue")): VoxTrans(
+        "voxel.armor.misc.pants.worker_blue",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Chest("WorkerGreen0")): VoxTrans(
+        "voxel.armor.misc.chest.worker_green",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerGreen1")): VoxTrans(
+        "voxel.armor.misc.chest.shirt_white",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerRed0")): VoxTrans(
+        "voxel.armor.misc.chest.worker_green",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerRed1")): VoxTrans(
+        "voxel.armor.misc.chest.shirt_white",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerPurple0")): VoxTrans(
+        "voxel.armor.misc.chest.worker_green",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerPurple1")): VoxTrans(
+        "voxel.armor.misc.chest.shirt_white",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerYellow0")): VoxTrans(
+        "voxel.armor.misc.chest.worker_green",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerYellow1")): VoxTrans(
+        "voxel.armor.misc.chest.shirt_white",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerOrange0")): VoxTrans(
+        "voxel.armor.misc.chest.worker_green",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Chest("WorkerOrange1")): VoxTrans(
+        "voxel.armor.misc.chest.shirt_white",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    // Velorite Battlemage Set
+    Armor(Chest("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.shoulder",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Back("VeloriteMage")): VoxTrans(
+        "voxel.armor.velorite_battlemage.back",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    // Assassin Set
+    Armor(Chest("Assassin")): VoxTrans(
+        "voxel.armor.assassin.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Assassin")): VoxTrans(
+        "voxel.armor.assassin.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Assassin")): VoxTrans(
+        "voxel.armor.assassin.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Assassin")): VoxTrans(
+        "voxel.armor.assassin.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Assassin")): VoxTrans(
+        "voxel.armor.assassin.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Assassin")): VoxTrans(
+        "voxel.armor.assassin.shoulder",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    //PlateLeather Armor
+    Armor(Chest("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("LeatherPlate")): VoxTrans(
+        "voxel.armor.leather_plate.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    //Ferocious Armor
+    Armor(Chest("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.hand",
+        (0.0, 0.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
+    ),
+    Armor(Shoulder("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Ferocious")): VoxTrans(
+        "voxel.armor.ferocious.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Blue Leather Armor
+    Armor(Chest("BlueLeather")): VoxTrans(
+        "voxel.armor.leather_blue.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("BlueLeather")): VoxTrans(
+        "voxel.armor.leather_blue.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Linen Cloth
+    Armor(Chest("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("ClothBlue")): VoxTrans(
+        "voxel.armor.cloth_blue.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("ClothBlue0")): VoxTrans(
+        "voxel.armor.cloth_blue.shoulder_0",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Shoulder("ClothBlue1")): VoxTrans(
+        "voxel.armor.cloth_blue.shoulder_1",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    //////////////
+    Armor(Chest("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("ClothGreen")): VoxTrans(
+        "voxel.armor.cloth_green.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    //////
+    Armor(Chest("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("ClothPurple")): VoxTrans(
+        "voxel.armor.cloth_purple.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Shoulder("IronSpikes")): VoxTrans(
+        "voxel.armor.misc.shoulder.iron_spikes",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Shoulder("IronLeather3")): VoxTrans(
+        "voxel.armor.misc.shoulder.leather_iron_3",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Shoulder("IronLeather2")): VoxTrans(
+        "voxel.armor.misc.shoulder.leather_iron_2",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Shoulder("IronLeather1")): VoxTrans(
+        "voxel.armor.misc.shoulder.leather_iron_1",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Shoulder("IronLeather0")): VoxTrans(
+        "voxel.armor.misc.shoulder.leather_iron_0",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Shoulder("LeatherStrip")): VoxTrans(
+        "voxel.armor.misc.shoulder.leather_strip",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Foot("Jackalope")): VoxTrans(
+        "voxel.armor.misc.foot.jackalope",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Twig Set
+    Armor(Chest("Twigs")): VoxTrans(
+        "voxel.armor.twigs.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Twigs")): VoxTrans(
+        "voxel.armor.twigs.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Twigs")): VoxTrans(
+        "voxel.armor.twigs.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Twigs")): VoxTrans(
+        "voxel.armor.twigs.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Twigs")): VoxTrans(
+        "voxel.armor.twigs.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Twigs")): VoxTrans(
+        "voxel.armor.twigs.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+        ),
+    //TwigsLeaves Set
+    Armor(Chest("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("TwigsLeaves")): VoxTrans(
+        "voxel.armor.twigsleaves.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    //TwigsFlowers Set
+    Armor(Chest("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("TwigsFlowers")): VoxTrans(
+        "voxel.armor.twigsflowers.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    //Tarasque Set
+    Armor(Chest("Tarasque")): VoxTrans(
+        "voxel.armor.tarasque.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Tarasque")): VoxTrans(
+        "voxel.armor.tarasque.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Tarasque")): VoxTrans(
+        "voxel.armor.tarasque.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Tarasque")): VoxTrans(
+        "voxel.armor.tarasque.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Tarasque")): VoxTrans(
+        "voxel.armor.tarasque.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Tarasque")): VoxTrans(
+        "voxel.armor.tarasque.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    //Bonerattler Set
+    Armor(Chest("Bonerattler")): VoxTrans(
+        "voxel.armor.bonerattler.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Bonerattler")): VoxTrans(
+        "voxel.armor.bonerattler.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Bonerattler")): VoxTrans(
+        "voxel.armor.bonerattler.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Bonerattler")): VoxTrans(
+        "voxel.armor.bonerattler.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Bonerattler")): VoxTrans(
+        "voxel.armor.bonerattler.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Bonerattler")): VoxTrans(
+        "voxel.armor.bonerattler.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    //Rawhide Set
+    Armor(Chest("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Rawhide")): VoxTrans(
+        "voxel.armor.hide.rawhide.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Leather set
+    Armor(Chest("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Leather")): VoxTrans(
+        "voxel.armor.hide.leather.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Scale Set
+    Armor(Chest("Scale")): VoxTrans(
+        "voxel.armor.hide.scale.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Scale")): VoxTrans(
+        "voxel.armor.hide.scale.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Scale")): VoxTrans(
+        "voxel.armor.hide.scale.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Scale")): VoxTrans(
+        "voxel.armor.hide.scale.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Scale")): VoxTrans(
+        "voxel.armor.hide.scale.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Scale")): VoxTrans(
+        "voxel.armor.hide.scale.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Scale")): VoxTrans(
+        "voxel.armor.hide.scale.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Carapace Set
+    Armor(Chest("Carapace")): VoxTrans(
+        "voxel.armor.hide.carapace.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Carapace")): VoxTrans(
+        "voxel.armor.hide.carapace.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Carapace")): VoxTrans(
+        "voxel.armor.hide.carapace.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Carapace")): VoxTrans(
+        "voxel.armor.hide.carapace.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Carapace")): VoxTrans(
+        "voxel.armor.hide.carapace.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Carapace")): VoxTrans(
+        "voxel.armor.hide.carapace.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Carapace")): VoxTrans(
+        "voxel.armor.hide.carapace.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Primal Set
+    Armor(Chest("Primal")): VoxTrans(
+        "voxel.armor.hide.primal.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Primal")): VoxTrans(
+        "voxel.armor.hide.primal.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Primal")): VoxTrans(
+        "voxel.armor.hide.primal.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Primal")): VoxTrans(
+        "voxel.armor.hide.primal.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Primal")): VoxTrans(
+        "voxel.armor.hide.primal.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Primal")): VoxTrans(
+        "voxel.armor.hide.primal.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Primal")): VoxTrans(
+        "voxel.armor.hide.primal.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Dragonscale Set
+    Armor(Chest("Dragonscale")): VoxTrans(
+        "voxel.armor.hide.dragonscale.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Dragonscale")): VoxTrans(
+        "voxel.armor.hide.dragonscale.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Dragonscale")): VoxTrans(
+        "voxel.armor.hide.dragonscale.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Dragonscale")): VoxTrans(
+        "voxel.armor.hide.dragonscale.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Dragonscale")): VoxTrans(
+        "voxel.armor.hide.dragonscale.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Dragonscale")): VoxTrans(
+        "voxel.armor.hide.dragonscale.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Dragonscale")): VoxTrans(
+        "voxel.armor.hide.dragonscale.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Savage Set
+    Armor(Chest("Savage")): VoxTrans(
+        "voxel.armor.savage.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Savage")): VoxTrans(
+        "voxel.armor.savage.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Savage")): VoxTrans(
+        "voxel.armor.savage.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Savage")): VoxTrans(
+        "voxel.armor.savage.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Savage")): VoxTrans(
+        "voxel.armor.savage.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Savage")): VoxTrans(
+        "voxel.armor.savage.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Savage")): VoxTrans(
+        "voxel.armor.savage.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Linen Set
+    Armor(Chest("Linen")): VoxTrans(
+        "voxel.armor.cloth.linen.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Linen")): VoxTrans(
+        "voxel.armor.cloth.linen.pants",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Linen")): VoxTrans(
+        "voxel.armor.cloth.linen.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Linen")): VoxTrans(
+        "voxel.armor.cloth.linen.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Linen")): VoxTrans(
+        "voxel.armor.cloth.linen.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Linen")): VoxTrans(
+        "voxel.armor.cloth.linen.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Linen")): VoxTrans(
+        "voxel.armor.cloth.linen.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Woolen Set
+    Armor(Chest("Woolen")): VoxTrans(
+        "voxel.armor.cloth.woolen.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Woolen")): VoxTrans(
+        "voxel.armor.cloth.woolen.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Woolen")): VoxTrans(
+        "voxel.armor.cloth.woolen.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Woolen")): VoxTrans(
+        "voxel.armor.cloth.woolen.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Woolen")): VoxTrans(
+        "voxel.armor.cloth.woolen.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Woolen")): VoxTrans(
+        "voxel.armor.cloth.woolen.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Woolen")): VoxTrans(
+        "voxel.armor.cloth.woolen.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Silken Set
+    Armor(Chest("Silken")): VoxTrans(
+        "voxel.armor.cloth.silken.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Silken")): VoxTrans(
+        "voxel.armor.cloth.silken.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Silken")): VoxTrans(
+        "voxel.armor.cloth.silken.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Silken")): VoxTrans(
+        "voxel.armor.cloth.silken.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Silken")): VoxTrans(
+        "voxel.armor.cloth.silken.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Silken")): VoxTrans(
+        "voxel.armor.cloth.silken.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Silken")): VoxTrans(
+        "voxel.armor.cloth.silken.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Druid Set
+    Armor(Chest("Druid")): VoxTrans(
+        "voxel.armor.cloth.druid.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Druid")): VoxTrans(
+        "voxel.armor.cloth.druid.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Druid")): VoxTrans(
+        "voxel.armor.cloth.druid.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Druid")): VoxTrans(
+        "voxel.armor.cloth.druid.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Druid")): VoxTrans(
+        "voxel.armor.cloth.druid.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Druid")): VoxTrans(
+        "voxel.armor.cloth.druid.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Druid")): VoxTrans(
+        "voxel.armor.cloth.druid.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Moonweave Set
+    Armor(Chest("Moonweave")): VoxTrans(
+        "voxel.armor.cloth.moonweave.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Moonweave")): VoxTrans(
+        "voxel.armor.cloth.moonweave.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Moonweave")): VoxTrans(
+        "voxel.armor.cloth.moonweave.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Moonweave")): VoxTrans(
+        "voxel.armor.cloth.moonweave.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Moonweave")): VoxTrans(
+        "voxel.armor.cloth.moonweave.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Moonweave")): VoxTrans(
+        "voxel.armor.cloth.moonweave.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Moonweave")): VoxTrans(
+        "voxel.armor.cloth.moonweave.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Sunsilk Set
+    Armor(Chest("Sunsilk")): VoxTrans(
+        "voxel.armor.cloth.sunsilk.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Sunsilk")): VoxTrans(
+        "voxel.armor.cloth.sunsilk.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Sunsilk")): VoxTrans(
+        "voxel.armor.cloth.sunsilk.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Sunsilk")): VoxTrans(
+        "voxel.armor.cloth.sunsilk.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Sunsilk")): VoxTrans(
+        "voxel.armor.cloth.sunsilk.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Sunsilk")): VoxTrans(
+        "voxel.armor.cloth.sunsilk.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Sunsilk")): VoxTrans(
+        "voxel.armor.cloth.sunsilk.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Bronze Set
+    Armor(Chest("Bronze")): VoxTrans(
+        "voxel.armor.mail.bronze.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Bronze")): VoxTrans(
+        "voxel.armor.mail.bronze.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Bronze")): VoxTrans(
+        "voxel.armor.mail.bronze.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Bronze")): VoxTrans(
+        "voxel.armor.mail.bronze.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Bronze")): VoxTrans(
+        "voxel.armor.mail.bronze.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Bronze")): VoxTrans(
+        "voxel.armor.mail.bronze.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Bronze")): VoxTrans(
+        "voxel.armor.mail.bronze.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Iron Set
+    Armor(Chest("Iron")): VoxTrans(
+        "voxel.armor.mail.iron.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Iron")): VoxTrans(
+        "voxel.armor.mail.iron.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Iron")): VoxTrans(
+        "voxel.armor.mail.iron.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Iron")): VoxTrans(
+        "voxel.armor.mail.iron.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Iron")): VoxTrans(
+        "voxel.armor.mail.iron.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Iron")): VoxTrans(
+        "voxel.armor.mail.iron.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Iron")): VoxTrans(
+        "voxel.armor.mail.iron.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Steel Set
+    Armor(Chest("Steel")): VoxTrans(
+        "voxel.armor.mail.steel.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Steel")): VoxTrans(
+        "voxel.armor.mail.steel.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Steel")): VoxTrans(
+        "voxel.armor.mail.steel.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Steel")): VoxTrans(
+        "voxel.armor.mail.steel.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Steel")): VoxTrans(
+        "voxel.armor.mail.steel.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Steel")): VoxTrans(
+        "voxel.armor.mail.steel.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Steel")): VoxTrans(
+        "voxel.armor.mail.steel.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Cobalt Set
+    Armor(Chest("Cobalt")): VoxTrans(
+        "voxel.armor.mail.cobalt.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Cobalt")): VoxTrans(
+        "voxel.armor.mail.cobalt.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Cobalt")): VoxTrans(
+        "voxel.armor.mail.cobalt.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Cobalt")): VoxTrans(
+        "voxel.armor.mail.cobalt.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Cobalt")): VoxTrans(
+        "voxel.armor.mail.cobalt.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Cobalt")): VoxTrans(
+        "voxel.armor.mail.cobalt.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Cobalt")): VoxTrans(
+        "voxel.armor.mail.cobalt.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Bloodsteel Set
+    Armor(Chest("Bloodsteel")): VoxTrans(
+        "voxel.armor.mail.bloodsteel.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Bloodsteel")): VoxTrans(
+        "voxel.armor.mail.bloodsteel.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Bloodsteel")): VoxTrans(
+        "voxel.armor.mail.bloodsteel.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Bloodsteel")): VoxTrans(
+        "voxel.armor.mail.bloodsteel.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Bloodsteel")): VoxTrans(
+        "voxel.armor.mail.bloodsteel.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Bloodsteel")): VoxTrans(
+        "voxel.armor.mail.bloodsteel.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Bloodsteel")): VoxTrans(
+        "voxel.armor.mail.bloodsteel.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Orichalcum Set
+    Armor(Chest("Orichalcum")): VoxTrans(
+        "voxel.armor.mail.orichalcum.chest",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1,
+    ),
+    Armor(Pants("Orichalcum")): VoxTrans(
+        "voxel.armor.mail.orichalcum.pants",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Belt("Orichalcum")): VoxTrans(
+        "voxel.armor.mail.orichalcum.belt",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Foot("Orichalcum")): VoxTrans(
+        "voxel.armor.mail.orichalcum.foot",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Hand("Orichalcum")): VoxTrans(
+        "voxel.armor.mail.orichalcum.hand",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Shoulder("Orichalcum")): VoxTrans(
+        "voxel.armor.mail.orichalcum.shoulder",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Back("Orichalcum")): VoxTrans(
+        "voxel.armor.mail.orichalcum.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //misc
+     Armor(Pants("Hunting")): VoxTrans(
+        "voxel.armor.misc.pants.grayscale",
+        (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    // Backs
+    Armor(Back("Short0")): VoxTrans(
+        "voxel.armor.misc.back.short-0",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Back("Short1")): VoxTrans(
+        "voxel.armor.misc.back.short-1",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Back("Admin")): VoxTrans(
+        "voxel.armor.misc.back.admin",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Back("DungeonPurple")): VoxTrans(
+        "voxel.armor.misc.back.dungeon_purple",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Back("LeatherBlue")): VoxTrans(
+        "voxel.armor.leather_blue.back",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Back("Backpack")): VoxTrans(
+        "voxel.armor.misc.back.backpack",
+        (0.0, 0.0, 0.0), (-75.0, 45.0,0.0), 0.9,
+    ),
+    Armor(Back("BackpackBlue")): VoxTrans(
+        "voxel.armor.misc.back.backpack",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    //Hats
+    Armor(Head("Witch")): VoxTrans(
+        "voxel.armor.witch.hat",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Head("Pirate")): VoxTrans(
+        "voxel.armor.pirate.hat",
+        (1.0, 2.0, 0.0), (-120.0, 210.0,15.0), 1.0,
+    ),
+    Armor(Head("Thief")): VoxTrans(
+        "voxel.armor.misc.head.bandana.thief",
+        (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9,
+    ),
+    Armor(Head("Red")): VoxTrans(
+        "voxel.armor.misc.head.bandana.red",
+        (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9,
+    ),
+    Armor(Head("Straw")): VoxTrans(
+        "voxel.armor.misc.head.straw",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
+    ),
+    Armor(Head("Hood")): VoxTrans(
+        "voxel.armor.misc.head.hood",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3,
+    ),
+    Armor(Head("Crown")): VoxTrans(
+        "voxel.armor.misc.head.crown",
+        (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3,
+    ),
+    Armor(Head("Mitre")): VoxTrans(
+        "voxel.armor.misc.head.mitre",
+        (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3,
+    ),
+    Armor(Head("Spikeguard")): VoxTrans(
+        "voxel.armor.misc.head.spikeguard",
+        (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3,
+    ),
+    // Rings
+    Armor(Ring("Scratched")): VoxTrans(
+        "voxel.armor.misc.ring.scratched",
+        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
+    ),
+    Armor(Ring("Gold")): VoxTrans(
+        "voxel.armor.misc.ring.gold",
+        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
+    ),
+    Armor(Ring("Topaz")): VoxTrans(
+        "voxel.armor.misc.ring.topaz",
+        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
+    ),
+    Armor(Ring("Amethyst")): VoxTrans(
+        "voxel.armor.misc.ring.amethyst",
+        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
+    ),
+    Armor(Ring("Sapphire")): VoxTrans(
+        "voxel.armor.misc.ring.sapphire",
+        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
+    ),
+    Armor(Ring("Emerald")): VoxTrans(
+        "voxel.armor.misc.ring.emerald",
+        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
+    ),
+    Armor(Ring("Ruby")): VoxTrans(
+        "voxel.armor.misc.ring.ruby",
+        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
+    ),
+    Armor(Ring("Diamond")): VoxTrans(
+        "voxel.armor.misc.ring.diamond",
+        (0.0, 0.0, 0.0), (45.0, 20.0, 0.0), 0.9,
+    ),
+    Armor(Ring("Cultist")): VoxTrans(
+        "voxel.armor.cultist.ring",
+        (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
     ),
 
-    "Seashell Necklace": (
-        output: ("common.items.armor.misc.neck.shell", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 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),
+    // Necks
+    Armor(Neck("Ankh")): VoxTrans(
+        "voxel.armor.misc.neck.ankh_of_life",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "red cloth": (
-        output: ("common.items.crafting_ing.cloth.linen_red", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen"), 1),
-            (Item("common.items.flowers.red"), 1),
-            (Item("common.items.crafting_tools.mortar_pestle"), 0),
-        ],
-        craft_sprite: None,
+    Armor(Neck("Carcanet")): VoxTrans(
+        "voxel.armor.misc.neck.carcanet_of_wrath",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "tiny red pouch": (
-        output: ("common.items.armor.misc.bag.tiny_red_pouch", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.linen_red"), 3),
-        ],
-        craft_sprite: None,
+    Armor(Neck("Fang")): VoxTrans(
+        "voxel.armor.misc.neck.fang",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "tiny leather pouch": (
-        output: ("common.items.armor.misc.bag.tiny_leather_pouch", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.leather_strips"), 12),
-        ],
-        craft_sprite: None,
+    Armor(Neck("Honeycomb")): VoxTrans(
+        "voxel.armor.misc.neck.honeycomb_pendant",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "knitted red pouch": (
-        output: ("common.items.armor.misc.bag.knitted_red_pouch", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 6),
-            (Item("common.items.armor.misc.bag.tiny_red_pouch"), 2),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: None,
+    Armor(Neck("Haniwa")): VoxTrans(
+        "voxel.armor.misc.neck.haniwa_talisman",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "woven red bag": (
-        output: ("common.items.armor.misc.bag.woven_red_bag", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.silk"), 6),
-            (Item("common.items.armor.misc.bag.knitted_red_pouch"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: None,
+    Armor(Neck("Pendant")): VoxTrans(
+        "voxel.armor.misc.neck.pendant_of_protection",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "traveler backpack": (
-        output: ("common.items.armor.misc.back.backpack", 1),
-        inputs: [
-            (Item("common.items.mineral.gem.diamond"), 2),
-            (Item("common.items.crafting_ing.twigs"), 2),
-            (Item("common.items.crafting_ing.cloth.silk"), 4),
-            (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),
-        ],
-        craft_sprite: Some(CraftingBench),
+    Armor(Neck("ResilienceGem")): VoxTrans(
+        "voxel.armor.misc.neck.resilience_gem",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "sturdy red backpack": (
-        output: ("common.items.armor.misc.bag.sturdy_red_backpack", 1),
-        inputs: [
-            (Item("common.items.mineral.gem.amethyst"), 2),
-            (Item("common.items.crafting_ing.cloth.linen_red"), 3),
-            (Item("common.items.crafting_ing.leather.thick_leather"), 6),
-            (Item("common.items.armor.misc.bag.woven_red_bag"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: None,
+    Armor(Neck("Shell")): VoxTrans(
+        "voxel.armor.misc.neck.shell",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "troll hide pack": (
-        output: ("common.items.armor.misc.bag.troll_hide_pack", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.hide.leather_troll"), 10),
-            (Item("common.items.crafting_ing.leather.leather_strips"), 10),
-            (Item("common.items.mineral.gem.diamond"), 1),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: None,
+    Armor(Neck("Amethyst")): VoxTrans(
+        "voxel.armor.misc.neck.amethyst",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "Mindflayer Spellbag": (
-        output: ("common.items.armor.misc.bag.mindflayer_spellbag", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1),
-            (Item("common.items.crafting_ing.leather.rigid_leather"), 8),
-            (Item("common.items.mineral.gem.diamond"), 4),
-            (Item("common.items.mineral.ore.veloritefrag"), 10),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
-        ],
-        craft_sprite: None,
+    Armor(Neck("Diamond")): VoxTrans(
+        "voxel.armor.misc.neck.diamond",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "tin pickaxe": (
-        output: ("common.items.tool.pickaxe_stone", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.leather_strips"), 4),
-            (Item("common.items.crafting_ing.stones"), 5),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-        ],
-        craft_sprite: Some(Anvil),
+    Armor(Neck("Cultist")): VoxTrans(
+        "voxel.armor.cultist.necklace",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "steel pickaxe": (
-        output: ("common.items.tool.pickaxe_steel", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
-            (Item("common.items.mineral.ingot.steel"), 5),
-            (Item("common.items.tool.craftsman_hammer"), 0),
-        ],
-        craft_sprite: Some(Anvil),
+    Armor(Neck("Ruby")): VoxTrans(
+        "voxel.armor.misc.neck.ruby",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "fang necklace": (
-        output: ("common.items.armor.misc.neck.fang", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.leather.leather_strips"), 3),
-            (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 15),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
+    Armor(Neck("Topaz")): VoxTrans(
+        "voxel.armor.misc.neck.topaz",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "honeycomb pendant": (
-        output: ("common.items.armor.misc.neck.honeycomb_pendant", 1),
-        inputs: [
-            (Item("common.items.crafting_ing.sticky_thread"), 3),
-            (Item("common.items.crafting_ing.honey"), 15),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
+    Armor(Neck("Emerald")): VoxTrans(
+        "voxel.armor.misc.neck.emerald",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "diamond ring": (
-        output: ("common.items.armor.misc.ring.diamond", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.gold"), 1),
-            (Item("common.items.mineral.gem.diamond"), 1),
-        ],
-        craft_sprite: Some(CraftingBench),
+    Armor(Neck("Gold")): VoxTrans(
+        "voxel.armor.misc.neck.gold",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "diamond necklace": (
-        output: ("common.items.armor.misc.neck.diamond", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.gold"), 4),
-            (Item("common.items.mineral.gem.diamond"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
+    Armor(Neck("Sapphire")): VoxTrans(
+        "voxel.armor.misc.neck.sapphire",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "ruby ring": (
-        output: ("common.items.armor.misc.ring.ruby", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.silver"), 1),
-            (Item("common.items.mineral.gem.ruby"), 1),
-        ],
-        craft_sprite: Some(CraftingBench),
+    Armor(Neck("Scratched")): VoxTrans(
+        "voxel.armor.misc.neck.scratched",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    "ruby necklace": (
-        output: ("common.items.armor.misc.neck.ruby", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.silver"), 4),
-            (Item("common.items.mineral.gem.ruby"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
+
+    // Tabards
+    Armor(Tabard("Admin")): Png(
+        "element.items.tabard_admin",
     ),
-    "emerald ring": (
-        output: ("common.items.armor.misc.ring.emerald", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 1),
-            (Item("common.items.mineral.gem.emerald"), 1),
-        ],
-        craft_sprite: Some(CraftingBench),
+    // Heads
+    Armor(Head("Leather")): VoxTrans(
+        "voxel.armor.misc.head.leather-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    "emerald necklace": (
-        output: ("common.items.armor.misc.neck.emerald", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.cobalt"), 4),
-            (Item("common.items.mineral.gem.emerald"), 6),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
+    Armor(Head("Assassin")): VoxTrans(
+        "voxel.armor.misc.head.assa_mask-0",
+        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
     ),
-    "sapphire ring": (
-        output: ("common.items.armor.misc.ring.sapphire", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 1),
-            (Item("common.items.mineral.gem.sapphire"), 1),
-        ],
-        craft_sprite: Some(CraftingBench),
+    Armor(Head("Exclamation")): VoxTrans(
+        "voxel.armor.misc.head.exclamation",
+        (0.0, 15.0, 0.0), (-75.0, 135.0, 0.0), 3.0,
     ),
-    "sapphire necklace": (
-        output: ("common.items.armor.misc.neck.sapphire", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.iron"), 2),
-            (Item("common.items.mineral.gem.sapphire"), 3),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
+    // Bags
+    Armor(Bag("RedFace")): Png (
+        "element.items.item_bag_red_face",
     ),
-    "topaz ring": (
-        output: ("common.items.armor.misc.ring.topaz", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.copper"), 1),
-            (Item("common.items.mineral.gem.topaz"), 1),
-        ],
-        craft_sprite: Some(CraftingBench),
+    Armor(Bag("BlackHole")): Png (
+        "element.items.item_bag_brown_face",
     ),
-    "topaz necklace": (
-        output: ("common.items.armor.misc.neck.topaz", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.copper"), 2),
-            (Item("common.items.mineral.gem.topaz"), 3),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
+    Armor(Bag("BlueFace")): Png (
+        "element.items.item_bag_blue_face",
     ),
-    "amethyst ring": (
-        output: ("common.items.armor.misc.ring.amethyst", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.tin"), 1),
-            (Item("common.items.mineral.gem.amethyst"), 1),
-        ],
-        craft_sprite: Some(CraftingBench),
+    Armor(Bag("PurpleSkull")): Png (
+        "element.items.item_bag_skull",
     ),
-    "amethyst necklace": (
-        output: ("common.items.armor.misc.neck.amethyst", 1),
-        inputs: [
-            (Item("common.items.mineral.ingot.tin"), 2),
-            (Item("common.items.mineral.gem.amethyst"), 3),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
+    Armor(Bag("GreenLarge")): Png (
+        "element.items.item_bag_green_large",
     ),
-    //"metal_blade": (
-    //    output: ("common.items.crafting_ing.modular.damage.sword.metal_blade", 1),
-    //    inputs: [
-    //        (Tag(MetalIngot), 5),
-    //        (Item("common.items.tool.craftsman_hammer"), 0),
-    //    ],
-    //    craft_sprite: Some(Anvil),
-    //    is_recycling: false,
-    //),
-}
+    Armor(Bag("LeatherLarge")): Png (
+        "element.items.item_bag_leather_large",
+    ),
+    Armor(Bag("GreenMid")): Png (
+        "element.items.item_bag_green_mid",
+    ),
+    Armor(Bag("LeatherSmall")): Png (
+        "element.items.item_bag_leather_small",
+    ),
+    Armor(Bag("RedLarge")): Png (
+        "element.items.item_bag_large",
+    ),
+    Armor(Bag("RedMed")): Png (
+        "element.items.item_bag_med",
+    ),
+    Armor(Bag("RedSmall")): Png (
+        "element.items.item_bag_small",
+    ),
+    Armor(Bag("RedTiny")): Png (
+        "element.items.item_bag_tiny",
+    ),
+    Armor(Bag("BluePouch")): Png (
+        "element.items.item_bag_blue",
+    ),
+    // Consumables
+    Consumable("common.items.food.apple"): Png(
+        "element.items.item_apple",
+    ),
+    Consumable("common.items.food.coconut"): Png(
+        "element.items.item_coconut",
+    ),
+    Consumable("common.items.food.cactus_colada"): VoxTrans(
+        "voxel.object.cactus_drink",
+        (-1.0, 1.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Consumable("common.items.consumable.potion_med"): VoxTrans(
+        "voxel.object.potion_red",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
+    ),
+    Consumable("common.items.consumable.potion_minor"): VoxTrans(
+        "voxel.object.potion_red",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.5,
+    ),
+    Consumable("common.items.consumable.potion_big"): VoxTrans(
+        "voxel.object.potion_red",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
+    ),
+    Consumable("common.items.boss_drops.potions"): VoxTrans(
+        "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.mushroom"): VoxTrans(
+        "voxel.sprite.mushrooms.mushroom-10",
+        (0.0, 0.0, 0.0), (-50.0, 70.0, 40.0), 1.0,
+    ),
+    Ingredient("Velorite"): VoxTrans(
+        "voxel.sprite.velorite.velorite_ore",
+        (0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Ingredient("VeloriteFrag"): VoxTrans(
+        "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.spore_corruption"): VoxTrans(
+        "voxel.sprite.spore.corruption_spore",
+        (0.0, 0.0, 0.0), (-30.0, 30.0, 20.0), 0.8,
+    ),
+    Consumable("common.items.food.apple_stick"): Png(
+        "element.items.item_apple_stick",
+    ),
+    Consumable("common.items.food.mushroom_stick"): Png(
+        "element.items.item_shroom_stick",
+    ),
+    Consumable("common.items.food.sunflower_icetea"): Png(
+        "element.items.item_sunflower_tea",
+    ),
+    Consumable("common.items.food.carrot"): VoxTrans(
+        "voxel.sprite.carrot.carrot",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Consumable("common.items.food.tomato"): VoxTrans(
+        "voxel.sprite.tomato.tomato",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Consumable("common.items.food.lettuce"): VoxTrans(
+        "voxel.sprite.cabbage.cabbage",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Consumable("common.items.food.meat.fish_raw"): VoxTrans(
+        "voxel.sprite.food.meat.fish_raw",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Consumable("common.items.food.meat.fish_cooked"): VoxTrans(
+        "voxel.sprite.food.meat.fish_cooked",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Consumable("common.items.food.meat.bird_raw"): VoxTrans(
+        "voxel.sprite.food.meat.bird_raw",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Consumable("common.items.food.meat.bird_cooked"): VoxTrans(
+        "voxel.sprite.food.meat.bird_cooked",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Consumable("common.items.food.meat.bird_large_raw"): VoxTrans(
+        "voxel.sprite.food.meat.bird_large_raw",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Consumable("common.items.food.meat.bird_large_cooked"): VoxTrans(
+        "voxel.sprite.food.meat.bird_large_cooked",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Consumable("common.items.food.meat.beast_small_raw"): VoxTrans(
+        "voxel.sprite.food.meat.beast_small_raw",
+        (0.0, 0.0, 0.0), (-50.0, 10.0, 0.0), 1.0,
+    ),
+    Consumable("common.items.food.meat.beast_small_cooked"): VoxTrans(
+        "voxel.sprite.food.meat.beast_small_cooked",
+        (0.0, 0.0, 0.0), (-50.0, 20.0, 0.0), 1.0,
+    ),
+    Consumable("common.items.food.meat.tough_raw"): VoxTrans(
+        "voxel.sprite.food.meat.tough_raw",
+        (0.0, 0.0, 0.0), (-50.0, 10.0, 0.0), 1.0,
+    ),
+    Consumable("common.items.food.meat.tough_cooked"): VoxTrans(
+        "voxel.sprite.food.meat.tough_cooked",
+        (0.0, 0.0, 0.0), (-50.0, 20.0, 0.0), 1.0,
+    ),
+    Consumable("common.items.food.meat.beast_large_raw"): VoxTrans(
+        "voxel.sprite.food.meat.beast_large_raw",
+        (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8,
+    ),
+    Consumable("common.items.food.meat.beast_large_cooked"): VoxTrans(
+        "voxel.sprite.food.meat.beast_large_cooked",
+        (-1.0, 0.0, 0.0), (-80.0, 40.0, 0.0), 0.8,
+    ),
+    Consumable("common.items.food.plainsalad"): VoxTrans(
+        "voxel.sprite.food.salad_plain",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Consumable("common.items.food.tomatosalad"): VoxTrans(
+        "voxel.sprite.food.salad_tomato",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    // Throwables
+    Throwable(Bomb): VoxTrans(
+        "voxel.object.bomb",
+        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Throwable(Firework(Blue)): VoxTrans(
+        "voxel.weapon.projectile.fireworks_blue-0",
+        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Throwable(Firework(Green)): VoxTrans(
+        "voxel.weapon.projectile.fireworks_green-0",
+        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Throwable(Firework(Purple)): VoxTrans(
+        "voxel.weapon.projectile.fireworks_purple-0",
+        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Throwable(Firework(Red)): VoxTrans(
+        "voxel.weapon.projectile.fireworks_red-0",
+        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Throwable(Firework(White)): VoxTrans(
+        "voxel.weapon.projectile.fireworks_white-0",
+        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Throwable(Firework(Yellow)): VoxTrans(
+        "voxel.weapon.projectile.fireworks_yellow-0",
+        (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Throwable(TrainingDummy): VoxTrans(
+        "voxel.object.training_dummy",
+        (0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    // Ingredients
+    Tool("common.items.tool.craftsman_hammer"): VoxTrans(
+        "voxel.weapon.hammer.craftsman",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9,
+    ),
+    Ingredient("SewingSet"): Png(
+        "element.items.sewing_set",
+    ),
+    Ingredient("Flower"): VoxTrans(
+        "voxel.sprite.flowers.sunflower_1",
+        (-2.0, -0.5, -1.0), (-60.0, 40.0, 20.0), 1.1,
+    ),
+    Ingredient("FlowerRed"): VoxTrans(
+        "voxel.sprite.flowers.flower_red-4",
+        (0.0, 0.5, 0.0), (-70.0, 10.0, 0.0), 0.8,
+    ),
+    Ingredient("Sunflower"): VoxTrans(
+        "voxel.sprite.flowers.sunflower_1",
+        (0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Ingredient("Grass"): VoxTrans(
+        "voxel.sprite.grass.grass_long_5",
+        (0.0, 0.0, 0.0), (-90.0, 50.0, 0.0), 1.0,
+    ),
+    Ingredient("Stones"): VoxTrans(
+        "voxel.sprite.rocks.rock-0",
+        (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Ingredient("Cactus"): VoxTrans(
+        "voxel.sprite.cacti.flat_cactus_med",
+        (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.9,
+    ),
+    Ingredient("Seashells"): VoxTrans(
+        "voxel.sprite.seashells.shell-0",
+        (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8,
+    ),
+    Ingredient("IcyShard"): Png(
+        "element.items.item_ice_shard",
+    ),
+    Ingredient("FlayerBagDamaged"): Png(
+        "element.items.item_flayer_soul",
+    ),
+    Ingredient("RaptorFeather"): Png(
+        "element.items.item_raptor_feather",
+    ),
+    Ingredient("Twigs"): VoxTrans(
+        "voxel.sprite.twigs.twigs-0",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("AnimalHide"): VoxTrans(
+        "voxel.sprite.crafting_ing.hide.animal_hide",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("ToughHide"): VoxTrans(
+        "voxel.sprite.crafting_ing.hide.tough_hide",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("RuggedHide"): VoxTrans(
+        "voxel.sprite.crafting_ing.hide.rugged_hide",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("SimpleLeather"): VoxTrans(
+        "voxel.sprite.crafting_ing.leather.simple_leather",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("ThickLeather"): VoxTrans(
+        "voxel.sprite.crafting_ing.leather.thick_leather",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("RigidLeather"): VoxTrans(
+        "voxel.sprite.crafting_ing.leather.rigid_leather",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("TrollLeather"): VoxTrans(
+        "voxel.sprite.crafting_ing.hide.troll_hide",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("LeatherStrips"): VoxTrans(
+        "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.8,
+    ),
+    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.animal_misc.claw",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("VenomSac"): VoxTrans(
+        "voxel.sprite.crafting_ing.animal_misc.venom_sac",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("LivelyVine"): VoxTrans(
+        "voxel.sprite.crafting_ing.animal_misc.lively_vine",
+        (0.0, 0.0, 0.0), (-40.0, -40.0, 20.0), 1.2,
+    ),
+    Ingredient("SharpFang"): VoxTrans(
+        "voxel.sprite.crafting_ing.animal_misc.sharp_fang",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0,
+    ),
+    Ingredient("Fur"): VoxTrans(
+        "voxel.sprite.crafting_ing.animal_misc.fur",
+        (0.0, 0.0, 0.0), (-40.0, -10.0, 10.0), 1.0,
+    ),
+    Ingredient("LargeHorn"): VoxTrans(
+        "voxel.sprite.crafting_ing.animal_misc.large_horn",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("GrimEyeball"): VoxTrans(
+        "voxel.sprite.crafting_ing.animal_misc.grim_eyeball",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("PlantFiber"): VoxTrans(
+        "voxel.sprite.crafting_ing.plant_fiber",
+        (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9,
+    ),
+    Ingredient("Moonbell"): VoxTrans(
+        "voxel.sprite.flowers.moonbell",
+        (0.0, 0.0, 0.0), (-65.0, 40.0, 20.0), 0.9,
+    ),
+    Ingredient("Pyrebloom"): VoxTrans(
+        "voxel.sprite.flowers.pyrebloom",
+        (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.9,
+    ),
+    Ingredient("WildFlax"): VoxTrans(
+        "voxel.sprite.flowers.flax",
+        (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.8,
+    ),
+    Ingredient("CottonBoll"): VoxTrans(
+        "voxel.sprite.crafting_ing.cotton_boll",
+        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
+    ),
+    Ingredient("Cotton"): VoxTrans(
+        "voxel.sprite.crafting_ing.cloth.cotton",
+        (0.0, 0.0, 0.0), (-65.0, 0.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("LinenRed"): VoxTrans(
+        "voxel.sprite.crafting_ing.cloth.linen_red",
+        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
+    ),
+    Ingredient("StickyThread"): VoxTrans(
+        "voxel.sprite.crafting_ing.sticky_thread",
+        (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9,
+    ),
+    Ingredient("SilverIngot"): VoxTrans(
+        "voxel.sprite.mineral.ingot.silver",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("GoldIngot"): VoxTrans(
+        "voxel.sprite.mineral.ingot.gold",
+        (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85,
+    ),
+    Ingredient("OrichalcumIngot"): VoxTrans(
+        "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, 15.0), 0.9,
+    ),
+    Ingredient("SilverOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.silver",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
+    ),
+    Ingredient("BloodstoneOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.bloodstone",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
+    ),
+    Ingredient("CobaltOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.cobalt",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
+    ),
+    Ingredient("CopperOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.copper",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
+    ),
+    Ingredient("IronOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.iron",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
+    ),
+    Ingredient("TinOre"): VoxTrans(
+        "voxel.sprite.mineral.ore.tin",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
+    ),
+    Ingredient("Coal"): VoxTrans(
+        "voxel.sprite.mineral.ore.coal",
+        (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9,
+    ),
+    Ingredient("Honey"): Png(
+        "element.items.item_honey",
+    ),
+    Ingredient("MortarPestle"): Png(
+        "element.items.item_mortarpestlecoco",
+    ),
+    Ingredient("EmptyVial"): VoxTrans(
+        "voxel.object.potion_empty",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("Bowl"): VoxTrans(
+        "voxel.sprite.crafting_ing.bowl",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("Oil"): VoxTrans(
+        "voxel.sprite.crafting_ing.oil",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("ViscousOoze"): VoxTrans(
+        "voxel.sprite.crafting_ing.animal_misc.viscous_ooze",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8,
+    ),
+    Ingredient("PhoenixFeather"): VoxTrans(
+        "voxel.sprite.crafting_ing.animal_misc.phoenix_feather",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.2,
+    ),
+    // Gliders
+    Glider("Starter"): VoxTrans(
+        "voxel.glider.starter",
+        (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
+    ),
+    Glider("PlainCloth"): VoxTrans(
+        "voxel.glider.basic_white",
+        (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
+    ),
+    Glider("RedCloth"): VoxTrans(
+        "voxel.glider.basic_red",
+        (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
+    ),
+    Glider("Blue0"): VoxTrans(
+        "voxel.glider.blue",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("ButterflyMorpho"): VoxTrans(
+        "voxel.glider.butterfly1",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("ButterflyMonarch"): VoxTrans(
+        "voxel.glider.butterfly2",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("ButterflyLove"): VoxTrans(
+        "voxel.glider.butterfly3",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("MothLuna"): VoxTrans(
+        "voxel.glider.moth",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("SandRaptor"): VoxTrans(
+        "voxel.glider.sandraptor",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("SnowRaptor"): VoxTrans(
+        "voxel.glider.snowraptor",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("WoodRaptor"): VoxTrans(
+        "voxel.glider.woodraptor",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("Sunset"): VoxTrans(
+        "voxel.glider.sunset",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("Moonrise"): VoxTrans(
+        "voxel.glider.moonrise",
+        (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("Purple0"): VoxTrans(
+        "voxel.glider.cultists",
+        (5.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    Glider("Leaves"): VoxTrans(
+        "voxel.glider.leaves",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1,
+    ),
+    // Debug Items
+    Tool("common.items.debug.admin_stick"): VoxTrans(
+        "voxel.weapon.tool.broom_belzeshrub_purple",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
+    ),
+    // Gems
+    Ingredient("Amethyst"): VoxTrans(
+        "voxel.sprite.mineral.gem.amethystgem",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
+    ),
+    Ingredient("Topaz"): VoxTrans(
+        "voxel.sprite.mineral.gem.topazgem",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
+    ),
+    Ingredient("Sapphire"): VoxTrans(
+        "voxel.sprite.mineral.gem.sapphiregem",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.6,
+    ),
+    Ingredient("Emerald"): VoxTrans(
+        "voxel.sprite.mineral.gem.emeraldgem",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
+    ),
+    Ingredient("Ruby"): VoxTrans(
+        "voxel.sprite.mineral.gem.rubygem",
+        (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
+    ),
+    Ingredient("Diamond"): VoxTrans(
+        "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(
+        "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_blade",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+    ModularComponent("common.items.crafting_ing.modular.held.sword.tier5"): VoxTrans(
+        "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
+        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+    ),
+})

From a192bc0cf79e49d8ef8c8dc90241f362228e127a Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sat, 6 Nov 2021 17:45:02 +0100
Subject: [PATCH 03/39] + Gnarling armor count - 7 previous being 7 + Adlet-bow
 armor count - 39 previous being 62 + Sahagin armor count - 71 previous being
 88 + Haniwa armor count - 96 previous being 91 + Myrmidon armor count - 152
 previous being 161 + Although an overall decrease in armor there's an
 increase in poise res, crit power, energy, and other stats. + Gave everything
 staff an ability set in skillset, and linked them all

---
 assets/common/entity/dungeon/tier-0/staff.ron |  1 +
 assets/common/entity/dungeon/tier-1/staff.ron |  1 +
 assets/common/entity/dungeon/tier-2/staff.ron |  1 +
 assets/common/entity/dungeon/tier-3/staff.ron |  1 +
 .../biped_small/adlet/chest/adlet_bow.ron     | 10 ++++-----
 .../biped_small/adlet/chest/adlet_spear.ron   |  6 +++---
 .../biped_small/adlet/foot/adlet.ron          | 10 ++++-----
 .../biped_small/adlet/hand/adlet_bow.ron      | 10 ++++-----
 .../biped_small/adlet/hand/adlet_spear.ron    |  8 +++----
 .../biped_small/adlet/head/adlet_bow.ron      | 10 ++++-----
 .../biped_small/adlet/head/adlet_spear.ron    |  6 +++---
 .../biped_small/adlet/pants/adlet_bow.ron     | 10 ++++-----
 .../biped_small/adlet/pants/adlet_spear.ron   |  6 +++---
 .../biped_small/adlet/tail/adlet.ron          | 10 ++++-----
 .../biped_small/gnarling/chest/gnarling.ron   |  6 +++---
 .../biped_small/gnarling/foot/gnarling.ron    |  6 +++---
 .../biped_small/gnarling/hand/gnarling.ron    |  6 +++---
 .../biped_small/gnarling/head/gnarling.ron    |  6 +++---
 .../biped_small/gnarling/pants/gnarling.ron   |  6 +++---
 .../biped_small/gnarling/tail/gnarling.ron    |  6 +++---
 .../biped_small/haniwa/chest/haniwa.ron       | 10 ++++-----
 .../biped_small/haniwa/foot/haniwa.ron        | 10 ++++-----
 .../biped_small/haniwa/hand/haniwa.ron        | 10 ++++-----
 .../biped_small/haniwa/head/haniwa.ron        | 10 ++++-----
 .../biped_small/haniwa/pants/haniwa.ron       | 10 ++++-----
 .../biped_small/myrmidon/chest/myrmidon.ron   | 12 +++++------
 .../biped_small/myrmidon/foot/myrmidon.ron    | 12 +++++------
 .../biped_small/myrmidon/hand/myrmidon.ron    | 12 +++++------
 .../biped_small/myrmidon/head/myrmidon.ron    | 12 +++++------
 .../biped_small/myrmidon/pants/myrmidon.ron   | 12 +++++------
 .../biped_small/myrmidon/tail/myrmidon.ron    | 10 ++++-----
 .../biped_small/sahagin/chest/sahagin.ron     | 10 ++++-----
 .../biped_small/sahagin/foot/sahagin.ron      | 10 ++++-----
 .../biped_small/sahagin/hand/sahagin.ron      | 10 ++++-----
 .../biped_small/sahagin/head/sahagin.ron      | 10 ++++-----
 .../biped_small/sahagin/pants/sahagin.ron     | 10 ++++-----
 .../biped_small/sahagin/tail/sahagin.ron      | 10 ++++-----
 .../biped_small/adlet/adlet_bow.ron           |  4 ++--
 .../biped_small/adlet/gnoll_staff.ron         |  4 ++--
 .../biped_small/adlet/wooden_spear.ron        |  2 +-
 .../biped_small/gnarling/adlet_bow.ron        |  2 +-
 .../biped_small/gnarling/gnoll_staff.ron      |  2 +-
 .../biped_small/haniwa/adlet_bow.ron          |  4 ++--
 .../biped_small/haniwa/gnoll_staff.ron        |  2 +-
 .../biped_small/haniwa/wooden_spear.ron       |  2 +-
 .../biped_small/myrmidon/adlet_bow.ron        |  4 ++--
 .../biped_small/myrmidon/gnoll_staff.ron      |  4 ++--
 .../biped_small/myrmidon/wooden_spear.ron     |  2 +-
 .../biped_small/sahagin/adlet_bow.ron         |  4 ++--
 .../biped_small/sahagin/gnoll_staff.ron       |  2 +-
 .../biped_small/sahagin/wooden_spear.ron      |  2 +-
 .../common/skillset/dungeon/tier-0/enemy.ron  |  1 +
 .../common/skillset/dungeon/tier-0/staff.ron  |  9 ++++++++
 assets/common/skillset/dungeon/tier-1/bow.ron |  4 ++--
 .../common/skillset/dungeon/tier-1/enemy.ron  |  1 +
 .../common/skillset/dungeon/tier-1/staff.ron  | 12 +++++++++++
 assets/common/skillset/dungeon/tier-2/bow.ron |  8 +++----
 .../common/skillset/dungeon/tier-2/enemy.ron  |  1 +
 .../common/skillset/dungeon/tier-2/staff.ron  | 15 +++++++++++++
 assets/common/skillset/dungeon/tier-3/bow.ron | 15 ++++++-------
 .../common/skillset/dungeon/tier-3/enemy.ron  |  1 +
 .../skillset/dungeon/tier-3/sceptre.ron       | 16 +++++++-------
 .../common/skillset/dungeon/tier-3/staff.ron  | 21 +++++++++++++++++++
 .../common/skillset/dungeon/tier-3/sword.ron  | 14 ++++++-------
 .../common/skillset/dungeon/tier-4/enemy.ron  |  1 +
 65 files changed, 266 insertions(+), 199 deletions(-)
 create mode 100644 assets/common/skillset/dungeon/tier-0/staff.ron
 create mode 100644 assets/common/skillset/dungeon/tier-1/staff.ron
 create mode 100644 assets/common/skillset/dungeon/tier-2/staff.ron
 create mode 100644 assets/common/skillset/dungeon/tier-3/staff.ron

diff --git a/assets/common/entity/dungeon/tier-0/staff.ron b/assets/common/entity/dungeon/tier-0/staff.ron
index cbcd59a973..e1825cf2ec 100644
--- a/assets/common/entity/dungeon/tier-0/staff.ron
+++ b/assets/common/entity/dungeon/tier-0/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+        SkillSetAsset("common.skillset.dungeon.tier-0.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-1/staff.ron b/assets/common/entity/dungeon/tier-1/staff.ron
index 314e450021..8420431780 100644
--- a/assets/common/entity/dungeon/tier-1/staff.ron
+++ b/assets/common/entity/dungeon/tier-1/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-1.adlet_spear"),
+        SkillSetAsset("common.skillset.dungeon.tier-1.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-2/staff.ron b/assets/common/entity/dungeon/tier-2/staff.ron
index e1a883baa7..4357fa4539 100644
--- a/assets/common/entity/dungeon/tier-2/staff.ron
+++ b/assets/common/entity/dungeon/tier-2/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
+        SkillSetAsset("common.skillset.dungeon.tier-2.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-3/staff.ron b/assets/common/entity/dungeon/tier-3/staff.ron
index d71561c3c5..6d65b13dab 100644
--- a/assets/common/entity/dungeon/tier-3/staff.ron
+++ b/assets/common/entity/dungeon/tier-3/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
+        SkillSetAsset("common.skillset.dungeon.tier-3.staff"),
     ],
 )
diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
index 80f79ba5ed..e1ce60d709 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("AdletBow"),
         stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(14.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 5.4,
+            energy_reward: 0.054,
+            crit_power: 0.05,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
index cc8792d375..e8f73b60dc 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("AdletSpear"),
         stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(16.0),
+            poise_resilience: Normal(3.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.06,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
index 93ee43dd6a..517abac85b 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Foot("Adlet"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(4.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 1.8,
+            energy_reward: 0.018,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
index cfc26410ab..52f78dc70f 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("AdletBow"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(4.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 1.8,
+            energy_reward: 0.018,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
index 99defb895d..b68d2ef036 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("AdletSpear"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
+            protection: Normal(6.0),
+            poise_resilience: Normal(3.0),
+            energy_max: 0.0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
index 7b997e8db7..a4a1028c10 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("AdletBow"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 3.6,
+            energy_reward: 0.04,
+            crit_power: 0.32,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
index 4ad3b24a4e..c2397cf473 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("AdletSpear"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(9.0),
+            poise_resilience: Normal(3.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
index f0586feb2f..988dc0ec60 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("AdletBow"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 3.6,
+            energy_reward: 0.04,
+            crit_power: 0.32,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
index ee87368054..d0f8064082 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("AdletSpear"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(9.0),
+            poise_resilience: Normal(3.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
index 82138763fb..84702748e1 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Belt("Adlet"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(3.0),
+            poise_resilience: Normal(3.0),
+            energy_max: 0.8,
+            energy_reward: 0.01,
+            crit_power: 0.008,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
index 312a683788..3fb1bcfb42 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.025,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
index b6ab6405ba..f327dd4751 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.9,
+            energy_reward: 0.009,
+            crit_power: 0.008,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
index 87d3f691b2..2c2543db0a 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.9,
+            energy_reward: 0.009,
+            crit_power: 0.008,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
index 8757f8b287..fe2e73f76f 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 1.8,
+            energy_reward: 0.02,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
index 268a3c44e3..3ae5f385c6 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 1.8,
+            energy_reward: 0.02,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
index e80c2c6fd8..37414a2b87 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.4,
+            energy_reward: 0.005,
+            crit_power: 0.004,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index 084a1b5237..cba7224047 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("Haniwa"),
         stats: (
-            protection: Normal(23.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(38.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 10.8,
+            energy_reward: 0.108,
+            crit_power: 0.1,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index 35079dc965..5f6a8b3d7b 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Foot("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(10.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 3.6,
+            energy_reward: 0.036,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index f6f36c417d..7ea532be0e 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(10.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 3.6,
+            energy_reward: 0.036,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index 55ef9ea2ab..cf83a16610 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(19.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 7.2,
+            energy_reward: 0.08,
+            crit_power: 0.064,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index acbecaa0fd..39b49cca7e 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(19.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 7.2,
+            energy_reward: 0.08,
+            crit_power: 0.064,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
index 5a693f5595..72c5943353 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Chest("Myrmidon"),
         stats: (
-            protection: Normal(36.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(48.0),
+            poise_resilience: Normal(6.0),
+            energy_max: 13.5,
+            energy_reward: 0.135,
+            crit_power: 0.125,
+            stealth: 0.125,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
index 16bd298e4d..27b849a7cf 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Foot("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(16.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 4.5,
+            energy_reward: 0.045,
+            crit_power: 0.04,
+            stealth: 0.04,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
index 5fc02c5840..38d6e4c491 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Hand("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(16.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 4.5,
+            energy_reward: 0.045,
+            crit_power: 0.04,
+            stealth: 0.04,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
index 6ba6dd071a..7c5540a2dd 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Head("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(32.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 9.0,
+            energy_reward: 0.1,
+            crit_power: 0.08,
+            stealth: 0.08,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
index b21efaa619..8b0c522244 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Pants("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(32.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 9.0,
+            energy_reward: 0.1,
+            crit_power: 0.08,
+            stealth: 0.08,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
index 9641725934..17635c8739 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Belt("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
+            protection: Normal(8.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            energy_max: 2.0,
+            energy_reward: 0.025,
+            crit_power: 0.02,
+            stealth: 0.02,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
index 5169dfd141..0f8ba2150b 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("Sahagin"),
         stats: (
-            protection: Normal(18.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(26.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 8.1,
+            energy_reward: 0.81,
+            crit_power: 0.075,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
index ede72b9e11..4e0e07828a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Foot("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.024,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
index 377555f351..7464e4e212 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.024,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
index 647cda4baa..749b539a71 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(13.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 5.4,
+            energy_reward: 0.06,
+            crit_power: 0.048,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
index 4a7928e7aa..b6872fb831 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(13.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 5.4,
+            energy_reward: 0.06,
+            crit_power: 0.048,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
index 40a6babc5a..208dd4d65e 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Belt("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(5.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 1.2,
+            energy_reward: 0.015,
+            crit_power: 0.012,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index 0973eedb9f..b7968b73c6 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.6,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 5fe99814c8..07a5270aa1 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 0.7,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
index 7ea0f637f2..c27a4282d8 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.07589286,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index 401083b24a..d2e4d1bb68 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.5,
             crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index 7b58d6d483..de4c29dcf7 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.8,
+            speed: 0.6,
             crit_chance: 0.12037037,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index 0f1754a5e8..fa52c9d190 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.6,
+            power: 1.8,
             effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.9,
             crit_chance: 0.05625,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 836fc43a00..1738ed4117 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.8,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.9,
             crit_chance: 0.036458332,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
index 8f786d5c69..1d22fef7e0 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.4,
+            power: 1.8,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.05357143,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
index ac233dde25..6d23956268 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 2.0,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 1.0,
             crit_chance: 0.095454544,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
index 6ccef52257..fcb80cc7fb 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.7,
+            power: 2.0,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 1.0,
             crit_chance: 0.040873703,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
index 4aa6e8482a..0d797abeab 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.7,
+            power: 2.0,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.04963235,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 296946a0f6..715c199007 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.3,
             effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.8,
             crit_chance: 0.066083916,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
index 74b42dd235..1990b82fde 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.3,
             effect_power: 0.8,
             speed: 0.8,
             crit_chance: 0.053030305,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
index 1de6a21ae2..21d7badeb8 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.3,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.05965909,
diff --git a/assets/common/skillset/dungeon/tier-0/enemy.ron b/assets/common/skillset/dungeon/tier-0/enemy.ron
index f3b680f683..f0a97a83ea 100644
--- a/assets/common/skillset/dungeon/tier-0/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-0/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-0.bow"),
+    Tree("common.skillset.dungeon.tier-0.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-0/staff.ron b/assets/common/skillset/dungeon/tier-0/staff.ron
new file mode 100644
index 0000000000..60bbb942b6
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-0/staff.ron
@@ -0,0 +1,9 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(1))),
+    Skill((Staff(BRegen), Some(1))),
+    Skill((Staff(BRadius), Some(1))),
+
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-1/bow.ron b/assets/common/skillset/dungeon/tier-1/bow.ron
index 5a99b61b66..53f1155a57 100644
--- a/assets/common/skillset/dungeon/tier-1/bow.ron
+++ b/assets/common/skillset/dungeon/tier-1/bow.ron
@@ -2,8 +2,8 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
+    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
diff --git a/assets/common/skillset/dungeon/tier-1/enemy.ron b/assets/common/skillset/dungeon/tier-1/enemy.ron
index e815920cfc..7874664548 100644
--- a/assets/common/skillset/dungeon/tier-1/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-1/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-1.bow"),
+    Tree("common.skillset.dungeon.tier-1.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-1/staff.ron b/assets/common/skillset/dungeon/tier-1/staff.ron
new file mode 100644
index 0000000000..144cd98a5c
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-1/staff.ron
@@ -0,0 +1,12 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(1))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(1))),
+
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron
index 2b1dfbd825..7a87349fa6 100644
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ b/assets/common/skillset/dungeon/tier-2/bow.ron
@@ -2,14 +2,14 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
+    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
     // Repeater
-    Skill((Bow(RDamage), Some(1))),
-    Skill((Bow(RCost), Some(1))),
+    Skill((Bow(RDamage), Some(2))),
+    Skill((Bow(RCost), Some(2))),
     Skill((Bow(RSpeed), Some(1))),
 ])
 
diff --git a/assets/common/skillset/dungeon/tier-2/enemy.ron b/assets/common/skillset/dungeon/tier-2/enemy.ron
index 0d93f8900a..54af9723dc 100644
--- a/assets/common/skillset/dungeon/tier-2/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-2/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-2.bow"),
+    Tree("common.skillset.dungeon.tier-2.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/dungeon/tier-2/staff.ron
new file mode 100644
index 0000000000..30eedf312e
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-2/staff.ron
@@ -0,0 +1,15 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(1))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(2))),
+    Skill((Staff(FDamage), Some(2))),
+    Skill((Staff(FDrain), Some(1))),
+    Skill((Staff(FVelocity), Some(1))),
+
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron
index 2344f7494a..bef5d56116 100644
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ b/assets/common/skillset/dungeon/tier-3/bow.ron
@@ -2,15 +2,16 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CRegen), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
-    Skill((Bow(CSpeed), Some(1))),
-    Skill((Bow(CMove), Some(1))),
+    Skill((Bow(CDamage), Some(3))),
+    Skill((Bow(CRegen), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
+    Skill((Bow(CSpeed), Some(2))),
+    Skill((Bow(CMove), Some(2))),
 
     // Repeater
-    Skill((Bow(RDamage), Some(1))),
-    Skill((Bow(RSpeed), Some(1))),
+    Skill((Bow(RDamage), Some(2))),
+    Skill((Bow(RCost), Some(2))),
+    Skill((Bow(RSpeed), Some(2))),
 
     // Shotgun
     Skill((Bow(UnlockShotgun), None)),
diff --git a/assets/common/skillset/dungeon/tier-3/enemy.ron b/assets/common/skillset/dungeon/tier-3/enemy.ron
index 53c4c60e76..b5eebc556d 100644
--- a/assets/common/skillset/dungeon/tier-3/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-3/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-3.bow"),
+    Tree("common.skillset.dungeon.tier-3.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/sceptre.ron b/assets/common/skillset/dungeon/tier-3/sceptre.ron
index 77d06e0ec8..d736f740f0 100644
--- a/assets/common/skillset/dungeon/tier-3/sceptre.ron
+++ b/assets/common/skillset/dungeon/tier-3/sceptre.ron
@@ -2,16 +2,16 @@
     Group(Weapon(Sceptre)),
 
     // Beam
-    Skill((Sceptre(LDamage), Some(1))),
-    Skill((Sceptre(LRange), Some(1))),
-    Skill((Sceptre(LLifesteal), Some(1))),
-    Skill((Sceptre(LRegen), Some(1))),
+    Skill((Sceptre(LDamage), Some(3))),
+    Skill((Sceptre(LRange), Some(2))),
+    Skill((Sceptre(LLifesteal), Some(2))),
+    Skill((Sceptre(LRegen), Some(2))),
 
     // Heal
-    Skill((Sceptre(HHeal), Some(1))),
-    Skill((Sceptre(HDuration), Some(1))),
-    Skill((Sceptre(HRange), Some(1))),
-    Skill((Sceptre(HCost), Some(1))),
+    Skill((Sceptre(HHeal), Some(2))),
+    Skill((Sceptre(HDuration), Some(2))),
+    Skill((Sceptre(HRange), Some(2))),
+    Skill((Sceptre(HCost), Some(2))),
     // Ward
     Skill((Sceptre(UnlockAura), None)),
     Skill((Sceptre(AStrength), Some(1))),
diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/dungeon/tier-3/staff.ron
new file mode 100644
index 0000000000..2a9405874d
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-3/staff.ron
@@ -0,0 +1,21 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(3))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(3))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(2))),
+    Skill((Staff(FDamage), Some(3))),
+    Skill((Staff(FDrain), Some(2))),
+    Skill((Staff(FVelocity), Some(2))),
+
+    // Shockwave
+    Skill((Staff(UnlockShockwave), None)),
+    Skill((Staff(SDamage), Some(1))),
+    Skill((Staff(SKnockback), Some(1))),
+    Skill((Staff(SRange), Some(1))),
+    Skill((Staff(SCost), Some(1))),
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/sword.ron b/assets/common/skillset/dungeon/tier-3/sword.ron
index 653b99296f..19f60c2bd1 100644
--- a/assets/common/skillset/dungeon/tier-3/sword.ron
+++ b/assets/common/skillset/dungeon/tier-3/sword.ron
@@ -3,16 +3,16 @@
 
     // TripleStrike
     Skill((Sword(TsCombo), None)),
-    Skill((Sword(TsDamage), Some(1))),
-    Skill((Sword(TsRegen), Some(1))),
+    Skill((Sword(TsDamage), Some(3))),
+    Skill((Sword(TsRegen), Some(2))),
 
     // Dash
-    Skill((Sword(DDamage), Some(1))),
-    Skill((Sword(DCost), Some(1))),
-    Skill((Sword(DDrain), Some(1))),
+    Skill((Sword(DDamage), Some(2))),
+    Skill((Sword(DCost), Some(2))),
+    Skill((Sword(DDrain), Some(2))),
 
     // Spin of death
     Skill((Sword(UnlockSpin), None)),
-    Skill((Sword(SDamage), Some(2))),
-    Skill((Sword(SCost), Some(2))),
+    Skill((Sword(SDamage), Some(1))),
+    Skill((Sword(SCost), Some(1))),
 ])
diff --git a/assets/common/skillset/dungeon/tier-4/enemy.ron b/assets/common/skillset/dungeon/tier-4/enemy.ron
index 937fa30b79..9e7acf32ef 100644
--- a/assets/common/skillset/dungeon/tier-4/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-4/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.preset.max.bow"),
+    Tree("common.skillset.preset.max.staff"),
 ])
\ No newline at end of file

From 3baa17bb3cd1ca7281665627426d986544801c01 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:41:21 +0100
Subject: [PATCH 04/39] + All bosses ranging from T0 to T3 have a ~4% chance of
 dropping equipment one tier higher than normal, while having a ~1.7% chance
 to drop equipment even higher than that. + All chests have a ~2% chance to
 drop better equipment than their tier.

---
 .../common/loot_tables/dungeon/tier-0/boss.ron   | 11 +++++++----
 .../common/loot_tables/dungeon/tier-0/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-1/boss.ron   | 11 ++++++++---
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-2/boss.ron   |  5 +++++
 .../common/loot_tables/dungeon/tier-2/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-3/boss.ron   | 11 ++++++++---
 .../common/loot_tables/dungeon/tier-3/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-4/chest.ron  |  2 ++
 9 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 85a4617e48..1bb03d88e5 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -1,8 +1,11 @@
 [
     // Weapons
-    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
     // Armor
-    (2.0, LootTable("common.loot_tables.armor.tier-0")),
-    (1.0, Item("common.items.armor.misc.neck.scratched")),
-    (0.5, Item("common.items.armor.misc.head.straw")),
+    (4.0, LootTable("common.loot_tables.armor.tier-0")),
+    (0.5, LootTable("common.loot_tables.armor.tier-1")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.scratched")),
+    (1.0, Item("common.items.armor.misc.head.straw")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 4f7a653e59..82b3f709f2 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (1.0, LootTable("common.loot_tables.armor.tier-0")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (2.0, LootTable("common.loot_tables.armor.tier-0")),
+    (0.5, LootTable("common.loot_tables.armor.tier-1")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 4135deb1e3..42a726c9c2 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -1,7 +1,12 @@
 [
     // Weapons
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
+    (0.2, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
-    (1.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
+    (4.0, LootTable("common.loot_tables.armor.tier-1")),
+    (0.5, LootTable("common.loot_tables.armor.tier-2")),
+    (0.2, LootTable("common.loot_tables.armor.tier-3")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index e8f758e40e..556c8ec915 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (2.0, LootTable("common.loot_tables.armor.tier-1")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
+    (0.5, LootTable("common.loot_tables.armor.tier-2")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 0cf6b9164a..2a17415144 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -2,6 +2,11 @@
     // Equipment
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
     (5.0, LootTable("common.loot_tables.armor.tier-2")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-3")),
+    (0.2, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.2, LootTable("common.loot_tables.armor.tier-4")),
+    // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
     (1.0, Item("common.items.armor.misc.bag.heavy_seabag")),
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index a0c0557b60..23312096f2 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (1.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (2.0, LootTable("common.loot_tables.armor.tier-2")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index a36c830209..826e181f03 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,7 +1,12 @@
 [
     // Weapons
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.2, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.3, Item("common.items.armor.misc.neck.haniwa_talisman")),
+    (4.0, LootTable("common.loot_tables.armor.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-4")),
+    (0.2, LootTable("common.loot_tables.armor.tier-2")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index cae94ddc30..8f92fd9427 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (2.0, LootTable("common.loot_tables.armor.tier-3")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.5, LootTable("common.loot_tables.armor.tier-4")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron
index 06b6965324..0bf234eccf 100644
--- a/assets/common/loot_tables/dungeon/tier-4/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron
@@ -2,6 +2,8 @@
     // Gear
     (1.0, LootTable("common.loot_tables.weapons.tier-4")),
     (1.0, LootTable("common.loot_tables.armor.tier-4")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-5")),
+    (0.5, LootTable("common.loot_tables.armor.tier-5")),
     (3.0, Item("common.items.armor.misc.head.spikeguard")),
     // Currency
     (3.0, ItemQuantity("common.items.utility.coins", 200, 500)),

From ac88147aefb53d73b546cf5698fea3c5609ac4e9 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:56:41 +0100
Subject: [PATCH 05/39] + Lowered drop rate of extra extra tier armor and
 weapons from ~1.7% to ~0.8% + Organized T2 boss ron

---
 assets/common/loot_tables/dungeon/tier-1/boss.ron |  4 ++--
 assets/common/loot_tables/dungeon/tier-2/boss.ron |  9 +++++----
 assets/common/loot_tables/dungeon/tier-3/boss.ron | 12 ++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 42a726c9c2..5f63d6e35f 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -2,11 +2,11 @@
     // Weapons
     (4.0, LootTable("common.loot_tables.weapons.tier-1")),
     (0.5, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.2, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.1, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
     (4.0, LootTable("common.loot_tables.armor.tier-1")),
     (0.5, LootTable("common.loot_tables.armor.tier-2")),
-    (0.2, LootTable("common.loot_tables.armor.tier-3")),
+    (0.1, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 2a17415144..75ab36d706 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -1,11 +1,12 @@
 [
-    // Equipment
+    // Weapons
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (5.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.1, LootTable("common.loot_tables.weapons.tier-4")),
+    // Armor
+    (5.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, LootTable("common.loot_tables.armor.tier-3")),
-    (0.2, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.2, LootTable("common.loot_tables.armor.tier-4")),
+    (0.1, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index 826e181f03..f2417530a1 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,12 +1,12 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.2, LootTable("common.loot_tables.weapons.tier-5")),
+    (3.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.5, LootTable("common.loot_tables.armor.tier-4")),
-    (0.2, LootTable("common.loot_tables.armor.tier-2")),
+    (3.0, LootTable("common.loot_tables.armor.tier-3")),
+    (1.0, LootTable("common.loot_tables.armor.tier-4")),
+    (0.5, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file

From 1b215bcaa45de5a2e64108537a91f3ab85bee07c Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:56:41 +0100
Subject: [PATCH 06/39] + Made sure that abilities in staff simple match
 abilities in the staff skillset. + If anything happened to chests then no
 more! (Don't question it) + Bosses have a ~4% chance to drop higher tiered
 gear + Organized T2 boss ron

---
 .../common/loot_tables/dungeon/tier-0/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-1/boss.ron   |  2 --
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-2/boss.ron   |  2 --
 .../common/loot_tables/dungeon/tier-2/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-3/boss.ron   |  2 --
 .../common/loot_tables/dungeon/tier-3/chest.ron  | 16 +++++++---------
 assets/common/skillset/dungeon/tier-1/bow.ron    |  2 --
 assets/common/skillset/dungeon/tier-2/bow.ron    |  6 +-----
 assets/common/skillset/dungeon/tier-2/staff.ron  |  2 --
 assets/common/skillset/dungeon/tier-3/bow.ron    | 13 +------------
 assets/common/skillset/dungeon/tier-3/staff.ron  | 12 +++---------
 12 files changed, 33 insertions(+), 72 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 82b3f709f2..4f7a653e59 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (2.0, LootTable("common.loot_tables.armor.tier-0")),
-    (0.5, LootTable("common.loot_tables.armor.tier-1")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (1.0, LootTable("common.loot_tables.armor.tier-0")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 5f63d6e35f..4c1381707a 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -2,11 +2,9 @@
     // Weapons
     (4.0, LootTable("common.loot_tables.weapons.tier-1")),
     (0.5, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.1, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
     (4.0, LootTable("common.loot_tables.armor.tier-1")),
     (0.5, LootTable("common.loot_tables.armor.tier-2")),
-    (0.1, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index 556c8ec915..e8f758e40e 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (2.0, LootTable("common.loot_tables.armor.tier-1")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.5, LootTable("common.loot_tables.armor.tier-2")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.armor.tier-1")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 75ab36d706..5d7073558e 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -2,11 +2,9 @@
     // Weapons
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
     (0.5, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.1, LootTable("common.loot_tables.weapons.tier-4")),
     // Armor
     (5.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, LootTable("common.loot_tables.armor.tier-3")),
-    (0.1, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index 23312096f2..a0c0557b60 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (2.0, LootTable("common.loot_tables.armor.tier-2")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.5, LootTable("common.loot_tables.armor.tier-3")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (1.0, LootTable("common.loot_tables.armor.tier-2")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index f2417530a1..45d78dfa20 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -2,11 +2,9 @@
     // Weapons
     (3.0, LootTable("common.loot_tables.weapons.tier-3")),
     (1.0, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
     (3.0, LootTable("common.loot_tables.armor.tier-3")),
     (1.0, LootTable("common.loot_tables.armor.tier-4")),
-    (0.5, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index 8f92fd9427..cae94ddc30 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (2.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.5, LootTable("common.loot_tables.armor.tier-4")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (1.0, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/skillset/dungeon/tier-1/bow.ron b/assets/common/skillset/dungeon/tier-1/bow.ron
index 53f1155a57..521acd6260 100644
--- a/assets/common/skillset/dungeon/tier-1/bow.ron
+++ b/assets/common/skillset/dungeon/tier-1/bow.ron
@@ -7,6 +7,4 @@
     Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(1))),
 ])
diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron
index 7a87349fa6..369bb83f81 100644
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ b/assets/common/skillset/dungeon/tier-2/bow.ron
@@ -4,12 +4,8 @@
     // Charged
     Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
-    Skill((Bow(CSpeed), Some(1))),
+    Skill((Bow(CSpeed), Some(2))),
     Skill((Bow(CMove), Some(1))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(2))),
-    Skill((Bow(RCost), Some(2))),
-    Skill((Bow(RSpeed), Some(1))),
 ])
 
diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/dungeon/tier-2/staff.ron
index 30eedf312e..ce6f3ea287 100644
--- a/assets/common/skillset/dungeon/tier-2/staff.ron
+++ b/assets/common/skillset/dungeon/tier-2/staff.ron
@@ -9,7 +9,5 @@
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(2))),
-    Skill((Staff(FDrain), Some(1))),
-    Skill((Staff(FVelocity), Some(1))),
 
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron
index bef5d56116..50ee426093 100644
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ b/assets/common/skillset/dungeon/tier-3/bow.ron
@@ -2,21 +2,10 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(3))),
+    Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CRegen), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(2))),
     Skill((Bow(CMove), Some(2))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(2))),
-    Skill((Bow(RCost), Some(2))),
-    Skill((Bow(RSpeed), Some(2))),
-
-    // Shotgun
-    Skill((Bow(UnlockShotgun), None)),
-    Skill((Bow(SDamage), Some(1))),
-    Skill((Bow(SSpread), Some(1))),
-    Skill((Bow(SArrows), Some(1))),
-    Skill((Bow(SCost), Some(1))),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/dungeon/tier-3/staff.ron
index 2a9405874d..d5e92082fa 100644
--- a/assets/common/skillset/dungeon/tier-3/staff.ron
+++ b/assets/common/skillset/dungeon/tier-3/staff.ron
@@ -2,20 +2,14 @@
     Group(Weapon(Staff)),
 
     // Fireball
-    Skill((Staff(BDamage), Some(3))),
+    Skill((Staff(BDamage), Some(2))),
     Skill((Staff(BRegen), Some(2))),
-    Skill((Staff(BRadius), Some(3))),
+    Skill((Staff(BRadius), Some(2))),
 
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(3))),
     Skill((Staff(FDrain), Some(2))),
-    Skill((Staff(FVelocity), Some(2))),
+    Skill((Staff(FVelocity), Some(1))),
 
-    // Shockwave
-    Skill((Staff(UnlockShockwave), None)),
-    Skill((Staff(SDamage), Some(1))),
-    Skill((Staff(SKnockback), Some(1))),
-    Skill((Staff(SRange), Some(1))),
-    Skill((Staff(SCost), Some(1))),
 ])
\ No newline at end of file

From 3373b56c962d1256bd6f1d2fa1c7b4d082baa72e Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Mon, 8 Nov 2021 18:31:53 +0100
Subject: [PATCH 07/39] + Fixed item_image_manifest finally (weird bug)

---
 assets/voxygen/item_image_manifest.ron | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 117d8b69f0..9b903e33d5 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -17,27 +17,27 @@
     ),
     Tool("CraftingBench"): VoxTrans(
         "voxel.sprite.crafting_bench.crafting_bench-0",
-       (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0,
+        (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 1.0,
     ),
     Tool("Forge"): VoxTrans(
         "voxel.object.forge",
-       (0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0,
+        (0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0,
     ),
     Tool("Loom"): VoxTrans(
         "voxel.object.loom",
-       (0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0,
+        (0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0,
     ),
     Tool("SpinningWheel"): VoxTrans(
         "voxel.object.spinning_wheel",
-       (0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0,
+        (0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0,
     ),
     Tool("TanningRack"): VoxTrans(
         "voxel.object.tanning_rack",
-       (0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0,
+        (0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0,
     ),
     Tool("DismantlingBench"): VoxTrans(
         "voxel.sprite.salvaging_station.salvaging_station-0",
-       (0.0, 0.0, 0.0), (-50.0, 40.0, 30.0), 0.9,
+        (0.0, 0.0, 0.0), (-50.0, 40.0, 30.0), 0.9,
     ),
     // Weapons
     // Diary Example Images
@@ -51,7 +51,7 @@
     ),
     Tool("example_axe"): VoxTrans(
         "voxel.weapon.axe.2haxe_bloodsteel-0",
-       (0.0, 0.0, 0.0), (-90.0, 70.0, 0.0), 1.0,
+        (0.0, 0.0, 0.0), (-90.0, 70.0, 0.0), 1.0,
     ),
     Tool("example_hammer"): VoxTrans(
         "voxel.weapon.hammer.2hhammer_ramshead",
@@ -999,7 +999,7 @@
         "voxel.weapon.sceptre.root_evil",
         (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
     ),
-     Tool("common.items.weapons.sceptre.sceptre_velorite_0"): VoxTrans(
+    Tool("common.items.weapons.sceptre.sceptre_velorite_0"): VoxTrans(
         "voxel.weapon.sceptre.ore-nature",
         (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15,
     ),
@@ -1086,7 +1086,7 @@
         "voxel.weapon.tool.shovel_gold",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
-	// Picks
+    // Picks
     Tool("common.items.tool.pickaxe_stone"): VoxTrans(
         "voxel.weapon.tool.pickaxe_green-0",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0,
@@ -1463,7 +1463,7 @@
     Armor(Shoulder("Twigs")): VoxTrans(
         "voxel.armor.twigs.shoulder",
         (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0,
-        ),
+    ),
     //TwigsLeaves Set
     Armor(Chest("TwigsLeaves")): VoxTrans(
         "voxel.armor.twigsleaves.chest",
@@ -2116,7 +2116,7 @@
         (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
     ),
     //misc
-     Armor(Pants("Hunting")): VoxTrans(
+    Armor(Pants("Hunting")): VoxTrans(
         "voxel.armor.misc.pants.grayscale",
         (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9,
     ),
@@ -2223,7 +2223,6 @@
         "voxel.armor.cultist.ring",
         (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
     ),
-    
     // Necks
     Armor(Neck("Ankh")): VoxTrans(
         "voxel.armor.misc.neck.ankh_of_life",

From 264bce1a389b8eb6ab57157c1a43a8f3d26d5d14 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Mon, 8 Nov 2021 23:05:28 +0100
Subject: [PATCH 08/39] + Adjusted damage, crit chance, and attack speed of
 weapons + Adjusted boss and chest loot table to match it's new intended tier
 of difficulty while providing an intermediate stage for new players to
 explore between T0(T1) and T1(T2)

---
 .../biped_small/adlet/chest/adlet_bow.ron        |  2 +-
 .../biped_small/haniwa/chest/haniwa.ron          |  2 +-
 .../npc_armor/biped_small/haniwa/foot/haniwa.ron |  2 +-
 .../npc_armor/biped_small/haniwa/hand/haniwa.ron |  2 +-
 .../npc_armor/biped_small/haniwa/head/haniwa.ron |  2 +-
 .../biped_small/haniwa/pants/haniwa.ron          |  2 +-
 .../biped_small/sahagin/chest/sahagin.ron        |  2 +-
 .../biped_small/sahagin/foot/sahagin.ron         |  2 +-
 .../biped_small/sahagin/hand/sahagin.ron         |  2 +-
 .../biped_small/sahagin/head/sahagin.ron         |  2 +-
 .../biped_small/sahagin/pants/sahagin.ron        |  2 +-
 .../biped_small/sahagin/tail/sahagin.ron         |  2 +-
 .../npc_weapons/biped_small/adlet/adlet_bow.ron  |  4 ++--
 .../biped_small/adlet/gnoll_staff.ron            |  4 ++--
 .../biped_small/adlet/wooden_spear.ron           |  2 +-
 .../biped_small/gnarling/adlet_bow.ron           |  4 ++--
 .../biped_small/gnarling/gnoll_staff.ron         |  4 ++--
 .../biped_small/gnarling/wooden_spear.ron        |  2 +-
 .../npc_weapons/biped_small/haniwa/adlet_bow.ron |  4 ++--
 .../biped_small/haniwa/gnoll_staff.ron           |  4 ++--
 .../biped_small/haniwa/wooden_spear.ron          |  2 +-
 .../biped_small/sahagin/adlet_bow.ron            |  6 +++---
 .../biped_small/sahagin/gnoll_staff.ron          |  4 ++--
 .../biped_small/sahagin/wooden_spear.ron         |  4 ++--
 .../common/loot_tables/dungeon/tier-0/boss.ron   | 16 ++++++++++------
 .../common/loot_tables/dungeon/tier-0/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-1/boss.ron   |  8 ++++----
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-2/boss.ron   |  8 ++++----
 .../common/loot_tables/dungeon/tier-2/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-3/boss.ron   |  8 ++++----
 .../common/loot_tables/dungeon/tier-3/chest.ron  | 16 +++++++++-------
 32 files changed, 92 insertions(+), 80 deletions(-)

diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
index e1ce60d709..8fdfc77329 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(14.0),
             poise_resilience: Normal(2.0),
-            energy_max: 5.4,
+            energy_max: 4.4,
             energy_reward: 0.054,
             crit_power: 0.05,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index cba7224047..f7c2400300 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(38.0),
             poise_resilience: Normal(5.0),
-            energy_max: 10.8,
+            energy_max: 5.0,
             energy_reward: 0.108,
             crit_power: 0.1,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index 5f6a8b3d7b..eebdb949c6 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
-            energy_max: 3.6,
+            energy_max: 5.0,
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index 7ea532be0e..a73b06e8c0 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
-            energy_max: 3.6,
+            energy_max: 5.0,
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index cf83a16610..53753c9e89 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
-            energy_max: 7.2,
+            energy_max: 5.0,
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index 39b49cca7e..d8deeeb3bb 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
-            energy_max: 7.2,
+            energy_max: 5.0,
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
index 0f8ba2150b..dbc76fd21a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(26.0),
             poise_resilience: Normal(4.0),
-            energy_max: 8.1,
+            energy_max: 3.4,
             energy_reward: 0.81,
             crit_power: 0.075,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
index 4e0e07828a..6e679be98a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
-            energy_max: 2.7,
+            energy_max: 3.4,
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
index 7464e4e212..3606ca4783 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
-            energy_max: 2.7,
+            energy_max: 3.4,
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
index 749b539a71..a5d7099154 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
-            energy_max: 5.4,
+            energy_max: 3.4,
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
index b6872fb831..f9a1b9d51c 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
-            energy_max: 5.4,
+            energy_max: 3.4,
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
index 208dd4d65e..368ae49a5e 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(5.0),
             poise_resilience: Normal(4.0),
-            energy_max: 1.2,
+            energy_max: 3.4,
             energy_reward: 0.015,
             crit_power: 0.012,
             stealth: 0.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index b7968b73c6..430e84fee7 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.7,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 07a5270aa1..4588d5c1e2 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.6,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
index c27a4282d8..7ea0f637f2 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.07589286,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index d2e4d1bb68..f3a87da8b1 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,8 +8,8 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.5,
-            crit_chance: 0.26764706,
+            speed: 0.6,
+            crit_chance: 0.13541667,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index de4c29dcf7..226837bf9f 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,8 +8,8 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.6,
-            crit_chance: 0.12037037,
+            speed: 0.5,
+            crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
index 8aa201d533..db58f5bacb 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
@@ -9,7 +9,7 @@ ItemDef(
             power: 0.3,
             effect_power: 1.0,
             speed: 1.0,
-            crit_chance: 0.13541667,
+            crit_chance: 0.12037037,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index fa52c9d190..b480970b4f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.05625,
+            crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 1738ed4117..fe5268388f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.036458332,
+            crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
index 1d22fef7e0..6bbadb8173 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.05357143,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 715c199007..5c44dfa272 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.3,
+            power: 1.2,
             effect_power: 0.8,
-            speed: 0.8,
-            crit_chance: 0.066083916,
+            speed: 0.9,
+            crit_chance: 0.05965909,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
index 1990b82fde..fe69702d5a 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.3,
+            power: 1.2,
             effect_power: 0.8,
             speed: 0.8,
-            crit_chance: 0.053030305,
+            crit_chance: 0.066083916,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
index 21d7badeb8..cfa87de675 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.3,
+            power: 1.2,
             effect_power: 1.0,
             speed: 1.0,
-            crit_chance: 0.05965909,
+            crit_chance: 0.053030305,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 1bb03d88e5..7d5dd6cfff 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -1,11 +1,15 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
+    (5.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-0")),
-    (0.5, LootTable("common.loot_tables.armor.tier-1")),
+    (5.0, LootTable("common.loot_tables.armor.tier-0")),
+    (2.0, LootTable("common.loot_tables.armor.tier-1")),
     // Misc
-    (2.0, Item("common.items.armor.misc.neck.scratched")),
-    (1.0, Item("common.items.armor.misc.head.straw")),
+    (3.0, Item("common.items.armor.misc.neck.scratched")),
+    (2.0, Item("common.items.armor.misc.head.straw")),
+    // Indirect crafting materials for T2 gear
+    (1.0, ItemQuantity("common.items.craftin_ing.sticky_thread", 2, 5)),
+    (1.0, ItemQuantity("common.items.mineral.coal", 2, 5)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.leather_strips", 2, 5)),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 4f7a653e59..0e6fee696c 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (1.0, LootTable("common.loot_tables.armor.tier-0")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (2.0, LootTable("common.loot_tables.armor.tier-0")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.armor.tier-1")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 4c1381707a..c9218cda4b 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -1,10 +1,10 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (2.5, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-1")),
-    (0.5, LootTable("common.loot_tables.armor.tier-2")),
+    (4.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.5, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index e8f758e40e..de3c2b9147 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (2.0, LootTable("common.loot_tables.armor.tier-1")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (1.0, LootTable("common.loot_tables.armor.tier-2")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 5d7073558e..14b546a5f9 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -1,10 +1,10 @@
 [
     // Weapons
-    (5.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (5.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
     // Armor
-    (5.0, LootTable("common.loot_tables.armor.tier-2")),
-    (0.5, LootTable("common.loot_tables.armor.tier-3")),
+    (5.0, LootTable("common.loot_tables.armor.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index a0c0557b60..1e6f582b93 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (1.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (2.0, LootTable("common.loot_tables.armor.tier-2")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (1.0, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index 45d78dfa20..89ca31fb5f 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,10 +1,10 @@
 [
     // Weapons
-    (3.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (3.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
-    (3.0, LootTable("common.loot_tables.armor.tier-3")),
-    (1.0, LootTable("common.loot_tables.armor.tier-4")),
+    (3.0, LootTable("common.loot_tables.armor.tier-4")),
+    (1.0, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index cae94ddc30..fae2e74d80 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (2.0, LootTable("common.loot_tables.armor.tier-3")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (1.0, LootTable("common.loot_tables.armor.tier-4")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]

From 9d59959e8c7db27a23caa85bce32f8afb74dc1db Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 9 Nov 2021 09:33:05 +0100
Subject: [PATCH 09/39] + Reducing attack speed of minions

---
 assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron | 2 +-
 .../common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron  | 2 +-
 .../common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron | 2 +-
 .../items/npc_weapons/biped_small/gnarling/gnoll_staff.ron      | 2 +-
 .../common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron   | 2 +-
 .../common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron | 2 +-
 .../common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron | 2 +-
 .../items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron      | 2 +-
 .../common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index 430e84fee7..e560436fe9 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.7,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.6,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 4588d5c1e2..f3e2191a33 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.7,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.7,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index f3a87da8b1..d927326c31 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.5,
             crit_chance: 0.13541667,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index 226837bf9f..d0e96ded3e 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 0.6,
             crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index b480970b4f..775f7bb67f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.6,
             effect_power: 0.8,
-            speed: 0.9,
+            speed: 0.7,
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index fe5268388f..5a2c62c527 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.6,
             effect_power: 0.8,
-            speed: 0.9,
+            speed: 0.8,
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
index 6d23956268..185f2d5f7e 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 2.0,
             effect_power: 0.8,
-            speed: 1.0,
+            speed: 0.8,
             crit_chance: 0.095454544,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
index fcb80cc7fb..ecbf99b510 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 2.0,
             effect_power: 0.8,
-            speed: 1.0,
+            speed: 0.9,
             crit_chance: 0.040873703,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 5c44dfa272..be326e45e2 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.2,
             effect_power: 0.8,
-            speed: 0.9,
+            speed: 0.7,
             crit_chance: 0.05965909,
             range: 1.0,
             energy_efficiency: 1.0,

From 9e8aa4e6b17f1c89354056055beee20b8977ec31 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 9 Nov 2021 11:50:26 +0100
Subject: [PATCH 10/39] + Fixing spelling msitake in T0 Boss
 craftin_ing.sticky_thread to crafting_ing.sticky_thread

---
 assets/common/loot_tables/dungeon/tier-0/boss.ron | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 7d5dd6cfff..937f973a55 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -9,7 +9,7 @@
     (3.0, Item("common.items.armor.misc.neck.scratched")),
     (2.0, Item("common.items.armor.misc.head.straw")),
     // Indirect crafting materials for T2 gear
-    (1.0, ItemQuantity("common.items.craftin_ing.sticky_thread", 2, 5)),
+    (1.0, ItemQuantity("common.items.crafting_ing.sticky_thread", 2, 5)),
     (1.0, ItemQuantity("common.items.mineral.coal", 2, 5)),
     (1.0, ItemQuantity("common.items.crafting_ing.leather.leather_strips", 2, 5)),
 ]
\ No newline at end of file

From 5221be5d42a69b28e06dd3c55bfe036b343722ca Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Wed, 3 Nov 2021 00:37:59 +0100
Subject: [PATCH 11/39] + Updating item_image_manifest to Master (was behind)

---
 assets/voxygen/item_image_manifest.ron | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 9b903e33d5..ea448df5f5 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //  Png(specifier),
 //  Vox(specier),
 //  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
@@ -2887,4 +2888,4 @@
         "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-})
+)]
\ No newline at end of file

From f009b3fb654305c7a7c0bca91b0802139d42e613 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Wed, 3 Nov 2021 00:40:02 +0100
Subject: [PATCH 12/39] + Updating item_image_manifest to Master (was behind)

---
 assets/voxygen/item_image_manifest.ron | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index ea448df5f5..2057799030 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //  Png(specifier),
 //  Vox(specier),
 //  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
@@ -2888,4 +2887,4 @@
         "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-)]
\ No newline at end of file
+})
\ No newline at end of file

From c8e88375c6b3f08433ac12270df4c51d224cd314 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sat, 6 Nov 2021 17:45:02 +0100
Subject: [PATCH 13/39] + Gnarling armor count - 7 previous being 7 + Adlet-bow
 armor count - 39 previous being 62 + Sahagin armor count - 71 previous being
 88 + Haniwa armor count - 96 previous being 91 + Myrmidon armor count - 152
 previous being 161 + Although an overall decrease in armor there's an
 increase in poise res, crit power, energy, and other stats. + Gave everything
 staff an ability set in skillset, and linked them all

---
 assets/common/entity/dungeon/tier-0/staff.ron |  1 +
 assets/common/entity/dungeon/tier-1/staff.ron |  1 +
 assets/common/entity/dungeon/tier-2/staff.ron |  1 +
 assets/common/entity/dungeon/tier-3/staff.ron |  1 +
 .../biped_small/adlet/chest/adlet_bow.ron     | 10 ++++-----
 .../biped_small/adlet/chest/adlet_spear.ron   |  6 +++---
 .../biped_small/adlet/foot/adlet.ron          | 10 ++++-----
 .../biped_small/adlet/hand/adlet_bow.ron      | 10 ++++-----
 .../biped_small/adlet/hand/adlet_spear.ron    |  8 +++----
 .../biped_small/adlet/head/adlet_bow.ron      | 10 ++++-----
 .../biped_small/adlet/head/adlet_spear.ron    |  6 +++---
 .../biped_small/adlet/pants/adlet_bow.ron     | 10 ++++-----
 .../biped_small/adlet/pants/adlet_spear.ron   |  6 +++---
 .../biped_small/adlet/tail/adlet.ron          | 10 ++++-----
 .../biped_small/gnarling/chest/gnarling.ron   |  6 +++---
 .../biped_small/gnarling/foot/gnarling.ron    |  6 +++---
 .../biped_small/gnarling/hand/gnarling.ron    |  6 +++---
 .../biped_small/gnarling/head/gnarling.ron    |  6 +++---
 .../biped_small/gnarling/pants/gnarling.ron   |  6 +++---
 .../biped_small/gnarling/tail/gnarling.ron    |  6 +++---
 .../biped_small/haniwa/chest/haniwa.ron       | 10 ++++-----
 .../biped_small/haniwa/foot/haniwa.ron        | 10 ++++-----
 .../biped_small/haniwa/hand/haniwa.ron        | 10 ++++-----
 .../biped_small/haniwa/head/haniwa.ron        | 10 ++++-----
 .../biped_small/haniwa/pants/haniwa.ron       | 10 ++++-----
 .../biped_small/myrmidon/chest/myrmidon.ron   | 12 +++++------
 .../biped_small/myrmidon/foot/myrmidon.ron    | 12 +++++------
 .../biped_small/myrmidon/hand/myrmidon.ron    | 12 +++++------
 .../biped_small/myrmidon/head/myrmidon.ron    | 12 +++++------
 .../biped_small/myrmidon/pants/myrmidon.ron   | 12 +++++------
 .../biped_small/myrmidon/tail/myrmidon.ron    | 10 ++++-----
 .../biped_small/sahagin/chest/sahagin.ron     | 10 ++++-----
 .../biped_small/sahagin/foot/sahagin.ron      | 10 ++++-----
 .../biped_small/sahagin/hand/sahagin.ron      | 10 ++++-----
 .../biped_small/sahagin/head/sahagin.ron      | 10 ++++-----
 .../biped_small/sahagin/pants/sahagin.ron     | 10 ++++-----
 .../biped_small/sahagin/tail/sahagin.ron      | 10 ++++-----
 .../biped_small/adlet/adlet_bow.ron           |  4 ++--
 .../biped_small/adlet/gnoll_staff.ron         |  4 ++--
 .../biped_small/adlet/wooden_spear.ron        |  2 +-
 .../biped_small/gnarling/adlet_bow.ron        |  2 +-
 .../biped_small/gnarling/gnoll_staff.ron      |  2 +-
 .../biped_small/haniwa/adlet_bow.ron          |  4 ++--
 .../biped_small/haniwa/gnoll_staff.ron        |  2 +-
 .../biped_small/haniwa/wooden_spear.ron       |  2 +-
 .../biped_small/myrmidon/adlet_bow.ron        |  4 ++--
 .../biped_small/myrmidon/gnoll_staff.ron      |  4 ++--
 .../biped_small/myrmidon/wooden_spear.ron     |  2 +-
 .../biped_small/sahagin/adlet_bow.ron         |  4 ++--
 .../biped_small/sahagin/gnoll_staff.ron       |  2 +-
 .../biped_small/sahagin/wooden_spear.ron      |  2 +-
 .../common/skillset/dungeon/tier-0/enemy.ron  |  1 +
 .../common/skillset/dungeon/tier-0/staff.ron  |  9 ++++++++
 assets/common/skillset/dungeon/tier-1/bow.ron |  4 ++--
 .../common/skillset/dungeon/tier-1/enemy.ron  |  1 +
 .../common/skillset/dungeon/tier-1/staff.ron  | 12 +++++++++++
 assets/common/skillset/dungeon/tier-2/bow.ron |  8 +++----
 .../common/skillset/dungeon/tier-2/enemy.ron  |  1 +
 .../common/skillset/dungeon/tier-2/staff.ron  | 15 +++++++++++++
 assets/common/skillset/dungeon/tier-3/bow.ron | 15 ++++++-------
 .../common/skillset/dungeon/tier-3/enemy.ron  |  1 +
 .../skillset/dungeon/tier-3/sceptre.ron       | 16 +++++++-------
 .../common/skillset/dungeon/tier-3/staff.ron  | 21 +++++++++++++++++++
 .../common/skillset/dungeon/tier-3/sword.ron  | 14 ++++++-------
 .../common/skillset/dungeon/tier-4/enemy.ron  |  1 +
 65 files changed, 266 insertions(+), 199 deletions(-)
 create mode 100644 assets/common/skillset/dungeon/tier-0/staff.ron
 create mode 100644 assets/common/skillset/dungeon/tier-1/staff.ron
 create mode 100644 assets/common/skillset/dungeon/tier-2/staff.ron
 create mode 100644 assets/common/skillset/dungeon/tier-3/staff.ron

diff --git a/assets/common/entity/dungeon/tier-0/staff.ron b/assets/common/entity/dungeon/tier-0/staff.ron
index cbcd59a973..e1825cf2ec 100644
--- a/assets/common/entity/dungeon/tier-0/staff.ron
+++ b/assets/common/entity/dungeon/tier-0/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+        SkillSetAsset("common.skillset.dungeon.tier-0.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-1/staff.ron b/assets/common/entity/dungeon/tier-1/staff.ron
index 314e450021..8420431780 100644
--- a/assets/common/entity/dungeon/tier-1/staff.ron
+++ b/assets/common/entity/dungeon/tier-1/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-1.adlet_spear"),
+        SkillSetAsset("common.skillset.dungeon.tier-1.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-2/staff.ron b/assets/common/entity/dungeon/tier-2/staff.ron
index e1a883baa7..4357fa4539 100644
--- a/assets/common/entity/dungeon/tier-2/staff.ron
+++ b/assets/common/entity/dungeon/tier-2/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
+        SkillSetAsset("common.skillset.dungeon.tier-2.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-3/staff.ron b/assets/common/entity/dungeon/tier-3/staff.ron
index d71561c3c5..6d65b13dab 100644
--- a/assets/common/entity/dungeon/tier-3/staff.ron
+++ b/assets/common/entity/dungeon/tier-3/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
+        SkillSetAsset("common.skillset.dungeon.tier-3.staff"),
     ],
 )
diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
index 80f79ba5ed..e1ce60d709 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("AdletBow"),
         stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(14.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 5.4,
+            energy_reward: 0.054,
+            crit_power: 0.05,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
index cc8792d375..e8f73b60dc 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("AdletSpear"),
         stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(16.0),
+            poise_resilience: Normal(3.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.06,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
index 93ee43dd6a..517abac85b 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Foot("Adlet"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(4.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 1.8,
+            energy_reward: 0.018,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
index cfc26410ab..52f78dc70f 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("AdletBow"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(4.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 1.8,
+            energy_reward: 0.018,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
index 99defb895d..b68d2ef036 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("AdletSpear"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
+            protection: Normal(6.0),
+            poise_resilience: Normal(3.0),
+            energy_max: 0.0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
index 7b997e8db7..a4a1028c10 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("AdletBow"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 3.6,
+            energy_reward: 0.04,
+            crit_power: 0.32,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
index 4ad3b24a4e..c2397cf473 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("AdletSpear"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(9.0),
+            poise_resilience: Normal(3.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
index f0586feb2f..988dc0ec60 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("AdletBow"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 3.6,
+            energy_reward: 0.04,
+            crit_power: 0.32,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
index ee87368054..d0f8064082 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("AdletSpear"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(9.0),
+            poise_resilience: Normal(3.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
index 82138763fb..84702748e1 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Belt("Adlet"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(3.0),
+            poise_resilience: Normal(3.0),
+            energy_max: 0.8,
+            energy_reward: 0.01,
+            crit_power: 0.008,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
index 312a683788..3fb1bcfb42 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.025,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
index b6ab6405ba..f327dd4751 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.9,
+            energy_reward: 0.009,
+            crit_power: 0.008,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
index 87d3f691b2..2c2543db0a 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.9,
+            energy_reward: 0.009,
+            crit_power: 0.008,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
index 8757f8b287..fe2e73f76f 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 1.8,
+            energy_reward: 0.02,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
index 268a3c44e3..3ae5f385c6 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 1.8,
+            energy_reward: 0.02,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
index e80c2c6fd8..37414a2b87 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.4,
+            energy_reward: 0.005,
+            crit_power: 0.004,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index 084a1b5237..cba7224047 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("Haniwa"),
         stats: (
-            protection: Normal(23.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(38.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 10.8,
+            energy_reward: 0.108,
+            crit_power: 0.1,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index 35079dc965..5f6a8b3d7b 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Foot("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(10.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 3.6,
+            energy_reward: 0.036,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index f6f36c417d..7ea532be0e 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(10.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 3.6,
+            energy_reward: 0.036,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index 55ef9ea2ab..cf83a16610 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(19.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 7.2,
+            energy_reward: 0.08,
+            crit_power: 0.064,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index acbecaa0fd..39b49cca7e 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(19.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 7.2,
+            energy_reward: 0.08,
+            crit_power: 0.064,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
index 5a693f5595..72c5943353 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Chest("Myrmidon"),
         stats: (
-            protection: Normal(36.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(48.0),
+            poise_resilience: Normal(6.0),
+            energy_max: 13.5,
+            energy_reward: 0.135,
+            crit_power: 0.125,
+            stealth: 0.125,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
index 16bd298e4d..27b849a7cf 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Foot("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(16.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 4.5,
+            energy_reward: 0.045,
+            crit_power: 0.04,
+            stealth: 0.04,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
index 5fc02c5840..38d6e4c491 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Hand("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(16.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 4.5,
+            energy_reward: 0.045,
+            crit_power: 0.04,
+            stealth: 0.04,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
index 6ba6dd071a..7c5540a2dd 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Head("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(32.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 9.0,
+            energy_reward: 0.1,
+            crit_power: 0.08,
+            stealth: 0.08,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
index b21efaa619..8b0c522244 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Pants("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(32.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 9.0,
+            energy_reward: 0.1,
+            crit_power: 0.08,
+            stealth: 0.08,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
index 9641725934..17635c8739 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Belt("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
+            protection: Normal(8.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            energy_max: 2.0,
+            energy_reward: 0.025,
+            crit_power: 0.02,
+            stealth: 0.02,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
index 5169dfd141..0f8ba2150b 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("Sahagin"),
         stats: (
-            protection: Normal(18.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(26.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 8.1,
+            energy_reward: 0.81,
+            crit_power: 0.075,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
index ede72b9e11..4e0e07828a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Foot("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.024,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
index 377555f351..7464e4e212 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.024,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
index 647cda4baa..749b539a71 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(13.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 5.4,
+            energy_reward: 0.06,
+            crit_power: 0.048,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
index 4a7928e7aa..b6872fb831 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(13.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 5.4,
+            energy_reward: 0.06,
+            crit_power: 0.048,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
index 40a6babc5a..208dd4d65e 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Belt("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(5.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 1.2,
+            energy_reward: 0.015,
+            crit_power: 0.012,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index 0973eedb9f..b7968b73c6 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.6,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 5fe99814c8..07a5270aa1 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 0.7,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
index 7ea0f637f2..c27a4282d8 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.07589286,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index 401083b24a..d2e4d1bb68 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.5,
             crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index 7b58d6d483..de4c29dcf7 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.8,
+            speed: 0.6,
             crit_chance: 0.12037037,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index 0f1754a5e8..fa52c9d190 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.6,
+            power: 1.8,
             effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.9,
             crit_chance: 0.05625,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 836fc43a00..1738ed4117 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.8,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.9,
             crit_chance: 0.036458332,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
index 8f786d5c69..1d22fef7e0 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.4,
+            power: 1.8,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.05357143,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
index ac233dde25..6d23956268 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 2.0,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 1.0,
             crit_chance: 0.095454544,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
index 6ccef52257..fcb80cc7fb 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.7,
+            power: 2.0,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 1.0,
             crit_chance: 0.040873703,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
index 4aa6e8482a..0d797abeab 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.7,
+            power: 2.0,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.04963235,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 296946a0f6..715c199007 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.3,
             effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.8,
             crit_chance: 0.066083916,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
index 74b42dd235..1990b82fde 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.3,
             effect_power: 0.8,
             speed: 0.8,
             crit_chance: 0.053030305,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
index 1de6a21ae2..21d7badeb8 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.3,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.05965909,
diff --git a/assets/common/skillset/dungeon/tier-0/enemy.ron b/assets/common/skillset/dungeon/tier-0/enemy.ron
index f3b680f683..f0a97a83ea 100644
--- a/assets/common/skillset/dungeon/tier-0/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-0/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-0.bow"),
+    Tree("common.skillset.dungeon.tier-0.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-0/staff.ron b/assets/common/skillset/dungeon/tier-0/staff.ron
new file mode 100644
index 0000000000..60bbb942b6
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-0/staff.ron
@@ -0,0 +1,9 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(1))),
+    Skill((Staff(BRegen), Some(1))),
+    Skill((Staff(BRadius), Some(1))),
+
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-1/bow.ron b/assets/common/skillset/dungeon/tier-1/bow.ron
index 5a99b61b66..53f1155a57 100644
--- a/assets/common/skillset/dungeon/tier-1/bow.ron
+++ b/assets/common/skillset/dungeon/tier-1/bow.ron
@@ -2,8 +2,8 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
+    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
diff --git a/assets/common/skillset/dungeon/tier-1/enemy.ron b/assets/common/skillset/dungeon/tier-1/enemy.ron
index e815920cfc..7874664548 100644
--- a/assets/common/skillset/dungeon/tier-1/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-1/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-1.bow"),
+    Tree("common.skillset.dungeon.tier-1.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-1/staff.ron b/assets/common/skillset/dungeon/tier-1/staff.ron
new file mode 100644
index 0000000000..144cd98a5c
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-1/staff.ron
@@ -0,0 +1,12 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(1))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(1))),
+
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron
index 2b1dfbd825..7a87349fa6 100644
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ b/assets/common/skillset/dungeon/tier-2/bow.ron
@@ -2,14 +2,14 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
+    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
     // Repeater
-    Skill((Bow(RDamage), Some(1))),
-    Skill((Bow(RCost), Some(1))),
+    Skill((Bow(RDamage), Some(2))),
+    Skill((Bow(RCost), Some(2))),
     Skill((Bow(RSpeed), Some(1))),
 ])
 
diff --git a/assets/common/skillset/dungeon/tier-2/enemy.ron b/assets/common/skillset/dungeon/tier-2/enemy.ron
index 0d93f8900a..54af9723dc 100644
--- a/assets/common/skillset/dungeon/tier-2/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-2/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-2.bow"),
+    Tree("common.skillset.dungeon.tier-2.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/dungeon/tier-2/staff.ron
new file mode 100644
index 0000000000..30eedf312e
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-2/staff.ron
@@ -0,0 +1,15 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(1))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(2))),
+    Skill((Staff(FDamage), Some(2))),
+    Skill((Staff(FDrain), Some(1))),
+    Skill((Staff(FVelocity), Some(1))),
+
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron
index 2344f7494a..bef5d56116 100644
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ b/assets/common/skillset/dungeon/tier-3/bow.ron
@@ -2,15 +2,16 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CRegen), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
-    Skill((Bow(CSpeed), Some(1))),
-    Skill((Bow(CMove), Some(1))),
+    Skill((Bow(CDamage), Some(3))),
+    Skill((Bow(CRegen), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
+    Skill((Bow(CSpeed), Some(2))),
+    Skill((Bow(CMove), Some(2))),
 
     // Repeater
-    Skill((Bow(RDamage), Some(1))),
-    Skill((Bow(RSpeed), Some(1))),
+    Skill((Bow(RDamage), Some(2))),
+    Skill((Bow(RCost), Some(2))),
+    Skill((Bow(RSpeed), Some(2))),
 
     // Shotgun
     Skill((Bow(UnlockShotgun), None)),
diff --git a/assets/common/skillset/dungeon/tier-3/enemy.ron b/assets/common/skillset/dungeon/tier-3/enemy.ron
index 53c4c60e76..b5eebc556d 100644
--- a/assets/common/skillset/dungeon/tier-3/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-3/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-3.bow"),
+    Tree("common.skillset.dungeon.tier-3.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/sceptre.ron b/assets/common/skillset/dungeon/tier-3/sceptre.ron
index 77d06e0ec8..d736f740f0 100644
--- a/assets/common/skillset/dungeon/tier-3/sceptre.ron
+++ b/assets/common/skillset/dungeon/tier-3/sceptre.ron
@@ -2,16 +2,16 @@
     Group(Weapon(Sceptre)),
 
     // Beam
-    Skill((Sceptre(LDamage), Some(1))),
-    Skill((Sceptre(LRange), Some(1))),
-    Skill((Sceptre(LLifesteal), Some(1))),
-    Skill((Sceptre(LRegen), Some(1))),
+    Skill((Sceptre(LDamage), Some(3))),
+    Skill((Sceptre(LRange), Some(2))),
+    Skill((Sceptre(LLifesteal), Some(2))),
+    Skill((Sceptre(LRegen), Some(2))),
 
     // Heal
-    Skill((Sceptre(HHeal), Some(1))),
-    Skill((Sceptre(HDuration), Some(1))),
-    Skill((Sceptre(HRange), Some(1))),
-    Skill((Sceptre(HCost), Some(1))),
+    Skill((Sceptre(HHeal), Some(2))),
+    Skill((Sceptre(HDuration), Some(2))),
+    Skill((Sceptre(HRange), Some(2))),
+    Skill((Sceptre(HCost), Some(2))),
     // Ward
     Skill((Sceptre(UnlockAura), None)),
     Skill((Sceptre(AStrength), Some(1))),
diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/dungeon/tier-3/staff.ron
new file mode 100644
index 0000000000..2a9405874d
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-3/staff.ron
@@ -0,0 +1,21 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(3))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(3))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(2))),
+    Skill((Staff(FDamage), Some(3))),
+    Skill((Staff(FDrain), Some(2))),
+    Skill((Staff(FVelocity), Some(2))),
+
+    // Shockwave
+    Skill((Staff(UnlockShockwave), None)),
+    Skill((Staff(SDamage), Some(1))),
+    Skill((Staff(SKnockback), Some(1))),
+    Skill((Staff(SRange), Some(1))),
+    Skill((Staff(SCost), Some(1))),
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/sword.ron b/assets/common/skillset/dungeon/tier-3/sword.ron
index 653b99296f..19f60c2bd1 100644
--- a/assets/common/skillset/dungeon/tier-3/sword.ron
+++ b/assets/common/skillset/dungeon/tier-3/sword.ron
@@ -3,16 +3,16 @@
 
     // TripleStrike
     Skill((Sword(TsCombo), None)),
-    Skill((Sword(TsDamage), Some(1))),
-    Skill((Sword(TsRegen), Some(1))),
+    Skill((Sword(TsDamage), Some(3))),
+    Skill((Sword(TsRegen), Some(2))),
 
     // Dash
-    Skill((Sword(DDamage), Some(1))),
-    Skill((Sword(DCost), Some(1))),
-    Skill((Sword(DDrain), Some(1))),
+    Skill((Sword(DDamage), Some(2))),
+    Skill((Sword(DCost), Some(2))),
+    Skill((Sword(DDrain), Some(2))),
 
     // Spin of death
     Skill((Sword(UnlockSpin), None)),
-    Skill((Sword(SDamage), Some(2))),
-    Skill((Sword(SCost), Some(2))),
+    Skill((Sword(SDamage), Some(1))),
+    Skill((Sword(SCost), Some(1))),
 ])
diff --git a/assets/common/skillset/dungeon/tier-4/enemy.ron b/assets/common/skillset/dungeon/tier-4/enemy.ron
index 937fa30b79..9e7acf32ef 100644
--- a/assets/common/skillset/dungeon/tier-4/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-4/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.preset.max.bow"),
+    Tree("common.skillset.preset.max.staff"),
 ])
\ No newline at end of file

From 84d46314ad99bf1784934a98a762b134234d6019 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:41:21 +0100
Subject: [PATCH 14/39] + All bosses ranging from T0 to T3 have a ~4% chance of
 dropping equipment one tier higher than normal, while having a ~1.7% chance
 to drop equipment even higher than that. + All chests have a ~2% chance to
 drop better equipment than their tier.

---
 .../common/loot_tables/dungeon/tier-0/boss.ron   | 11 +++++++----
 .../common/loot_tables/dungeon/tier-0/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-1/boss.ron   | 11 ++++++++---
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-2/boss.ron   |  5 +++++
 .../common/loot_tables/dungeon/tier-2/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-3/boss.ron   | 11 ++++++++---
 .../common/loot_tables/dungeon/tier-3/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-4/chest.ron  |  2 ++
 9 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 85a4617e48..1bb03d88e5 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -1,8 +1,11 @@
 [
     // Weapons
-    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
     // Armor
-    (2.0, LootTable("common.loot_tables.armor.tier-0")),
-    (1.0, Item("common.items.armor.misc.neck.scratched")),
-    (0.5, Item("common.items.armor.misc.head.straw")),
+    (4.0, LootTable("common.loot_tables.armor.tier-0")),
+    (0.5, LootTable("common.loot_tables.armor.tier-1")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.scratched")),
+    (1.0, Item("common.items.armor.misc.head.straw")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 4f7a653e59..82b3f709f2 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (1.0, LootTable("common.loot_tables.armor.tier-0")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (2.0, LootTable("common.loot_tables.armor.tier-0")),
+    (0.5, LootTable("common.loot_tables.armor.tier-1")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 4135deb1e3..42a726c9c2 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -1,7 +1,12 @@
 [
     // Weapons
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
+    (0.2, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
-    (1.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
+    (4.0, LootTable("common.loot_tables.armor.tier-1")),
+    (0.5, LootTable("common.loot_tables.armor.tier-2")),
+    (0.2, LootTable("common.loot_tables.armor.tier-3")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index e8f758e40e..556c8ec915 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (2.0, LootTable("common.loot_tables.armor.tier-1")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
+    (0.5, LootTable("common.loot_tables.armor.tier-2")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 0cf6b9164a..2a17415144 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -2,6 +2,11 @@
     // Equipment
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
     (5.0, LootTable("common.loot_tables.armor.tier-2")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-3")),
+    (0.2, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.2, LootTable("common.loot_tables.armor.tier-4")),
+    // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
     (1.0, Item("common.items.armor.misc.bag.heavy_seabag")),
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index a0c0557b60..23312096f2 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (1.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (2.0, LootTable("common.loot_tables.armor.tier-2")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index a36c830209..826e181f03 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,7 +1,12 @@
 [
     // Weapons
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.2, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.3, Item("common.items.armor.misc.neck.haniwa_talisman")),
+    (4.0, LootTable("common.loot_tables.armor.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-4")),
+    (0.2, LootTable("common.loot_tables.armor.tier-2")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index cae94ddc30..8f92fd9427 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (2.0, LootTable("common.loot_tables.armor.tier-3")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.5, LootTable("common.loot_tables.armor.tier-4")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron
index 06b6965324..0bf234eccf 100644
--- a/assets/common/loot_tables/dungeon/tier-4/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron
@@ -2,6 +2,8 @@
     // Gear
     (1.0, LootTable("common.loot_tables.weapons.tier-4")),
     (1.0, LootTable("common.loot_tables.armor.tier-4")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-5")),
+    (0.5, LootTable("common.loot_tables.armor.tier-5")),
     (3.0, Item("common.items.armor.misc.head.spikeguard")),
     // Currency
     (3.0, ItemQuantity("common.items.utility.coins", 200, 500)),

From 6b637534f8decb719da2db25c700691753492557 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:56:41 +0100
Subject: [PATCH 15/39] + Lowered drop rate of extra extra tier armor and
 weapons from ~1.7% to ~0.8% + Organized T2 boss ron

---
 assets/common/loot_tables/dungeon/tier-1/boss.ron |  4 ++--
 assets/common/loot_tables/dungeon/tier-2/boss.ron |  9 +++++----
 assets/common/loot_tables/dungeon/tier-3/boss.ron | 12 ++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 42a726c9c2..5f63d6e35f 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -2,11 +2,11 @@
     // Weapons
     (4.0, LootTable("common.loot_tables.weapons.tier-1")),
     (0.5, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.2, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.1, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
     (4.0, LootTable("common.loot_tables.armor.tier-1")),
     (0.5, LootTable("common.loot_tables.armor.tier-2")),
-    (0.2, LootTable("common.loot_tables.armor.tier-3")),
+    (0.1, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 2a17415144..75ab36d706 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -1,11 +1,12 @@
 [
-    // Equipment
+    // Weapons
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (5.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.1, LootTable("common.loot_tables.weapons.tier-4")),
+    // Armor
+    (5.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, LootTable("common.loot_tables.armor.tier-3")),
-    (0.2, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.2, LootTable("common.loot_tables.armor.tier-4")),
+    (0.1, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index 826e181f03..f2417530a1 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,12 +1,12 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.2, LootTable("common.loot_tables.weapons.tier-5")),
+    (3.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.5, LootTable("common.loot_tables.armor.tier-4")),
-    (0.2, LootTable("common.loot_tables.armor.tier-2")),
+    (3.0, LootTable("common.loot_tables.armor.tier-3")),
+    (1.0, LootTable("common.loot_tables.armor.tier-4")),
+    (0.5, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file

From 7b5d92f5fb801dee31a0a530ee91574493eb5b7f Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:56:41 +0100
Subject: [PATCH 16/39] + Made sure that abilities in staff simple match
 abilities in the staff skillset. + If anything happened to chests then no
 more! (Don't question it) + Bosses have a ~4% chance to drop higher tiered
 gear + Organized T2 boss ron

---
 .../common/loot_tables/dungeon/tier-0/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-1/boss.ron   |  2 --
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-2/boss.ron   |  2 --
 .../common/loot_tables/dungeon/tier-2/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-3/boss.ron   |  2 --
 .../common/loot_tables/dungeon/tier-3/chest.ron  | 16 +++++++---------
 assets/common/skillset/dungeon/tier-1/bow.ron    |  2 --
 assets/common/skillset/dungeon/tier-2/bow.ron    |  6 +-----
 assets/common/skillset/dungeon/tier-2/staff.ron  |  2 --
 assets/common/skillset/dungeon/tier-3/bow.ron    | 13 +------------
 assets/common/skillset/dungeon/tier-3/staff.ron  | 12 +++---------
 12 files changed, 33 insertions(+), 72 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 82b3f709f2..4f7a653e59 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (2.0, LootTable("common.loot_tables.armor.tier-0")),
-    (0.5, LootTable("common.loot_tables.armor.tier-1")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (1.0, LootTable("common.loot_tables.armor.tier-0")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 5f63d6e35f..4c1381707a 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -2,11 +2,9 @@
     // Weapons
     (4.0, LootTable("common.loot_tables.weapons.tier-1")),
     (0.5, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.1, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
     (4.0, LootTable("common.loot_tables.armor.tier-1")),
     (0.5, LootTable("common.loot_tables.armor.tier-2")),
-    (0.1, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index 556c8ec915..e8f758e40e 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (2.0, LootTable("common.loot_tables.armor.tier-1")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.5, LootTable("common.loot_tables.armor.tier-2")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.armor.tier-1")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 75ab36d706..5d7073558e 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -2,11 +2,9 @@
     // Weapons
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
     (0.5, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.1, LootTable("common.loot_tables.weapons.tier-4")),
     // Armor
     (5.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, LootTable("common.loot_tables.armor.tier-3")),
-    (0.1, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index 23312096f2..a0c0557b60 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (2.0, LootTable("common.loot_tables.armor.tier-2")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.5, LootTable("common.loot_tables.armor.tier-3")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (1.0, LootTable("common.loot_tables.armor.tier-2")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index f2417530a1..45d78dfa20 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -2,11 +2,9 @@
     // Weapons
     (3.0, LootTable("common.loot_tables.weapons.tier-3")),
     (1.0, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
     (3.0, LootTable("common.loot_tables.armor.tier-3")),
     (1.0, LootTable("common.loot_tables.armor.tier-4")),
-    (0.5, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index 8f92fd9427..cae94ddc30 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (2.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.5, LootTable("common.loot_tables.armor.tier-4")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (1.0, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/skillset/dungeon/tier-1/bow.ron b/assets/common/skillset/dungeon/tier-1/bow.ron
index 53f1155a57..521acd6260 100644
--- a/assets/common/skillset/dungeon/tier-1/bow.ron
+++ b/assets/common/skillset/dungeon/tier-1/bow.ron
@@ -7,6 +7,4 @@
     Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(1))),
 ])
diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron
index 7a87349fa6..369bb83f81 100644
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ b/assets/common/skillset/dungeon/tier-2/bow.ron
@@ -4,12 +4,8 @@
     // Charged
     Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
-    Skill((Bow(CSpeed), Some(1))),
+    Skill((Bow(CSpeed), Some(2))),
     Skill((Bow(CMove), Some(1))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(2))),
-    Skill((Bow(RCost), Some(2))),
-    Skill((Bow(RSpeed), Some(1))),
 ])
 
diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/dungeon/tier-2/staff.ron
index 30eedf312e..ce6f3ea287 100644
--- a/assets/common/skillset/dungeon/tier-2/staff.ron
+++ b/assets/common/skillset/dungeon/tier-2/staff.ron
@@ -9,7 +9,5 @@
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(2))),
-    Skill((Staff(FDrain), Some(1))),
-    Skill((Staff(FVelocity), Some(1))),
 
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron
index bef5d56116..50ee426093 100644
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ b/assets/common/skillset/dungeon/tier-3/bow.ron
@@ -2,21 +2,10 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(3))),
+    Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CRegen), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(2))),
     Skill((Bow(CMove), Some(2))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(2))),
-    Skill((Bow(RCost), Some(2))),
-    Skill((Bow(RSpeed), Some(2))),
-
-    // Shotgun
-    Skill((Bow(UnlockShotgun), None)),
-    Skill((Bow(SDamage), Some(1))),
-    Skill((Bow(SSpread), Some(1))),
-    Skill((Bow(SArrows), Some(1))),
-    Skill((Bow(SCost), Some(1))),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/dungeon/tier-3/staff.ron
index 2a9405874d..d5e92082fa 100644
--- a/assets/common/skillset/dungeon/tier-3/staff.ron
+++ b/assets/common/skillset/dungeon/tier-3/staff.ron
@@ -2,20 +2,14 @@
     Group(Weapon(Staff)),
 
     // Fireball
-    Skill((Staff(BDamage), Some(3))),
+    Skill((Staff(BDamage), Some(2))),
     Skill((Staff(BRegen), Some(2))),
-    Skill((Staff(BRadius), Some(3))),
+    Skill((Staff(BRadius), Some(2))),
 
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(3))),
     Skill((Staff(FDrain), Some(2))),
-    Skill((Staff(FVelocity), Some(2))),
+    Skill((Staff(FVelocity), Some(1))),
 
-    // Shockwave
-    Skill((Staff(UnlockShockwave), None)),
-    Skill((Staff(SDamage), Some(1))),
-    Skill((Staff(SKnockback), Some(1))),
-    Skill((Staff(SRange), Some(1))),
-    Skill((Staff(SCost), Some(1))),
 ])
\ No newline at end of file

From f764ae99c033f45a69e7cd458a4ace980a77b0c6 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Mon, 8 Nov 2021 23:05:28 +0100
Subject: [PATCH 17/39] + Adjusted damage, crit chance, and attack speed of
 weapons + Adjusted boss and chest loot table to match it's new intended tier
 of difficulty while providing an intermediate stage for new players to
 explore between T0(T1) and T1(T2)

---
 .../biped_small/adlet/chest/adlet_bow.ron        |  2 +-
 .../biped_small/haniwa/chest/haniwa.ron          |  2 +-
 .../npc_armor/biped_small/haniwa/foot/haniwa.ron |  2 +-
 .../npc_armor/biped_small/haniwa/hand/haniwa.ron |  2 +-
 .../npc_armor/biped_small/haniwa/head/haniwa.ron |  2 +-
 .../biped_small/haniwa/pants/haniwa.ron          |  2 +-
 .../biped_small/sahagin/chest/sahagin.ron        |  2 +-
 .../biped_small/sahagin/foot/sahagin.ron         |  2 +-
 .../biped_small/sahagin/hand/sahagin.ron         |  2 +-
 .../biped_small/sahagin/head/sahagin.ron         |  2 +-
 .../biped_small/sahagin/pants/sahagin.ron        |  2 +-
 .../biped_small/sahagin/tail/sahagin.ron         |  2 +-
 .../npc_weapons/biped_small/adlet/adlet_bow.ron  |  4 ++--
 .../biped_small/adlet/gnoll_staff.ron            |  4 ++--
 .../biped_small/adlet/wooden_spear.ron           |  2 +-
 .../biped_small/gnarling/adlet_bow.ron           |  4 ++--
 .../biped_small/gnarling/gnoll_staff.ron         |  4 ++--
 .../biped_small/gnarling/wooden_spear.ron        |  2 +-
 .../npc_weapons/biped_small/haniwa/adlet_bow.ron |  4 ++--
 .../biped_small/haniwa/gnoll_staff.ron           |  4 ++--
 .../biped_small/haniwa/wooden_spear.ron          |  2 +-
 .../biped_small/sahagin/adlet_bow.ron            |  6 +++---
 .../biped_small/sahagin/gnoll_staff.ron          |  4 ++--
 .../biped_small/sahagin/wooden_spear.ron         |  4 ++--
 .../common/loot_tables/dungeon/tier-0/boss.ron   | 16 ++++++++++------
 .../common/loot_tables/dungeon/tier-0/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-1/boss.ron   |  8 ++++----
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-2/boss.ron   |  8 ++++----
 .../common/loot_tables/dungeon/tier-2/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-3/boss.ron   |  8 ++++----
 .../common/loot_tables/dungeon/tier-3/chest.ron  | 16 +++++++++-------
 32 files changed, 92 insertions(+), 80 deletions(-)

diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
index e1ce60d709..8fdfc77329 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(14.0),
             poise_resilience: Normal(2.0),
-            energy_max: 5.4,
+            energy_max: 4.4,
             energy_reward: 0.054,
             crit_power: 0.05,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index cba7224047..f7c2400300 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(38.0),
             poise_resilience: Normal(5.0),
-            energy_max: 10.8,
+            energy_max: 5.0,
             energy_reward: 0.108,
             crit_power: 0.1,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index 5f6a8b3d7b..eebdb949c6 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
-            energy_max: 3.6,
+            energy_max: 5.0,
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index 7ea532be0e..a73b06e8c0 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
-            energy_max: 3.6,
+            energy_max: 5.0,
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index cf83a16610..53753c9e89 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
-            energy_max: 7.2,
+            energy_max: 5.0,
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index 39b49cca7e..d8deeeb3bb 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
-            energy_max: 7.2,
+            energy_max: 5.0,
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
index 0f8ba2150b..dbc76fd21a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(26.0),
             poise_resilience: Normal(4.0),
-            energy_max: 8.1,
+            energy_max: 3.4,
             energy_reward: 0.81,
             crit_power: 0.075,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
index 4e0e07828a..6e679be98a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
-            energy_max: 2.7,
+            energy_max: 3.4,
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
index 7464e4e212..3606ca4783 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
-            energy_max: 2.7,
+            energy_max: 3.4,
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
index 749b539a71..a5d7099154 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
-            energy_max: 5.4,
+            energy_max: 3.4,
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
index b6872fb831..f9a1b9d51c 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
-            energy_max: 5.4,
+            energy_max: 3.4,
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
index 208dd4d65e..368ae49a5e 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(5.0),
             poise_resilience: Normal(4.0),
-            energy_max: 1.2,
+            energy_max: 3.4,
             energy_reward: 0.015,
             crit_power: 0.012,
             stealth: 0.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index b7968b73c6..430e84fee7 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.7,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 07a5270aa1..4588d5c1e2 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.6,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
index c27a4282d8..7ea0f637f2 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.07589286,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index d2e4d1bb68..f3a87da8b1 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,8 +8,8 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.5,
-            crit_chance: 0.26764706,
+            speed: 0.6,
+            crit_chance: 0.13541667,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index de4c29dcf7..226837bf9f 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,8 +8,8 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.6,
-            crit_chance: 0.12037037,
+            speed: 0.5,
+            crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
index 8aa201d533..db58f5bacb 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
@@ -9,7 +9,7 @@ ItemDef(
             power: 0.3,
             effect_power: 1.0,
             speed: 1.0,
-            crit_chance: 0.13541667,
+            crit_chance: 0.12037037,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index fa52c9d190..b480970b4f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.05625,
+            crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 1738ed4117..fe5268388f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.036458332,
+            crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
index 1d22fef7e0..6bbadb8173 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.05357143,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 715c199007..5c44dfa272 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.3,
+            power: 1.2,
             effect_power: 0.8,
-            speed: 0.8,
-            crit_chance: 0.066083916,
+            speed: 0.9,
+            crit_chance: 0.05965909,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
index 1990b82fde..fe69702d5a 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.3,
+            power: 1.2,
             effect_power: 0.8,
             speed: 0.8,
-            crit_chance: 0.053030305,
+            crit_chance: 0.066083916,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
index 21d7badeb8..cfa87de675 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.3,
+            power: 1.2,
             effect_power: 1.0,
             speed: 1.0,
-            crit_chance: 0.05965909,
+            crit_chance: 0.053030305,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 1bb03d88e5..7d5dd6cfff 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -1,11 +1,15 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
+    (5.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-0")),
-    (0.5, LootTable("common.loot_tables.armor.tier-1")),
+    (5.0, LootTable("common.loot_tables.armor.tier-0")),
+    (2.0, LootTable("common.loot_tables.armor.tier-1")),
     // Misc
-    (2.0, Item("common.items.armor.misc.neck.scratched")),
-    (1.0, Item("common.items.armor.misc.head.straw")),
+    (3.0, Item("common.items.armor.misc.neck.scratched")),
+    (2.0, Item("common.items.armor.misc.head.straw")),
+    // Indirect crafting materials for T2 gear
+    (1.0, ItemQuantity("common.items.craftin_ing.sticky_thread", 2, 5)),
+    (1.0, ItemQuantity("common.items.mineral.coal", 2, 5)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.leather_strips", 2, 5)),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 4f7a653e59..0e6fee696c 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (1.0, LootTable("common.loot_tables.armor.tier-0")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (2.0, LootTable("common.loot_tables.armor.tier-0")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.armor.tier-1")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 4c1381707a..c9218cda4b 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -1,10 +1,10 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (2.5, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-1")),
-    (0.5, LootTable("common.loot_tables.armor.tier-2")),
+    (4.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.5, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index e8f758e40e..de3c2b9147 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (2.0, LootTable("common.loot_tables.armor.tier-1")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (1.0, LootTable("common.loot_tables.armor.tier-2")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 5d7073558e..14b546a5f9 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -1,10 +1,10 @@
 [
     // Weapons
-    (5.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (5.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
     // Armor
-    (5.0, LootTable("common.loot_tables.armor.tier-2")),
-    (0.5, LootTable("common.loot_tables.armor.tier-3")),
+    (5.0, LootTable("common.loot_tables.armor.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index a0c0557b60..1e6f582b93 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (1.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (2.0, LootTable("common.loot_tables.armor.tier-2")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (1.0, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index 45d78dfa20..89ca31fb5f 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,10 +1,10 @@
 [
     // Weapons
-    (3.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (3.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
-    (3.0, LootTable("common.loot_tables.armor.tier-3")),
-    (1.0, LootTable("common.loot_tables.armor.tier-4")),
+    (3.0, LootTable("common.loot_tables.armor.tier-4")),
+    (1.0, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index cae94ddc30..fae2e74d80 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (2.0, LootTable("common.loot_tables.armor.tier-3")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (1.0, LootTable("common.loot_tables.armor.tier-4")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]

From 7a49f26568cec1bc2c3b331607d4635585988e15 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 9 Nov 2021 09:33:05 +0100
Subject: [PATCH 18/39] + Reducing attack speed of minions

---
 assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron | 2 +-
 .../common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron  | 2 +-
 .../common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron | 2 +-
 .../items/npc_weapons/biped_small/gnarling/gnoll_staff.ron      | 2 +-
 .../common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron   | 2 +-
 .../common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron | 2 +-
 .../common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron | 2 +-
 .../items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron      | 2 +-
 .../common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index 430e84fee7..e560436fe9 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.7,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.6,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 4588d5c1e2..f3e2191a33 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.7,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.7,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index f3a87da8b1..d927326c31 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.5,
             crit_chance: 0.13541667,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index 226837bf9f..d0e96ded3e 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 0.6,
             crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index b480970b4f..775f7bb67f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.6,
             effect_power: 0.8,
-            speed: 0.9,
+            speed: 0.7,
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index fe5268388f..5a2c62c527 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.6,
             effect_power: 0.8,
-            speed: 0.9,
+            speed: 0.8,
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
index 6d23956268..185f2d5f7e 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 2.0,
             effect_power: 0.8,
-            speed: 1.0,
+            speed: 0.8,
             crit_chance: 0.095454544,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
index fcb80cc7fb..ecbf99b510 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 2.0,
             effect_power: 0.8,
-            speed: 1.0,
+            speed: 0.9,
             crit_chance: 0.040873703,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 5c44dfa272..be326e45e2 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.2,
             effect_power: 0.8,
-            speed: 0.9,
+            speed: 0.7,
             crit_chance: 0.05965909,
             range: 1.0,
             energy_efficiency: 1.0,

From 027664f1c0b10c9bbf054eae3b48e049199571cb Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 9 Nov 2021 11:50:26 +0100
Subject: [PATCH 19/39] + Fixing spelling msitake in T0 Boss
 craftin_ing.sticky_thread to crafting_ing.sticky_thread

---
 assets/common/loot_tables/dungeon/tier-0/boss.ron | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 7d5dd6cfff..937f973a55 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -9,7 +9,7 @@
     (3.0, Item("common.items.armor.misc.neck.scratched")),
     (2.0, Item("common.items.armor.misc.head.straw")),
     // Indirect crafting materials for T2 gear
-    (1.0, ItemQuantity("common.items.craftin_ing.sticky_thread", 2, 5)),
+    (1.0, ItemQuantity("common.items.crafting_ing.sticky_thread", 2, 5)),
     (1.0, ItemQuantity("common.items.mineral.coal", 2, 5)),
     (1.0, ItemQuantity("common.items.crafting_ing.leather.leather_strips", 2, 5)),
 ]
\ No newline at end of file

From debbc1e4c6b9d01ffda2e1d2c4b30f818135ea45 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 9 Nov 2021 22:40:25 +0100
Subject: [PATCH 20/39] + Fixed pathing for coal in T0 boss loot table, was
 mineral.coal is mineral.ore.coal now

---
 assets/common/loot_tables/dungeon/tier-0/boss.ron | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 937f973a55..98f8b5661c 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -10,6 +10,6 @@
     (2.0, Item("common.items.armor.misc.head.straw")),
     // Indirect crafting materials for T2 gear
     (1.0, ItemQuantity("common.items.crafting_ing.sticky_thread", 2, 5)),
-    (1.0, ItemQuantity("common.items.mineral.coal", 2, 5)),
+    (1.0, ItemQuantity("common.items.mineral.ore.coal", 2, 5)),
     (1.0, ItemQuantity("common.items.crafting_ing.leather.leather_strips", 2, 5)),
 ]
\ No newline at end of file

From 4e19f2444b18343d8e67cc12b77f6687f053e0d6 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Wed, 3 Nov 2021 00:37:59 +0100
Subject: [PATCH 21/39] + Updating item_image_manifest to Master (was behind)

---
 assets/voxygen/item_image_manifest.ron | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 5fe775f6e1..0a4c03ca5e 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //  Png(specifier),
 //  Vox(specier),
 //  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
@@ -2949,4 +2950,4 @@
         "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-})
+)]
\ No newline at end of file

From 8d86f62f2edf64eede91d8755cbd4c2d275b841f Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Wed, 3 Nov 2021 00:40:02 +0100
Subject: [PATCH 22/39] + Updating item_image_manifest to Master (was behind)

---
 assets/voxygen/item_image_manifest.ron | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 0a4c03ca5e..db22621cb1 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //  Png(specifier),
 //  Vox(specier),
 //  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)
@@ -2950,4 +2949,4 @@
         "voxel.weapon_components.sword.cultist.cultist_purp_2h-0_handle",
         (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
-)]
\ No newline at end of file
+})
\ No newline at end of file

From 2163dc73b4d127d84da386c4f1b6ba7b61c1a8fc Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sat, 6 Nov 2021 17:45:02 +0100
Subject: [PATCH 23/39] + Gnarling armor count - 7 previous being 7 + Adlet-bow
 armor count - 39 previous being 62 + Sahagin armor count - 71 previous being
 88 + Haniwa armor count - 96 previous being 91 + Myrmidon armor count - 152
 previous being 161 + Although an overall decrease in armor there's an
 increase in poise res, crit power, energy, and other stats. + Gave everything
 staff an ability set in skillset, and linked them all

---
 assets/common/entity/dungeon/tier-0/staff.ron |  1 +
 assets/common/entity/dungeon/tier-1/staff.ron |  1 +
 assets/common/entity/dungeon/tier-2/staff.ron |  1 +
 assets/common/entity/dungeon/tier-3/staff.ron |  1 +
 .../biped_small/adlet/chest/adlet_bow.ron     | 10 ++++-----
 .../biped_small/adlet/chest/adlet_spear.ron   |  6 +++---
 .../biped_small/adlet/foot/adlet.ron          | 10 ++++-----
 .../biped_small/adlet/hand/adlet_bow.ron      | 10 ++++-----
 .../biped_small/adlet/hand/adlet_spear.ron    |  8 +++----
 .../biped_small/adlet/head/adlet_bow.ron      | 10 ++++-----
 .../biped_small/adlet/head/adlet_spear.ron    |  6 +++---
 .../biped_small/adlet/pants/adlet_bow.ron     | 10 ++++-----
 .../biped_small/adlet/pants/adlet_spear.ron   |  6 +++---
 .../biped_small/adlet/tail/adlet.ron          | 10 ++++-----
 .../biped_small/gnarling/chest/gnarling.ron   |  6 +++---
 .../biped_small/gnarling/foot/gnarling.ron    |  6 +++---
 .../biped_small/gnarling/hand/gnarling.ron    |  6 +++---
 .../biped_small/gnarling/head/gnarling.ron    |  6 +++---
 .../biped_small/gnarling/pants/gnarling.ron   |  6 +++---
 .../biped_small/gnarling/tail/gnarling.ron    |  6 +++---
 .../biped_small/haniwa/chest/haniwa.ron       | 10 ++++-----
 .../biped_small/haniwa/foot/haniwa.ron        | 10 ++++-----
 .../biped_small/haniwa/hand/haniwa.ron        | 10 ++++-----
 .../biped_small/haniwa/head/haniwa.ron        | 10 ++++-----
 .../biped_small/haniwa/pants/haniwa.ron       | 10 ++++-----
 .../biped_small/myrmidon/chest/myrmidon.ron   | 12 +++++------
 .../biped_small/myrmidon/foot/myrmidon.ron    | 12 +++++------
 .../biped_small/myrmidon/hand/myrmidon.ron    | 12 +++++------
 .../biped_small/myrmidon/head/myrmidon.ron    | 12 +++++------
 .../biped_small/myrmidon/pants/myrmidon.ron   | 12 +++++------
 .../biped_small/myrmidon/tail/myrmidon.ron    | 10 ++++-----
 .../biped_small/sahagin/chest/sahagin.ron     | 10 ++++-----
 .../biped_small/sahagin/foot/sahagin.ron      | 10 ++++-----
 .../biped_small/sahagin/hand/sahagin.ron      | 10 ++++-----
 .../biped_small/sahagin/head/sahagin.ron      | 10 ++++-----
 .../biped_small/sahagin/pants/sahagin.ron     | 10 ++++-----
 .../biped_small/sahagin/tail/sahagin.ron      | 10 ++++-----
 .../biped_small/adlet/adlet_bow.ron           |  4 ++--
 .../biped_small/adlet/gnoll_staff.ron         |  4 ++--
 .../biped_small/adlet/wooden_spear.ron        |  2 +-
 .../biped_small/gnarling/adlet_bow.ron        |  2 +-
 .../biped_small/gnarling/gnoll_staff.ron      |  2 +-
 .../biped_small/haniwa/adlet_bow.ron          |  4 ++--
 .../biped_small/haniwa/gnoll_staff.ron        |  2 +-
 .../biped_small/haniwa/wooden_spear.ron       |  2 +-
 .../biped_small/myrmidon/adlet_bow.ron        |  4 ++--
 .../biped_small/myrmidon/gnoll_staff.ron      |  4 ++--
 .../biped_small/myrmidon/wooden_spear.ron     |  2 +-
 .../biped_small/sahagin/adlet_bow.ron         |  4 ++--
 .../biped_small/sahagin/gnoll_staff.ron       |  2 +-
 .../biped_small/sahagin/wooden_spear.ron      |  2 +-
 .../common/skillset/dungeon/tier-0/enemy.ron  |  1 +
 .../common/skillset/dungeon/tier-0/staff.ron  |  9 ++++++++
 assets/common/skillset/dungeon/tier-1/bow.ron |  4 ++--
 .../common/skillset/dungeon/tier-1/enemy.ron  |  1 +
 .../common/skillset/dungeon/tier-1/staff.ron  | 12 +++++++++++
 assets/common/skillset/dungeon/tier-2/bow.ron |  8 +++----
 .../common/skillset/dungeon/tier-2/enemy.ron  |  1 +
 .../common/skillset/dungeon/tier-2/staff.ron  | 15 +++++++++++++
 assets/common/skillset/dungeon/tier-3/bow.ron | 15 ++++++-------
 .../common/skillset/dungeon/tier-3/enemy.ron  |  1 +
 .../skillset/dungeon/tier-3/sceptre.ron       | 16 +++++++-------
 .../common/skillset/dungeon/tier-3/staff.ron  | 21 +++++++++++++++++++
 .../common/skillset/dungeon/tier-3/sword.ron  | 14 ++++++-------
 .../common/skillset/dungeon/tier-4/enemy.ron  |  1 +
 65 files changed, 266 insertions(+), 199 deletions(-)
 create mode 100644 assets/common/skillset/dungeon/tier-0/staff.ron
 create mode 100644 assets/common/skillset/dungeon/tier-1/staff.ron
 create mode 100644 assets/common/skillset/dungeon/tier-2/staff.ron
 create mode 100644 assets/common/skillset/dungeon/tier-3/staff.ron

diff --git a/assets/common/entity/dungeon/tier-0/staff.ron b/assets/common/entity/dungeon/tier-0/staff.ron
index cbcd59a973..e1825cf2ec 100644
--- a/assets/common/entity/dungeon/tier-0/staff.ron
+++ b/assets/common/entity/dungeon/tier-0/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+        SkillSetAsset("common.skillset.dungeon.tier-0.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-1/staff.ron b/assets/common/entity/dungeon/tier-1/staff.ron
index 314e450021..8420431780 100644
--- a/assets/common/entity/dungeon/tier-1/staff.ron
+++ b/assets/common/entity/dungeon/tier-1/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-1.adlet_spear"),
+        SkillSetAsset("common.skillset.dungeon.tier-1.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-2/staff.ron b/assets/common/entity/dungeon/tier-2/staff.ron
index e1a883baa7..4357fa4539 100644
--- a/assets/common/entity/dungeon/tier-2/staff.ron
+++ b/assets/common/entity/dungeon/tier-2/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
+        SkillSetAsset("common.skillset.dungeon.tier-2.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-3/staff.ron b/assets/common/entity/dungeon/tier-3/staff.ron
index d71561c3c5..6d65b13dab 100644
--- a/assets/common/entity/dungeon/tier-3/staff.ron
+++ b/assets/common/entity/dungeon/tier-3/staff.ron
@@ -9,5 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
+        SkillSetAsset("common.skillset.dungeon.tier-3.staff"),
     ],
 )
diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
index 80f79ba5ed..e1ce60d709 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("AdletBow"),
         stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(14.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 5.4,
+            energy_reward: 0.054,
+            crit_power: 0.05,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
index cc8792d375..e8f73b60dc 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("AdletSpear"),
         stats: (
-            protection: Normal(12.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(16.0),
+            poise_resilience: Normal(3.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.06,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
index 93ee43dd6a..517abac85b 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Foot("Adlet"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(4.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 1.8,
+            energy_reward: 0.018,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
index cfc26410ab..52f78dc70f 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("AdletBow"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(4.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 1.8,
+            energy_reward: 0.018,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
index 99defb895d..b68d2ef036 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("AdletSpear"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
+            protection: Normal(6.0),
+            poise_resilience: Normal(3.0),
+            energy_max: 0.0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
index 7b997e8db7..a4a1028c10 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("AdletBow"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 3.6,
+            energy_reward: 0.04,
+            crit_power: 0.32,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
index 4ad3b24a4e..c2397cf473 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("AdletSpear"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(9.0),
+            poise_resilience: Normal(3.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
index f0586feb2f..988dc0ec60 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("AdletBow"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 3.6,
+            energy_reward: 0.04,
+            crit_power: 0.32,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
index ee87368054..d0f8064082 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("AdletSpear"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
+            protection: Normal(9.0),
+            poise_resilience: Normal(3.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
index 82138763fb..84702748e1 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Belt("Adlet"),
         stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(3.0),
+            poise_resilience: Normal(3.0),
+            energy_max: 0.8,
+            energy_reward: 0.01,
+            crit_power: 0.008,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
index 312a683788..3fb1bcfb42 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(2.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.025,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
index b6ab6405ba..f327dd4751 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.9,
+            energy_reward: 0.009,
+            crit_power: 0.008,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
index 87d3f691b2..2c2543db0a 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.9,
+            energy_reward: 0.009,
+            crit_power: 0.008,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
index 8757f8b287..fe2e73f76f 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 1.8,
+            energy_reward: 0.02,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
index 268a3c44e3..3ae5f385c6 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 1.8,
+            energy_reward: 0.02,
+            crit_power: 0.016,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
index e80c2c6fd8..37414a2b87 100644
--- a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
+++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron
@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            energy_max: 0.4,
+            energy_reward: 0.005,
+            crit_power: 0.004,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index 084a1b5237..cba7224047 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("Haniwa"),
         stats: (
-            protection: Normal(23.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(38.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 10.8,
+            energy_reward: 0.108,
+            crit_power: 0.1,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index 35079dc965..5f6a8b3d7b 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Foot("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(10.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 3.6,
+            energy_reward: 0.036,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index f6f36c417d..7ea532be0e 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(10.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 3.6,
+            energy_reward: 0.036,
+            crit_power: 0.032,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index 55ef9ea2ab..cf83a16610 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(19.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 7.2,
+            energy_reward: 0.08,
+            crit_power: 0.064,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index acbecaa0fd..39b49cca7e 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("Haniwa"),
         stats: (
-            protection: Normal(17.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(19.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 7.2,
+            energy_reward: 0.08,
+            crit_power: 0.064,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
index 5a693f5595..72c5943353 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Chest("Myrmidon"),
         stats: (
-            protection: Normal(36.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(48.0),
+            poise_resilience: Normal(6.0),
+            energy_max: 13.5,
+            energy_reward: 0.135,
+            crit_power: 0.125,
+            stealth: 0.125,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
index 16bd298e4d..27b849a7cf 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Foot("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(16.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 4.5,
+            energy_reward: 0.045,
+            crit_power: 0.04,
+            stealth: 0.04,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
index 5fc02c5840..38d6e4c491 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Hand("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(16.0),
+            poise_resilience: Normal(2.0),
+            energy_max: 4.5,
+            energy_reward: 0.045,
+            crit_power: 0.04,
+            stealth: 0.04,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
index 6ba6dd071a..7c5540a2dd 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Head("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(32.0),
+            poise_resilience: Normal(5.0),
+            energy_max: 9.0,
+            energy_reward: 0.1,
+            crit_power: 0.08,
+            stealth: 0.08,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
index b21efaa619..8b0c522244 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Pants("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            protection: Normal(32.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 9.0,
+            energy_reward: 0.1,
+            crit_power: 0.08,
+            stealth: 0.08,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
index 9641725934..17635c8739 100644
--- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
+++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron
@@ -4,12 +4,12 @@ ItemDef(
     kind: Armor((
         kind: Belt("Myrmidon"),
         stats: (
-            protection: Normal(25.0),
+            protection: Normal(8.0),
             poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
+            energy_max: 2.0,
+            energy_reward: 0.025,
+            crit_power: 0.02,
+            stealth: 0.02,
         ),
     )),
     quality: Low,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
index 5169dfd141..0f8ba2150b 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Chest("Sahagin"),
         stats: (
-            protection: Normal(18.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(26.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 8.1,
+            energy_reward: 0.81,
+            crit_power: 0.075,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
index ede72b9e11..4e0e07828a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Foot("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.024,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
index 377555f351..7464e4e212 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Hand("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(7.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 2.7,
+            energy_reward: 0.027,
+            crit_power: 0.024,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
index 647cda4baa..749b539a71 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Head("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(13.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 5.4,
+            energy_reward: 0.06,
+            crit_power: 0.048,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
index 4a7928e7aa..b6872fb831 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Pants("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(13.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 5.4,
+            energy_reward: 0.06,
+            crit_power: 0.048,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
index 40a6babc5a..208dd4d65e 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Belt("Sahagin"),
         stats: (
-            protection: Normal(14.0),
-            poise_resilience: Normal(1.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
+            protection: Normal(5.0),
+            poise_resilience: Normal(4.0),
+            energy_max: 1.2,
+            energy_reward: 0.015,
+            crit_power: 0.012,
             stealth: 0.0,
         ),
     )),
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index 0973eedb9f..b7968b73c6 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.6,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 5fe99814c8..07a5270aa1 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 0.7,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
index 7ea0f637f2..c27a4282d8 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.07589286,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index 401083b24a..d2e4d1bb68 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.5,
             crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index 7b58d6d483..de4c29dcf7 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.8,
+            speed: 0.6,
             crit_chance: 0.12037037,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index 0f1754a5e8..fa52c9d190 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.6,
+            power: 1.8,
             effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.9,
             crit_chance: 0.05625,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 836fc43a00..1738ed4117 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.8,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.9,
             crit_chance: 0.036458332,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
index 8f786d5c69..1d22fef7e0 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.4,
+            power: 1.8,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.05357143,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
index ac233dde25..6d23956268 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 2.0,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 1.0,
             crit_chance: 0.095454544,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
index 6ccef52257..fcb80cc7fb 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.7,
+            power: 2.0,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 1.0,
             crit_chance: 0.040873703,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
index 4aa6e8482a..0d797abeab 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.7,
+            power: 2.0,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.04963235,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 296946a0f6..715c199007 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.3,
             effect_power: 0.8,
-            speed: 0.3,
+            speed: 0.8,
             crit_chance: 0.066083916,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
index 74b42dd235..1990b82fde 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.3,
             effect_power: 0.8,
             speed: 0.8,
             crit_chance: 0.053030305,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
index 1de6a21ae2..21d7badeb8 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.1,
+            power: 1.3,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.05965909,
diff --git a/assets/common/skillset/dungeon/tier-0/enemy.ron b/assets/common/skillset/dungeon/tier-0/enemy.ron
index f3b680f683..f0a97a83ea 100644
--- a/assets/common/skillset/dungeon/tier-0/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-0/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-0.bow"),
+    Tree("common.skillset.dungeon.tier-0.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-0/staff.ron b/assets/common/skillset/dungeon/tier-0/staff.ron
new file mode 100644
index 0000000000..60bbb942b6
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-0/staff.ron
@@ -0,0 +1,9 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(1))),
+    Skill((Staff(BRegen), Some(1))),
+    Skill((Staff(BRadius), Some(1))),
+
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-1/bow.ron b/assets/common/skillset/dungeon/tier-1/bow.ron
index 5a99b61b66..53f1155a57 100644
--- a/assets/common/skillset/dungeon/tier-1/bow.ron
+++ b/assets/common/skillset/dungeon/tier-1/bow.ron
@@ -2,8 +2,8 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
+    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
diff --git a/assets/common/skillset/dungeon/tier-1/enemy.ron b/assets/common/skillset/dungeon/tier-1/enemy.ron
index e815920cfc..7874664548 100644
--- a/assets/common/skillset/dungeon/tier-1/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-1/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-1.bow"),
+    Tree("common.skillset.dungeon.tier-1.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-1/staff.ron b/assets/common/skillset/dungeon/tier-1/staff.ron
new file mode 100644
index 0000000000..144cd98a5c
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-1/staff.ron
@@ -0,0 +1,12 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(1))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(1))),
+
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron
index 2b1dfbd825..7a87349fa6 100644
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ b/assets/common/skillset/dungeon/tier-2/bow.ron
@@ -2,14 +2,14 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
+    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
     // Repeater
-    Skill((Bow(RDamage), Some(1))),
-    Skill((Bow(RCost), Some(1))),
+    Skill((Bow(RDamage), Some(2))),
+    Skill((Bow(RCost), Some(2))),
     Skill((Bow(RSpeed), Some(1))),
 ])
 
diff --git a/assets/common/skillset/dungeon/tier-2/enemy.ron b/assets/common/skillset/dungeon/tier-2/enemy.ron
index 0d93f8900a..54af9723dc 100644
--- a/assets/common/skillset/dungeon/tier-2/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-2/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-2.bow"),
+    Tree("common.skillset.dungeon.tier-2.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/dungeon/tier-2/staff.ron
new file mode 100644
index 0000000000..30eedf312e
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-2/staff.ron
@@ -0,0 +1,15 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(1))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(2))),
+    Skill((Staff(FDamage), Some(2))),
+    Skill((Staff(FDrain), Some(1))),
+    Skill((Staff(FVelocity), Some(1))),
+
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron
index 2344f7494a..bef5d56116 100644
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ b/assets/common/skillset/dungeon/tier-3/bow.ron
@@ -2,15 +2,16 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(1))),
-    Skill((Bow(CRegen), Some(1))),
-    Skill((Bow(CKnockback), Some(1))),
-    Skill((Bow(CSpeed), Some(1))),
-    Skill((Bow(CMove), Some(1))),
+    Skill((Bow(CDamage), Some(3))),
+    Skill((Bow(CRegen), Some(2))),
+    Skill((Bow(CKnockback), Some(2))),
+    Skill((Bow(CSpeed), Some(2))),
+    Skill((Bow(CMove), Some(2))),
 
     // Repeater
-    Skill((Bow(RDamage), Some(1))),
-    Skill((Bow(RSpeed), Some(1))),
+    Skill((Bow(RDamage), Some(2))),
+    Skill((Bow(RCost), Some(2))),
+    Skill((Bow(RSpeed), Some(2))),
 
     // Shotgun
     Skill((Bow(UnlockShotgun), None)),
diff --git a/assets/common/skillset/dungeon/tier-3/enemy.ron b/assets/common/skillset/dungeon/tier-3/enemy.ron
index 53c4c60e76..b5eebc556d 100644
--- a/assets/common/skillset/dungeon/tier-3/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-3/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.dungeon.tier-3.bow"),
+    Tree("common.skillset.dungeon.tier-3.staff"),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/sceptre.ron b/assets/common/skillset/dungeon/tier-3/sceptre.ron
index 77d06e0ec8..d736f740f0 100644
--- a/assets/common/skillset/dungeon/tier-3/sceptre.ron
+++ b/assets/common/skillset/dungeon/tier-3/sceptre.ron
@@ -2,16 +2,16 @@
     Group(Weapon(Sceptre)),
 
     // Beam
-    Skill((Sceptre(LDamage), Some(1))),
-    Skill((Sceptre(LRange), Some(1))),
-    Skill((Sceptre(LLifesteal), Some(1))),
-    Skill((Sceptre(LRegen), Some(1))),
+    Skill((Sceptre(LDamage), Some(3))),
+    Skill((Sceptre(LRange), Some(2))),
+    Skill((Sceptre(LLifesteal), Some(2))),
+    Skill((Sceptre(LRegen), Some(2))),
 
     // Heal
-    Skill((Sceptre(HHeal), Some(1))),
-    Skill((Sceptre(HDuration), Some(1))),
-    Skill((Sceptre(HRange), Some(1))),
-    Skill((Sceptre(HCost), Some(1))),
+    Skill((Sceptre(HHeal), Some(2))),
+    Skill((Sceptre(HDuration), Some(2))),
+    Skill((Sceptre(HRange), Some(2))),
+    Skill((Sceptre(HCost), Some(2))),
     // Ward
     Skill((Sceptre(UnlockAura), None)),
     Skill((Sceptre(AStrength), Some(1))),
diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/dungeon/tier-3/staff.ron
new file mode 100644
index 0000000000..2a9405874d
--- /dev/null
+++ b/assets/common/skillset/dungeon/tier-3/staff.ron
@@ -0,0 +1,21 @@
+([
+    Group(Weapon(Staff)),
+
+    // Fireball
+    Skill((Staff(BDamage), Some(3))),
+    Skill((Staff(BRegen), Some(2))),
+    Skill((Staff(BRadius), Some(3))),
+
+    // Flamethrower
+    Skill((Staff(FRange), Some(2))),
+    Skill((Staff(FDamage), Some(3))),
+    Skill((Staff(FDrain), Some(2))),
+    Skill((Staff(FVelocity), Some(2))),
+
+    // Shockwave
+    Skill((Staff(UnlockShockwave), None)),
+    Skill((Staff(SDamage), Some(1))),
+    Skill((Staff(SKnockback), Some(1))),
+    Skill((Staff(SRange), Some(1))),
+    Skill((Staff(SCost), Some(1))),
+])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/sword.ron b/assets/common/skillset/dungeon/tier-3/sword.ron
index 653b99296f..19f60c2bd1 100644
--- a/assets/common/skillset/dungeon/tier-3/sword.ron
+++ b/assets/common/skillset/dungeon/tier-3/sword.ron
@@ -3,16 +3,16 @@
 
     // TripleStrike
     Skill((Sword(TsCombo), None)),
-    Skill((Sword(TsDamage), Some(1))),
-    Skill((Sword(TsRegen), Some(1))),
+    Skill((Sword(TsDamage), Some(3))),
+    Skill((Sword(TsRegen), Some(2))),
 
     // Dash
-    Skill((Sword(DDamage), Some(1))),
-    Skill((Sword(DCost), Some(1))),
-    Skill((Sword(DDrain), Some(1))),
+    Skill((Sword(DDamage), Some(2))),
+    Skill((Sword(DCost), Some(2))),
+    Skill((Sword(DDrain), Some(2))),
 
     // Spin of death
     Skill((Sword(UnlockSpin), None)),
-    Skill((Sword(SDamage), Some(2))),
-    Skill((Sword(SCost), Some(2))),
+    Skill((Sword(SDamage), Some(1))),
+    Skill((Sword(SCost), Some(1))),
 ])
diff --git a/assets/common/skillset/dungeon/tier-4/enemy.ron b/assets/common/skillset/dungeon/tier-4/enemy.ron
index 937fa30b79..9e7acf32ef 100644
--- a/assets/common/skillset/dungeon/tier-4/enemy.ron
+++ b/assets/common/skillset/dungeon/tier-4/enemy.ron
@@ -1,4 +1,5 @@
 ([
     //You can always add more :P
     Tree("common.skillset.preset.max.bow"),
+    Tree("common.skillset.preset.max.staff"),
 ])
\ No newline at end of file

From 3debaf2ded880c8b06d9cea816fe730d95617d31 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:41:21 +0100
Subject: [PATCH 24/39] + All bosses ranging from T0 to T3 have a ~4% chance of
 dropping equipment one tier higher than normal, while having a ~1.7% chance
 to drop equipment even higher than that. + All chests have a ~2% chance to
 drop better equipment than their tier.

---
 .../common/loot_tables/dungeon/tier-0/boss.ron   | 11 +++++++----
 .../common/loot_tables/dungeon/tier-0/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-1/boss.ron   | 11 ++++++++---
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-2/boss.ron   |  5 +++++
 .../common/loot_tables/dungeon/tier-2/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-3/boss.ron   | 11 ++++++++---
 .../common/loot_tables/dungeon/tier-3/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-4/chest.ron  |  2 ++
 9 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 85a4617e48..1bb03d88e5 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -1,8 +1,11 @@
 [
     // Weapons
-    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
     // Armor
-    (2.0, LootTable("common.loot_tables.armor.tier-0")),
-    (1.0, Item("common.items.armor.misc.neck.scratched")),
-    (0.5, Item("common.items.armor.misc.head.straw")),
+    (4.0, LootTable("common.loot_tables.armor.tier-0")),
+    (0.5, LootTable("common.loot_tables.armor.tier-1")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.scratched")),
+    (1.0, Item("common.items.armor.misc.head.straw")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 4f7a653e59..82b3f709f2 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (1.0, LootTable("common.loot_tables.armor.tier-0")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (2.0, LootTable("common.loot_tables.armor.tier-0")),
+    (0.5, LootTable("common.loot_tables.armor.tier-1")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 4135deb1e3..42a726c9c2 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -1,7 +1,12 @@
 [
     // Weapons
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
+    (0.2, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
-    (1.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
+    (4.0, LootTable("common.loot_tables.armor.tier-1")),
+    (0.5, LootTable("common.loot_tables.armor.tier-2")),
+    (0.2, LootTable("common.loot_tables.armor.tier-3")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index 4bba161714..af7696a0a6 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,14 +1,16 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (2.0, LootTable("common.loot_tables.armor.tier-1")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
+    (0.5, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, Item("common.items.armor.misc.head.hog_hood")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 0cf6b9164a..2a17415144 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -2,6 +2,11 @@
     // Equipment
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
     (5.0, LootTable("common.loot_tables.armor.tier-2")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-3")),
+    (0.2, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.2, LootTable("common.loot_tables.armor.tier-4")),
+    // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
     (1.0, Item("common.items.armor.misc.bag.heavy_seabag")),
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index a0c0557b60..23312096f2 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (1.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (2.0, LootTable("common.loot_tables.armor.tier-2")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index a36c830209..826e181f03 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,7 +1,12 @@
 [
     // Weapons
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.2, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.3, Item("common.items.armor.misc.neck.haniwa_talisman")),
+    (4.0, LootTable("common.loot_tables.armor.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-4")),
+    (0.2, LootTable("common.loot_tables.armor.tier-2")),
+    // Misc
+    (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index cae94ddc30..8f92fd9427 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (2.0, LootTable("common.loot_tables.armor.tier-3")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.5, LootTable("common.loot_tables.armor.tier-4")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron
index 06b6965324..0bf234eccf 100644
--- a/assets/common/loot_tables/dungeon/tier-4/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron
@@ -2,6 +2,8 @@
     // Gear
     (1.0, LootTable("common.loot_tables.weapons.tier-4")),
     (1.0, LootTable("common.loot_tables.armor.tier-4")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-5")),
+    (0.5, LootTable("common.loot_tables.armor.tier-5")),
     (3.0, Item("common.items.armor.misc.head.spikeguard")),
     // Currency
     (3.0, ItemQuantity("common.items.utility.coins", 200, 500)),

From 9e28d889aff71791d8f67890fb64382f96efb520 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:56:41 +0100
Subject: [PATCH 25/39] + Lowered drop rate of extra extra tier armor and
 weapons from ~1.7% to ~0.8% + Organized T2 boss ron

---
 assets/common/loot_tables/dungeon/tier-1/boss.ron |  4 ++--
 assets/common/loot_tables/dungeon/tier-2/boss.ron |  9 +++++----
 assets/common/loot_tables/dungeon/tier-3/boss.ron | 12 ++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 42a726c9c2..5f63d6e35f 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -2,11 +2,11 @@
     // Weapons
     (4.0, LootTable("common.loot_tables.weapons.tier-1")),
     (0.5, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.2, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.1, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
     (4.0, LootTable("common.loot_tables.armor.tier-1")),
     (0.5, LootTable("common.loot_tables.armor.tier-2")),
-    (0.2, LootTable("common.loot_tables.armor.tier-3")),
+    (0.1, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 2a17415144..75ab36d706 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -1,11 +1,12 @@
 [
-    // Equipment
+    // Weapons
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (5.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.1, LootTable("common.loot_tables.weapons.tier-4")),
+    // Armor
+    (5.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, LootTable("common.loot_tables.armor.tier-3")),
-    (0.2, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.2, LootTable("common.loot_tables.armor.tier-4")),
+    (0.1, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index 826e181f03..f2417530a1 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,12 +1,12 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.2, LootTable("common.loot_tables.weapons.tier-5")),
+    (3.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.5, LootTable("common.loot_tables.armor.tier-4")),
-    (0.2, LootTable("common.loot_tables.armor.tier-2")),
+    (3.0, LootTable("common.loot_tables.armor.tier-3")),
+    (1.0, LootTable("common.loot_tables.armor.tier-4")),
+    (0.5, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file

From 90f29ce277cd226ef125e18ffc9ef507b0c8b29c Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:56:41 +0100
Subject: [PATCH 26/39] + Made sure that abilities in staff simple match
 abilities in the staff skillset. + If anything happened to chests then no
 more! (Don't question it) + Bosses have a ~4% chance to drop higher tiered
 gear + Organized T2 boss ron

---
 .../common/loot_tables/dungeon/tier-0/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-1/boss.ron   |  2 --
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-2/boss.ron   |  2 --
 .../common/loot_tables/dungeon/tier-2/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-3/boss.ron   |  2 --
 .../common/loot_tables/dungeon/tier-3/chest.ron  | 16 +++++++---------
 assets/common/skillset/dungeon/tier-1/bow.ron    |  2 --
 assets/common/skillset/dungeon/tier-2/bow.ron    |  6 +-----
 assets/common/skillset/dungeon/tier-2/staff.ron  |  2 --
 assets/common/skillset/dungeon/tier-3/bow.ron    | 13 +------------
 assets/common/skillset/dungeon/tier-3/staff.ron  | 12 +++---------
 12 files changed, 33 insertions(+), 72 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 82b3f709f2..4f7a653e59 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (2.0, LootTable("common.loot_tables.armor.tier-0")),
-    (0.5, LootTable("common.loot_tables.armor.tier-1")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (1.0, LootTable("common.loot_tables.armor.tier-0")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 5f63d6e35f..4c1381707a 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -2,11 +2,9 @@
     // Weapons
     (4.0, LootTable("common.loot_tables.weapons.tier-1")),
     (0.5, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.1, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
     (4.0, LootTable("common.loot_tables.armor.tier-1")),
     (0.5, LootTable("common.loot_tables.armor.tier-2")),
-    (0.1, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index af7696a0a6..4bba161714 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,16 +1,14 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (2.0, LootTable("common.loot_tables.armor.tier-1")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.5, LootTable("common.loot_tables.armor.tier-2")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.armor.tier-1")),
     (0.5, Item("common.items.armor.misc.head.hog_hood")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 75ab36d706..5d7073558e 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -2,11 +2,9 @@
     // Weapons
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
     (0.5, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.1, LootTable("common.loot_tables.weapons.tier-4")),
     // Armor
     (5.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, LootTable("common.loot_tables.armor.tier-3")),
-    (0.1, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index 23312096f2..a0c0557b60 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (2.0, LootTable("common.loot_tables.armor.tier-2")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.5, LootTable("common.loot_tables.armor.tier-3")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (1.0, LootTable("common.loot_tables.armor.tier-2")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index f2417530a1..45d78dfa20 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -2,11 +2,9 @@
     // Weapons
     (3.0, LootTable("common.loot_tables.weapons.tier-3")),
     (1.0, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
     (3.0, LootTable("common.loot_tables.armor.tier-3")),
     (1.0, LootTable("common.loot_tables.armor.tier-4")),
-    (0.5, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index 8f92fd9427..cae94ddc30 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -1,15 +1,13 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (2.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
-    (0.5, LootTable("common.loot_tables.armor.tier-4")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (1.0, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/skillset/dungeon/tier-1/bow.ron b/assets/common/skillset/dungeon/tier-1/bow.ron
index 53f1155a57..521acd6260 100644
--- a/assets/common/skillset/dungeon/tier-1/bow.ron
+++ b/assets/common/skillset/dungeon/tier-1/bow.ron
@@ -7,6 +7,4 @@
     Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(1))),
 ])
diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron
index 7a87349fa6..369bb83f81 100644
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ b/assets/common/skillset/dungeon/tier-2/bow.ron
@@ -4,12 +4,8 @@
     // Charged
     Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
-    Skill((Bow(CSpeed), Some(1))),
+    Skill((Bow(CSpeed), Some(2))),
     Skill((Bow(CMove), Some(1))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(2))),
-    Skill((Bow(RCost), Some(2))),
-    Skill((Bow(RSpeed), Some(1))),
 ])
 
diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/dungeon/tier-2/staff.ron
index 30eedf312e..ce6f3ea287 100644
--- a/assets/common/skillset/dungeon/tier-2/staff.ron
+++ b/assets/common/skillset/dungeon/tier-2/staff.ron
@@ -9,7 +9,5 @@
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(2))),
-    Skill((Staff(FDrain), Some(1))),
-    Skill((Staff(FVelocity), Some(1))),
 
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron
index bef5d56116..50ee426093 100644
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ b/assets/common/skillset/dungeon/tier-3/bow.ron
@@ -2,21 +2,10 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(3))),
+    Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CRegen), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(2))),
     Skill((Bow(CMove), Some(2))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(2))),
-    Skill((Bow(RCost), Some(2))),
-    Skill((Bow(RSpeed), Some(2))),
-
-    // Shotgun
-    Skill((Bow(UnlockShotgun), None)),
-    Skill((Bow(SDamage), Some(1))),
-    Skill((Bow(SSpread), Some(1))),
-    Skill((Bow(SArrows), Some(1))),
-    Skill((Bow(SCost), Some(1))),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/dungeon/tier-3/staff.ron
index 2a9405874d..d5e92082fa 100644
--- a/assets/common/skillset/dungeon/tier-3/staff.ron
+++ b/assets/common/skillset/dungeon/tier-3/staff.ron
@@ -2,20 +2,14 @@
     Group(Weapon(Staff)),
 
     // Fireball
-    Skill((Staff(BDamage), Some(3))),
+    Skill((Staff(BDamage), Some(2))),
     Skill((Staff(BRegen), Some(2))),
-    Skill((Staff(BRadius), Some(3))),
+    Skill((Staff(BRadius), Some(2))),
 
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(3))),
     Skill((Staff(FDrain), Some(2))),
-    Skill((Staff(FVelocity), Some(2))),
+    Skill((Staff(FVelocity), Some(1))),
 
-    // Shockwave
-    Skill((Staff(UnlockShockwave), None)),
-    Skill((Staff(SDamage), Some(1))),
-    Skill((Staff(SKnockback), Some(1))),
-    Skill((Staff(SRange), Some(1))),
-    Skill((Staff(SCost), Some(1))),
 ])
\ No newline at end of file

From 34d3cc836e647a79fda54a125a7517496b1497aa Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Mon, 8 Nov 2021 23:05:28 +0100
Subject: [PATCH 27/39] + Adjusted damage, crit chance, and attack speed of
 weapons + Adjusted boss and chest loot table to match it's new intended tier
 of difficulty while providing an intermediate stage for new players to
 explore between T0(T1) and T1(T2)

---
 .../biped_small/adlet/chest/adlet_bow.ron        |  2 +-
 .../biped_small/haniwa/chest/haniwa.ron          |  2 +-
 .../npc_armor/biped_small/haniwa/foot/haniwa.ron |  2 +-
 .../npc_armor/biped_small/haniwa/hand/haniwa.ron |  2 +-
 .../npc_armor/biped_small/haniwa/head/haniwa.ron |  2 +-
 .../biped_small/haniwa/pants/haniwa.ron          |  2 +-
 .../biped_small/sahagin/chest/sahagin.ron        |  2 +-
 .../biped_small/sahagin/foot/sahagin.ron         |  2 +-
 .../biped_small/sahagin/hand/sahagin.ron         |  2 +-
 .../biped_small/sahagin/head/sahagin.ron         |  2 +-
 .../biped_small/sahagin/pants/sahagin.ron        |  2 +-
 .../biped_small/sahagin/tail/sahagin.ron         |  2 +-
 .../npc_weapons/biped_small/adlet/adlet_bow.ron  |  4 ++--
 .../biped_small/adlet/gnoll_staff.ron            |  4 ++--
 .../biped_small/adlet/wooden_spear.ron           |  2 +-
 .../biped_small/gnarling/adlet_bow.ron           |  4 ++--
 .../biped_small/gnarling/gnoll_staff.ron         |  4 ++--
 .../biped_small/gnarling/wooden_spear.ron        |  2 +-
 .../npc_weapons/biped_small/haniwa/adlet_bow.ron |  4 ++--
 .../biped_small/haniwa/gnoll_staff.ron           |  4 ++--
 .../biped_small/haniwa/wooden_spear.ron          |  2 +-
 .../biped_small/sahagin/adlet_bow.ron            |  6 +++---
 .../biped_small/sahagin/gnoll_staff.ron          |  4 ++--
 .../biped_small/sahagin/wooden_spear.ron         |  4 ++--
 .../common/loot_tables/dungeon/tier-0/boss.ron   | 16 ++++++++++------
 .../common/loot_tables/dungeon/tier-0/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-1/boss.ron   |  8 ++++----
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-2/boss.ron   |  8 ++++----
 .../common/loot_tables/dungeon/tier-2/chest.ron  | 16 +++++++++-------
 .../common/loot_tables/dungeon/tier-3/boss.ron   |  8 ++++----
 .../common/loot_tables/dungeon/tier-3/chest.ron  | 16 +++++++++-------
 32 files changed, 92 insertions(+), 80 deletions(-)

diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
index e1ce60d709..8fdfc77329 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(14.0),
             poise_resilience: Normal(2.0),
-            energy_max: 5.4,
+            energy_max: 4.4,
             energy_reward: 0.054,
             crit_power: 0.05,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index cba7224047..f7c2400300 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(38.0),
             poise_resilience: Normal(5.0),
-            energy_max: 10.8,
+            energy_max: 5.0,
             energy_reward: 0.108,
             crit_power: 0.1,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index 5f6a8b3d7b..eebdb949c6 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
-            energy_max: 3.6,
+            energy_max: 5.0,
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index 7ea532be0e..a73b06e8c0 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
-            energy_max: 3.6,
+            energy_max: 5.0,
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index cf83a16610..53753c9e89 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
-            energy_max: 7.2,
+            energy_max: 5.0,
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index 39b49cca7e..d8deeeb3bb 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
-            energy_max: 7.2,
+            energy_max: 5.0,
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
index 0f8ba2150b..dbc76fd21a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(26.0),
             poise_resilience: Normal(4.0),
-            energy_max: 8.1,
+            energy_max: 3.4,
             energy_reward: 0.81,
             crit_power: 0.075,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
index 4e0e07828a..6e679be98a 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
-            energy_max: 2.7,
+            energy_max: 3.4,
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
index 7464e4e212..3606ca4783 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
-            energy_max: 2.7,
+            energy_max: 3.4,
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
index 749b539a71..a5d7099154 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
-            energy_max: 5.4,
+            energy_max: 3.4,
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
index b6872fb831..f9a1b9d51c 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
-            energy_max: 5.4,
+            energy_max: 3.4,
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
index 208dd4d65e..368ae49a5e 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@@ -6,7 +6,7 @@ ItemDef(
         stats: (
             protection: Normal(5.0),
             poise_resilience: Normal(4.0),
-            energy_max: 1.2,
+            energy_max: 3.4,
             energy_reward: 0.015,
             crit_power: 0.012,
             stealth: 0.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index b7968b73c6..430e84fee7 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.7,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 07a5270aa1..4588d5c1e2 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.6,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
index c27a4282d8..7ea0f637f2 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.07589286,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index d2e4d1bb68..f3a87da8b1 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,8 +8,8 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.5,
-            crit_chance: 0.26764706,
+            speed: 0.6,
+            crit_chance: 0.13541667,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index de4c29dcf7..226837bf9f 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,8 +8,8 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.6,
-            crit_chance: 0.12037037,
+            speed: 0.5,
+            crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
index 8aa201d533..db58f5bacb 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron
@@ -9,7 +9,7 @@ ItemDef(
             power: 0.3,
             effect_power: 1.0,
             speed: 1.0,
-            crit_chance: 0.13541667,
+            crit_chance: 0.12037037,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index fa52c9d190..b480970b4f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.05625,
+            crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 1738ed4117..fe5268388f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.036458332,
+            crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
index 1d22fef7e0..6bbadb8173 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.05357143,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 715c199007..5c44dfa272 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.3,
+            power: 1.2,
             effect_power: 0.8,
-            speed: 0.8,
-            crit_chance: 0.066083916,
+            speed: 0.9,
+            crit_chance: 0.05965909,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
index 1990b82fde..fe69702d5a 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.3,
+            power: 1.2,
             effect_power: 0.8,
             speed: 0.8,
-            crit_chance: 0.053030305,
+            crit_chance: 0.066083916,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
index 21d7badeb8..cfa87de675 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron
@@ -6,10 +6,10 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.3,
+            power: 1.2,
             effect_power: 1.0,
             speed: 1.0,
-            crit_chance: 0.05965909,
+            crit_chance: 0.053030305,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 1bb03d88e5..7d5dd6cfff 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -1,11 +1,15 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-1")),
+    (5.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-0")),
-    (0.5, LootTable("common.loot_tables.armor.tier-1")),
+    (5.0, LootTable("common.loot_tables.armor.tier-0")),
+    (2.0, LootTable("common.loot_tables.armor.tier-1")),
     // Misc
-    (2.0, Item("common.items.armor.misc.neck.scratched")),
-    (1.0, Item("common.items.armor.misc.head.straw")),
+    (3.0, Item("common.items.armor.misc.neck.scratched")),
+    (2.0, Item("common.items.armor.misc.head.straw")),
+    // Indirect crafting materials for T2 gear
+    (1.0, ItemQuantity("common.items.craftin_ing.sticky_thread", 2, 5)),
+    (1.0, ItemQuantity("common.items.mineral.coal", 2, 5)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.leather_strips", 2, 5)),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 4f7a653e59..0e6fee696c 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (1.0, LootTable("common.loot_tables.armor.tier-0")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-0")),
+    (2.0, LootTable("common.loot_tables.armor.tier-0")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.armor.tier-1")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index 4c1381707a..c9218cda4b 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -1,10 +1,10 @@
 [
     // Weapons
-    (4.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-2")),
+    (4.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (2.5, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
-    (4.0, LootTable("common.loot_tables.armor.tier-1")),
-    (0.5, LootTable("common.loot_tables.armor.tier-2")),
+    (4.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.5, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index 4bba161714..422288308d 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,14 +1,16 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (1.0, LootTable("common.loot_tables.armor.tier-1")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (2.0, LootTable("common.loot_tables.armor.tier-1")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (1.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, Item("common.items.armor.misc.head.hog_hood")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 5d7073558e..14b546a5f9 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -1,10 +1,10 @@
 [
     // Weapons
-    (5.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-3")),
+    (5.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
     // Armor
-    (5.0, LootTable("common.loot_tables.armor.tier-2")),
-    (0.5, LootTable("common.loot_tables.armor.tier-3")),
+    (5.0, LootTable("common.loot_tables.armor.tier-3")),
+    (0.5, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index a0c0557b60..1e6f582b93 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (1.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-2")),
+    (2.0, LootTable("common.loot_tables.armor.tier-2")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (1.0, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index 45d78dfa20..89ca31fb5f 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,10 +1,10 @@
 [
     // Weapons
-    (3.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (3.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
-    (3.0, LootTable("common.loot_tables.armor.tier-3")),
-    (1.0, LootTable("common.loot_tables.armor.tier-4")),
+    (3.0, LootTable("common.loot_tables.armor.tier-4")),
+    (1.0, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index cae94ddc30..fae2e74d80 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -1,13 +1,15 @@
 [
     // Gear
-    (1.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (1.0, LootTable("common.loot_tables.armor.tier-3")),
+    (2.0, LootTable("common.loot_tables.weapons.tier-3")),
+    (2.0, LootTable("common.loot_tables.armor.tier-3")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-4")),
+    (1.0, LootTable("common.loot_tables.armor.tier-4")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]

From c1d318f7eed56d6a97044e6b59374b424bbeba55 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 9 Nov 2021 09:33:05 +0100
Subject: [PATCH 28/39] + Reducing attack speed of minions

---
 assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron | 2 +-
 .../common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron  | 2 +-
 .../common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron | 2 +-
 .../items/npc_weapons/biped_small/gnarling/gnoll_staff.ron      | 2 +-
 .../common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron   | 2 +-
 .../common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron | 2 +-
 .../common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron | 2 +-
 .../items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron      | 2 +-
 .../common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index 430e84fee7..e560436fe9 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.7,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.6,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 4588d5c1e2..f3e2191a33 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.7,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.7,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index f3a87da8b1..d927326c31 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.5,
             crit_chance: 0.13541667,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index 226837bf9f..d0e96ded3e 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 0.6,
             crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index b480970b4f..775f7bb67f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.6,
             effect_power: 0.8,
-            speed: 0.9,
+            speed: 0.7,
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index fe5268388f..5a2c62c527 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.6,
             effect_power: 0.8,
-            speed: 0.9,
+            speed: 0.8,
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
index 6d23956268..185f2d5f7e 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 2.0,
             effect_power: 0.8,
-            speed: 1.0,
+            speed: 0.8,
             crit_chance: 0.095454544,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
index fcb80cc7fb..ecbf99b510 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 2.0,
             effect_power: 0.8,
-            speed: 1.0,
+            speed: 0.9,
             crit_chance: 0.040873703,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 5c44dfa272..be326e45e2 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.2,
             effect_power: 0.8,
-            speed: 0.9,
+            speed: 0.7,
             crit_chance: 0.05965909,
             range: 1.0,
             energy_efficiency: 1.0,

From 518099b92c59fccb7957788d4e678d72f05e0347 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 9 Nov 2021 11:50:26 +0100
Subject: [PATCH 29/39] + Fixing spelling msitake in T0 Boss
 craftin_ing.sticky_thread to crafting_ing.sticky_thread

---
 assets/common/loot_tables/dungeon/tier-0/boss.ron | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 7d5dd6cfff..937f973a55 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -9,7 +9,7 @@
     (3.0, Item("common.items.armor.misc.neck.scratched")),
     (2.0, Item("common.items.armor.misc.head.straw")),
     // Indirect crafting materials for T2 gear
-    (1.0, ItemQuantity("common.items.craftin_ing.sticky_thread", 2, 5)),
+    (1.0, ItemQuantity("common.items.crafting_ing.sticky_thread", 2, 5)),
     (1.0, ItemQuantity("common.items.mineral.coal", 2, 5)),
     (1.0, ItemQuantity("common.items.crafting_ing.leather.leather_strips", 2, 5)),
 ]
\ No newline at end of file

From e69a6b82dc96ab84f6718db53c0833e69db576ef Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Wed, 3 Nov 2021 00:37:59 +0100
Subject: [PATCH 30/39] + Updating item_image_manifest to Master (was behind)

---
 assets/voxygen/item_image_manifest.ron | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index db22621cb1..33a851146f 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //  Png(specifier),
 //  Vox(specier),
 //  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)

From 1b1fee4f0b09a6b3bcad1ae63c6aa8626dd1180a Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Wed, 3 Nov 2021 00:40:02 +0100
Subject: [PATCH 31/39] + Updating item_image_manifest to Master (was behind)

---
 assets/voxygen/item_image_manifest.ron | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron
index 33a851146f..db22621cb1 100644
--- a/assets/voxygen/item_image_manifest.ron
+++ b/assets/voxygen/item_image_manifest.ron
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //  Png(specifier),
 //  Vox(specier),
 //  VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom)

From 0461178cd8c38f2175762ca0f446a73980f4acca Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sat, 6 Nov 2021 17:45:02 +0100
Subject: [PATCH 32/39] + Gnarling armor count - 7 previous being 7 + Adlet-bow
 armor count - 39 previous being 62 + Sahagin armor count - 71 previous being
 88 + Haniwa armor count - 96 previous being 91 + Myrmidon armor count - 152
 previous being 161 + Although an overall decrease in armor there's an
 increase in poise res, crit power, energy, and other stats. + Gave everything
 staff an ability set in skillset, and linked them all

---
 .../npc_armor/biped_small/adlet/chest/adlet_bow.ron |  4 ++++
 .../npc_armor/biped_small/haniwa/chest/haniwa.ron   |  4 ++++
 .../npc_armor/biped_small/haniwa/foot/haniwa.ron    |  4 ++++
 .../npc_armor/biped_small/haniwa/hand/haniwa.ron    |  4 ++++
 .../npc_armor/biped_small/haniwa/head/haniwa.ron    |  4 ++++
 .../npc_armor/biped_small/haniwa/pants/haniwa.ron   |  4 ++++
 .../npc_armor/biped_small/sahagin/chest/sahagin.ron |  4 ++++
 .../npc_armor/biped_small/sahagin/foot/sahagin.ron  |  4 ++++
 .../npc_armor/biped_small/sahagin/hand/sahagin.ron  |  4 ++++
 .../npc_armor/biped_small/sahagin/head/sahagin.ron  |  4 ++++
 .../npc_armor/biped_small/sahagin/pants/sahagin.ron |  4 ++++
 .../npc_armor/biped_small/sahagin/tail/sahagin.ron  |  4 ++++
 .../npc_weapons/biped_small/adlet/adlet_bow.ron     |  2 +-
 .../npc_weapons/biped_small/adlet/gnoll_staff.ron   |  2 +-
 .../npc_weapons/biped_small/adlet/wooden_spear.ron  |  2 +-
 .../npc_weapons/biped_small/gnarling/adlet_bow.ron  |  2 +-
 .../biped_small/gnarling/gnoll_staff.ron            |  2 +-
 .../npc_weapons/biped_small/haniwa/adlet_bow.ron    |  2 +-
 assets/common/skillset/dungeon/tier-2/bow.ron       |  6 +++++-
 assets/common/skillset/dungeon/tier-2/staff.ron     |  2 ++
 assets/common/skillset/dungeon/tier-3/bow.ron       | 13 ++++++++++++-
 assets/common/skillset/dungeon/tier-3/staff.ron     | 12 +++++++++---
 22 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
index 8fdfc77329..b1584492bb 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(14.0),
             poise_resilience: Normal(2.0),
+<<<<<<< HEAD
             energy_max: 4.4,
+=======
+            energy_max: 5.4,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.054,
             crit_power: 0.05,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index f7c2400300..0dac431a0d 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(38.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
             energy_max: 5.0,
+=======
+            energy_max: 10.8,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.108,
             crit_power: 0.1,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index eebdb949c6..ad3a5054fc 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
             energy_max: 5.0,
+=======
+            energy_max: 3.6,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index a73b06e8c0..105a6a0cb0 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
             energy_max: 5.0,
+=======
+            energy_max: 3.6,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index 53753c9e89..8e9770c5fb 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
             energy_max: 5.0,
+=======
+            energy_max: 7.2,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index d8deeeb3bb..a61242a2f0 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
             energy_max: 5.0,
+=======
+            energy_max: 7.2,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
index dbc76fd21a..aa359f17f4 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(26.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
             energy_max: 3.4,
+=======
+            energy_max: 8.1,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.81,
             crit_power: 0.075,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
index 6e679be98a..fed5425874 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
             energy_max: 3.4,
+=======
+            energy_max: 2.7,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
index 3606ca4783..27828f84e7 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
             energy_max: 3.4,
+=======
+            energy_max: 2.7,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
index a5d7099154..50eae4c203 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
             energy_max: 3.4,
+=======
+            energy_max: 5.4,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
index f9a1b9d51c..3758b32b97 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
             energy_max: 3.4,
+=======
+            energy_max: 5.4,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
index 368ae49a5e..7693d4b6a2 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@@ -6,7 +6,11 @@ ItemDef(
         stats: (
             protection: Normal(5.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
             energy_max: 3.4,
+=======
+            energy_max: 1.2,
+>>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
             energy_reward: 0.015,
             crit_power: 0.012,
             stealth: 0.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index e560436fe9..b7968b73c6 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 0.8,
             speed: 0.6,
             crit_chance: 0.08406594,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index f3e2191a33..07a5270aa1 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 0.8,
             speed: 0.7,
             crit_chance: 0.05059524,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
index 7ea0f637f2..c27a4282d8 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.7,
+            power: 0.8,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.07589286,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index d927326c31..d2e4d1bb68 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -9,7 +9,7 @@ ItemDef(
             power: 0.3,
             effect_power: 0.8,
             speed: 0.5,
-            crit_chance: 0.13541667,
+            crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index d0e96ded3e..de4c29dcf7 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -9,7 +9,7 @@ ItemDef(
             power: 0.3,
             effect_power: 0.8,
             speed: 0.6,
-            crit_chance: 0.26764706,
+            crit_chance: 0.12037037,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index 775f7bb67f..2b9cf3c98c 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.6,
+            power: 1.8,
             effect_power: 0.8,
             speed: 0.7,
             crit_chance: 0.043827,
diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron
index 369bb83f81..7a87349fa6 100644
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ b/assets/common/skillset/dungeon/tier-2/bow.ron
@@ -4,8 +4,12 @@
     // Charged
     Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
-    Skill((Bow(CSpeed), Some(2))),
+    Skill((Bow(CSpeed), Some(1))),
     Skill((Bow(CMove), Some(1))),
 
+    // Repeater
+    Skill((Bow(RDamage), Some(2))),
+    Skill((Bow(RCost), Some(2))),
+    Skill((Bow(RSpeed), Some(1))),
 ])
 
diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/dungeon/tier-2/staff.ron
index ce6f3ea287..30eedf312e 100644
--- a/assets/common/skillset/dungeon/tier-2/staff.ron
+++ b/assets/common/skillset/dungeon/tier-2/staff.ron
@@ -9,5 +9,7 @@
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(2))),
+    Skill((Staff(FDrain), Some(1))),
+    Skill((Staff(FVelocity), Some(1))),
 
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron
index 50ee426093..bef5d56116 100644
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ b/assets/common/skillset/dungeon/tier-3/bow.ron
@@ -2,10 +2,21 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(2))),
+    Skill((Bow(CDamage), Some(3))),
     Skill((Bow(CRegen), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(2))),
     Skill((Bow(CMove), Some(2))),
 
+    // Repeater
+    Skill((Bow(RDamage), Some(2))),
+    Skill((Bow(RCost), Some(2))),
+    Skill((Bow(RSpeed), Some(2))),
+
+    // Shotgun
+    Skill((Bow(UnlockShotgun), None)),
+    Skill((Bow(SDamage), Some(1))),
+    Skill((Bow(SSpread), Some(1))),
+    Skill((Bow(SArrows), Some(1))),
+    Skill((Bow(SCost), Some(1))),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/dungeon/tier-3/staff.ron
index d5e92082fa..2a9405874d 100644
--- a/assets/common/skillset/dungeon/tier-3/staff.ron
+++ b/assets/common/skillset/dungeon/tier-3/staff.ron
@@ -2,14 +2,20 @@
     Group(Weapon(Staff)),
 
     // Fireball
-    Skill((Staff(BDamage), Some(2))),
+    Skill((Staff(BDamage), Some(3))),
     Skill((Staff(BRegen), Some(2))),
-    Skill((Staff(BRadius), Some(2))),
+    Skill((Staff(BRadius), Some(3))),
 
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(3))),
     Skill((Staff(FDrain), Some(2))),
-    Skill((Staff(FVelocity), Some(1))),
+    Skill((Staff(FVelocity), Some(2))),
 
+    // Shockwave
+    Skill((Staff(UnlockShockwave), None)),
+    Skill((Staff(SDamage), Some(1))),
+    Skill((Staff(SKnockback), Some(1))),
+    Skill((Staff(SRange), Some(1))),
+    Skill((Staff(SCost), Some(1))),
 ])
\ No newline at end of file

From b92d104ca0a677feb5f3be21117ce3b845f11e43 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sun, 7 Nov 2021 11:56:41 +0100
Subject: [PATCH 33/39] + Made sure that abilities in staff simple match
 abilities in the staff skillset. + If anything happened to chests then no
 more! (Don't question it) + Bosses have a ~4% chance to drop higher tiered
 gear + Organized T2 boss ron

---
 assets/common/loot_tables/dungeon/tier-0/chest.ron | 10 +++++-----
 assets/common/loot_tables/dungeon/tier-1/chest.ron | 10 +++++-----
 assets/common/loot_tables/dungeon/tier-2/chest.ron | 10 +++++-----
 assets/common/loot_tables/dungeon/tier-3/chest.ron | 10 +++++-----
 assets/common/skillset/dungeon/tier-2/bow.ron      |  6 +-----
 assets/common/skillset/dungeon/tier-2/staff.ron    |  2 --
 assets/common/skillset/dungeon/tier-3/bow.ron      | 13 +------------
 assets/common/skillset/dungeon/tier-3/staff.ron    | 12 +++---------
 8 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 0e6fee696c..8c2d95a94b 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -5,11 +5,11 @@
     (1.0, LootTable("common.loot_tables.weapons.tier-1")),
     (1.0, LootTable("common.loot_tables.armor.tier-1")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index 422288308d..1ce2682e47 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -6,11 +6,11 @@
     (1.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, Item("common.items.armor.misc.head.hog_hood")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index 1e6f582b93..37a023898c 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -5,11 +5,11 @@
     (1.0, LootTable("common.loot_tables.weapons.tier-3")),
     (1.0, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index fae2e74d80..33bc1a208e 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -5,11 +5,11 @@
     (1.0, LootTable("common.loot_tables.weapons.tier-4")),
     (1.0, LootTable("common.loot_tables.armor.tier-4")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.moderate")),
+    (2.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron
index 7a87349fa6..369bb83f81 100644
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ b/assets/common/skillset/dungeon/tier-2/bow.ron
@@ -4,12 +4,8 @@
     // Charged
     Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
-    Skill((Bow(CSpeed), Some(1))),
+    Skill((Bow(CSpeed), Some(2))),
     Skill((Bow(CMove), Some(1))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(2))),
-    Skill((Bow(RCost), Some(2))),
-    Skill((Bow(RSpeed), Some(1))),
 ])
 
diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/dungeon/tier-2/staff.ron
index 30eedf312e..ce6f3ea287 100644
--- a/assets/common/skillset/dungeon/tier-2/staff.ron
+++ b/assets/common/skillset/dungeon/tier-2/staff.ron
@@ -9,7 +9,5 @@
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(2))),
-    Skill((Staff(FDrain), Some(1))),
-    Skill((Staff(FVelocity), Some(1))),
 
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron
index bef5d56116..50ee426093 100644
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ b/assets/common/skillset/dungeon/tier-3/bow.ron
@@ -2,21 +2,10 @@
     Group(Weapon(Bow)),
 
     // Charged
-    Skill((Bow(CDamage), Some(3))),
+    Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CRegen), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
     Skill((Bow(CSpeed), Some(2))),
     Skill((Bow(CMove), Some(2))),
 
-    // Repeater
-    Skill((Bow(RDamage), Some(2))),
-    Skill((Bow(RCost), Some(2))),
-    Skill((Bow(RSpeed), Some(2))),
-
-    // Shotgun
-    Skill((Bow(UnlockShotgun), None)),
-    Skill((Bow(SDamage), Some(1))),
-    Skill((Bow(SSpread), Some(1))),
-    Skill((Bow(SArrows), Some(1))),
-    Skill((Bow(SCost), Some(1))),
 ])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/dungeon/tier-3/staff.ron
index 2a9405874d..d5e92082fa 100644
--- a/assets/common/skillset/dungeon/tier-3/staff.ron
+++ b/assets/common/skillset/dungeon/tier-3/staff.ron
@@ -2,20 +2,14 @@
     Group(Weapon(Staff)),
 
     // Fireball
-    Skill((Staff(BDamage), Some(3))),
+    Skill((Staff(BDamage), Some(2))),
     Skill((Staff(BRegen), Some(2))),
-    Skill((Staff(BRadius), Some(3))),
+    Skill((Staff(BRadius), Some(2))),
 
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(3))),
     Skill((Staff(FDrain), Some(2))),
-    Skill((Staff(FVelocity), Some(2))),
+    Skill((Staff(FVelocity), Some(1))),
 
-    // Shockwave
-    Skill((Staff(UnlockShockwave), None)),
-    Skill((Staff(SDamage), Some(1))),
-    Skill((Staff(SKnockback), Some(1))),
-    Skill((Staff(SRange), Some(1))),
-    Skill((Staff(SCost), Some(1))),
 ])
\ No newline at end of file

From 10e6de3e8971a691a1ee3a347c98f4f8351b4744 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Mon, 8 Nov 2021 23:05:28 +0100
Subject: [PATCH 34/39] + Adjusted damage, crit chance, and attack speed of
 weapons + Adjusted boss and chest loot table to match it's new intended tier
 of difficulty while providing an intermediate stage for new players to
 explore between T0(T1) and T1(T2)

---
 .../npc_armor/biped_small/adlet/chest/adlet_bow.ron    |  4 ++++
 .../npc_armor/biped_small/haniwa/chest/haniwa.ron      |  4 ++++
 .../items/npc_armor/biped_small/haniwa/foot/haniwa.ron |  4 ++++
 .../items/npc_armor/biped_small/haniwa/hand/haniwa.ron |  4 ++++
 .../items/npc_armor/biped_small/haniwa/head/haniwa.ron |  4 ++++
 .../npc_armor/biped_small/haniwa/pants/haniwa.ron      |  4 ++++
 .../npc_armor/biped_small/sahagin/chest/sahagin.ron    |  4 ++++
 .../npc_armor/biped_small/sahagin/foot/sahagin.ron     |  4 ++++
 .../npc_armor/biped_small/sahagin/hand/sahagin.ron     |  4 ++++
 .../npc_armor/biped_small/sahagin/head/sahagin.ron     |  4 ++++
 .../npc_armor/biped_small/sahagin/pants/sahagin.ron    |  4 ++++
 .../npc_armor/biped_small/sahagin/tail/sahagin.ron     |  4 ++++
 .../items/npc_weapons/biped_small/adlet/adlet_bow.ron  |  4 ++--
 .../npc_weapons/biped_small/adlet/gnoll_staff.ron      |  4 ++--
 .../npc_weapons/biped_small/adlet/wooden_spear.ron     |  2 +-
 .../npc_weapons/biped_small/gnarling/adlet_bow.ron     |  4 ++--
 .../npc_weapons/biped_small/gnarling/gnoll_staff.ron   |  4 ++--
 .../items/npc_weapons/biped_small/haniwa/adlet_bow.ron |  6 +++++-
 .../npc_weapons/biped_small/haniwa/gnoll_staff.ron     |  4 ++++
 .../npc_weapons/biped_small/sahagin/adlet_bow.ron      |  4 ++++
 assets/common/loot_tables/dungeon/tier-0/chest.ron     | 10 +++++-----
 assets/common/loot_tables/dungeon/tier-1/chest.ron     | 10 +++++-----
 assets/common/loot_tables/dungeon/tier-2/chest.ron     | 10 +++++-----
 assets/common/loot_tables/dungeon/tier-3/chest.ron     | 10 +++++-----
 24 files changed, 90 insertions(+), 30 deletions(-)

diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
index b1584492bb..e7d2477d7f 100644
--- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
+++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(14.0),
             poise_resilience: Normal(2.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 4.4,
 =======
             energy_max: 5.4,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 4.4,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.054,
             crit_power: 0.05,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index 0dac431a0d..292bed528e 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(38.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 5.0,
 =======
             energy_max: 10.8,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 5.0,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.108,
             crit_power: 0.1,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index ad3a5054fc..92ba62bb55 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 5.0,
 =======
             energy_max: 3.6,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 5.0,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index 105a6a0cb0..a1ee9e2f88 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(10.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 5.0,
 =======
             energy_max: 3.6,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 5.0,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.036,
             crit_power: 0.032,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index 8e9770c5fb..a72a31b1e6 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 5.0,
 =======
             energy_max: 7.2,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 5.0,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index a61242a2f0..55e62f4a92 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(19.0),
             poise_resilience: Normal(5.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 5.0,
 =======
             energy_max: 7.2,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 5.0,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.08,
             crit_power: 0.064,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
index aa359f17f4..9751c9c36f 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(26.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 3.4,
 =======
             energy_max: 8.1,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 3.4,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.81,
             crit_power: 0.075,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
index fed5425874..06da3b66e3 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 3.4,
 =======
             energy_max: 2.7,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 3.4,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
index 27828f84e7..3f705ceb47 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(7.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 3.4,
 =======
             energy_max: 2.7,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 3.4,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.027,
             crit_power: 0.024,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
index 50eae4c203..826ab044e4 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 3.4,
 =======
             energy_max: 5.4,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 3.4,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
index 3758b32b97..d9fec1e6bb 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(13.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 3.4,
 =======
             energy_max: 5.4,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 3.4,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.06,
             crit_power: 0.048,
             stealth: 0.0,
diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
index 7693d4b6a2..eef2995a8e 100644
--- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
+++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron
@@ -6,11 +6,15 @@ ItemDef(
         stats: (
             protection: Normal(5.0),
             poise_resilience: Normal(4.0),
+<<<<<<< HEAD
 <<<<<<< HEAD
             energy_max: 3.4,
 =======
             energy_max: 1.2,
 >>>>>>> a192bc0cf (+ Gnarling armor count - 7 previous being 7)
+=======
+            energy_max: 3.4,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             energy_reward: 0.015,
             crit_power: 0.012,
             stealth: 0.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index b7968b73c6..430e84fee7 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.7,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 07a5270aa1..4588d5c1e2 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.6,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
index c27a4282d8..7ea0f637f2 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron
@@ -6,7 +6,7 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 0.8,
+            power: 0.7,
             effect_power: 1.0,
             speed: 1.0,
             crit_chance: 0.07589286,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index d2e4d1bb68..f3a87da8b1 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,8 +8,8 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.5,
-            crit_chance: 0.26764706,
+            speed: 0.6,
+            crit_chance: 0.13541667,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index de4c29dcf7..226837bf9f 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,8 +8,8 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.6,
-            crit_chance: 0.12037037,
+            speed: 0.5,
+            crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index 2b9cf3c98c..05e4841754 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -6,9 +6,13 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.0,
-            power: 1.8,
+            power: 1.6,
             effect_power: 0.8,
+<<<<<<< HEAD
             speed: 0.7,
+=======
+            speed: 0.9,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 5a2c62c527..f3e0c2bdd7 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -8,7 +8,11 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.6,
             effect_power: 0.8,
+<<<<<<< HEAD
             speed: 0.8,
+=======
+            speed: 0.9,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index be326e45e2..d8601fbf77 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -8,7 +8,11 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.2,
             effect_power: 0.8,
+<<<<<<< HEAD
             speed: 0.7,
+=======
+            speed: 0.9,
+>>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             crit_chance: 0.05965909,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/loot_tables/dungeon/tier-0/chest.ron b/assets/common/loot_tables/dungeon/tier-0/chest.ron
index 8c2d95a94b..0e6fee696c 100644
--- a/assets/common/loot_tables/dungeon/tier-0/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/chest.ron
@@ -5,11 +5,11 @@
     (1.0, LootTable("common.loot_tables.weapons.tier-1")),
     (1.0, LootTable("common.loot_tables.armor.tier-1")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 10, 20)),
+    (6.0, ItemQuantity("common.items.utility.coins", 10, 20)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.linen", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.simple_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.bronze", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index 1ce2682e47..422288308d 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -6,11 +6,11 @@
     (1.0, LootTable("common.loot_tables.armor.tier-2")),
     (0.5, Item("common.items.armor.misc.head.hog_hood")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.poor")),
+    (4.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-2/chest.ron b/assets/common/loot_tables/dungeon/tier-2/chest.ron
index 37a023898c..1e6f582b93 100644
--- a/assets/common/loot_tables/dungeon/tier-2/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/chest.ron
@@ -5,11 +5,11 @@
     (1.0, LootTable("common.loot_tables.weapons.tier-3")),
     (1.0, LootTable("common.loot_tables.armor.tier-3")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 50, 100)),
+    (6.0, ItemQuantity("common.items.utility.coins", 50, 100)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.silk", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.scales", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.steel", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-3/chest.ron b/assets/common/loot_tables/dungeon/tier-3/chest.ron
index 33bc1a208e..fae2e74d80 100644
--- a/assets/common/loot_tables/dungeon/tier-3/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/chest.ron
@@ -5,11 +5,11 @@
     (1.0, LootTable("common.loot_tables.weapons.tier-4")),
     (1.0, LootTable("common.loot_tables.armor.tier-4")),
     // Currency
-    (3.0, ItemQuantity("common.items.utility.coins", 100, 200)),
+    (6.0, ItemQuantity("common.items.utility.coins", 100, 200)),
     // Materials
-    (1.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
-    (1.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
-    (1.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.cloth.lifecloth", 3, 10)),
+    (2.0, ItemQuantity("common.items.crafting_ing.hide.carapace", 3, 10)),
+    (2.0, ItemQuantity("common.items.mineral.ingot.cobalt", 3, 10)),
     // Consumables
-    (2.0, LootTable("common.loot_tables.consumable.moderate")),
+    (4.0, LootTable("common.loot_tables.consumable.moderate")),
 ]

From 77b74091a988e596a737a377acfe97594c296c86 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 9 Nov 2021 09:33:05 +0100
Subject: [PATCH 35/39] + Reducing attack speed of minions

---
 .../common/items/npc_weapons/biped_small/adlet/adlet_bow.ron  | 2 +-
 .../items/npc_weapons/biped_small/adlet/gnoll_staff.ron       | 2 +-
 .../items/npc_weapons/biped_small/gnarling/adlet_bow.ron      | 2 +-
 .../items/npc_weapons/biped_small/gnarling/gnoll_staff.ron    | 2 +-
 .../common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron | 4 ----
 .../items/npc_weapons/biped_small/haniwa/gnoll_staff.ron      | 4 ----
 .../items/npc_weapons/biped_small/sahagin/adlet_bow.ron       | 4 ----
 7 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index 430e84fee7..e560436fe9 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.7,
             effect_power: 0.8,
-            speed: 0.7,
+            speed: 0.6,
             crit_chance: 0.08406594,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 4588d5c1e2..f3e2191a33 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.7,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.7,
             crit_chance: 0.05059524,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index f3a87da8b1..d927326c31 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.6,
+            speed: 0.5,
             crit_chance: 0.13541667,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index 226837bf9f..d0e96ded3e 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -8,7 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 0.3,
             effect_power: 0.8,
-            speed: 0.5,
+            speed: 0.6,
             crit_chance: 0.26764706,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index 05e4841754..775f7bb67f 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -8,11 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.6,
             effect_power: 0.8,
-<<<<<<< HEAD
             speed: 0.7,
-=======
-            speed: 0.9,
->>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index f3e0c2bdd7..5a2c62c527 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -8,11 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.6,
             effect_power: 0.8,
-<<<<<<< HEAD
             speed: 0.8,
-=======
-            speed: 0.9,
->>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             crit_chance: 0.043827,
             range: 1.0,
             energy_efficiency: 1.0,
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index d8601fbf77..be326e45e2 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -8,11 +8,7 @@ ItemDef(
             equip_time_secs: 0.0,
             power: 1.2,
             effect_power: 0.8,
-<<<<<<< HEAD
             speed: 0.7,
-=======
-            speed: 0.9,
->>>>>>> 264bce1a3 (+ Adjusted damage, crit chance, and attack speed of weapons)
             crit_chance: 0.05965909,
             range: 1.0,
             energy_efficiency: 1.0,

From 05997262808becead91219b67428bfd368594b32 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 9 Nov 2021 22:40:25 +0100
Subject: [PATCH 36/39] + Fixed pathing for coal in T0 boss loot table, was
 mineral.coal is mineral.ore.coal now

---
 assets/common/loot_tables/dungeon/tier-0/boss.ron | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 937f973a55..98f8b5661c 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -10,6 +10,6 @@
     (2.0, Item("common.items.armor.misc.head.straw")),
     // Indirect crafting materials for T2 gear
     (1.0, ItemQuantity("common.items.crafting_ing.sticky_thread", 2, 5)),
-    (1.0, ItemQuantity("common.items.mineral.coal", 2, 5)),
+    (1.0, ItemQuantity("common.items.mineral.ore.coal", 2, 5)),
     (1.0, ItemQuantity("common.items.crafting_ing.leather.leather_strips", 2, 5)),
 ]
\ No newline at end of file

From 2fa0abf23d3ccc50019641b878d1fb5715367fbe Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Fri, 12 Nov 2021 20:04:30 +0100
Subject: [PATCH 37/39] + Small fix to boss loot table. Boss drops gear from
 same tier and slight chance from one above.

---
 assets/common/loot_tables/dungeon/tier-0/boss.ron | 6 ++----
 assets/common/loot_tables/dungeon/tier-1/boss.ron | 2 --
 assets/common/loot_tables/dungeon/tier-2/boss.ron | 2 --
 assets/common/loot_tables/dungeon/tier-3/boss.ron | 2 --
 assets/common/loot_tables/dungeon/tier-4/boss.ron | 1 +
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron
index 98f8b5661c..cc91b8d56d 100644
--- a/assets/common/loot_tables/dungeon/tier-0/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-0/boss.ron
@@ -1,10 +1,8 @@
 [
     // Weapons
-    (5.0, LootTable("common.loot_tables.weapons.tier-0")),
-    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (5.0, LootTable("common.loot_tables.weapons.tier-1")),
     // Armor
-    (5.0, LootTable("common.loot_tables.armor.tier-0")),
-    (2.0, LootTable("common.loot_tables.armor.tier-1")),
+    (5.0, LootTable("common.loot_tables.armor.tier-1")),
     // Misc
     (3.0, Item("common.items.armor.misc.neck.scratched")),
     (2.0, Item("common.items.armor.misc.head.straw")),
diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron
index c9218cda4b..07d279f000 100644
--- a/assets/common/loot_tables/dungeon/tier-1/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/boss.ron
@@ -1,10 +1,8 @@
 [
     // Weapons
     (4.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (2.5, LootTable("common.loot_tables.weapons.tier-3")),
     // Armor
     (4.0, LootTable("common.loot_tables.armor.tier-2")),
-    (2.5, LootTable("common.loot_tables.armor.tier-3")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron
index 14b546a5f9..bab0bb5fc3 100644
--- a/assets/common/loot_tables/dungeon/tier-2/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-2/boss.ron
@@ -1,10 +1,8 @@
 [
     // Weapons
     (5.0, LootTable("common.loot_tables.weapons.tier-3")),
-    (0.5, LootTable("common.loot_tables.weapons.tier-4")),
     // Armor
     (5.0, LootTable("common.loot_tables.armor.tier-3")),
-    (0.5, LootTable("common.loot_tables.armor.tier-4")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron
index 89ca31fb5f..f6f598f52b 100644
--- a/assets/common/loot_tables/dungeon/tier-3/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-3/boss.ron
@@ -1,10 +1,8 @@
 [
     // Weapons
     (3.0, LootTable("common.loot_tables.weapons.tier-4")),
-    (1.0, LootTable("common.loot_tables.weapons.tier-5")),
     // Armor
     (3.0, LootTable("common.loot_tables.armor.tier-4")),
-    (1.0, LootTable("common.loot_tables.armor.tier-5")),
     // Misc
     (2.0, Item("common.items.armor.misc.neck.haniwa_talisman")),
 ]
\ No newline at end of file
diff --git a/assets/common/loot_tables/dungeon/tier-4/boss.ron b/assets/common/loot_tables/dungeon/tier-4/boss.ron
index 16e3dc7291..ea8e12b47d 100644
--- a/assets/common/loot_tables/dungeon/tier-4/boss.ron
+++ b/assets/common/loot_tables/dungeon/tier-4/boss.ron
@@ -2,6 +2,7 @@
     // Armor
     (10.0, LootTable("common.loot_tables.weapons.tier-5")),
     (10.0, LootTable("common.loot_tables.armor.tier-5")),
+    // Misc
     (1.0, Item("common.items.armor.misc.neck.carcanet_of_wrath")),
     // Legendary weapons
     (1.0, LootTable("common.loot_tables.weapons.legendary_melee")),

From 7c560cc6b926a7078483be8d9422879a18d1e8da Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Thu, 18 Nov 2021 19:53:21 +0100
Subject: [PATCH 38/39] + CHANGELOG.md message "Dungeons have somewhat proper
 scaling. The higher the dungeon the harder it gets, Cultist staying unchanged
 while Mino is now at its level."

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05431595d5..30c41f89be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Agents using fireball projectiles aim at the feet instead of the eyes
 - Explosions can now have a nonzero minimum falloff
 - EXP on kill is now shared based on damage contribution
+- Dungeons have somewhat proper scaling. The higher the dungeon the harder it gets, Cultist staying unchanged while Mino is now at its level.
 
 ### Removed
 

From 5dca7f9515cfed5802a5f0f7f176ba759ffd4d71 Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Sat, 20 Nov 2021 07:44:23 +0100
Subject: [PATCH 39/39] + T1 & T4 chest loot table fix

---
 .../common/loot_tables/dungeon/tier-1/chest.ron  | 16 +++++++---------
 .../common/loot_tables/dungeon/tier-4/chest.ron  |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/assets/common/loot_tables/dungeon/tier-1/chest.ron b/assets/common/loot_tables/dungeon/tier-1/chest.ron
index 422288308d..4bba161714 100644
--- a/assets/common/loot_tables/dungeon/tier-1/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-1/chest.ron
@@ -1,16 +1,14 @@
 [
     // Gear
-    (2.0, LootTable("common.loot_tables.weapons.tier-1")),
-    (2.0, LootTable("common.loot_tables.armor.tier-1")),
-    (1.0, LootTable("common.loot_tables.weapons.tier-2")),
-    (1.0, LootTable("common.loot_tables.armor.tier-2")),
+    (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    (1.0, LootTable("common.loot_tables.armor.tier-1")),
     (0.5, Item("common.items.armor.misc.head.hog_hood")),
     // Currency
-    (6.0, ItemQuantity("common.items.utility.coins", 20, 50)),
+    (3.0, ItemQuantity("common.items.utility.coins", 20, 50)),
     // Materials
-    (2.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
-    (2.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
-    (2.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 3, 10)),
+    (1.0, ItemQuantity("common.items.crafting_ing.leather.thick_leather", 3, 10)),
+    (1.0, ItemQuantity("common.items.mineral.ingot.iron", 3, 10)),
     // Consumables
-    (4.0, LootTable("common.loot_tables.consumable.poor")),
+    (2.0, LootTable("common.loot_tables.consumable.poor")),
 ]
diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron
index 06b6965324..a366774f3c 100644
--- a/assets/common/loot_tables/dungeon/tier-4/chest.ron
+++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron
@@ -2,7 +2,7 @@
     // Gear
     (1.0, LootTable("common.loot_tables.weapons.tier-4")),
     (1.0, LootTable("common.loot_tables.armor.tier-4")),
-    (3.0, Item("common.items.armor.misc.head.spikeguard")),
+    (1.0, Item("common.items.armor.misc.head.spikeguard")),
     // Currency
     (3.0, ItemQuantity("common.items.utility.coins", 200, 500)),
     // Materials