From 534c7dc8b928eecc1ea948da5cdd6bf74f741f2c Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 18 May 2022 16:28:06 -0400 Subject: [PATCH 1/3] Simplified item key (no assets) --- common/src/bin/csv_export/main.rs | 24 ++-- common/src/bin/csv_import/main.rs | 2 +- common/src/comp/body/item_drop.rs | 26 ++-- common/src/comp/inventory/item/armor.rs | 26 ++-- common/src/comp/inventory/item/item_key.rs | 62 +++----- common/src/comp/inventory/item/mod.rs | 11 +- common/src/comp/inventory/loadout.rs | 4 +- common/src/comp/inventory/slot.rs | 34 ++--- common/src/comp/inventory/test_helpers.rs | 2 +- server/src/sys/agent.rs | 2 +- voxygen/src/audio/sfx/mod.rs | 11 +- voxygen/src/hud/crafting.rs | 8 +- voxygen/src/hud/diary.rs | 22 +-- voxygen/src/hud/util.rs | 30 ++-- voxygen/src/scene/figure/cache.rs | 157 ++++----------------- voxygen/src/ui/widgets/item_tooltip.rs | 2 +- 16 files changed, 141 insertions(+), 282 deletions(-) diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index d9857765f5..56c35ee563 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -186,18 +186,18 @@ fn get_tool_hands(tool: &Tool) -> String { fn get_armor_kind(kind: &ArmorKind) -> String { match kind { - ArmorKind::Shoulder(_) => "Shoulder".to_string(), - ArmorKind::Chest(_) => "Chest".to_string(), - ArmorKind::Belt(_) => "Belt".to_string(), - ArmorKind::Hand(_) => "Hand".to_string(), - ArmorKind::Pants(_) => "Pants".to_string(), - ArmorKind::Foot(_) => "Foot".to_string(), - ArmorKind::Back(_) => "Back".to_string(), - ArmorKind::Ring(_) => "Ring".to_string(), - ArmorKind::Neck(_) => "Neck".to_string(), - ArmorKind::Head(_) => "Head".to_string(), - ArmorKind::Tabard(_) => "Tabard".to_string(), - ArmorKind::Bag(_) => "Bag".to_string(), + ArmorKind::Shoulder => "Shoulder".to_string(), + ArmorKind::Chest => "Chest".to_string(), + ArmorKind::Belt => "Belt".to_string(), + ArmorKind::Hand => "Hand".to_string(), + ArmorKind::Pants => "Pants".to_string(), + ArmorKind::Foot => "Foot".to_string(), + ArmorKind::Back => "Back".to_string(), + ArmorKind::Ring => "Ring".to_string(), + ArmorKind::Neck => "Neck".to_string(), + ArmorKind::Head => "Head".to_string(), + ArmorKind::Tabard => "Tabard".to_string(), + ArmorKind::Bag => "Bag".to_string(), } } diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs index 0a78e6e969..3eda17b68e 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -73,7 +73,7 @@ fn armor_stats() -> Result<(), Box> { { match &*item.kind() { comp::item::ItemKind::Armor(armor) => { - if let ArmorKind::Bag(_) = armor.kind { + if let ArmorKind::Bag = armor.kind { continue; } diff --git a/common/src/comp/body/item_drop.rs b/common/src/comp/body/item_drop.rs index f53a705423..65690d0b85 100644 --- a/common/src/comp/body/item_drop.rs +++ b/common/src/comp/body/item_drop.rs @@ -66,20 +66,20 @@ impl From<&Item> for Body { ItemKind::Tool(Tool { kind, .. }) => Body::Tool(*kind), ItemKind::ModularComponent(_) => Body::ModularComponent, ItemKind::Lantern(_) => Body::Lantern, - ItemKind::Glider(_) => Body::Glider, + ItemKind::Glider => Body::Glider, ItemKind::Armor(armor) => match armor.kind { - ArmorKind::Shoulder(_) => Body::Armor(ItemDropArmorKind::Shoulder), - ArmorKind::Chest(_) => Body::Armor(ItemDropArmorKind::Chest), - ArmorKind::Belt(_) => Body::Armor(ItemDropArmorKind::Belt), - ArmorKind::Hand(_) => Body::Armor(ItemDropArmorKind::Hand), - ArmorKind::Pants(_) => Body::Armor(ItemDropArmorKind::Pants), - ArmorKind::Foot(_) => Body::Armor(ItemDropArmorKind::Foot), - ArmorKind::Back(_) => Body::Armor(ItemDropArmorKind::Back), - ArmorKind::Ring(_) => Body::Armor(ItemDropArmorKind::Ring), - ArmorKind::Neck(_) => Body::Armor(ItemDropArmorKind::Neck), - ArmorKind::Head(_) => Body::Armor(ItemDropArmorKind::Head), - ArmorKind::Tabard(_) => Body::Armor(ItemDropArmorKind::Tabard), - ArmorKind::Bag(_) => Body::Armor(ItemDropArmorKind::Bag), + ArmorKind::Shoulder => Body::Armor(ItemDropArmorKind::Shoulder), + ArmorKind::Chest => Body::Armor(ItemDropArmorKind::Chest), + ArmorKind::Belt => Body::Armor(ItemDropArmorKind::Belt), + ArmorKind::Hand => Body::Armor(ItemDropArmorKind::Hand), + ArmorKind::Pants => Body::Armor(ItemDropArmorKind::Pants), + ArmorKind::Foot => Body::Armor(ItemDropArmorKind::Foot), + ArmorKind::Back => Body::Armor(ItemDropArmorKind::Back), + ArmorKind::Ring => Body::Armor(ItemDropArmorKind::Ring), + ArmorKind::Neck => Body::Armor(ItemDropArmorKind::Neck), + ArmorKind::Head => Body::Armor(ItemDropArmorKind::Head), + ArmorKind::Tabard => Body::Armor(ItemDropArmorKind::Tabard), + ArmorKind::Bag => Body::Armor(ItemDropArmorKind::Bag), }, ItemKind::Utility { kind, .. } => match kind { Utility::Coins => { diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index e0c8d73dc8..4ae071fb94 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -1,20 +1,20 @@ use serde::{Deserialize, Serialize}; use std::{cmp::Ordering, ops::Sub}; -#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum ArmorKind { - Shoulder(String), - Chest(String), - Belt(String), - Hand(String), - Pants(String), - Foot(String), - Back(String), - Ring(String), - Neck(String), - Head(String), - Tabard(String), - Bag(String), + Shoulder, + Chest, + Belt, + Hand, + Pants, + Foot, + Back, + Ring, + Neck, + Head, + Tabard, + Bag, } impl Armor { diff --git a/common/src/comp/inventory/item/item_key.rs b/common/src/comp/inventory/item/item_key.rs index 463e807417..ea6cc5af88 100644 --- a/common/src/comp/inventory/item/item_key.rs +++ b/common/src/comp/inventory/item/item_key.rs @@ -1,26 +1,15 @@ use crate::{ assets::AssetExt, - comp::inventory::item::{ - armor::{Armor, ArmorKind}, - modular, Glider, ItemDef, ItemDefinitionId, ItemDesc, ItemKind, Lantern, Throwable, - Utility, - }, + comp::inventory::item::{modular, ItemDef, ItemDefinitionId, ItemDesc, ItemKind}, }; use serde::{Deserialize, Serialize}; use std::sync::Arc; #[derive(Clone, Debug, Serialize, Deserialize, Hash, Eq, PartialEq)] pub enum ItemKey { - Tool(String), + Simple(String), ModularWeapon(modular::ModularWeaponKey), ModularWeaponComponent(modular::ModularWeaponComponentKey), - Lantern(String), - Glider(String), - Armor(ArmorKind), - Utility(Utility), - Consumable(String), - Throwable(Throwable), - Ingredient(String), TagExamples(Vec), Empty, } @@ -29,46 +18,29 @@ impl From<&T> for ItemKey { fn from(item_desc: &T) -> Self { let item_definition_id = item_desc.item_definition_id(); - match &*item_desc.kind() { - ItemKind::Tool(_) => match item_definition_id { - ItemDefinitionId::Simple(id) => ItemKey::Tool(id.to_string()), - ItemDefinitionId::Modular { .. } => { - ItemKey::ModularWeapon(modular::weapon_to_key(item_desc)) - }, - ItemDefinitionId::Compound { .. } => ItemKey::Empty, - }, - ItemKind::ModularComponent(_) => match item_definition_id { - ItemDefinitionId::Simple(id) => ItemKey::Tool(id.to_owned()), + if let ItemKind::TagExamples { item_ids } = &*item_desc.kind() { + ItemKey::TagExamples( + item_ids + .iter() + .map(|id| ItemKey::from(&*Arc::::load_expect_cloned(id))) + .collect(), + ) + } else { + match item_definition_id { + ItemDefinitionId::Simple(id) => ItemKey::Simple(String::from(id)), ItemDefinitionId::Compound { simple_base, .. } => { if let Ok(key) = modular::weapon_component_to_key(simple_base, item_desc.components()) { ItemKey::ModularWeaponComponent(key) } else { - ItemKey::Tool(simple_base.to_owned()) + ItemKey::Simple(simple_base.to_owned()) } }, - ItemDefinitionId::Modular { .. } => ItemKey::Empty, - }, - ItemKind::Lantern(Lantern { kind, .. }) => ItemKey::Lantern(kind.clone()), - ItemKind::Glider(Glider { kind, .. }) => ItemKey::Glider(kind.clone()), - ItemKind::Armor(Armor { kind, .. }) => ItemKey::Armor(kind.clone()), - ItemKind::Utility { kind, .. } => ItemKey::Utility(*kind), - ItemKind::Consumable { .. } => { - if let ItemDefinitionId::Simple(id) = item_definition_id { - ItemKey::Consumable(id.to_owned()) - } else { - ItemKey::Empty - } - }, - ItemKind::Throwable { kind, .. } => ItemKey::Throwable(*kind), - ItemKind::Ingredient { kind, .. } => ItemKey::Ingredient(kind.clone()), - ItemKind::TagExamples { item_ids } => ItemKey::TagExamples( - item_ids - .iter() - .map(|id| ItemKey::from(&*Arc::::load_expect_cloned(id))) - .collect(), - ), + ItemDefinitionId::Modular { .. } => { + ItemKey::ModularWeapon(modular::weapon_to_key(item_desc)) + }, + } } } } diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index fa636e2978..a487c153c8 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -53,7 +53,6 @@ pub enum Utility { #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub struct Lantern { - pub kind: String, color: Rgb, strength_thousandths: u32, flicker_thousandths: u32, @@ -65,11 +64,6 @@ impl Lantern { pub fn color(&self) -> Rgb { self.color.map(|c| c as f32 / 255.0) } } -#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] -pub struct Glider { - pub kind: String, -} - #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Copy, PartialOrd, Ord)] pub enum Quality { Low, // Grey @@ -273,7 +267,7 @@ pub enum ItemKind { ModularComponent(modular::ModularComponent), Lantern(Lantern), Armor(armor::Armor), - Glider(Glider), + Glider, Consumable { kind: ConsumableKind, effects: Vec, @@ -285,7 +279,6 @@ pub enum ItemKind { kind: Utility, }, Ingredient { - kind: String, /// Used to generate names for modular items composed of this ingredient descriptor: String, }, @@ -307,7 +300,7 @@ impl ItemKind { pub fn is_equippable(&self) -> bool { matches!( self, - ItemKind::Tool(_) | ItemKind::Armor { .. } | ItemKind::Glider(_) | ItemKind::Lantern(_) + ItemKind::Tool(_) | ItemKind::Armor { .. } | ItemKind::Glider | ItemKind::Lantern(_) ) } } diff --git a/common/src/comp/inventory/loadout.rs b/common/src/comp/inventory/loadout.rs index c0ea6258d2..7b3dfb1aab 100644 --- a/common/src/comp/inventory/loadout.rs +++ b/common/src/comp/inventory/loadout.rs @@ -474,7 +474,7 @@ mod tests { let result = loadout .get_slot_to_equip_into(&ItemKind::Armor(Armor::test_armor( - ArmorKind::Bag("test".to_string()), + ArmorKind::Bag, Protection::Normal(0.0), Protection::Normal(0.0), ))) @@ -494,7 +494,7 @@ mod tests { let result = loadout .get_slot_to_equip_into(&ItemKind::Armor(Armor::test_armor( - ArmorKind::Bag("test".to_string()), + ArmorKind::Bag, Protection::Normal(0.0), Protection::Normal(0.0), ))) diff --git a/common/src/comp/inventory/slot.rs b/common/src/comp/inventory/slot.rs index 48f2789264..fb19152618 100644 --- a/common/src/comp/inventory/slot.rs +++ b/common/src/comp/inventory/slot.rs @@ -127,7 +127,7 @@ impl EquipSlot { (Self::InactiveMainhand, ItemKind::Tool(_)) => true, (Self::InactiveOffhand, ItemKind::Tool(tool)) => matches!(tool.hands, tool::Hands::One), (Self::Lantern, ItemKind::Lantern(_)) => true, - (Self::Glider, ItemKind::Glider(_)) => true, + (Self::Glider, ItemKind::Glider) => true, _ => false, } } @@ -137,22 +137,22 @@ impl ArmorSlot { fn can_hold(self, armor: &item::armor::ArmorKind) -> bool { matches!( (self, armor), - (Self::Head, ArmorKind::Head(_)) - | (Self::Neck, ArmorKind::Neck(_)) - | (Self::Shoulders, ArmorKind::Shoulder(_)) - | (Self::Chest, ArmorKind::Chest(_)) - | (Self::Hands, ArmorKind::Hand(_)) - | (Self::Ring1, ArmorKind::Ring(_)) - | (Self::Ring2, ArmorKind::Ring(_)) - | (Self::Back, ArmorKind::Back(_)) - | (Self::Belt, ArmorKind::Belt(_)) - | (Self::Legs, ArmorKind::Pants(_)) - | (Self::Feet, ArmorKind::Foot(_)) - | (Self::Tabard, ArmorKind::Tabard(_)) - | (Self::Bag1, ArmorKind::Bag(_)) - | (Self::Bag2, ArmorKind::Bag(_)) - | (Self::Bag3, ArmorKind::Bag(_)) - | (Self::Bag4, ArmorKind::Bag(_)) + (Self::Head, ArmorKind::Head) + | (Self::Neck, ArmorKind::Neck) + | (Self::Shoulders, ArmorKind::Shoulder) + | (Self::Chest, ArmorKind::Chest) + | (Self::Hands, ArmorKind::Hand) + | (Self::Ring1, ArmorKind::Ring) + | (Self::Ring2, ArmorKind::Ring) + | (Self::Back, ArmorKind::Back) + | (Self::Belt, ArmorKind::Belt) + | (Self::Legs, ArmorKind::Pants) + | (Self::Feet, ArmorKind::Foot) + | (Self::Tabard, ArmorKind::Tabard) + | (Self::Bag1, ArmorKind::Bag) + | (Self::Bag2, ArmorKind::Bag) + | (Self::Bag3, ArmorKind::Bag) + | (Self::Bag4, ArmorKind::Bag) ) } } diff --git a/common/src/comp/inventory/test_helpers.rs b/common/src/comp/inventory/test_helpers.rs index 8c86b0b430..1281ee6a85 100644 --- a/common/src/comp/inventory/test_helpers.rs +++ b/common/src/comp/inventory/test_helpers.rs @@ -13,7 +13,7 @@ pub(super) fn get_test_bag(slots: u16) -> Item { let item_def = ItemDef::new_test( "common.items.testing.test_bag".to_string(), ItemKind::Armor(armor::Armor::test_armor( - ArmorKind::Bag("Test Bag".to_string()), + ArmorKind::Bag, Protection::Normal(0.0), Protection::Normal(0.0), )), diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs index e9e79b2105..5d347c953e 100644 --- a/server/src/sys/agent.rs +++ b/server/src/sys/agent.rs @@ -167,7 +167,7 @@ impl<'a> System<'a> for Sys { .equipped(EquipSlot::Glider) .as_ref() .map_or(false, |item| { - matches!(&*item.kind(), comp::item::ItemKind::Glider(_)) + matches!(&*item.kind(), comp::item::ItemKind::Glider) }); let is_gliding = matches!( diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs index 2685da7f2a..9e359f9570 100644 --- a/voxygen/src/audio/sfx/mod.rs +++ b/voxygen/src/audio/sfx/mod.rs @@ -92,7 +92,7 @@ use common::{ assets::{self, AssetExt, AssetHandle}, comp::{ beam, biped_large, biped_small, humanoid, - item::{ItemKind, ToolKind}, + item::{ItemDefinitionId, ItemKind, ToolKind}, object, poise::PoiseState, quadruped_low, quadruped_medium, quadruped_small, Body, CharacterAbilityType, @@ -306,11 +306,10 @@ impl From<&InventoryUpdateEvent> for SfxEvent { ItemKind::Tool(tool) => { SfxEvent::Inventory(SfxInventoryEvent::CollectedTool(tool.kind)) }, - ItemKind::Ingredient { kind, .. } => match &kind[..] { - "Diamond" | "Ruby" | "Emerald" | "Sapphire" | "Topaz" | "Amethyst" => { - SfxEvent::Inventory(SfxInventoryEvent::CollectedItem(kind.clone())) - }, - _ => SfxEvent::Inventory(SfxInventoryEvent::Collected), + ItemKind::Ingredient { .. } if matches!(item.item_definition_id(), ItemDefinitionId::Simple(id) if id.contains("mineral.gem.")) => { + SfxEvent::Inventory(SfxInventoryEvent::CollectedItem(String::from( + "Gemstone", + ))) }, _ => SfxEvent::Inventory(SfxInventoryEvent::Collected), } diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index 51603f0731..1254aed9bb 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -245,7 +245,7 @@ impl CraftingTab { ItemKind::Armor(_) => !item.tags().contains(&ItemTag::Bag), _ => false, }, - CraftingTab::Glider => matches!(&*item.kind(), ItemKind::Glider(_)), + CraftingTab::Glider => matches!(&*item.kind(), ItemKind::Glider), CraftingTab::Potion => item.tags().contains(&ItemTag::Potion), CraftingTab::ProcessedMaterial => item .tags() @@ -782,7 +782,7 @@ impl<'a> Widget for Crafting<'a> { Button::image(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool(station_img_str.to_string())), + .img_ids_or_not_found_img(ItemKey::Simple(station_img_str.to_string())), self.pulse, )) .image_color(color::LIGHT_RED) @@ -1413,7 +1413,7 @@ impl<'a> Widget for Crafting<'a> { Image::new(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool(station_img.to_string())), + .img_ids_or_not_found_img(ItemKey::Simple(station_img.to_string())), self.pulse, )) .w_h(25.0, 25.0) @@ -1754,7 +1754,7 @@ impl<'a> Widget for Crafting<'a> { Image::new(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool("DismantlingBench".to_string())), + .img_ids_or_not_found_img(ItemKey::Simple("DismantlingBench".to_string())), self.pulse, )) .wh([size; 2]) diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index 692cedb027..d714382390 100644 --- a/voxygen/src/hud/diary.rs +++ b/voxygen/src/hud/diary.rs @@ -1361,9 +1361,9 @@ impl<'a> Diary<'a> { use ToolKind::*; // General Combat Image::new(animate_by_pulse( - &self - .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool("example_general_combat_left".to_string())), + &self.item_imgs.img_ids_or_not_found_img(ItemKey::Simple( + "example_general_combat_left".to_string(), + )), self.pulse, )) .wh(ART_SIZE) @@ -1372,7 +1372,7 @@ impl<'a> Diary<'a> { .set(state.ids.general_combat_render_0, ui); Image::new(animate_by_pulse( - &self.item_imgs.img_ids_or_not_found_img(ItemKey::Tool( + &self.item_imgs.img_ids_or_not_found_img(ItemKey::Simple( "example_general_combat_right".to_string(), )), self.pulse, @@ -1541,7 +1541,7 @@ impl<'a> Diary<'a> { Image::new(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool("example_sword".to_string())), + .img_ids_or_not_found_img(ItemKey::Simple("example_sword".to_string())), self.pulse, )) .wh(ART_SIZE) @@ -1712,7 +1712,7 @@ impl<'a> Diary<'a> { Image::new(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool("example_hammer".to_string())), + .img_ids_or_not_found_img(ItemKey::Simple("example_hammer".to_string())), self.pulse, )) .wh(ART_SIZE) @@ -1870,7 +1870,7 @@ impl<'a> Diary<'a> { Image::new(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool("example_axe".to_string())), + .img_ids_or_not_found_img(ItemKey::Simple("example_axe".to_string())), self.pulse, )) .wh(ART_SIZE) @@ -2028,7 +2028,7 @@ impl<'a> Diary<'a> { Image::new(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool("example_sceptre".to_string())), + .img_ids_or_not_found_img(ItemKey::Simple("example_sceptre".to_string())), self.pulse, )) .wh(ART_SIZE) @@ -2180,7 +2180,7 @@ impl<'a> Diary<'a> { Image::new(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool("example_bow".to_string())), + .img_ids_or_not_found_img(ItemKey::Simple("example_bow".to_string())), self.pulse, )) .wh(ART_SIZE) @@ -2338,7 +2338,7 @@ impl<'a> Diary<'a> { Image::new(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool("example_staff_fire".to_string())), + .img_ids_or_not_found_img(ItemKey::Simple("example_staff_fire".to_string())), self.pulse, )) .wh(ART_SIZE) @@ -2485,7 +2485,7 @@ impl<'a> Diary<'a> { Image::new(animate_by_pulse( &self .item_imgs - .img_ids_or_not_found_img(ItemKey::Tool("example_pick".to_string())), + .img_ids_or_not_found_img(ItemKey::Simple("example_pick".to_string())), self.pulse, )) .wh(ART_SIZE) diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index a9111b0298..0764f8658d 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -89,7 +89,7 @@ pub fn kind_text<'a>(kind: &ItemKind, i18n: &'a Localization) -> Cow<'a, str> { Cow::Borrowed(i18n.get("common.kind.modular_component")) } }, - ItemKind::Glider(_glider) => Cow::Borrowed(i18n.get("common.kind.glider")), + ItemKind::Glider => Cow::Borrowed(i18n.get("common.kind.glider")), ItemKind::Consumable { .. } => Cow::Borrowed(i18n.get("common.kind.consumable")), ItemKind::Throwable { .. } => Cow::Borrowed(i18n.get("common.kind.throwable")), ItemKind::Utility { .. } => Cow::Borrowed(i18n.get("common.kind.utility")), @@ -112,7 +112,7 @@ pub fn material_kind_text<'a>(kind: &MaterialKind, i18n: &'a Localization) -> &' pub fn stats_count(item: &dyn ItemDesc) -> usize { let mut count = match &*item.kind() { ItemKind::Armor(armor) => { - if matches!(armor.kind, ArmorKind::Bag(_)) { + if matches!(armor.kind, ArmorKind::Bag) { 0 } else { armor.stats.energy_reward().is_some() as usize @@ -129,7 +129,7 @@ pub fn stats_count(item: &dyn ItemDesc) -> usize { }; let is_bag = match &*item.kind() { - ItemKind::Armor(armor) => matches!(armor.kind, ArmorKind::Bag(_)), + ItemKind::Armor(armor) => matches!(armor.kind, ArmorKind::Bag), _ => false, }; if item.num_slots() != 0 && !is_bag { @@ -224,18 +224,18 @@ pub fn consumable_desc(effects: &[Effect], i18n: &Localization) -> Vec { // Armor fn armor_kind<'a>(armor: &Armor, i18n: &'a Localization) -> &'a str { let kind = match armor.kind { - ArmorKind::Shoulder(_) => i18n.get("hud.bag.shoulders"), - ArmorKind::Chest(_) => i18n.get("hud.bag.chest"), - ArmorKind::Belt(_) => i18n.get("hud.bag.belt"), - ArmorKind::Hand(_) => i18n.get("hud.bag.hands"), - ArmorKind::Pants(_) => i18n.get("hud.bag.legs"), - ArmorKind::Foot(_) => i18n.get("hud.bag.feet"), - ArmorKind::Back(_) => i18n.get("hud.bag.back"), - ArmorKind::Ring(_) => i18n.get("hud.bag.ring"), - ArmorKind::Neck(_) => i18n.get("hud.bag.neck"), - ArmorKind::Head(_) => i18n.get("hud.bag.head"), - ArmorKind::Tabard(_) => i18n.get("hud.bag.tabard"), - ArmorKind::Bag(_) => i18n.get("hud.bag.bag"), + ArmorKind::Shoulder => i18n.get("hud.bag.shoulders"), + ArmorKind::Chest => i18n.get("hud.bag.chest"), + ArmorKind::Belt => i18n.get("hud.bag.belt"), + ArmorKind::Hand => i18n.get("hud.bag.hands"), + ArmorKind::Pants => i18n.get("hud.bag.legs"), + ArmorKind::Foot => i18n.get("hud.bag.feet"), + ArmorKind::Back => i18n.get("hud.bag.back"), + ArmorKind::Ring => i18n.get("hud.bag.ring"), + ArmorKind::Neck => i18n.get("hud.bag.neck"), + ArmorKind::Head => i18n.get("hud.bag.head"), + ArmorKind::Tabard => i18n.get("hud.bag.tabard"), + ArmorKind::Bag => i18n.get("hud.bag.bag"), }; kind } diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs index 57add515c5..ed5153528d 100644 --- a/voxygen/src/scene/figure/cache.rs +++ b/voxygen/src/scene/figure/cache.rs @@ -12,11 +12,7 @@ use common::{ slot::{ArmorSlot, EquipSlot}, Inventory, }, - item::{ - armor::{Armor, ArmorKind}, - item_key::ItemKey, - modular, Item, ItemDefinitionId, ItemKind, - }, + item::{item_key::ItemKey, modular, Item, ItemDefinitionId}, CharacterState, }, figure::Segment, @@ -128,6 +124,20 @@ impl CharacterCacheKey { CameraMode::ThirdPerson | CameraMode::Freefly => false, }; + let key_from_slot = |slot| { + inventory + .equipped(slot) + .map(|i| i.item_definition_id()) + .map(|id| match id { + // TODO: Properly handle items with components here. Probably wait until modular + // armor? + ItemDefinitionId::Simple(id) => id, + ItemDefinitionId::Compound { simple_base, .. } => simple_base, + ItemDefinitionId::Modular { pseudo_base, .. } => pseudo_base, + }) + .map(String::from) + }; + // Third person tools are only modeled when the camera is either not first // person, or the camera is first person and we are in a tool-using // state. @@ -146,78 +156,12 @@ impl CharacterCacheKey { None } else { Some(CharacterThirdPersonKey { - head: if let Some(ItemKind::Armor(Armor { - kind: ArmorKind::Head(armor), - .. - })) = inventory - .equipped(EquipSlot::Armor(ArmorSlot::Head)) - .map(|i| i.kind()) - .as_deref() - { - Some(armor.clone()) - } else { - None - }, - shoulder: if let Some(ItemKind::Armor(Armor { - kind: ArmorKind::Shoulder(armor), - .. - })) = inventory - .equipped(EquipSlot::Armor(ArmorSlot::Shoulders)) - .map(|i| i.kind()) - .as_deref() - { - Some(armor.clone()) - } else { - None - }, - chest: if let Some(ItemKind::Armor(Armor { - kind: ArmorKind::Chest(armor), - .. - })) = inventory - .equipped(EquipSlot::Armor(ArmorSlot::Chest)) - .map(|i| i.kind()) - .as_deref() - { - Some(armor.clone()) - } else { - None - }, - belt: if let Some(ItemKind::Armor(Armor { - kind: ArmorKind::Belt(armor), - .. - })) = inventory - .equipped(EquipSlot::Armor(ArmorSlot::Belt)) - .map(|i| i.kind()) - .as_deref() - { - Some(armor.clone()) - } else { - None - }, - back: if let Some(ItemKind::Armor(Armor { - kind: ArmorKind::Back(armor), - .. - })) = inventory - .equipped(EquipSlot::Armor(ArmorSlot::Back)) - .map(|i| i.kind()) - .as_deref() - { - Some(armor.clone()) - } else { - None - }, - pants: if let Some(ItemKind::Armor(Armor { - kind: ArmorKind::Pants(armor), - .. - })) = inventory - .equipped(EquipSlot::Armor(ArmorSlot::Legs)) - .map(|i| i.kind()) - .as_deref() - { - Some(armor.clone()) - } else { - None - }, + head: key_from_slot(EquipSlot::Armor(ArmorSlot::Head)), + shoulder: key_from_slot(EquipSlot::Armor(ArmorSlot::Shoulders)), + chest: key_from_slot(EquipSlot::Armor(ArmorSlot::Chest)), + belt: key_from_slot(EquipSlot::Armor(ArmorSlot::Belt)), + back: key_from_slot(EquipSlot::Armor(ArmorSlot::Back)), + pants: key_from_slot(EquipSlot::Armor(ArmorSlot::Legs)), }) }, tool: if are_tools_visible { @@ -241,60 +185,11 @@ impl CharacterCacheKey { } else { None }, - lantern: if let Some(ItemKind::Lantern(lantern)) = inventory - .equipped(EquipSlot::Lantern) - .map(|i| i.kind()) - .as_deref() - { - Some(lantern.kind.clone()) - } else { - None - }, - glider: if let Some(ItemKind::Glider(glider)) = inventory - .equipped(EquipSlot::Glider) - .map(|i| i.kind()) - .as_deref() - { - Some(glider.kind.clone()) - } else { - None - }, - hand: if let Some(ItemKind::Armor(Armor { - kind: ArmorKind::Hand(armor), - .. - })) = inventory - .equipped(EquipSlot::Armor(ArmorSlot::Hands)) - .map(|i| i.kind()) - .as_deref() - { - Some(armor.clone()) - } else { - None - }, - foot: if let Some(ItemKind::Armor(Armor { - kind: ArmorKind::Foot(armor), - .. - })) = inventory - .equipped(EquipSlot::Armor(ArmorSlot::Feet)) - .map(|i| i.kind()) - .as_deref() - { - Some(armor.clone()) - } else { - None - }, - head: if let Some(ItemKind::Armor(Armor { - kind: ArmorKind::Head(armor), - .. - })) = inventory - .equipped(EquipSlot::Armor(ArmorSlot::Head)) - .map(|i| i.kind()) - .as_deref() - { - Some(armor.clone()) - } else { - None - }, + lantern: key_from_slot(EquipSlot::Lantern), + glider: key_from_slot(EquipSlot::Glider), + hand: key_from_slot(EquipSlot::Armor(ArmorSlot::Hands)), + foot: key_from_slot(EquipSlot::Armor(ArmorSlot::Feet)), + head: key_from_slot(EquipSlot::Armor(ArmorSlot::Head)), } } } diff --git a/voxygen/src/ui/widgets/item_tooltip.rs b/voxygen/src/ui/widgets/item_tooltip.rs index 9f72b245de..5acb74f047 100644 --- a/voxygen/src/ui/widgets/item_tooltip.rs +++ b/voxygen/src/ui/widgets/item_tooltip.rs @@ -802,7 +802,7 @@ impl<'a> Widget for ItemTooltip<'a> { }, ItemKind::Armor(armor) => { match armor.kind { - ArmorKind::Bag(_) => { + ArmorKind::Bag => { // Bags widget::Text::new(&format!( "{} {}", From aeca67443b2039d03cc3968490e8ccfc1e2d6dc7 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 18 May 2022 16:28:10 -0400 Subject: [PATCH 2/3] Simplified item key (assets) --- assets/common/items/armor/alchemist/belt.ron | 2 +- assets/common/items/armor/alchemist/chest.ron | 2 +- assets/common/items/armor/alchemist/hat.ron | 2 +- assets/common/items/armor/alchemist/pants.ron | 2 +- assets/common/items/armor/assassin/belt.ron | 2 +- assets/common/items/armor/assassin/chest.ron | 2 +- assets/common/items/armor/assassin/foot.ron | 2 +- assets/common/items/armor/assassin/hand.ron | 2 +- assets/common/items/armor/assassin/head.ron | 2 +- assets/common/items/armor/assassin/pants.ron | 2 +- .../common/items/armor/assassin/shoulder.ron | 2 +- assets/common/items/armor/blacksmith/belt.ron | 2 +- .../common/items/armor/blacksmith/chest.ron | 2 +- assets/common/items/armor/blacksmith/hand.ron | 2 +- assets/common/items/armor/blacksmith/hat.ron | 2 +- .../common/items/armor/blacksmith/pants.ron | 2 +- .../common/items/armor/bonerattler/belt.ron | 2 +- .../common/items/armor/bonerattler/chest.ron | 2 +- .../common/items/armor/bonerattler/foot.ron | 2 +- .../common/items/armor/bonerattler/hand.ron | 2 +- .../common/items/armor/bonerattler/pants.ron | 2 +- .../items/armor/bonerattler/shoulder.ron | 2 +- assets/common/items/armor/chef/belt.ron | 2 +- assets/common/items/armor/chef/chest.ron | 2 +- assets/common/items/armor/chef/hat.ron | 2 +- assets/common/items/armor/chef/pants.ron | 2 +- .../common/items/armor/cloth/druid/back.ron | 2 +- .../common/items/armor/cloth/druid/belt.ron | 2 +- .../common/items/armor/cloth/druid/chest.ron | 2 +- .../common/items/armor/cloth/druid/foot.ron | 2 +- .../common/items/armor/cloth/druid/hand.ron | 2 +- .../common/items/armor/cloth/druid/pants.ron | 2 +- .../items/armor/cloth/druid/shoulder.ron | 2 +- .../common/items/armor/cloth/linen/back.ron | 2 +- .../common/items/armor/cloth/linen/belt.ron | 2 +- .../common/items/armor/cloth/linen/chest.ron | 2 +- .../common/items/armor/cloth/linen/foot.ron | 2 +- .../common/items/armor/cloth/linen/hand.ron | 2 +- .../common/items/armor/cloth/linen/pants.ron | 2 +- .../items/armor/cloth/linen/shoulder.ron | 2 +- .../items/armor/cloth/moonweave/back.ron | 2 +- .../items/armor/cloth/moonweave/belt.ron | 2 +- .../items/armor/cloth/moonweave/chest.ron | 2 +- .../items/armor/cloth/moonweave/foot.ron | 2 +- .../items/armor/cloth/moonweave/hand.ron | 2 +- .../items/armor/cloth/moonweave/pants.ron | 2 +- .../items/armor/cloth/moonweave/shoulder.ron | 2 +- .../common/items/armor/cloth/silken/back.ron | 2 +- .../common/items/armor/cloth/silken/belt.ron | 2 +- .../common/items/armor/cloth/silken/chest.ron | 2 +- .../common/items/armor/cloth/silken/foot.ron | 2 +- .../common/items/armor/cloth/silken/hand.ron | 2 +- .../common/items/armor/cloth/silken/pants.ron | 2 +- .../items/armor/cloth/silken/shoulder.ron | 2 +- .../common/items/armor/cloth/sunsilk/back.ron | 2 +- .../common/items/armor/cloth/sunsilk/belt.ron | 2 +- .../items/armor/cloth/sunsilk/chest.ron | 2 +- .../common/items/armor/cloth/sunsilk/foot.ron | 2 +- .../common/items/armor/cloth/sunsilk/hand.ron | 2 +- .../items/armor/cloth/sunsilk/pants.ron | 2 +- .../items/armor/cloth/sunsilk/shoulder.ron | 2 +- .../common/items/armor/cloth/woolen/back.ron | 2 +- .../common/items/armor/cloth/woolen/belt.ron | 2 +- .../common/items/armor/cloth/woolen/chest.ron | 2 +- .../common/items/armor/cloth/woolen/foot.ron | 2 +- .../common/items/armor/cloth/woolen/hand.ron | 2 +- .../common/items/armor/cloth/woolen/pants.ron | 2 +- .../items/armor/cloth/woolen/shoulder.ron | 2 +- assets/common/items/armor/cloth_blue/belt.ron | 2 +- .../common/items/armor/cloth_blue/chest.ron | 2 +- assets/common/items/armor/cloth_blue/foot.ron | 2 +- assets/common/items/armor/cloth_blue/hand.ron | 2 +- .../common/items/armor/cloth_blue/pants.ron | 2 +- .../items/armor/cloth_blue/shoulder_0.ron | 2 +- .../items/armor/cloth_blue/shoulder_1.ron | 2 +- .../common/items/armor/cloth_green/belt.ron | 2 +- .../common/items/armor/cloth_green/chest.ron | 2 +- .../common/items/armor/cloth_green/foot.ron | 2 +- .../common/items/armor/cloth_green/hand.ron | 2 +- .../common/items/armor/cloth_green/pants.ron | 2 +- .../items/armor/cloth_green/shoulder.ron | 2 +- .../common/items/armor/cloth_purple/belt.ron | 2 +- .../common/items/armor/cloth_purple/chest.ron | 2 +- .../common/items/armor/cloth_purple/foot.ron | 2 +- .../common/items/armor/cloth_purple/hand.ron | 2 +- .../common/items/armor/cloth_purple/pants.ron | 2 +- .../items/armor/cloth_purple/shoulder.ron | 2 +- assets/common/items/armor/cultist/bandana.ron | 2 +- assets/common/items/armor/cultist/belt.ron | 2 +- assets/common/items/armor/cultist/chest.ron | 2 +- assets/common/items/armor/cultist/foot.ron | 2 +- assets/common/items/armor/cultist/hand.ron | 2 +- .../common/items/armor/cultist/necklace.ron | 2 +- assets/common/items/armor/cultist/pants.ron | 2 +- assets/common/items/armor/cultist/ring.ron | 2 +- .../common/items/armor/cultist/shoulder.ron | 2 +- assets/common/items/armor/ferocious/back.ron | 2 +- assets/common/items/armor/ferocious/belt.ron | 2 +- assets/common/items/armor/ferocious/chest.ron | 2 +- assets/common/items/armor/ferocious/foot.ron | 2 +- assets/common/items/armor/ferocious/hand.ron | 2 +- assets/common/items/armor/ferocious/pants.ron | 2 +- .../common/items/armor/ferocious/shoulder.ron | 2 +- .../common/items/armor/hide/carapace/back.ron | 2 +- .../common/items/armor/hide/carapace/belt.ron | 2 +- .../items/armor/hide/carapace/chest.ron | 2 +- .../common/items/armor/hide/carapace/foot.ron | 2 +- .../common/items/armor/hide/carapace/hand.ron | 2 +- .../items/armor/hide/carapace/pants.ron | 2 +- .../items/armor/hide/carapace/shoulder.ron | 2 +- .../items/armor/hide/dragonscale/back.ron | 2 +- .../items/armor/hide/dragonscale/belt.ron | 2 +- .../items/armor/hide/dragonscale/chest.ron | 2 +- .../items/armor/hide/dragonscale/foot.ron | 2 +- .../items/armor/hide/dragonscale/hand.ron | 2 +- .../items/armor/hide/dragonscale/pants.ron | 2 +- .../items/armor/hide/dragonscale/shoulder.ron | 2 +- .../common/items/armor/hide/leather/back.ron | 2 +- .../common/items/armor/hide/leather/belt.ron | 2 +- .../common/items/armor/hide/leather/chest.ron | 2 +- .../common/items/armor/hide/leather/foot.ron | 2 +- .../common/items/armor/hide/leather/hand.ron | 2 +- .../common/items/armor/hide/leather/head.ron | 2 +- .../common/items/armor/hide/leather/pants.ron | 2 +- .../items/armor/hide/leather/shoulder.ron | 2 +- .../common/items/armor/hide/primal/back.ron | 2 +- .../common/items/armor/hide/primal/belt.ron | 2 +- .../common/items/armor/hide/primal/chest.ron | 2 +- .../common/items/armor/hide/primal/foot.ron | 2 +- .../common/items/armor/hide/primal/hand.ron | 2 +- .../common/items/armor/hide/primal/pants.ron | 2 +- .../items/armor/hide/primal/shoulder.ron | 2 +- .../common/items/armor/hide/rawhide/back.ron | 2 +- .../common/items/armor/hide/rawhide/belt.ron | 2 +- .../common/items/armor/hide/rawhide/chest.ron | 2 +- .../common/items/armor/hide/rawhide/foot.ron | 2 +- .../common/items/armor/hide/rawhide/hand.ron | 2 +- .../common/items/armor/hide/rawhide/pants.ron | 2 +- .../items/armor/hide/rawhide/shoulder.ron | 2 +- assets/common/items/armor/hide/scale/back.ron | 2 +- assets/common/items/armor/hide/scale/belt.ron | 2 +- .../common/items/armor/hide/scale/chest.ron | 2 +- assets/common/items/armor/hide/scale/foot.ron | 2 +- assets/common/items/armor/hide/scale/hand.ron | 2 +- .../common/items/armor/hide/scale/pants.ron | 2 +- .../items/armor/hide/scale/shoulder.ron | 2 +- .../common/items/armor/leather_plate/belt.ron | 2 +- .../items/armor/leather_plate/chest.ron | 2 +- .../common/items/armor/leather_plate/foot.ron | 2 +- .../common/items/armor/leather_plate/hand.ron | 2 +- .../items/armor/leather_plate/helmet.ron | 2 +- .../items/armor/leather_plate/pants.ron | 2 +- .../items/armor/leather_plate/shoulder.ron | 2 +- .../items/armor/mail/bloodsteel/back.ron | 2 +- .../items/armor/mail/bloodsteel/belt.ron | 2 +- .../items/armor/mail/bloodsteel/chest.ron | 2 +- .../items/armor/mail/bloodsteel/foot.ron | 2 +- .../items/armor/mail/bloodsteel/hand.ron | 2 +- .../items/armor/mail/bloodsteel/pants.ron | 2 +- .../items/armor/mail/bloodsteel/shoulder.ron | 2 +- .../common/items/armor/mail/bronze/back.ron | 2 +- .../common/items/armor/mail/bronze/belt.ron | 2 +- .../common/items/armor/mail/bronze/chest.ron | 2 +- .../common/items/armor/mail/bronze/foot.ron | 2 +- .../common/items/armor/mail/bronze/hand.ron | 2 +- .../common/items/armor/mail/bronze/pants.ron | 2 +- .../items/armor/mail/bronze/shoulder.ron | 2 +- .../common/items/armor/mail/cobalt/back.ron | 2 +- .../common/items/armor/mail/cobalt/belt.ron | 2 +- .../common/items/armor/mail/cobalt/chest.ron | 2 +- .../common/items/armor/mail/cobalt/foot.ron | 2 +- .../common/items/armor/mail/cobalt/hand.ron | 2 +- .../common/items/armor/mail/cobalt/pants.ron | 2 +- .../items/armor/mail/cobalt/shoulder.ron | 2 +- assets/common/items/armor/mail/iron/back.ron | 2 +- assets/common/items/armor/mail/iron/belt.ron | 2 +- assets/common/items/armor/mail/iron/chest.ron | 2 +- assets/common/items/armor/mail/iron/foot.ron | 2 +- assets/common/items/armor/mail/iron/hand.ron | 2 +- assets/common/items/armor/mail/iron/pants.ron | 2 +- .../common/items/armor/mail/iron/shoulder.ron | 2 +- .../items/armor/mail/orichalcum/back.ron | 2 +- .../items/armor/mail/orichalcum/belt.ron | 2 +- .../items/armor/mail/orichalcum/chest.ron | 2 +- .../items/armor/mail/orichalcum/foot.ron | 2 +- .../items/armor/mail/orichalcum/hand.ron | 2 +- .../items/armor/mail/orichalcum/pants.ron | 2 +- .../items/armor/mail/orichalcum/shoulder.ron | 2 +- assets/common/items/armor/mail/steel/back.ron | 2 +- assets/common/items/armor/mail/steel/belt.ron | 2 +- .../common/items/armor/mail/steel/chest.ron | 2 +- assets/common/items/armor/mail/steel/foot.ron | 2 +- assets/common/items/armor/mail/steel/hand.ron | 2 +- .../common/items/armor/mail/steel/pants.ron | 2 +- .../items/armor/mail/steel/shoulder.ron | 2 +- assets/common/items/armor/merchant/back.ron | 2 +- assets/common/items/armor/merchant/belt.ron | 2 +- assets/common/items/armor/merchant/chest.ron | 2 +- assets/common/items/armor/merchant/foot.ron | 2 +- assets/common/items/armor/merchant/hand.ron | 2 +- assets/common/items/armor/merchant/pants.ron | 2 +- .../common/items/armor/merchant/shoulder.ron | 2 +- assets/common/items/armor/merchant/turban.ron | 4 +- assets/common/items/armor/misc/back/admin.ron | 2 +- .../common/items/armor/misc/back/backpack.ron | 2 +- .../items/armor/misc/back/dungeon_purple.ron | 2 +- .../common/items/armor/misc/back/short_0.ron | 2 +- .../common/items/armor/misc/back/short_1.ron | 2 +- .../items/armor/misc/bag/heavy_seabag.ron | 2 +- .../armor/misc/bag/knitted_red_pouch.ron | 2 +- .../common/items/armor/misc/bag/liana_kit.ron | 2 +- .../armor/misc/bag/mindflayer_spellbag.ron | 2 +- .../armor/misc/bag/reliable_backpack.ron | 2 +- .../armor/misc/bag/soulkeeper_cursed.ron | 2 +- .../items/armor/misc/bag/soulkeeper_pure.ron | 2 +- .../armor/misc/bag/sturdy_red_backpack.ron | 2 +- .../armor/misc/bag/tiny_leather_pouch.ron | 2 +- .../items/armor/misc/bag/tiny_red_pouch.ron | 2 +- .../items/armor/misc/bag/troll_hide_pack.ron | 2 +- .../items/armor/misc/bag/woven_red_bag.ron | 2 +- .../items/armor/misc/chest/worker_green_0.ron | 2 +- .../items/armor/misc/chest/worker_green_1.ron | 2 +- .../armor/misc/chest/worker_orange_0.ron | 2 +- .../armor/misc/chest/worker_orange_1.ron | 2 +- .../armor/misc/chest/worker_purple_0.ron | 2 +- .../armor/misc/chest/worker_purple_1.ron | 2 +- .../armor/misc/chest/worker_purple_brown.ron | 2 +- .../items/armor/misc/chest/worker_red_0.ron | 2 +- .../items/armor/misc/chest/worker_red_1.ron | 2 +- .../armor/misc/chest/worker_yellow_0.ron | 2 +- .../armor/misc/chest/worker_yellow_1.ron | 2 +- .../armor/misc/foot/jackalope_slippers.ron | 2 +- .../common/items/armor/misc/foot/sandals.ron | 2 +- .../items/armor/misc/head/bamboo_twig.ron | 2 +- .../items/armor/misc/head/bandana/red.ron | 2 +- .../items/armor/misc/head/bandana/thief.ron | 2 +- .../items/armor/misc/head/boreal_warhelm.ron | 2 +- assets/common/items/armor/misc/head/crown.ron | 2 +- .../items/armor/misc/head/exclamation.ron | 2 +- .../common/items/armor/misc/head/headband.ron | 2 +- .../common/items/armor/misc/head/helmet.ron | 2 +- .../common/items/armor/misc/head/hog_hood.ron | 2 +- assets/common/items/armor/misc/head/hood.ron | 2 +- .../items/armor/misc/head/hood_dark.ron | 2 +- assets/common/items/armor/misc/head/mitre.ron | 2 +- .../items/armor/misc/head/spikeguard.ron | 2 +- assets/common/items/armor/misc/head/straw.ron | 2 +- .../items/armor/misc/head/wanderers_hat.ron | 2 +- .../items/armor/misc/head/winged_coronet.ron | 2 +- .../common/items/armor/misc/neck/amethyst.ron | 2 +- .../items/armor/misc/neck/ankh_of_life.ron | 2 +- .../armor/misc/neck/carcanet_of_wrath.ron | 2 +- .../common/items/armor/misc/neck/diamond.ron | 2 +- .../common/items/armor/misc/neck/emerald.ron | 2 +- assets/common/items/armor/misc/neck/fang.ron | 2 +- .../armor/misc/neck/gem_of_resilience.ron | 2 +- assets/common/items/armor/misc/neck/gold.ron | 2 +- .../items/armor/misc/neck/haniwa_talisman.ron | 2 +- .../armor/misc/neck/honeycomb_pendant.ron | 2 +- .../armor/misc/neck/pendant_of_protection.ron | 2 +- assets/common/items/armor/misc/neck/ruby.ron | 2 +- .../common/items/armor/misc/neck/sapphire.ron | 2 +- .../items/armor/misc/neck/scratched.ron | 2 +- assets/common/items/armor/misc/neck/shell.ron | 2 +- assets/common/items/armor/misc/neck/topaz.ron | 2 +- .../common/items/armor/misc/pants/hunting.ron | 2 +- .../items/armor/misc/pants/worker_blue.ron | 2 +- .../items/armor/misc/pants/worker_brown.ron | 2 +- .../common/items/armor/misc/ring/amethyst.ron | 2 +- .../common/items/armor/misc/ring/diamond.ron | 2 +- .../common/items/armor/misc/ring/emerald.ron | 2 +- assets/common/items/armor/misc/ring/gold.ron | 2 +- assets/common/items/armor/misc/ring/ruby.ron | 2 +- .../common/items/armor/misc/ring/sapphire.ron | 2 +- .../items/armor/misc/ring/scratched.ron | 2 +- assets/common/items/armor/misc/ring/topaz.ron | 2 +- .../items/armor/misc/shoulder/iron_spikes.ron | 2 +- .../armor/misc/shoulder/leather_iron_0.ron | 2 +- .../armor/misc/shoulder/leather_iron_1.ron | 2 +- .../armor/misc/shoulder/leather_iron_2.ron | 2 +- .../armor/misc/shoulder/leather_iron_3.ron | 2 +- .../armor/misc/shoulder/leather_strip.ron | 2 +- .../common/items/armor/misc/tabard/admin.ron | 2 +- assets/common/items/armor/pirate/belt.ron | 2 +- assets/common/items/armor/pirate/chest.ron | 2 +- assets/common/items/armor/pirate/foot.ron | 2 +- assets/common/items/armor/pirate/hand.ron | 2 +- assets/common/items/armor/pirate/hat.ron | 2 +- assets/common/items/armor/pirate/pants.ron | 2 +- assets/common/items/armor/pirate/shoulder.ron | 2 +- assets/common/items/armor/rugged/chest.ron | 2 +- assets/common/items/armor/rugged/pants.ron | 2 +- assets/common/items/armor/savage/back.ron | 2 +- assets/common/items/armor/savage/belt.ron | 2 +- assets/common/items/armor/savage/chest.ron | 2 +- assets/common/items/armor/savage/foot.ron | 2 +- assets/common/items/armor/savage/hand.ron | 2 +- assets/common/items/armor/savage/pants.ron | 2 +- assets/common/items/armor/savage/shoulder.ron | 2 +- assets/common/items/armor/tarasque/belt.ron | 2 +- assets/common/items/armor/tarasque/chest.ron | 2 +- assets/common/items/armor/tarasque/foot.ron | 2 +- assets/common/items/armor/tarasque/hand.ron | 2 +- assets/common/items/armor/tarasque/pants.ron | 2 +- .../common/items/armor/tarasque/shoulder.ron | 2 +- assets/common/items/armor/twigs/belt.ron | 2 +- assets/common/items/armor/twigs/chest.ron | 2 +- assets/common/items/armor/twigs/foot.ron | 2 +- assets/common/items/armor/twigs/hand.ron | 2 +- assets/common/items/armor/twigs/pants.ron | 2 +- assets/common/items/armor/twigs/shoulder.ron | 2 +- .../common/items/armor/twigsflowers/belt.ron | 2 +- .../common/items/armor/twigsflowers/chest.ron | 2 +- .../common/items/armor/twigsflowers/foot.ron | 2 +- .../common/items/armor/twigsflowers/hand.ron | 2 +- .../common/items/armor/twigsflowers/pants.ron | 2 +- .../items/armor/twigsflowers/shoulder.ron | 2 +- .../common/items/armor/twigsleaves/belt.ron | 2 +- .../common/items/armor/twigsleaves/chest.ron | 2 +- .../common/items/armor/twigsleaves/foot.ron | 2 +- .../common/items/armor/twigsleaves/hand.ron | 2 +- .../common/items/armor/twigsleaves/pants.ron | 2 +- .../items/armor/twigsleaves/shoulder.ron | 2 +- .../common/items/armor/velorite_mage/back.ron | 2 +- .../common/items/armor/velorite_mage/belt.ron | 2 +- .../items/armor/velorite_mage/chest.ron | 2 +- .../common/items/armor/velorite_mage/foot.ron | 2 +- .../common/items/armor/velorite_mage/hand.ron | 2 +- .../items/armor/velorite_mage/pants.ron | 2 +- .../items/armor/velorite_mage/shoulder.ron | 2 +- assets/common/items/armor/witch/back.ron | 2 +- assets/common/items/armor/witch/belt.ron | 2 +- assets/common/items/armor/witch/chest.ron | 2 +- assets/common/items/armor/witch/foot.ron | 2 +- assets/common/items/armor/witch/hand.ron | 2 +- assets/common/items/armor/witch/hat.ron | 2 +- assets/common/items/armor/witch/pants.ron | 2 +- assets/common/items/armor/witch/shoulder.ron | 2 +- assets/common/items/boss_drops/exp_flask.ron | 1 - assets/common/items/boss_drops/lantern.ron | 1 - assets/common/items/boss_drops/xp_potion.ron | 1 - .../armor/misc/head/woolly_wintercap.ron | 2 +- .../items/crafting_ing/animal_misc/bone.ron | 1 - .../items/crafting_ing/animal_misc/claw.ron | 1 - .../animal_misc/elegant_crest.ron | 1 - .../items/crafting_ing/animal_misc/ember.ron | 1 - .../crafting_ing/animal_misc/feather.ron | 1 - .../items/crafting_ing/animal_misc/fur.ron | 1 - .../crafting_ing/animal_misc/grim_eyeball.ron | 1 - .../crafting_ing/animal_misc/icy_fang.ron | 1 - .../crafting_ing/animal_misc/large_horn.ron | 1 - .../crafting_ing/animal_misc/lively_vine.ron | 1 - .../crafting_ing/animal_misc/long_tusk.ron | 1 - .../animal_misc/phoenix_feather.ron | 1 - .../animal_misc/raptor_feather.ron | 1 - .../crafting_ing/animal_misc/sharp_fang.ron | 1 - .../animal_misc/strong_pincer.ron | 1 - .../crafting_ing/animal_misc/venom_sac.ron | 1 - .../crafting_ing/animal_misc/viscous_ooze.ron | 1 - assets/common/items/crafting_ing/bowl.ron | 1 - assets/common/items/crafting_ing/cactus.ron | 1 - .../items/crafting_ing/cloth/cotton.ron | 1 - .../items/crafting_ing/cloth/lifecloth.ron | 1 - .../common/items/crafting_ing/cloth/linen.ron | 1 - .../items/crafting_ing/cloth/linen_red.ron | 1 - .../items/crafting_ing/cloth/moonweave.ron | 1 - .../common/items/crafting_ing/cloth/silk.ron | 1 - .../items/crafting_ing/cloth/sunsilk.ron | 1 - .../common/items/crafting_ing/cloth/wool.ron | 1 - .../common/items/crafting_ing/cotton_boll.ron | 1 - .../common/items/crafting_ing/empty_vial.ron | 1 - .../items/crafting_ing/hide/animal_hide.ron | 1 - .../items/crafting_ing/hide/carapace.ron | 1 - .../items/crafting_ing/hide/dragon_scale.ron | 1 - .../items/crafting_ing/hide/leather_troll.ron | 1 - .../common/items/crafting_ing/hide/plate.ron | 1 - .../items/crafting_ing/hide/rugged_hide.ron | 1 - .../common/items/crafting_ing/hide/scales.ron | 1 - .../items/crafting_ing/hide/tough_hide.ron | 1 - assets/common/items/crafting_ing/honey.ron | 1 - .../crafting_ing/leather/leather_strips.ron | 1 - .../crafting_ing/leather/rigid_leather.ron | 1 - .../crafting_ing/leather/simple_leather.ron | 1 - .../crafting_ing/leather/thick_leather.ron | 1 - .../crafting_ing/mindflayer_bag_damaged.ron | 1 - assets/common/items/crafting_ing/oil.ron | 1 - assets/common/items/crafting_ing/rock.ron | 1 - .../common/items/crafting_ing/seashells.ron | 1 - .../items/crafting_ing/sticky_thread.ron | 1 - assets/common/items/crafting_ing/stones.ron | 1 - assets/common/items/crafting_ing/twigs.ron | 1 - .../items/crafting_tools/mortar_pestle.ron | 1 - .../items/crafting_tools/sewing_set.ron | 1 - assets/common/items/debug/admin.ron | 2 +- assets/common/items/debug/admin_back.ron | 2 +- .../common/items/debug/admin_black_hole.ron | 2 +- assets/common/items/debug/cultist_belt.ron | 2 +- assets/common/items/debug/cultist_boots.ron | 2 +- .../common/items/debug/cultist_chest_blue.ron | 2 +- .../common/items/debug/cultist_hands_blue.ron | 2 +- .../common/items/debug/cultist_legs_blue.ron | 2 +- .../items/debug/cultist_shoulder_blue.ron | 2 +- assets/common/items/debug/dungeon_purple.ron | 2 +- assets/common/items/flowers/blue.ron | 1 - assets/common/items/flowers/moonbell.ron | 1 - assets/common/items/flowers/pink.ron | 1 - assets/common/items/flowers/plant_fiber.ron | 1 - assets/common/items/flowers/pyrebloom.ron | 1 - assets/common/items/flowers/red.ron | 1 - assets/common/items/flowers/sunflower.ron | 1 - assets/common/items/flowers/white.ron | 1 - assets/common/items/flowers/wild_flax.ron | 1 - assets/common/items/flowers/yellow.ron | 1 - assets/common/items/glider/basic_red.ron | 6 +- assets/common/items/glider/basic_white.ron | 6 +- assets/common/items/glider/blue.ron | 6 +- assets/common/items/glider/butterfly3.ron | 6 +- assets/common/items/glider/cloverleaf.ron | 6 +- assets/common/items/glider/leaves.ron | 6 +- assets/common/items/glider/monarch.ron | 6 +- assets/common/items/glider/moonrise.ron | 6 +- assets/common/items/glider/morpho.ron | 6 +- assets/common/items/glider/moth.ron | 6 +- assets/common/items/glider/sandraptor.ron | 6 +- assets/common/items/glider/skullgrin.ron | 6 +- assets/common/items/glider/snowraptor.ron | 6 +- assets/common/items/glider/sunset.ron | 6 +- assets/common/items/glider/woodraptor.ron | 6 +- assets/common/items/grasses/long.ron | 1 - assets/common/items/grasses/medium.ron | 1 - assets/common/items/grasses/short.ron | 1 - assets/common/items/lantern/black_0.ron | 1 - assets/common/items/lantern/blue_0.ron | 1 - assets/common/items/lantern/geode_purp.ron | 1 - assets/common/items/lantern/green_0.ron | 1 - assets/common/items/lantern/polaris.ron | 1 - assets/common/items/lantern/pumpkin.ron | 1 - assets/common/items/lantern/red_0.ron | 1 - assets/common/items/log/bamboo.ron | 1 - assets/common/items/log/eldwood.ron | 1 - assets/common/items/log/frostwood.ron | 1 - assets/common/items/log/hardwood.ron | 1 - assets/common/items/log/ironwood.ron | 1 - assets/common/items/log/wood.ron | 1 - assets/common/items/mineral/gem/amethyst.ron | 1 - assets/common/items/mineral/gem/diamond.ron | 1 - assets/common/items/mineral/gem/emerald.ron | 1 - assets/common/items/mineral/gem/ruby.ron | 1 - assets/common/items/mineral/gem/sapphire.ron | 1 - assets/common/items/mineral/gem/topaz.ron | 1 - .../common/items/mineral/ingot/bloodsteel.ron | 1 - assets/common/items/mineral/ingot/bronze.ron | 1 - assets/common/items/mineral/ingot/cobalt.ron | 1 - assets/common/items/mineral/ingot/copper.ron | 1 - assets/common/items/mineral/ingot/gold.ron | 1 - assets/common/items/mineral/ingot/iron.ron | 1 - .../common/items/mineral/ingot/orichalcum.ron | 1 - assets/common/items/mineral/ingot/silver.ron | 1 - assets/common/items/mineral/ingot/steel.ron | 1 - assets/common/items/mineral/ingot/tin.ron | 1 - .../common/items/mineral/ore/bloodstone.ron | 1 - assets/common/items/mineral/ore/coal.ron | 1 - assets/common/items/mineral/ore/cobalt.ron | 1 - assets/common/items/mineral/ore/copper.ron | 1 - assets/common/items/mineral/ore/gold.ron | 1 - assets/common/items/mineral/ore/iron.ron | 1 - assets/common/items/mineral/ore/silver.ron | 1 - assets/common/items/mineral/ore/tin.ron | 1 - assets/common/items/mineral/ore/velorite.ron | 1 - .../common/items/mineral/ore/veloritefrag.ron | 1 - assets/common/items/mineral/stone/basalt.ron | 1 - assets/common/items/mineral/stone/coal.ron | 1 - assets/common/items/mineral/stone/granite.ron | 1 - .../common/items/mineral/stone/obsidian.ron | 1 - .../items/npc_armor/arthropod/generic.ron | 2 +- .../items/npc_armor/back/backpack_blue.ron | 2 +- .../items/npc_armor/back/leather_blue.ron | 2 +- .../items/npc_armor/biped_large/generic.ron | 2 +- .../items/npc_armor/biped_large/harvester.ron | 2 +- .../npc_armor/biped_large/mindflayer.ron | 2 +- .../items/npc_armor/biped_large/minotaur.ron | 2 +- .../npc_armor/biped_large/tidal_warrior.ron | 2 +- .../items/npc_armor/biped_large/warlock.ron | 2 +- .../items/npc_armor/biped_large/warlord.ron | 2 +- .../items/npc_armor/biped_large/yeti.ron | 2 +- .../biped_small/adlet/chest/hunter.ron | 2 +- .../biped_small/adlet/chest/icepicker.ron | 2 +- .../biped_small/adlet/chest/tracker.ron | 2 +- .../biped_small/adlet/foot/hunter.ron | 2 +- .../biped_small/adlet/foot/icepicker.ron | 2 +- .../biped_small/adlet/foot/tracker.ron | 2 +- .../biped_small/adlet/hand/hunter.ron | 2 +- .../biped_small/adlet/hand/icepicker.ron | 2 +- .../biped_small/adlet/hand/tracker.ron | 2 +- .../biped_small/adlet/head/hunter.ron | 2 +- .../biped_small/adlet/head/icepicker.ron | 2 +- .../biped_small/adlet/head/tracker.ron | 2 +- .../biped_small/adlet/pants/hunter.ron | 2 +- .../biped_small/adlet/pants/icepicker.ron | 2 +- .../biped_small/adlet/pants/tracker.ron | 2 +- .../biped_small/adlet/tail/hunter.ron | 2 +- .../biped_small/adlet/tail/icepicker.ron | 2 +- .../biped_small/adlet/tail/tracker.ron | 2 +- .../biped_small/gnarling/chest/chieftain.ron | 2 +- .../biped_small/gnarling/chest/logger.ron | 2 +- .../biped_small/gnarling/chest/mugger.ron | 2 +- .../biped_small/gnarling/chest/stalker.ron | 2 +- .../biped_small/gnarling/foot/chieftain.ron | 2 +- .../biped_small/gnarling/foot/logger.ron | 2 +- .../biped_small/gnarling/foot/mugger.ron | 2 +- .../biped_small/gnarling/foot/stalker.ron | 2 +- .../biped_small/gnarling/hand/chieftain.ron | 2 +- .../biped_small/gnarling/hand/logger.ron | 2 +- .../biped_small/gnarling/hand/mugger.ron | 2 +- .../biped_small/gnarling/hand/stalker.ron | 2 +- .../biped_small/gnarling/head/chieftain.ron | 2 +- .../biped_small/gnarling/head/logger.ron | 2 +- .../biped_small/gnarling/head/mugger.ron | 2 +- .../biped_small/gnarling/head/stalker.ron | 2 +- .../biped_small/gnarling/pants/chieftain.ron | 2 +- .../biped_small/gnarling/pants/logger.ron | 2 +- .../biped_small/gnarling/pants/mugger.ron | 2 +- .../biped_small/gnarling/pants/stalker.ron | 2 +- .../biped_small/gnarling/tail/chieftain.ron | 2 +- .../biped_small/gnarling/tail/logger.ron | 2 +- .../biped_small/gnarling/tail/mugger.ron | 2 +- .../biped_small/gnarling/tail/stalker.ron | 2 +- .../biped_small/gnoll/chest/rogue.ron | 2 +- .../biped_small/gnoll/chest/shaman.ron | 2 +- .../biped_small/gnoll/chest/trapper.ron | 2 +- .../biped_small/gnoll/foot/rogue.ron | 2 +- .../biped_small/gnoll/foot/shaman.ron | 2 +- .../biped_small/gnoll/foot/trapper.ron | 2 +- .../biped_small/gnoll/hand/rogue.ron | 2 +- .../biped_small/gnoll/hand/shaman.ron | 2 +- .../biped_small/gnoll/hand/trapper.ron | 2 +- .../biped_small/gnoll/head/rogue.ron | 2 +- .../biped_small/gnoll/head/shaman.ron | 2 +- .../biped_small/gnoll/head/trapper.ron | 2 +- .../biped_small/gnoll/pants/rogue.ron | 2 +- .../biped_small/gnoll/pants/shaman.ron | 2 +- .../biped_small/gnoll/pants/trapper.ron | 2 +- .../biped_small/gnoll/tail/rogue.ron | 2 +- .../biped_small/gnoll/tail/shaman.ron | 2 +- .../biped_small/gnoll/tail/trapper.ron | 2 +- .../biped_small/gnome/chest/gnome.ron | 2 +- .../biped_small/gnome/foot/gnome.ron | 2 +- .../biped_small/gnome/hand/gnome.ron | 2 +- .../biped_small/gnome/head/gnome.ron | 2 +- .../biped_small/gnome/pants/gnome.ron | 2 +- .../biped_small/haniwa/chest/archer.ron | 2 +- .../biped_small/haniwa/chest/guard.ron | 2 +- .../biped_small/haniwa/chest/soldier.ron | 2 +- .../biped_small/haniwa/foot/archer.ron | 2 +- .../biped_small/haniwa/foot/guard.ron | 2 +- .../biped_small/haniwa/foot/soldier.ron | 2 +- .../biped_small/haniwa/hand/archer.ron | 2 +- .../biped_small/haniwa/hand/guard.ron | 2 +- .../biped_small/haniwa/hand/soldier.ron | 2 +- .../biped_small/haniwa/head/archer.ron | 2 +- .../biped_small/haniwa/head/guard.ron | 2 +- .../biped_small/haniwa/head/soldier.ron | 2 +- .../biped_small/haniwa/pants/archer.ron | 2 +- .../biped_small/haniwa/pants/guard.ron | 2 +- .../biped_small/haniwa/pants/soldier.ron | 2 +- .../npc_armor/biped_small/husk/chest/husk.ron | 2 +- .../npc_armor/biped_small/husk/foot/husk.ron | 2 +- .../npc_armor/biped_small/husk/hand/husk.ron | 2 +- .../npc_armor/biped_small/husk/head/husk.ron | 2 +- .../npc_armor/biped_small/husk/pants/husk.ron | 2 +- .../npc_armor/biped_small/husk/tail/husk.ron | 2 +- .../biped_small/kappa/chest/kappa.ron | 2 +- .../biped_small/kappa/foot/kappa.ron | 2 +- .../biped_small/kappa/hand/kappa.ron | 2 +- .../biped_small/kappa/head/kappa.ron | 2 +- .../biped_small/kappa/pants/kappa.ron | 2 +- .../biped_small/kappa/tail/kappa.ron | 2 +- .../mandragora/chest/mandragora.ron | 2 +- .../mandragora/foot/mandragora.ron | 2 +- .../mandragora/hand/mandragora.ron | 2 +- .../mandragora/pants/mandragora.ron | 2 +- .../mandragora/tail/mandragora.ron | 2 +- .../biped_small/myrmidon/chest/hoplite.ron | 2 +- .../biped_small/myrmidon/chest/marksman.ron | 2 +- .../biped_small/myrmidon/chest/strategian.ron | 2 +- .../biped_small/myrmidon/foot/hoplite.ron | 2 +- .../biped_small/myrmidon/foot/marksman.ron | 2 +- .../biped_small/myrmidon/foot/strategian.ron | 2 +- .../biped_small/myrmidon/hand/hoplite.ron | 2 +- .../biped_small/myrmidon/hand/marksman.ron | 2 +- .../biped_small/myrmidon/hand/strategian.ron | 2 +- .../biped_small/myrmidon/head/hoplite.ron | 2 +- .../biped_small/myrmidon/head/marksman.ron | 2 +- .../biped_small/myrmidon/head/strategian.ron | 2 +- .../biped_small/myrmidon/pants/hoplite.ron | 2 +- .../biped_small/myrmidon/pants/marksman.ron | 2 +- .../biped_small/myrmidon/pants/strategian.ron | 2 +- .../biped_small/myrmidon/tail/hoplite.ron | 2 +- .../biped_small/myrmidon/tail/marksman.ron | 2 +- .../biped_small/myrmidon/tail/strategian.ron | 2 +- .../biped_small/sahagin/chest/sniper.ron | 2 +- .../biped_small/sahagin/chest/sorcerer.ron | 2 +- .../biped_small/sahagin/chest/spearman.ron | 2 +- .../biped_small/sahagin/foot/sniper.ron | 2 +- .../biped_small/sahagin/foot/sorcerer.ron | 2 +- .../biped_small/sahagin/foot/spearman.ron | 2 +- .../biped_small/sahagin/hand/sniper.ron | 2 +- .../biped_small/sahagin/hand/sorcerer.ron | 2 +- .../biped_small/sahagin/hand/spearman.ron | 2 +- .../biped_small/sahagin/head/sniper.ron | 2 +- .../biped_small/sahagin/head/sorcerer.ron | 2 +- .../biped_small/sahagin/head/spearman.ron | 2 +- .../biped_small/sahagin/pants/sniper.ron | 2 +- .../biped_small/sahagin/pants/sorcerer.ron | 2 +- .../biped_small/sahagin/pants/spearman.ron | 2 +- .../biped_small/sahagin/tail/sniper.ron | 2 +- .../biped_small/sahagin/tail/sorcerer.ron | 2 +- .../biped_small/sahagin/tail/spearman.ron | 2 +- .../items/npc_armor/chest/leather_blue.ron | 2 +- .../items/npc_armor/chest/plate_red.ron | 2 +- .../items/npc_armor/golem/claygolem.ron | 2 +- .../items/npc_armor/golem/woodgolem.ron | 2 +- .../items/npc_armor/pants/leather_blue.ron | 2 +- .../items/npc_armor/pants/plate_red.ron | 2 +- .../items/npc_armor/quadruped_low/generic.ron | 2 +- .../items/npc_armor/quadruped_low/shell.ron | 2 +- .../items/npc_armor/theropod/rugged.ron | 2 +- .../common/items/testing/test_bag_18_slot.ron | 2 +- .../common/items/testing/test_bag_9_slot.ron | 2 +- assets/common/items/testing/test_boots.ron | 2 +- assets/voxygen/audio/sfx.ron | 32 +- assets/voxygen/item_image_manifest.ron | 1177 +++++++++-------- .../biped_small_armor_chest_manifest.ron | 46 +- .../voxel/biped_small_armor_foot_manifest.ron | 46 +- .../voxel/biped_small_armor_hand_manifest.ron | 46 +- .../voxel/biped_small_armor_head_manifest.ron | 46 +- .../biped_small_armor_pants_manifest.ron | 46 +- .../voxel/biped_small_armor_tail_manifest.ron | 34 +- .../voxel/humanoid_armor_back_manifest.ron | 64 +- .../voxel/humanoid_armor_belt_manifest.ron | 76 +- .../voxel/humanoid_armor_chest_manifest.ron | 104 +- .../voxel/humanoid_armor_foot_manifest.ron | 74 +- .../voxel/humanoid_armor_hand_manifest.ron | 72 +- .../voxel/humanoid_armor_head_manifest.ron | 635 ++++----- .../voxel/humanoid_armor_pants_manifest.ron | 88 +- .../humanoid_armor_shoulder_manifest.ron | 84 +- .../voxel/humanoid_glider_manifest.ron | 56 +- .../voxel/humanoid_lantern_manifest.ron | 16 +- assets/voxygen/voxel/item_drop_manifest.ron | 1073 ++++++++------- 649 files changed, 2393 insertions(+), 2634 deletions(-) diff --git a/assets/common/items/armor/alchemist/belt.ron b/assets/common/items/armor/alchemist/belt.ron index b2d8addeba..5c2ec37c6b 100644 --- a/assets/common/items/armor/alchemist/belt.ron +++ b/assets/common/items/armor/alchemist/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Alchemist Belt", description: "", kind: Armor(( - kind: Belt("Alchemist"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/alchemist/chest.ron b/assets/common/items/armor/alchemist/chest.ron index 9a294c2306..1bfd138182 100644 --- a/assets/common/items/armor/alchemist/chest.ron +++ b/assets/common/items/armor/alchemist/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Alchemist Jacket", description: "", kind: Armor(( - kind: Chest("Alchemist"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/alchemist/hat.ron b/assets/common/items/armor/alchemist/hat.ron index 84661fd631..80f8fd0ed5 100644 --- a/assets/common/items/armor/alchemist/hat.ron +++ b/assets/common/items/armor/alchemist/hat.ron @@ -2,7 +2,7 @@ ItemDef( name: "Alchemist Hat", description: "It seems like a parrot was perched up here.", kind: Armor(( - kind: Head("Alchemist"), + kind: Head, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/alchemist/pants.ron b/assets/common/items/armor/alchemist/pants.ron index 78d3e0420b..14a702cbe9 100644 --- a/assets/common/items/armor/alchemist/pants.ron +++ b/assets/common/items/armor/alchemist/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Alchemist Pants", description: "", kind: Armor(( - kind: Pants("Alchemist"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/assassin/belt.ron b/assets/common/items/armor/assassin/belt.ron index 824300101d..97fc7563ed 100644 --- a/assets/common/items/armor/assassin/belt.ron +++ b/assets/common/items/armor/assassin/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Assassin Belt", description: "Only the best for a member of the creed.", kind: Armor(( - kind: Belt("Assassin"), + kind: Belt, stats: ( protection: Some(Normal(2.0)), ), diff --git a/assets/common/items/armor/assassin/chest.ron b/assets/common/items/armor/assassin/chest.ron index 28b970c2e6..031d4900c9 100644 --- a/assets/common/items/armor/assassin/chest.ron +++ b/assets/common/items/armor/assassin/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Assassin Chest", description: "Only the best for a member of the creed.", kind: Armor(( - kind: Chest("Assassin"), + kind: Chest, stats: ( protection: Some(Normal(15.0)), ), diff --git a/assets/common/items/armor/assassin/foot.ron b/assets/common/items/armor/assassin/foot.ron index 3c9a558ffe..e79d1d9011 100644 --- a/assets/common/items/armor/assassin/foot.ron +++ b/assets/common/items/armor/assassin/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Assassin Boots", description: "Only the best for a member of the creed.", kind: Armor(( - kind: Foot("Assassin"), + kind: Foot, stats: ( protection: Some(Normal(4.0)), ), diff --git a/assets/common/items/armor/assassin/hand.ron b/assets/common/items/armor/assassin/hand.ron index 105d406199..a7197e4475 100644 --- a/assets/common/items/armor/assassin/hand.ron +++ b/assets/common/items/armor/assassin/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Assassin Gloves", description: "Only the best for a member of the creed.", kind: Armor(( - kind: Hand("Assassin"), + kind: Hand, stats: ( protection: Some(Normal(6.0)), ), diff --git a/assets/common/items/armor/assassin/head.ron b/assets/common/items/armor/assassin/head.ron index 16209f6d9d..ef556a3e5b 100644 --- a/assets/common/items/armor/assassin/head.ron +++ b/assets/common/items/armor/assassin/head.ron @@ -2,7 +2,7 @@ ItemDef( name: "Dark Assassin Mask", description: "A general assassination mask preventing the wearer from being identified.", kind: Armor(( - kind: Head("AssaMask0"), + kind: Head, stats: ( ), )), diff --git a/assets/common/items/armor/assassin/pants.ron b/assets/common/items/armor/assassin/pants.ron index 5dd151fd0e..84c994c016 100644 --- a/assets/common/items/armor/assassin/pants.ron +++ b/assets/common/items/armor/assassin/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Assassin Pants", description: "Only the best for a member of the creed.", kind: Armor(( - kind: Pants("Assassin"), + kind: Pants, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/assassin/shoulder.ron b/assets/common/items/armor/assassin/shoulder.ron index 564fb212b1..587d83f11d 100644 --- a/assets/common/items/armor/assassin/shoulder.ron +++ b/assets/common/items/armor/assassin/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Assassin Shoulder Guard", description: "Only the best for a member of the creed.", kind: Armor(( - kind: Shoulder("Assassin"), + kind: Shoulder, stats: ( protection: Some(Normal(8.0)), ), diff --git a/assets/common/items/armor/blacksmith/belt.ron b/assets/common/items/armor/blacksmith/belt.ron index 573b5fa7fc..11274009b7 100644 --- a/assets/common/items/armor/blacksmith/belt.ron +++ b/assets/common/items/armor/blacksmith/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blacksmith Belt", description: "", kind: Armor(( - kind: Belt("Blacksmith"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/blacksmith/chest.ron b/assets/common/items/armor/blacksmith/chest.ron index c5dc0c28e7..41c83ba1a8 100644 --- a/assets/common/items/armor/blacksmith/chest.ron +++ b/assets/common/items/armor/blacksmith/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blacksmith Jacket", description: "", kind: Armor(( - kind: Chest("Blacksmith"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/blacksmith/hand.ron b/assets/common/items/armor/blacksmith/hand.ron index e7423094db..7b2cdc5b2c 100644 --- a/assets/common/items/armor/blacksmith/hand.ron +++ b/assets/common/items/armor/blacksmith/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blacksmith Gloves", description: "", kind: Armor(( - kind: Hand("Blacksmith"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/blacksmith/hat.ron b/assets/common/items/armor/blacksmith/hat.ron index 2f8bc4d53d..127c06f106 100644 --- a/assets/common/items/armor/blacksmith/hat.ron +++ b/assets/common/items/armor/blacksmith/hat.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blacksmith Hat", description: "", kind: Armor(( - kind: Head("Blacksmith"), + kind: Head, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/blacksmith/pants.ron b/assets/common/items/armor/blacksmith/pants.ron index f0f38bc0ed..c1866f5139 100644 --- a/assets/common/items/armor/blacksmith/pants.ron +++ b/assets/common/items/armor/blacksmith/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blacksmith Pants", description: "", kind: Armor(( - kind: Pants("Blacksmith"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/bonerattler/belt.ron b/assets/common/items/armor/bonerattler/belt.ron index 5f053a64ce..f641604dd3 100644 --- a/assets/common/items/armor/bonerattler/belt.ron +++ b/assets/common/items/armor/bonerattler/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bonerattler Belt", description: "Sections of vertebrae fastened together with hide and a bonerattler eye for the buckle.", kind: Armor(( - kind: Belt("Bonerattler"), + kind: Belt, stats: ( protection: Some(Normal(3.0)), ), diff --git a/assets/common/items/armor/bonerattler/chest.ron b/assets/common/items/armor/bonerattler/chest.ron index ce59f9de49..8e06c20c2a 100644 --- a/assets/common/items/armor/bonerattler/chest.ron +++ b/assets/common/items/armor/bonerattler/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bonerattler Cuirass", description: "The spiny back and hide of a bonerattler fastened together into a protective cuirass.", kind: Armor(( - kind: Chest("Bonerattler"), + kind: Chest, stats: ( protection: Some(Normal(25.0)), ), diff --git a/assets/common/items/armor/bonerattler/foot.ron b/assets/common/items/armor/bonerattler/foot.ron index f73589d8fd..f065bdcb52 100644 --- a/assets/common/items/armor/bonerattler/foot.ron +++ b/assets/common/items/armor/bonerattler/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bonerattler Boots", description: "Boots made from the claws and hide of a bonerattler.", kind: Armor(( - kind: Foot("Bonerattler"), + kind: Foot, stats: ( protection: Some(Normal(5.0)), ), diff --git a/assets/common/items/armor/bonerattler/hand.ron b/assets/common/items/armor/bonerattler/hand.ron index f5b3c5dc18..469e9539cc 100644 --- a/assets/common/items/armor/bonerattler/hand.ron +++ b/assets/common/items/armor/bonerattler/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bonerattler Gauntlets", description: "The hide and bone from a bonerattler provide strong protection for the wearer.", kind: Armor(( - kind: Hand("Bonerattler"), + kind: Hand, stats: ( protection: Some(Normal(10.0)), ), diff --git a/assets/common/items/armor/bonerattler/pants.ron b/assets/common/items/armor/bonerattler/pants.ron index 79b4e6a308..26c4a75c41 100644 --- a/assets/common/items/armor/bonerattler/pants.ron +++ b/assets/common/items/armor/bonerattler/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bonerattler Chausses", description: "Assorted bones and hide from a bonerattler provide protection around the wearer's legs.", kind: Armor(( - kind: Pants("Bonerattler"), + kind: Pants, stats: ( protection: Some(Normal(20.0)), ), diff --git a/assets/common/items/armor/bonerattler/shoulder.ron b/assets/common/items/armor/bonerattler/shoulder.ron index e5de59605d..12fa1e0547 100644 --- a/assets/common/items/armor/bonerattler/shoulder.ron +++ b/assets/common/items/armor/bonerattler/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bonerattler Shoulder Pad", description: "Roughly formed bonerattler hide provide some strong protection.", kind: Armor(( - kind: Shoulder("Bonerattler"), + kind: Shoulder, stats: ( protection: Some(Normal(15.0)), ), diff --git a/assets/common/items/armor/chef/belt.ron b/assets/common/items/armor/chef/belt.ron index d95c5732b5..738a8d10a8 100644 --- a/assets/common/items/armor/chef/belt.ron +++ b/assets/common/items/armor/chef/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Chef Belt", description: "", kind: Armor(( - kind: Belt("Chef"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/chef/chest.ron b/assets/common/items/armor/chef/chest.ron index 74331d5b3d..cfc3672d1b 100644 --- a/assets/common/items/armor/chef/chest.ron +++ b/assets/common/items/armor/chef/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Chef Jacket", description: "", kind: Armor(( - kind: Chest("Chef"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/chef/hat.ron b/assets/common/items/armor/chef/hat.ron index 471b30db32..c5250bebef 100644 --- a/assets/common/items/armor/chef/hat.ron +++ b/assets/common/items/armor/chef/hat.ron @@ -2,7 +2,7 @@ ItemDef( name: "Chef Hat", description: "", kind: Armor(( - kind: Head("Chef"), + kind: Head, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/chef/pants.ron b/assets/common/items/armor/chef/pants.ron index 945ad24ed5..153f5cdcff 100644 --- a/assets/common/items/armor/chef/pants.ron +++ b/assets/common/items/armor/chef/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Chef Pants", description: "", kind: Armor(( - kind: Pants("Chef"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/cloth/druid/back.ron b/assets/common/items/armor/cloth/druid/back.ron index 779fb34fb6..c1c3676ab4 100644 --- a/assets/common/items/armor/cloth/druid/back.ron +++ b/assets/common/items/armor/cloth/druid/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Druid Cape", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Back("Druid"), + kind: Back, stats: ( protection: Some(Normal(3.0)), energy_max: Some(3.3), diff --git a/assets/common/items/armor/cloth/druid/belt.ron b/assets/common/items/armor/cloth/druid/belt.ron index 4140fb89f7..5b5cfc6b9f 100644 --- a/assets/common/items/armor/cloth/druid/belt.ron +++ b/assets/common/items/armor/cloth/druid/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Druid Sash", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Belt("Druid"), + kind: Belt, stats: ( protection: Some(Normal(3.0)), energy_max: Some(3.3), diff --git a/assets/common/items/armor/cloth/druid/chest.ron b/assets/common/items/armor/cloth/druid/chest.ron index f787f6812f..ed0a3e144e 100644 --- a/assets/common/items/armor/cloth/druid/chest.ron +++ b/assets/common/items/armor/cloth/druid/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Druid Chestguard", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Chest("Druid"), + kind: Chest, stats: ( protection: Some(Normal(18.0)), energy_max: Some(19.8), diff --git a/assets/common/items/armor/cloth/druid/foot.ron b/assets/common/items/armor/cloth/druid/foot.ron index dd820c0901..63d1ca531f 100644 --- a/assets/common/items/armor/cloth/druid/foot.ron +++ b/assets/common/items/armor/cloth/druid/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Druid Kickers", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Foot("Druid"), + kind: Foot, stats: ( protection: Some(Normal(6.0)), energy_max: Some(6.6), diff --git a/assets/common/items/armor/cloth/druid/hand.ron b/assets/common/items/armor/cloth/druid/hand.ron index f32f990c05..06162821f1 100644 --- a/assets/common/items/armor/cloth/druid/hand.ron +++ b/assets/common/items/armor/cloth/druid/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Druid Handwraps", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Hand("Druid"), + kind: Hand, stats: ( protection: Some(Normal(6.0)), energy_max: Some(6.6), diff --git a/assets/common/items/armor/cloth/druid/pants.ron b/assets/common/items/armor/cloth/druid/pants.ron index 475f253833..e142e7a565 100644 --- a/assets/common/items/armor/cloth/druid/pants.ron +++ b/assets/common/items/armor/cloth/druid/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Druid Leggings", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Pants("Druid"), + kind: Pants, stats: ( protection: Some(Normal(12.0)), energy_max: Some(13.2), diff --git a/assets/common/items/armor/cloth/druid/shoulder.ron b/assets/common/items/armor/cloth/druid/shoulder.ron index 28f3815ee5..71ba67a04d 100644 --- a/assets/common/items/armor/cloth/druid/shoulder.ron +++ b/assets/common/items/armor/cloth/druid/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Druid Shoulderpads", description: "Incredibly light, with the essence of nature.", kind: Armor(( - kind: Shoulder("Druid"), + kind: Shoulder, stats: ( protection: Some(Normal(12.0)), energy_max: Some(13.2), diff --git a/assets/common/items/armor/cloth/linen/back.ron b/assets/common/items/armor/cloth/linen/back.ron index b4af0c248f..1b8915e1cb 100644 --- a/assets/common/items/armor/cloth/linen/back.ron +++ b/assets/common/items/armor/cloth/linen/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Linen Shawl", description: "Roughly stitched, but it seems to hold.", kind: Armor(( - kind: Back("Linen"), + kind: Back, stats: ( protection: Some(Normal(1.0)), energy_max: Some(0.8), diff --git a/assets/common/items/armor/cloth/linen/belt.ron b/assets/common/items/armor/cloth/linen/belt.ron index 731e27aecb..bb3807061f 100644 --- a/assets/common/items/armor/cloth/linen/belt.ron +++ b/assets/common/items/armor/cloth/linen/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Linen Sash", description: "Roughly stitched, but it seems to hold.", kind: Armor(( - kind: Belt("Linen"), + kind: Belt, stats: ( protection: Some(Normal(1.0)), energy_max: Some(0.8), diff --git a/assets/common/items/armor/cloth/linen/chest.ron b/assets/common/items/armor/cloth/linen/chest.ron index fccf67bf00..ec2236a261 100644 --- a/assets/common/items/armor/cloth/linen/chest.ron +++ b/assets/common/items/armor/cloth/linen/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Linen Vest", description: "Roughly stitched, but it seems to hold.", kind: Armor(( - kind: Chest("Linen"), + kind: Chest, stats: ( protection: Some(Normal(5.0)), energy_max: Some(5.0), diff --git a/assets/common/items/armor/cloth/linen/foot.ron b/assets/common/items/armor/cloth/linen/foot.ron index bd23447f38..4df179cc82 100644 --- a/assets/common/items/armor/cloth/linen/foot.ron +++ b/assets/common/items/armor/cloth/linen/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Linen Feet", description: "Roughly stitched, but it seems to hold.", kind: Armor(( - kind: Foot("Linen"), + kind: Foot, stats: ( protection: Some(Normal(2.0)), energy_max: Some(1.7), diff --git a/assets/common/items/armor/cloth/linen/hand.ron b/assets/common/items/armor/cloth/linen/hand.ron index fec5b0059b..0adb4ef1d4 100644 --- a/assets/common/items/armor/cloth/linen/hand.ron +++ b/assets/common/items/armor/cloth/linen/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Linen Handwraps", description: "Roughly stitched, but it seems to hold.", kind: Armor(( - kind: Hand("Linen"), + kind: Hand, stats: ( protection: Some(Normal(2.0)), energy_max: Some(1.7), diff --git a/assets/common/items/armor/cloth/linen/pants.ron b/assets/common/items/armor/cloth/linen/pants.ron index ec0b542b80..84bb7c95b6 100644 --- a/assets/common/items/armor/cloth/linen/pants.ron +++ b/assets/common/items/armor/cloth/linen/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Linen Pants", description: "Roughly stitched, but it seems to hold.", kind: Armor(( - kind: Pants("Linen"), + kind: Pants, stats: ( protection: Some(Normal(3.0)), energy_max: Some(3.3), diff --git a/assets/common/items/armor/cloth/linen/shoulder.ron b/assets/common/items/armor/cloth/linen/shoulder.ron index 7dee2ae345..6a953f7794 100644 --- a/assets/common/items/armor/cloth/linen/shoulder.ron +++ b/assets/common/items/armor/cloth/linen/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Linen Shoulders", description: "Roughly stitched, but it seems to hold.", kind: Armor(( - kind: Shoulder("Linen"), + kind: Shoulder, stats: ( protection: Some(Normal(3.0)), energy_max: Some(3.3), diff --git a/assets/common/items/armor/cloth/moonweave/back.ron b/assets/common/items/armor/cloth/moonweave/back.ron index 8130d8ce91..4c7a754bf9 100644 --- a/assets/common/items/armor/cloth/moonweave/back.ron +++ b/assets/common/items/armor/cloth/moonweave/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Moonweave Cape", description: "The fabric dances silently, like moonlight.", kind: Armor(( - kind: Back("Moonweave"), + kind: Back, stats: ( protection: Some(Normal(4.0)), energy_max: Some(4.1), diff --git a/assets/common/items/armor/cloth/moonweave/belt.ron b/assets/common/items/armor/cloth/moonweave/belt.ron index 9ad29b1179..1252964f16 100644 --- a/assets/common/items/armor/cloth/moonweave/belt.ron +++ b/assets/common/items/armor/cloth/moonweave/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Moonweave Belt", description: "The fabric dances silently, like moonlight.", kind: Armor(( - kind: Belt("Moonweave"), + kind: Belt, stats: ( protection: Some(Normal(4.0)), energy_max: Some(4.1), diff --git a/assets/common/items/armor/cloth/moonweave/chest.ron b/assets/common/items/armor/cloth/moonweave/chest.ron index a56d71071e..60bff72375 100644 --- a/assets/common/items/armor/cloth/moonweave/chest.ron +++ b/assets/common/items/armor/cloth/moonweave/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Moonweave Vest", description: "The fabric dances silently, like moonlight.", kind: Armor(( - kind: Chest("Moonweave"), + kind: Chest, stats: ( protection: Some(Normal(23.0)), energy_max: Some(24.8), diff --git a/assets/common/items/armor/cloth/moonweave/foot.ron b/assets/common/items/armor/cloth/moonweave/foot.ron index 68a678833c..b498232757 100644 --- a/assets/common/items/armor/cloth/moonweave/foot.ron +++ b/assets/common/items/armor/cloth/moonweave/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Moonweave Boots", description: "The fabric dances silently, like moonlight.", kind: Armor(( - kind: Foot("Moonweave"), + kind: Foot, stats: ( protection: Some(Normal(8.0)), energy_max: Some(8.3), diff --git a/assets/common/items/armor/cloth/moonweave/hand.ron b/assets/common/items/armor/cloth/moonweave/hand.ron index c862c726e1..655b6decb9 100644 --- a/assets/common/items/armor/cloth/moonweave/hand.ron +++ b/assets/common/items/armor/cloth/moonweave/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Moonweave Gloves", description: "The fabric dances silently, like moonlight.", kind: Armor(( - kind: Hand("Moonweave"), + kind: Hand, stats: ( protection: Some(Normal(8.0)), energy_max: Some(8.3), diff --git a/assets/common/items/armor/cloth/moonweave/pants.ron b/assets/common/items/armor/cloth/moonweave/pants.ron index fcc3362dbb..8b89b32be2 100644 --- a/assets/common/items/armor/cloth/moonweave/pants.ron +++ b/assets/common/items/armor/cloth/moonweave/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Moonweave Legs", description: "The fabric dances silently, like moonlight.", kind: Armor(( - kind: Pants("Moonweave"), + kind: Pants, stats: ( protection: Some(Normal(17.0)), energy_max: Some(16.5), diff --git a/assets/common/items/armor/cloth/moonweave/shoulder.ron b/assets/common/items/armor/cloth/moonweave/shoulder.ron index 532c86a52a..0ed0d7eecb 100644 --- a/assets/common/items/armor/cloth/moonweave/shoulder.ron +++ b/assets/common/items/armor/cloth/moonweave/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Moonweave Shoulders", description: "The fabric dances silently, like moonlight.", kind: Armor(( - kind: Shoulder("Moonweave"), + kind: Shoulder, stats: ( protection: Some(Normal(17.0)), energy_max: Some(16.5), diff --git a/assets/common/items/armor/cloth/silken/back.ron b/assets/common/items/armor/cloth/silken/back.ron index 86fb76f2f1..1a202e3af8 100644 --- a/assets/common/items/armor/cloth/silken/back.ron +++ b/assets/common/items/armor/cloth/silken/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Silken Cape", description: "Weaved with care by a skilled tailor.", kind: Armor(( - kind: Back("Silken"), + kind: Back, stats: ( protection: Some(Normal(2.0)), energy_max: Some(2.5), diff --git a/assets/common/items/armor/cloth/silken/belt.ron b/assets/common/items/armor/cloth/silken/belt.ron index 7085de6e54..e489678f4d 100644 --- a/assets/common/items/armor/cloth/silken/belt.ron +++ b/assets/common/items/armor/cloth/silken/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Silken Sash", description: "Weaved with care by a skilled tailor.", kind: Armor(( - kind: Belt("Silken"), + kind: Belt, stats: ( protection: Some(Normal(2.0)), energy_max: Some(2.5), diff --git a/assets/common/items/armor/cloth/silken/chest.ron b/assets/common/items/armor/cloth/silken/chest.ron index 45c04836e6..3ffa71dadf 100644 --- a/assets/common/items/armor/cloth/silken/chest.ron +++ b/assets/common/items/armor/cloth/silken/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Silken Robe", description: "Weaved with care by a skilled tailor.", kind: Armor(( - kind: Chest("Silken"), + kind: Chest, stats: ( protection: Some(Normal(14.0)), energy_max: Some(14.9), diff --git a/assets/common/items/armor/cloth/silken/foot.ron b/assets/common/items/armor/cloth/silken/foot.ron index 9877b37377..362ec5a430 100644 --- a/assets/common/items/armor/cloth/silken/foot.ron +++ b/assets/common/items/armor/cloth/silken/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Silken Feet", description: "Weaved with care by a skilled tailor.", kind: Armor(( - kind: Foot("Silken"), + kind: Foot, stats: ( protection: Some(Normal(5.0)), energy_max: Some(5.0), diff --git a/assets/common/items/armor/cloth/silken/hand.ron b/assets/common/items/armor/cloth/silken/hand.ron index 61c9224089..8f330c1bfd 100644 --- a/assets/common/items/armor/cloth/silken/hand.ron +++ b/assets/common/items/armor/cloth/silken/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Silken Wraps", description: "Weaved with care by a skilled tailor.", kind: Armor(( - kind: Hand("Silken"), + kind: Hand, stats: ( protection: Some(Normal(5.0)), energy_max: Some(5.0), diff --git a/assets/common/items/armor/cloth/silken/pants.ron b/assets/common/items/armor/cloth/silken/pants.ron index 5ace1f7b3a..fb47370107 100644 --- a/assets/common/items/armor/cloth/silken/pants.ron +++ b/assets/common/items/armor/cloth/silken/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Silken Skirt", description: "Weaved with care by a skilled tailor.", kind: Armor(( - kind: Pants("Silken"), + kind: Pants, stats: ( protection: Some(Normal(9.0)), energy_max: Some(9.9), diff --git a/assets/common/items/armor/cloth/silken/shoulder.ron b/assets/common/items/armor/cloth/silken/shoulder.ron index d12c2b2ce2..f122689ce6 100644 --- a/assets/common/items/armor/cloth/silken/shoulder.ron +++ b/assets/common/items/armor/cloth/silken/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Silken Shoulders", description: "Weaved with care by a skilled tailor.", kind: Armor(( - kind: Shoulder("Silken"), + kind: Shoulder, stats: ( protection: Some(Normal(9.0)), energy_max: Some(9.9), diff --git a/assets/common/items/armor/cloth/sunsilk/back.ron b/assets/common/items/armor/cloth/sunsilk/back.ron index 46adce8d22..35a5e32d0c 100644 --- a/assets/common/items/armor/cloth/sunsilk/back.ron +++ b/assets/common/items/armor/cloth/sunsilk/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sunsilk Cape", description: "It radiates with the sun's power, and the grace to harness it.", kind: Armor(( - kind: Back("Sunsilk"), + kind: Back, stats: ( protection: Some(Normal(5.0)), energy_max: Some(5.0), diff --git a/assets/common/items/armor/cloth/sunsilk/belt.ron b/assets/common/items/armor/cloth/sunsilk/belt.ron index 4ccf131c74..e3084bd54f 100644 --- a/assets/common/items/armor/cloth/sunsilk/belt.ron +++ b/assets/common/items/armor/cloth/sunsilk/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sunsilk Sash", description: "It radiates with the sun's power, and the grace to harness it.", kind: Armor(( - kind: Belt("Sunsilk"), + kind: Belt, stats: ( protection: Some(Normal(5.0)), energy_max: Some(5.0), diff --git a/assets/common/items/armor/cloth/sunsilk/chest.ron b/assets/common/items/armor/cloth/sunsilk/chest.ron index 779a4ec1e7..d6886b189d 100644 --- a/assets/common/items/armor/cloth/sunsilk/chest.ron +++ b/assets/common/items/armor/cloth/sunsilk/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sunsilk Tunic", description: "It radiates with the sun's power, and the grace to harness it.", kind: Armor(( - kind: Chest("Sunsilk"), + kind: Chest, stats: ( protection: Some(Normal(27.0)), energy_max: Some(30.0), diff --git a/assets/common/items/armor/cloth/sunsilk/foot.ron b/assets/common/items/armor/cloth/sunsilk/foot.ron index 0b75d0e8e4..e80b3d49c1 100644 --- a/assets/common/items/armor/cloth/sunsilk/foot.ron +++ b/assets/common/items/armor/cloth/sunsilk/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sunsilk Footwraps", description: "It radiates with the sun's power, and the grace to harness it.", kind: Armor(( - kind: Foot("Sunsilk"), + kind: Foot, stats: ( protection: Some(Normal(9.0)), energy_max: Some(10.0), diff --git a/assets/common/items/armor/cloth/sunsilk/hand.ron b/assets/common/items/armor/cloth/sunsilk/hand.ron index 952a87e29f..901816aca7 100644 --- a/assets/common/items/armor/cloth/sunsilk/hand.ron +++ b/assets/common/items/armor/cloth/sunsilk/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sunsilk Handwraps", description: "It radiates with the sun's power, and the grace to harness it.", kind: Armor(( - kind: Hand("Sunsilk"), + kind: Hand, stats: ( protection: Some(Normal(9.0)), energy_max: Some(10.0), diff --git a/assets/common/items/armor/cloth/sunsilk/pants.ron b/assets/common/items/armor/cloth/sunsilk/pants.ron index 8b1a21959d..f300ea476c 100644 --- a/assets/common/items/armor/cloth/sunsilk/pants.ron +++ b/assets/common/items/armor/cloth/sunsilk/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sunsilk Kilt", description: "It radiates with the sun's power, and the grace to harness it.", kind: Armor(( - kind: Pants("Sunsilk"), + kind: Pants, stats: ( protection: Some(Normal(18.0)), energy_max: Some(20.0), diff --git a/assets/common/items/armor/cloth/sunsilk/shoulder.ron b/assets/common/items/armor/cloth/sunsilk/shoulder.ron index b4343ff7cf..6335185022 100644 --- a/assets/common/items/armor/cloth/sunsilk/shoulder.ron +++ b/assets/common/items/armor/cloth/sunsilk/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sunsilk Shoulderwraps", description: "It radiates with the sun's power, and the grace to harness it.", kind: Armor(( - kind: Shoulder("Sunsilk"), + kind: Shoulder, stats: ( protection: Some(Normal(18.0)), energy_max: Some(20.0), diff --git a/assets/common/items/armor/cloth/woolen/back.ron b/assets/common/items/armor/cloth/woolen/back.ron index 5a73b5f96a..e908e7fe83 100644 --- a/assets/common/items/armor/cloth/woolen/back.ron +++ b/assets/common/items/armor/cloth/woolen/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Woolen Cloak", description: "Thick and ready for the snow.", kind: Armor(( - kind: Back("Woolen"), + kind: Back, stats: ( protection: Some(Normal(2.0)), energy_max: Some(1.7), diff --git a/assets/common/items/armor/cloth/woolen/belt.ron b/assets/common/items/armor/cloth/woolen/belt.ron index f4174ae09d..8133649aa3 100644 --- a/assets/common/items/armor/cloth/woolen/belt.ron +++ b/assets/common/items/armor/cloth/woolen/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Woolen Belt", description: "Thick and ready for the snow.", kind: Armor(( - kind: Belt("Woolen"), + kind: Belt, stats: ( protection: Some(Normal(2.0)), energy_max: Some(1.7), diff --git a/assets/common/items/armor/cloth/woolen/chest.ron b/assets/common/items/armor/cloth/woolen/chest.ron index f7070f9dfa..4b95bf5d55 100644 --- a/assets/common/items/armor/cloth/woolen/chest.ron +++ b/assets/common/items/armor/cloth/woolen/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Woolen Parka", description: "Thick and ready for the snow.", kind: Armor(( - kind: Chest("Woolen"), + kind: Chest, stats: ( protection: Some(Normal(9.0)), energy_max: Some(9.9), diff --git a/assets/common/items/armor/cloth/woolen/foot.ron b/assets/common/items/armor/cloth/woolen/foot.ron index 40547178fe..b2d5f28866 100644 --- a/assets/common/items/armor/cloth/woolen/foot.ron +++ b/assets/common/items/armor/cloth/woolen/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Woolen Boots", description: "Thick and ready for the snow.", kind: Armor(( - kind: Foot("Woolen"), + kind: Foot, stats: ( protection: Some(Normal(3.0)), energy_max: Some(3.3), diff --git a/assets/common/items/armor/cloth/woolen/hand.ron b/assets/common/items/armor/cloth/woolen/hand.ron index 8f7f9fb035..a1ac5db7b5 100644 --- a/assets/common/items/armor/cloth/woolen/hand.ron +++ b/assets/common/items/armor/cloth/woolen/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Woolen Mittens", description: "Thick and ready for the snow.", kind: Armor(( - kind: Hand("Woolen"), + kind: Hand, stats: ( protection: Some(Normal(3.0)), energy_max: Some(3.3), diff --git a/assets/common/items/armor/cloth/woolen/pants.ron b/assets/common/items/armor/cloth/woolen/pants.ron index 857af0ad70..ece0326885 100644 --- a/assets/common/items/armor/cloth/woolen/pants.ron +++ b/assets/common/items/armor/cloth/woolen/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Woolen Pants", description: "Thick and ready for the snow.", kind: Armor(( - kind: Pants("Woolen"), + kind: Pants, stats: ( protection: Some(Normal(6.0)), energy_max: Some(6.6), diff --git a/assets/common/items/armor/cloth/woolen/shoulder.ron b/assets/common/items/armor/cloth/woolen/shoulder.ron index 905de99f8f..08e9b07dbb 100644 --- a/assets/common/items/armor/cloth/woolen/shoulder.ron +++ b/assets/common/items/armor/cloth/woolen/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Woolen Shoulders", description: "Thick and ready for the snow.", kind: Armor(( - kind: Shoulder("Woolen"), + kind: Shoulder, stats: ( protection: Some(Normal(6.0)), energy_max: Some(6.6), diff --git a/assets/common/items/armor/cloth_blue/belt.ron b/assets/common/items/armor/cloth_blue/belt.ron index 9fb15c2ad8..69d968e597 100644 --- a/assets/common/items/armor/cloth_blue/belt.ron +++ b/assets/common/items/armor/cloth_blue/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blue Linen Belt", description: "A stylish rough fabric belt, dyed blue.", kind: Armor(( - kind: Belt("ClothBlue"), + kind: Belt, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_blue/chest.ron b/assets/common/items/armor/cloth_blue/chest.ron index 4a48de587c..ef461e8892 100644 --- a/assets/common/items/armor/cloth_blue/chest.ron +++ b/assets/common/items/armor/cloth_blue/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blue Linen Chest", description: "A stylish rough fabric surcoat, dyed blue.", kind: Armor(( - kind: Chest("ClothBlue"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_blue/foot.ron b/assets/common/items/armor/cloth_blue/foot.ron index 8938b7e704..97a12ede60 100644 --- a/assets/common/items/armor/cloth_blue/foot.ron +++ b/assets/common/items/armor/cloth_blue/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blue Linen Boots", description: "Cobbled rough fabric boots, dyed blue.", kind: Armor(( - kind: Foot("ClothBlue"), + kind: Foot, stats: ( ), )), diff --git a/assets/common/items/armor/cloth_blue/hand.ron b/assets/common/items/armor/cloth_blue/hand.ron index dc6ec26507..fde98338f8 100644 --- a/assets/common/items/armor/cloth_blue/hand.ron +++ b/assets/common/items/armor/cloth_blue/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blue Linen Wrists", description: "Rough cloth bracelets provide a stylish fashion statement, dyed blue.", kind: Armor(( - kind: Hand("ClothBlue"), + kind: Hand, stats: ( ), )), diff --git a/assets/common/items/armor/cloth_blue/pants.ron b/assets/common/items/armor/cloth_blue/pants.ron index f37e462b56..464eed3c06 100644 --- a/assets/common/items/armor/cloth_blue/pants.ron +++ b/assets/common/items/armor/cloth_blue/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blue Linen Skirt", description: "A stylish, rough fabric skirt, dyed blue.", kind: Armor(( - kind: Pants("ClothBlue"), + kind: Pants, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_blue/shoulder_0.ron b/assets/common/items/armor/cloth_blue/shoulder_0.ron index fba44fe098..fdc31a93de 100644 --- a/assets/common/items/armor/cloth_blue/shoulder_0.ron +++ b/assets/common/items/armor/cloth_blue/shoulder_0.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blue Linen Coat", description: "A rough fabric coat, dyed blue.", kind: Armor(( - kind: Shoulder("ClothBlue0"), + kind: Shoulder, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_blue/shoulder_1.ron b/assets/common/items/armor/cloth_blue/shoulder_1.ron index 45a42eee2d..e6c0c16b8c 100644 --- a/assets/common/items/armor/cloth_blue/shoulder_1.ron +++ b/assets/common/items/armor/cloth_blue/shoulder_1.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blue Cloth Pads", description: "Simple shoulderpads made from blue cloth.", kind: Armor(( - kind: Shoulder("ClothBlue1"), + kind: Shoulder, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_green/belt.ron b/assets/common/items/armor/cloth_green/belt.ron index 98c31fe8fd..ea0a20c3f9 100644 --- a/assets/common/items/armor/cloth_green/belt.ron +++ b/assets/common/items/armor/cloth_green/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Green Linen Belt", description: "A stylish rough fabric belt, dyed green.", kind: Armor(( - kind: Belt("ClothGreen"), + kind: Belt, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_green/chest.ron b/assets/common/items/armor/cloth_green/chest.ron index 1586736c1c..2cd14c3f97 100644 --- a/assets/common/items/armor/cloth_green/chest.ron +++ b/assets/common/items/armor/cloth_green/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Green Linen Chest", description: "A stylish rough fabric surcoat, dyed green.", kind: Armor(( - kind: Chest("ClothGreen"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_green/foot.ron b/assets/common/items/armor/cloth_green/foot.ron index da242e9f79..48bb9b1e22 100644 --- a/assets/common/items/armor/cloth_green/foot.ron +++ b/assets/common/items/armor/cloth_green/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Green Linen Boots", description: "Cobbled rough fabric boots, dyed green.", kind: Armor(( - kind: Foot("ClothGreen"), + kind: Foot, stats: ( ), )), diff --git a/assets/common/items/armor/cloth_green/hand.ron b/assets/common/items/armor/cloth_green/hand.ron index 5f86f40ac7..8101005912 100644 --- a/assets/common/items/armor/cloth_green/hand.ron +++ b/assets/common/items/armor/cloth_green/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Green Linen Wrists", description: "Rough cloth bracelets provide a stylish fashion statement, dyed green.", kind: Armor(( - kind: Hand("ClothGreen"), + kind: Hand, stats: ( ), )), diff --git a/assets/common/items/armor/cloth_green/pants.ron b/assets/common/items/armor/cloth_green/pants.ron index 41e9571d78..7670a2d559 100644 --- a/assets/common/items/armor/cloth_green/pants.ron +++ b/assets/common/items/armor/cloth_green/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Green Linen Skirt", description: "A stylish, rough fabric skirt, dyed green.", kind: Armor(( - kind: Pants("ClothGreen"), + kind: Pants, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_green/shoulder.ron b/assets/common/items/armor/cloth_green/shoulder.ron index 89f937b6fc..9c0ca61e10 100644 --- a/assets/common/items/armor/cloth_green/shoulder.ron +++ b/assets/common/items/armor/cloth_green/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Green Linen Coat", description: "A rough fabric coat, dyed green.", kind: Armor(( - kind: Shoulder("ClothGreen"), + kind: Shoulder, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_purple/belt.ron b/assets/common/items/armor/cloth_purple/belt.ron index 2c031ea027..c8bdd00660 100644 --- a/assets/common/items/armor/cloth_purple/belt.ron +++ b/assets/common/items/armor/cloth_purple/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Linen Belt", description: "A stylish rough fabric belt, dyed purple.", kind: Armor(( - kind: Belt("ClothPurple"), + kind: Belt, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_purple/chest.ron b/assets/common/items/armor/cloth_purple/chest.ron index e3a30e0380..49fd67f1fc 100644 --- a/assets/common/items/armor/cloth_purple/chest.ron +++ b/assets/common/items/armor/cloth_purple/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Linen Chest", description: "A stylish rough fabric surcoat, dyed purple.", kind: Armor(( - kind: Chest("ClothPurple"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_purple/foot.ron b/assets/common/items/armor/cloth_purple/foot.ron index 9821704d75..e708eea7bc 100644 --- a/assets/common/items/armor/cloth_purple/foot.ron +++ b/assets/common/items/armor/cloth_purple/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Linen Boots", description: "Cobbled rough fabric boots, dyed purple.", kind: Armor(( - kind: Foot("ClothPurple"), + kind: Foot, stats: ( ), )), diff --git a/assets/common/items/armor/cloth_purple/hand.ron b/assets/common/items/armor/cloth_purple/hand.ron index fe7a04e88a..c41b8e21d0 100644 --- a/assets/common/items/armor/cloth_purple/hand.ron +++ b/assets/common/items/armor/cloth_purple/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Linen Wrists", description: "Rough cloth bracelets provide a stylish fashion statement, dyed purple.", kind: Armor(( - kind: Hand("ClothPurple"), + kind: Hand, stats: ( ), )), diff --git a/assets/common/items/armor/cloth_purple/pants.ron b/assets/common/items/armor/cloth_purple/pants.ron index 296db04575..04b9b81f88 100644 --- a/assets/common/items/armor/cloth_purple/pants.ron +++ b/assets/common/items/armor/cloth_purple/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Linen Skirt", description: "A stylish, rough fabric skirt, dyed purple.", kind: Armor(( - kind: Pants("ClothPurple"), + kind: Pants, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cloth_purple/shoulder.ron b/assets/common/items/armor/cloth_purple/shoulder.ron index 59caef7c4b..a4b562055d 100644 --- a/assets/common/items/armor/cloth_purple/shoulder.ron +++ b/assets/common/items/armor/cloth_purple/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Linen Coat", description: "A rough fabric coat, dyed purple.", kind: Armor(( - kind: Shoulder("ClothPurple"), + kind: Shoulder, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/cultist/bandana.ron b/assets/common/items/armor/cultist/bandana.ron index 04c2f6003c..d3b492fd38 100644 --- a/assets/common/items/armor/cultist/bandana.ron +++ b/assets/common/items/armor/cultist/bandana.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cultist Bandana", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("Cultist"), + kind: Head, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/cultist/belt.ron b/assets/common/items/armor/cultist/belt.ron index c4f5fc3adc..8603c7580e 100644 --- a/assets/common/items/armor/cultist/belt.ron +++ b/assets/common/items/armor/cultist/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cultist Belt", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("Cultist"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/cultist/chest.ron b/assets/common/items/armor/cultist/chest.ron index 474665f223..4724079176 100644 --- a/assets/common/items/armor/cultist/chest.ron +++ b/assets/common/items/armor/cultist/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cultist Chest", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("Cultist"), + kind: Chest, stats: ( protection: Some(Normal(44.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/armor/cultist/foot.ron b/assets/common/items/armor/cultist/foot.ron index 12ce526a6b..a47adba653 100644 --- a/assets/common/items/armor/cultist/foot.ron +++ b/assets/common/items/armor/cultist/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cultist Boots", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("Cultist"), + kind: Foot, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/cultist/hand.ron b/assets/common/items/armor/cultist/hand.ron index 66c0def7d2..8609194829 100644 --- a/assets/common/items/armor/cultist/hand.ron +++ b/assets/common/items/armor/cultist/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cultist Gloves", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Hand("Cultist"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/cultist/necklace.ron b/assets/common/items/armor/cultist/necklace.ron index ad99dfedcf..371b2ad6a2 100644 --- a/assets/common/items/armor/cultist/necklace.ron +++ b/assets/common/items/armor/cultist/necklace.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cultist Amulet", description: "You can still feel the Mindflayer's presence within this amulet...", kind: Armor(( - kind: Neck("Cultist"), + kind: Neck, stats: ( protection: Some(Normal(2.0)), energy_max: Some(4.5), diff --git a/assets/common/items/armor/cultist/pants.ron b/assets/common/items/armor/cultist/pants.ron index e6245109df..54360a1464 100644 --- a/assets/common/items/armor/cultist/pants.ron +++ b/assets/common/items/armor/cultist/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cultist Skirt", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Pants("Cultist"), + kind: Pants, stats: ( protection: Some(Normal(30.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/cultist/ring.ron b/assets/common/items/armor/cultist/ring.ron index 4e2191d11a..faef387548 100644 --- a/assets/common/items/armor/cultist/ring.ron +++ b/assets/common/items/armor/cultist/ring.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cultist Signet Ring", description: "Once belonged to a cultist.", kind: Armor(( - kind: Ring("Cultist"), + kind: Ring, stats: ( protection: Some(Normal(1.0)), energy_max: Some(5), diff --git a/assets/common/items/armor/cultist/shoulder.ron b/assets/common/items/armor/cultist/shoulder.ron index a8b6327c80..6a0cb8d03d 100644 --- a/assets/common/items/armor/cultist/shoulder.ron +++ b/assets/common/items/armor/cultist/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cultist Mantle", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Shoulder("Cultist"), + kind: Shoulder, stats: ( protection: Some(Normal(30.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/armor/ferocious/back.ron b/assets/common/items/armor/ferocious/back.ron index 0e3f080cca..8114b4237d 100644 --- a/assets/common/items/armor/ferocious/back.ron +++ b/assets/common/items/armor/ferocious/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ferocious Mantle", description: "The dark side of nature", kind: Armor(( - kind: Back("Ferocious"), + kind: Back, stats: ( protection: Some(Normal(6.0)), ), diff --git a/assets/common/items/armor/ferocious/belt.ron b/assets/common/items/armor/ferocious/belt.ron index 37f0405c7a..e893b940c2 100644 --- a/assets/common/items/armor/ferocious/belt.ron +++ b/assets/common/items/armor/ferocious/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ferocious Sash", description: "The dark side of nature", kind: Armor(( - kind: Belt("Ferocious"), + kind: Belt, stats: ( protection: Some(Normal(12.0)), ), diff --git a/assets/common/items/armor/ferocious/chest.ron b/assets/common/items/armor/ferocious/chest.ron index a933fe369d..bc3476f3b3 100644 --- a/assets/common/items/armor/ferocious/chest.ron +++ b/assets/common/items/armor/ferocious/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ferocious Shirt", description: "The dark side of nature", kind: Armor(( - kind: Chest("Ferocious"), + kind: Chest, stats: ( protection: Some(Normal(60.0)), ), diff --git a/assets/common/items/armor/ferocious/foot.ron b/assets/common/items/armor/ferocious/foot.ron index 13b14eaba9..eda365f1c4 100644 --- a/assets/common/items/armor/ferocious/foot.ron +++ b/assets/common/items/armor/ferocious/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ferocious Waraji", description: "The dark side of nature", kind: Armor(( - kind: Foot("Ferocious"), + kind: Foot, stats: ( protection: Some(Normal(12.0)), ), diff --git a/assets/common/items/armor/ferocious/hand.ron b/assets/common/items/armor/ferocious/hand.ron index 7ae5e00591..821d94d7c5 100644 --- a/assets/common/items/armor/ferocious/hand.ron +++ b/assets/common/items/armor/ferocious/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ferocious Wraps", description: "The dark side of nature", kind: Armor(( - kind: Hand("Ferocious"), + kind: Hand, stats: ( protection: Some(Normal(24.0)), ), diff --git a/assets/common/items/armor/ferocious/pants.ron b/assets/common/items/armor/ferocious/pants.ron index 42ca5bc226..34a4b19f4f 100644 --- a/assets/common/items/armor/ferocious/pants.ron +++ b/assets/common/items/armor/ferocious/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ferocious Shorts", description: "The dark side of nature", kind: Armor(( - kind: Pants("Ferocious"), + kind: Pants, stats: ( protection: Some(Normal(48.0)), ), diff --git a/assets/common/items/armor/ferocious/shoulder.ron b/assets/common/items/armor/ferocious/shoulder.ron index 58268b09df..bca663ee2d 100644 --- a/assets/common/items/armor/ferocious/shoulder.ron +++ b/assets/common/items/armor/ferocious/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ferocious Guards", description: "The dark side of nature", kind: Armor(( - kind: Shoulder("Ferocious"), + kind: Shoulder, stats: ( protection: Some(Normal(36.0)), ), diff --git a/assets/common/items/armor/hide/carapace/back.ron b/assets/common/items/armor/hide/carapace/back.ron index 58b8414631..bddb23d28a 100644 --- a/assets/common/items/armor/hide/carapace/back.ron +++ b/assets/common/items/armor/hide/carapace/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Carapace Cape", description: "Shell that once shielded a beast.", kind: Armor(( - kind: Back("Carapace"), + kind: Back, stats: ( protection: Some(Normal(5.0)), crit_power: Some(0.067), diff --git a/assets/common/items/armor/hide/carapace/belt.ron b/assets/common/items/armor/hide/carapace/belt.ron index 8380818d6d..a2f64cc10e 100644 --- a/assets/common/items/armor/hide/carapace/belt.ron +++ b/assets/common/items/armor/hide/carapace/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Carapace Belt", description: "Shell that once shielded a beast.", kind: Armor(( - kind: Belt("Carapace"), + kind: Belt, stats: ( protection: Some(Normal(5.0)), crit_power: Some(0.067), diff --git a/assets/common/items/armor/hide/carapace/chest.ron b/assets/common/items/armor/hide/carapace/chest.ron index 18a74ade68..3ab1bb99e0 100644 --- a/assets/common/items/armor/hide/carapace/chest.ron +++ b/assets/common/items/armor/hide/carapace/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Carapace Cuirass", description: "Shell that once shielded a beast.", kind: Armor(( - kind: Chest("Carapace"), + kind: Chest, stats: ( protection: Some(Normal(29.0)), crit_power: Some(0.399), diff --git a/assets/common/items/armor/hide/carapace/foot.ron b/assets/common/items/armor/hide/carapace/foot.ron index aadf479b20..1cccf90d09 100644 --- a/assets/common/items/armor/hide/carapace/foot.ron +++ b/assets/common/items/armor/hide/carapace/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Carapace Treads", description: "Shell that once shielded a beast.", kind: Armor(( - kind: Foot("Carapace"), + kind: Foot, stats: ( protection: Some(Normal(10.0)), crit_power: Some(0.133), diff --git a/assets/common/items/armor/hide/carapace/hand.ron b/assets/common/items/armor/hide/carapace/hand.ron index fe95e72aac..6d82c45aa0 100644 --- a/assets/common/items/armor/hide/carapace/hand.ron +++ b/assets/common/items/armor/hide/carapace/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Carapace Grips", description: "Shell that once shielded a beast.", kind: Armor(( - kind: Hand("Carapace"), + kind: Hand, stats: ( protection: Some(Normal(10.0)), crit_power: Some(0.133), diff --git a/assets/common/items/armor/hide/carapace/pants.ron b/assets/common/items/armor/hide/carapace/pants.ron index 39bf363478..0465cd63b6 100644 --- a/assets/common/items/armor/hide/carapace/pants.ron +++ b/assets/common/items/armor/hide/carapace/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Carapace Leggings", description: "Shell that once shielded a beast.", kind: Armor(( - kind: Pants("Carapace"), + kind: Pants, stats: ( protection: Some(Normal(19.0)), crit_power: Some(0.266), diff --git a/assets/common/items/armor/hide/carapace/shoulder.ron b/assets/common/items/armor/hide/carapace/shoulder.ron index 1b37bde030..8f7966b750 100644 --- a/assets/common/items/armor/hide/carapace/shoulder.ron +++ b/assets/common/items/armor/hide/carapace/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Carapace Shoulderpads", description: "Shell that once shielded a beast.", kind: Armor(( - kind: Shoulder("Carapace"), + kind: Shoulder, stats: ( protection: Some(Normal(19.0)), crit_power: Some(0.266), diff --git a/assets/common/items/armor/hide/dragonscale/back.ron b/assets/common/items/armor/hide/dragonscale/back.ron index 13d09d8f4c..57fa4aead4 100644 --- a/assets/common/items/armor/hide/dragonscale/back.ron +++ b/assets/common/items/armor/hide/dragonscale/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Dragonscale Cape", description: "Power pulses through it.", kind: Armor(( - kind: Back("Dragonscale"), + kind: Back, stats: ( protection: Some(Normal(7.0)), crit_power: Some(0.1), diff --git a/assets/common/items/armor/hide/dragonscale/belt.ron b/assets/common/items/armor/hide/dragonscale/belt.ron index 10b3e2473a..c7f5e2383f 100644 --- a/assets/common/items/armor/hide/dragonscale/belt.ron +++ b/assets/common/items/armor/hide/dragonscale/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Dragonscale Sash", description: "Power pulses through it.", kind: Armor(( - kind: Belt("Dragonscale"), + kind: Belt, stats: ( protection: Some(Normal(7.0)), crit_power: Some(0.1), diff --git a/assets/common/items/armor/hide/dragonscale/chest.ron b/assets/common/items/armor/hide/dragonscale/chest.ron index b20117e07d..ddd343d6c8 100644 --- a/assets/common/items/armor/hide/dragonscale/chest.ron +++ b/assets/common/items/armor/hide/dragonscale/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Dragonscale Chestplate", description: "Power pulses through it.", kind: Armor(( - kind: Chest("Dragonscale"), + kind: Chest, stats: ( protection: Some(Normal(42.0)), crit_power: Some(0.6), diff --git a/assets/common/items/armor/hide/dragonscale/foot.ron b/assets/common/items/armor/hide/dragonscale/foot.ron index d1566360fe..aeb9b9a4c6 100644 --- a/assets/common/items/armor/hide/dragonscale/foot.ron +++ b/assets/common/items/armor/hide/dragonscale/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Dragonscale Spurs", description: "Power pulses through it.", kind: Armor(( - kind: Foot("Dragonscale"), + kind: Foot, stats: ( protection: Some(Normal(14.0)), crit_power: Some(0.2), diff --git a/assets/common/items/armor/hide/dragonscale/hand.ron b/assets/common/items/armor/hide/dragonscale/hand.ron index 1cdbfea94e..c6bbe4ad85 100644 --- a/assets/common/items/armor/hide/dragonscale/hand.ron +++ b/assets/common/items/armor/hide/dragonscale/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Dragonscale Gloves", description: "Power pulses through it.", kind: Armor(( - kind: Hand("Dragonscale"), + kind: Hand, stats: ( protection: Some(Normal(14.0)), crit_power: Some(0.2), diff --git a/assets/common/items/armor/hide/dragonscale/pants.ron b/assets/common/items/armor/hide/dragonscale/pants.ron index 9457ffa874..c7b8091b65 100644 --- a/assets/common/items/armor/hide/dragonscale/pants.ron +++ b/assets/common/items/armor/hide/dragonscale/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Dragonscale Leggings", description: "Power pulses through it.", kind: Armor(( - kind: Pants("Dragonscale"), + kind: Pants, stats: ( protection: Some(Normal(28.0)), crit_power: Some(0.4), diff --git a/assets/common/items/armor/hide/dragonscale/shoulder.ron b/assets/common/items/armor/hide/dragonscale/shoulder.ron index 6a18688cb7..1f8a549d6e 100644 --- a/assets/common/items/armor/hide/dragonscale/shoulder.ron +++ b/assets/common/items/armor/hide/dragonscale/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Dragonscale Mantle", description: "Power pulses through it.", kind: Armor(( - kind: Shoulder("Dragonscale"), + kind: Shoulder, stats: ( protection: Some(Normal(28.0)), crit_power: Some(0.4), diff --git a/assets/common/items/armor/hide/leather/back.ron b/assets/common/items/armor/hide/leather/back.ron index e98214997d..4adc1ff818 100644 --- a/assets/common/items/armor/hide/leather/back.ron +++ b/assets/common/items/armor/hide/leather/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Cloak", description: "Swift like the wind.", kind: Armor(( - kind: Back("Leather"), + kind: Back, stats: ( protection: Some(Normal(2.0)), crit_power: Some(0.034), diff --git a/assets/common/items/armor/hide/leather/belt.ron b/assets/common/items/armor/hide/leather/belt.ron index b6e1e5ce10..f81cbf10b9 100644 --- a/assets/common/items/armor/hide/leather/belt.ron +++ b/assets/common/items/armor/hide/leather/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Belt", description: "Swift like the wind.", kind: Armor(( - kind: Belt("Leather"), + kind: Belt, stats: ( protection: Some(Normal(2.0)), crit_power: Some(0.034), diff --git a/assets/common/items/armor/hide/leather/chest.ron b/assets/common/items/armor/hide/leather/chest.ron index 436fe23356..ad761240a8 100644 --- a/assets/common/items/armor/hide/leather/chest.ron +++ b/assets/common/items/armor/hide/leather/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Chestpiece", description: "Swift like the wind.", kind: Armor(( - kind: Chest("Leather"), + kind: Chest, stats: ( protection: Some(Normal(14.0)), crit_power: Some(0.201), diff --git a/assets/common/items/armor/hide/leather/foot.ron b/assets/common/items/armor/hide/leather/foot.ron index 20b226cd1c..14f021d493 100644 --- a/assets/common/items/armor/hide/leather/foot.ron +++ b/assets/common/items/armor/hide/leather/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Boots", description: "Swift like the wind.", kind: Armor(( - kind: Foot("Leather"), + kind: Foot, stats: ( protection: Some(Normal(5.0)), crit_power: Some(0.067), diff --git a/assets/common/items/armor/hide/leather/hand.ron b/assets/common/items/armor/hide/leather/hand.ron index 3501ee731f..2a926909c7 100644 --- a/assets/common/items/armor/hide/leather/hand.ron +++ b/assets/common/items/armor/hide/leather/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Gloves", description: "Swift like the wind.", kind: Armor(( - kind: Hand("Leather"), + kind: Hand, stats: ( protection: Some(Normal(5.0)), crit_power: Some(0.067), diff --git a/assets/common/items/armor/hide/leather/head.ron b/assets/common/items/armor/hide/leather/head.ron index acb9557136..2aebcd5cf3 100644 --- a/assets/common/items/armor/hide/leather/head.ron +++ b/assets/common/items/armor/hide/leather/head.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Cap", description: "Swift like the wind.", kind: Armor(( - kind: Head("Leather"), + kind: Head, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/hide/leather/pants.ron b/assets/common/items/armor/hide/leather/pants.ron index a8eb018852..7d5a76f157 100644 --- a/assets/common/items/armor/hide/leather/pants.ron +++ b/assets/common/items/armor/hide/leather/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Pants", description: "Swift like the wind.", kind: Armor(( - kind: Pants("Leather"), + kind: Pants, stats: ( protection: Some(Normal(10.0)), crit_power: Some(0.134), diff --git a/assets/common/items/armor/hide/leather/shoulder.ron b/assets/common/items/armor/hide/leather/shoulder.ron index 529cf7f152..f2413abcc2 100644 --- a/assets/common/items/armor/hide/leather/shoulder.ron +++ b/assets/common/items/armor/hide/leather/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Shoulderpads", description: "Swift like the wind.", kind: Armor(( - kind: Shoulder("Leather"), + kind: Shoulder, stats: ( protection: Some(Normal(10.0)), crit_power: Some(0.134), diff --git a/assets/common/items/armor/hide/primal/back.ron b/assets/common/items/armor/hide/primal/back.ron index d8c0cbc560..624641ad03 100644 --- a/assets/common/items/armor/hide/primal/back.ron +++ b/assets/common/items/armor/hide/primal/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Primal Cape", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Back("Primal"), + kind: Back, stats: ( protection: Some(Normal(6.0)), crit_power: Some(0.084), diff --git a/assets/common/items/armor/hide/primal/belt.ron b/assets/common/items/armor/hide/primal/belt.ron index 0a7edf6759..2387669ada 100644 --- a/assets/common/items/armor/hide/primal/belt.ron +++ b/assets/common/items/armor/hide/primal/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Primal Sash", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Belt("Primal"), + kind: Belt, stats: ( protection: Some(Normal(6.0)), crit_power: Some(0.084), diff --git a/assets/common/items/armor/hide/primal/chest.ron b/assets/common/items/armor/hide/primal/chest.ron index 2b13431e55..4ac6f833d2 100644 --- a/assets/common/items/armor/hide/primal/chest.ron +++ b/assets/common/items/armor/hide/primal/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Primal Cuirass", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Chest("Primal"), + kind: Chest, stats: ( protection: Some(Normal(36.0)), crit_power: Some(0.501), diff --git a/assets/common/items/armor/hide/primal/foot.ron b/assets/common/items/armor/hide/primal/foot.ron index 3e1a49233b..3f905de0b2 100644 --- a/assets/common/items/armor/hide/primal/foot.ron +++ b/assets/common/items/armor/hide/primal/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Primal Boots", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Foot("Primal"), + kind: Foot, stats: ( protection: Some(Normal(12.0)), crit_power: Some(0.167), diff --git a/assets/common/items/armor/hide/primal/hand.ron b/assets/common/items/armor/hide/primal/hand.ron index 022ae44c1b..806f857ba7 100644 --- a/assets/common/items/armor/hide/primal/hand.ron +++ b/assets/common/items/armor/hide/primal/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Primal Gauntlets", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Hand("Primal"), + kind: Hand, stats: ( protection: Some(Normal(12.0)), crit_power: Some(0.167), diff --git a/assets/common/items/armor/hide/primal/pants.ron b/assets/common/items/armor/hide/primal/pants.ron index e42a414b13..f196b279c1 100644 --- a/assets/common/items/armor/hide/primal/pants.ron +++ b/assets/common/items/armor/hide/primal/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Primal Legs", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Pants("Primal"), + kind: Pants, stats: ( protection: Some(Normal(24.0)), crit_power: Some(0.334), diff --git a/assets/common/items/armor/hide/primal/shoulder.ron b/assets/common/items/armor/hide/primal/shoulder.ron index ad6dcb4125..e8251e45e6 100644 --- a/assets/common/items/armor/hide/primal/shoulder.ron +++ b/assets/common/items/armor/hide/primal/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Primal Shoulders", description: "Smithed from hide tougher than steel.", kind: Armor(( - kind: Shoulder("Primal"), + kind: Shoulder, stats: ( protection: Some(Normal(24.0)), crit_power: Some(0.334), diff --git a/assets/common/items/armor/hide/rawhide/back.ron b/assets/common/items/armor/hide/rawhide/back.ron index be2c9095f6..75adb70ffc 100644 --- a/assets/common/items/armor/hide/rawhide/back.ron +++ b/assets/common/items/armor/hide/rawhide/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Rawhide Cloak", description: "'Tightly packed pieces of leather to endure all weather.'", kind: Armor(( - kind: Back("Rawhide"), + kind: Back, stats: ( protection: Some(Normal(1.0)), crit_power: Some(0.017), diff --git a/assets/common/items/armor/hide/rawhide/belt.ron b/assets/common/items/armor/hide/rawhide/belt.ron index a1927d3936..2fbb18ff2c 100644 --- a/assets/common/items/armor/hide/rawhide/belt.ron +++ b/assets/common/items/armor/hide/rawhide/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Rawhide Belt", description: "'Tightly packed pieces of leather to endure all weather.'", kind: Armor(( - kind: Belt("Rawhide"), + kind: Belt, stats: ( protection: Some(Normal(1.0)), crit_power: Some(0.017), diff --git a/assets/common/items/armor/hide/rawhide/chest.ron b/assets/common/items/armor/hide/rawhide/chest.ron index a5931fdfb5..aee0ae54ae 100644 --- a/assets/common/items/armor/hide/rawhide/chest.ron +++ b/assets/common/items/armor/hide/rawhide/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Rawhide Chestpiece", description: "Tightly packed pieces of leather to endure all weather.", kind: Armor(( - kind: Chest("Rawhide"), + kind: Chest, stats: ( protection: Some(Normal(7.0)), crit_power: Some(0.099), diff --git a/assets/common/items/armor/hide/rawhide/foot.ron b/assets/common/items/armor/hide/rawhide/foot.ron index 91102b7eb9..84b3fee668 100644 --- a/assets/common/items/armor/hide/rawhide/foot.ron +++ b/assets/common/items/armor/hide/rawhide/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Rawhide Shoes", description: "'Tightly packed pieces of leather to endure all weather.", kind: Armor(( - kind: Foot("Rawhide"), + kind: Foot, stats: ( protection: Some(Normal(2.0)), crit_power: Some(0.033), diff --git a/assets/common/items/armor/hide/rawhide/hand.ron b/assets/common/items/armor/hide/rawhide/hand.ron index 1a256f4b65..9a808db868 100644 --- a/assets/common/items/armor/hide/rawhide/hand.ron +++ b/assets/common/items/armor/hide/rawhide/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Rawhide Bracers", description: "'Tightly packed pieces of leather to endure all weather.'", kind: Armor(( - kind: Hand("Rawhide"), + kind: Hand, stats: ( protection: Some(Normal(2.0)), crit_power: Some(0.033), diff --git a/assets/common/items/armor/hide/rawhide/pants.ron b/assets/common/items/armor/hide/rawhide/pants.ron index 6c74d33a7a..823f3a50ca 100644 --- a/assets/common/items/armor/hide/rawhide/pants.ron +++ b/assets/common/items/armor/hide/rawhide/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Rawhide Pants", description: "'Tightly packed pieces of leather to endure all weather.'", kind: Armor(( - kind: Pants("Rawhide"), + kind: Pants, stats: ( protection: Some(Normal(5.0)), crit_power: Some(0.066), diff --git a/assets/common/items/armor/hide/rawhide/shoulder.ron b/assets/common/items/armor/hide/rawhide/shoulder.ron index 0b89fb7163..c7b1b8acac 100644 --- a/assets/common/items/armor/hide/rawhide/shoulder.ron +++ b/assets/common/items/armor/hide/rawhide/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Rawhide Shoulderpads", description: "Tightly packed pieces of leather to endure all weather.", kind: Armor(( - kind: Shoulder("Rawhide"), + kind: Shoulder, stats: ( protection: Some(Normal(5.0)), crit_power: Some(0.066), diff --git a/assets/common/items/armor/hide/scale/back.ron b/assets/common/items/armor/hide/scale/back.ron index 92992ea4c3..cc16a88c73 100644 --- a/assets/common/items/armor/hide/scale/back.ron +++ b/assets/common/items/armor/hide/scale/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Scale Cape", description: "Each embedded scale provides protection.", kind: Armor(( - kind: Back("Scale"), + kind: Back, stats: ( protection: Some(Normal(4.0)), crit_power: Some(0.05), diff --git a/assets/common/items/armor/hide/scale/belt.ron b/assets/common/items/armor/hide/scale/belt.ron index 7c2e73461f..4bbb718348 100644 --- a/assets/common/items/armor/hide/scale/belt.ron +++ b/assets/common/items/armor/hide/scale/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Scale Girdle", description: "Each embedded scale provides protection.", kind: Armor(( - kind: Belt("Scale"), + kind: Belt, stats: ( protection: Some(Normal(4.0)), crit_power: Some(0.05), diff --git a/assets/common/items/armor/hide/scale/chest.ron b/assets/common/items/armor/hide/scale/chest.ron index 2647e01ea4..bdd1f191e0 100644 --- a/assets/common/items/armor/hide/scale/chest.ron +++ b/assets/common/items/armor/hide/scale/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Scale Chestpiece", description: "Each embedded scale provides protection.", kind: Armor(( - kind: Chest("Scale"), + kind: Chest, stats: ( protection: Some(Normal(21.0)), crit_power: Some(0.3), diff --git a/assets/common/items/armor/hide/scale/foot.ron b/assets/common/items/armor/hide/scale/foot.ron index 0dd6ec76e5..40b93f97b0 100644 --- a/assets/common/items/armor/hide/scale/foot.ron +++ b/assets/common/items/armor/hide/scale/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Scale Sabatons", description: "Each embedded scale provides protection.", kind: Armor(( - kind: Foot("Scale"), + kind: Foot, stats: ( protection: Some(Normal(7.0)), crit_power: Some(0.1), diff --git a/assets/common/items/armor/hide/scale/hand.ron b/assets/common/items/armor/hide/scale/hand.ron index d85b25352a..4f9f76046e 100644 --- a/assets/common/items/armor/hide/scale/hand.ron +++ b/assets/common/items/armor/hide/scale/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Scale Fists", description: "Each embedded scale provides protection.", kind: Armor(( - kind: Hand("Scale"), + kind: Hand, stats: ( protection: Some(Normal(7.0)), crit_power: Some(0.1), diff --git a/assets/common/items/armor/hide/scale/pants.ron b/assets/common/items/armor/hide/scale/pants.ron index ad19d3397f..7789c77fea 100644 --- a/assets/common/items/armor/hide/scale/pants.ron +++ b/assets/common/items/armor/hide/scale/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Scale Leggings", description: "Each embedded scale provides protection.", kind: Armor(( - kind: Pants("Scale"), + kind: Pants, stats: ( protection: Some(Normal(14.0)), crit_power: Some(0.2), diff --git a/assets/common/items/armor/hide/scale/shoulder.ron b/assets/common/items/armor/hide/scale/shoulder.ron index 669db0a5a9..b394b5820a 100644 --- a/assets/common/items/armor/hide/scale/shoulder.ron +++ b/assets/common/items/armor/hide/scale/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Scale Shoulderguards", description: "Each embedded scale provides protection.", kind: Armor(( - kind: Shoulder("Scale"), + kind: Shoulder, stats: ( protection: Some(Normal(14.0)), crit_power: Some(0.2), diff --git a/assets/common/items/armor/leather_plate/belt.ron b/assets/common/items/armor/leather_plate/belt.ron index 7403f595fc..8d70c155b3 100644 --- a/assets/common/items/armor/leather_plate/belt.ron +++ b/assets/common/items/armor/leather_plate/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Plate Belt", description: "Leather adorned with steel for better protection.", kind: Armor(( - kind: Belt("LeatherPlate"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/leather_plate/chest.ron b/assets/common/items/armor/leather_plate/chest.ron index 9f496336fd..8328aaacf6 100644 --- a/assets/common/items/armor/leather_plate/chest.ron +++ b/assets/common/items/armor/leather_plate/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Plate Chest", description: "Leather adorned with steel for better protection.", kind: Armor(( - kind: Chest("LeatherPlate"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(12.0)), diff --git a/assets/common/items/armor/leather_plate/foot.ron b/assets/common/items/armor/leather_plate/foot.ron index 1c149fefda..da4c47c088 100644 --- a/assets/common/items/armor/leather_plate/foot.ron +++ b/assets/common/items/armor/leather_plate/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Plate Boots", description: "Leather adorned with steel for better protection.", kind: Armor(( - kind: Foot("LeatherPlate"), + kind: Foot, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/leather_plate/hand.ron b/assets/common/items/armor/leather_plate/hand.ron index 69026fe230..a95d29183b 100644 --- a/assets/common/items/armor/leather_plate/hand.ron +++ b/assets/common/items/armor/leather_plate/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Plate Gloves", description: "Leather adorned with steel for better protection.", kind: Armor(( - kind: Hand("LeatherPlate"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/leather_plate/helmet.ron b/assets/common/items/armor/leather_plate/helmet.ron index 5b3873275d..69c56b679e 100644 --- a/assets/common/items/armor/leather_plate/helmet.ron +++ b/assets/common/items/armor/leather_plate/helmet.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Plate Helmet", description: "Leather adorned with steel for better protection.", kind: Armor(( - kind: Head("LeatherPlate"), + kind: Head, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(8.0)), diff --git a/assets/common/items/armor/leather_plate/pants.ron b/assets/common/items/armor/leather_plate/pants.ron index fbe2b06050..bfbb570f39 100644 --- a/assets/common/items/armor/leather_plate/pants.ron +++ b/assets/common/items/armor/leather_plate/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Plate Chausses", description: "Leather adorned with steel for better protection.", kind: Armor(( - kind: Pants("LeatherPlate"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(8.0)), diff --git a/assets/common/items/armor/leather_plate/shoulder.ron b/assets/common/items/armor/leather_plate/shoulder.ron index 14433e9c94..83875c2701 100644 --- a/assets/common/items/armor/leather_plate/shoulder.ron +++ b/assets/common/items/armor/leather_plate/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Plate Shoulder Pad", description: "Leather adorned with steel for better protection.", kind: Armor(( - kind: Shoulder("LeatherPlate"), + kind: Shoulder, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(8.0)), diff --git a/assets/common/items/armor/mail/bloodsteel/back.ron b/assets/common/items/armor/mail/bloodsteel/back.ron index c7903e00fc..bb49252326 100644 --- a/assets/common/items/armor/mail/bloodsteel/back.ron +++ b/assets/common/items/armor/mail/bloodsteel/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bloodsteel Cape", description: "Forged to preserve life, at the cost of another.", kind: Armor(( - kind: Back("Bloodsteel"), + kind: Back, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(2.5)), diff --git a/assets/common/items/armor/mail/bloodsteel/belt.ron b/assets/common/items/armor/mail/bloodsteel/belt.ron index b45dabd25b..abd65918e7 100644 --- a/assets/common/items/armor/mail/bloodsteel/belt.ron +++ b/assets/common/items/armor/mail/bloodsteel/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bloodsteel Girdle", description: "Forged to preserve life, at the cost of another.", kind: Armor(( - kind: Belt("Bloodsteel"), + kind: Belt, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(2.5)), diff --git a/assets/common/items/armor/mail/bloodsteel/chest.ron b/assets/common/items/armor/mail/bloodsteel/chest.ron index 3cb9aa5aa1..c41b293e79 100644 --- a/assets/common/items/armor/mail/bloodsteel/chest.ron +++ b/assets/common/items/armor/mail/bloodsteel/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bloodsteel Chest", description: "Forged to preserve life, at the cost of another.", kind: Armor(( - kind: Chest("Bloodsteel"), + kind: Chest, stats: ( protection: Some(Normal(60.0)), poise_resilience: Some(Normal(15.0)), diff --git a/assets/common/items/armor/mail/bloodsteel/foot.ron b/assets/common/items/armor/mail/bloodsteel/foot.ron index a81a8d8333..e500fca026 100644 --- a/assets/common/items/armor/mail/bloodsteel/foot.ron +++ b/assets/common/items/armor/mail/bloodsteel/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bloodsteel Sabatons", description: "Forged to preserve life, at the cost of another.", kind: Armor(( - kind: Foot("Bloodsteel"), + kind: Foot, stats: ( protection: Some(Normal(20.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/armor/mail/bloodsteel/hand.ron b/assets/common/items/armor/mail/bloodsteel/hand.ron index 745b0d5d01..1c197cde4c 100644 --- a/assets/common/items/armor/mail/bloodsteel/hand.ron +++ b/assets/common/items/armor/mail/bloodsteel/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bloodsteel Gauntlets", description: "Forged to preserve life, at the cost of another.", kind: Armor(( - kind: Hand("Bloodsteel"), + kind: Hand, stats: ( protection: Some(Normal(20.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/armor/mail/bloodsteel/pants.ron b/assets/common/items/armor/mail/bloodsteel/pants.ron index 932d3243bb..b24f2b9d6f 100644 --- a/assets/common/items/armor/mail/bloodsteel/pants.ron +++ b/assets/common/items/armor/mail/bloodsteel/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bloodsteel Legs", description: "Forged to preserve life, at the cost of another.", kind: Armor(( - kind: Pants("Bloodsteel"), + kind: Pants, stats: ( protection: Some(Normal(40.0)), poise_resilience: Some(Normal(10.0)), diff --git a/assets/common/items/armor/mail/bloodsteel/shoulder.ron b/assets/common/items/armor/mail/bloodsteel/shoulder.ron index 783a2720ce..2714ca2ad3 100644 --- a/assets/common/items/armor/mail/bloodsteel/shoulder.ron +++ b/assets/common/items/armor/mail/bloodsteel/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bloodsteel Pauldrons", description: "Forged to preserve life, at the cost of another.", kind: Armor(( - kind: Shoulder("Bloodsteel"), + kind: Shoulder, stats: ( protection: Some(Normal(40.0)), poise_resilience: Some(Normal(10.0)), diff --git a/assets/common/items/armor/mail/bronze/back.ron b/assets/common/items/armor/mail/bronze/back.ron index 83a618bee5..b596a0344c 100644 --- a/assets/common/items/armor/mail/bronze/back.ron +++ b/assets/common/items/armor/mail/bronze/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bronze Cloak", description: "'Heavy and dull, but it can take a punch.'", kind: Armor(( - kind: Back("Bronze"), + kind: Back, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(0.5)), diff --git a/assets/common/items/armor/mail/bronze/belt.ron b/assets/common/items/armor/mail/bronze/belt.ron index a26041d202..7bfb7483e0 100644 --- a/assets/common/items/armor/mail/bronze/belt.ron +++ b/assets/common/items/armor/mail/bronze/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bronze Girdle", description: "'Heavy and dull, but it can take a punch.'", kind: Armor(( - kind: Belt("Bronze"), + kind: Belt, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(0.5)), diff --git a/assets/common/items/armor/mail/bronze/chest.ron b/assets/common/items/armor/mail/bronze/chest.ron index a21849078e..8a1a400ca7 100644 --- a/assets/common/items/armor/mail/bronze/chest.ron +++ b/assets/common/items/armor/mail/bronze/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bronze Chestguard", description: "Heavy and dull, but it can take a punch.", kind: Armor(( - kind: Chest("Bronze"), + kind: Chest, stats: ( protection: Some(Normal(12.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/armor/mail/bronze/foot.ron b/assets/common/items/armor/mail/bronze/foot.ron index 60f39a92f7..9c147f2d5b 100644 --- a/assets/common/items/armor/mail/bronze/foot.ron +++ b/assets/common/items/armor/mail/bronze/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bronze Shoes", description: "'Heavy and dull, but it can take a punch.", kind: Armor(( - kind: Foot("Bronze"), + kind: Foot, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/mail/bronze/hand.ron b/assets/common/items/armor/mail/bronze/hand.ron index d3c2bcb5e1..2d8d0b32b6 100644 --- a/assets/common/items/armor/mail/bronze/hand.ron +++ b/assets/common/items/armor/mail/bronze/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bronze Gauntlets", description: "'Heavy and dull, but it can take a punch.'", kind: Armor(( - kind: Hand("Bronze"), + kind: Hand, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/mail/bronze/pants.ron b/assets/common/items/armor/mail/bronze/pants.ron index fc54c2a23f..0713fd0d33 100644 --- a/assets/common/items/armor/mail/bronze/pants.ron +++ b/assets/common/items/armor/mail/bronze/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bronze Pantalons", description: "'Heavy and dull, but it can take a punch.'", kind: Armor(( - kind: Pants("Bronze"), + kind: Pants, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/mail/bronze/shoulder.ron b/assets/common/items/armor/mail/bronze/shoulder.ron index d2473db520..1dc186daee 100644 --- a/assets/common/items/armor/mail/bronze/shoulder.ron +++ b/assets/common/items/armor/mail/bronze/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bronze Guards", description: "Heavy and dull, but it can take a punch.", kind: Armor(( - kind: Shoulder("Bronze"), + kind: Shoulder, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/mail/cobalt/back.ron b/assets/common/items/armor/mail/cobalt/back.ron index 822c94bbbb..919f053a20 100644 --- a/assets/common/items/armor/mail/cobalt/back.ron +++ b/assets/common/items/armor/mail/cobalt/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cobalt Cape", description: "Ornamental and impenetrable, the metal will never dull.", kind: Armor(( - kind: Back("Cobalt"), + kind: Back, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/mail/cobalt/belt.ron b/assets/common/items/armor/mail/cobalt/belt.ron index 2e05fd8af7..0341238898 100644 --- a/assets/common/items/armor/mail/cobalt/belt.ron +++ b/assets/common/items/armor/mail/cobalt/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cobalt Girdle", description: "Ornamental and impenetrable, the metal will never dull.", kind: Armor(( - kind: Belt("Cobalt"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/mail/cobalt/chest.ron b/assets/common/items/armor/mail/cobalt/chest.ron index b5ffe704d7..c7dd6332f9 100644 --- a/assets/common/items/armor/mail/cobalt/chest.ron +++ b/assets/common/items/armor/mail/cobalt/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cobalt Chestpiece", description: "Ornamental and impenetrable, the metal will never dull.", kind: Armor(( - kind: Chest("Cobalt"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(12.0)), diff --git a/assets/common/items/armor/mail/cobalt/foot.ron b/assets/common/items/armor/mail/cobalt/foot.ron index e1ab1c51f2..445b52191b 100644 --- a/assets/common/items/armor/mail/cobalt/foot.ron +++ b/assets/common/items/armor/mail/cobalt/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cobalt Footguards", description: "Ornamental and impenetrable, the metal will never dull.", kind: Armor(( - kind: Foot("Cobalt"), + kind: Foot, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/mail/cobalt/hand.ron b/assets/common/items/armor/mail/cobalt/hand.ron index 849aa96685..e80a6e11cc 100644 --- a/assets/common/items/armor/mail/cobalt/hand.ron +++ b/assets/common/items/armor/mail/cobalt/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cobalt Gauntlets", description: "Ornamental and impenetrable, the metal will never dull.", kind: Armor(( - kind: Hand("Cobalt"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/mail/cobalt/pants.ron b/assets/common/items/armor/mail/cobalt/pants.ron index 2196479028..40e365df5b 100644 --- a/assets/common/items/armor/mail/cobalt/pants.ron +++ b/assets/common/items/armor/mail/cobalt/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cobalt Leggings", description: "Ornamental and impenetrable, the metal will never dull.", kind: Armor(( - kind: Pants("Cobalt"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(8.0)), diff --git a/assets/common/items/armor/mail/cobalt/shoulder.ron b/assets/common/items/armor/mail/cobalt/shoulder.ron index b4b64828da..315805d9d5 100644 --- a/assets/common/items/armor/mail/cobalt/shoulder.ron +++ b/assets/common/items/armor/mail/cobalt/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Cobalt Shoulderguards", description: "Ornamental and impenetrable, the metal will never dull.", kind: Armor(( - kind: Shoulder("Cobalt"), + kind: Shoulder, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(8.0)), diff --git a/assets/common/items/armor/mail/iron/back.ron b/assets/common/items/armor/mail/iron/back.ron index 7103881a14..af45e5b12c 100644 --- a/assets/common/items/armor/mail/iron/back.ron +++ b/assets/common/items/armor/mail/iron/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron Cloak", description: "Sturdy and unyielding, across ages of war.", kind: Armor(( - kind: Back("Iron"), + kind: Back, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/mail/iron/belt.ron b/assets/common/items/armor/mail/iron/belt.ron index fe05f4d614..7c89911a3e 100644 --- a/assets/common/items/armor/mail/iron/belt.ron +++ b/assets/common/items/armor/mail/iron/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron Belt", description: "Sturdy and unyielding, across ages of war.", kind: Armor(( - kind: Belt("Iron"), + kind: Belt, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/mail/iron/chest.ron b/assets/common/items/armor/mail/iron/chest.ron index c4066f5bdd..87641cb3b6 100644 --- a/assets/common/items/armor/mail/iron/chest.ron +++ b/assets/common/items/armor/mail/iron/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron Chestguard", description: "Sturdy and unyielding, across ages of war.", kind: Armor(( - kind: Chest("Iron"), + kind: Chest, stats: ( protection: Some(Normal(24.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/mail/iron/foot.ron b/assets/common/items/armor/mail/iron/foot.ron index b2383da6e1..a3ebcb5c63 100644 --- a/assets/common/items/armor/mail/iron/foot.ron +++ b/assets/common/items/armor/mail/iron/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron Footguards", description: "Sturdy and unyielding, across ages of war.", kind: Armor(( - kind: Foot("Iron"), + kind: Foot, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/mail/iron/hand.ron b/assets/common/items/armor/mail/iron/hand.ron index d6701470e5..00d8eb6a07 100644 --- a/assets/common/items/armor/mail/iron/hand.ron +++ b/assets/common/items/armor/mail/iron/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron Fists", description: "Sturdy and unyielding, across ages of war.", kind: Armor(( - kind: Hand("Iron"), + kind: Hand, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/mail/iron/pants.ron b/assets/common/items/armor/mail/iron/pants.ron index eaa8f6882f..595e3b7e96 100644 --- a/assets/common/items/armor/mail/iron/pants.ron +++ b/assets/common/items/armor/mail/iron/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron Pants", description: "Sturdy and unyielding, across ages of war.", kind: Armor(( - kind: Pants("Iron"), + kind: Pants, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/mail/iron/shoulder.ron b/assets/common/items/armor/mail/iron/shoulder.ron index c7bc50f001..33c7c6de49 100644 --- a/assets/common/items/armor/mail/iron/shoulder.ron +++ b/assets/common/items/armor/mail/iron/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron Shoulderpads", description: "Sturdy and unyielding, across ages of war.", kind: Armor(( - kind: Shoulder("Iron"), + kind: Shoulder, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/mail/orichalcum/back.ron b/assets/common/items/armor/mail/orichalcum/back.ron index 459aac0ecb..e5a9fb3537 100644 --- a/assets/common/items/armor/mail/orichalcum/back.ron +++ b/assets/common/items/armor/mail/orichalcum/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Orichalcum Cape", description: "An ancient alloy. Myths remain of heroes who wore this metal.", kind: Armor(( - kind: Back("Orichalcum"), + kind: Back, stats: ( protection: Some(Normal(12.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/armor/mail/orichalcum/belt.ron b/assets/common/items/armor/mail/orichalcum/belt.ron index 3c44ee17d8..466136db08 100644 --- a/assets/common/items/armor/mail/orichalcum/belt.ron +++ b/assets/common/items/armor/mail/orichalcum/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Orichalcum Belt", description: "An ancient alloy. Myths remain of heroes who wore this metal.", kind: Armor(( - kind: Belt("Orichalcum"), + kind: Belt, stats: ( protection: Some(Normal(12.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/armor/mail/orichalcum/chest.ron b/assets/common/items/armor/mail/orichalcum/chest.ron index 7ddfdecaf4..9b5b8130e3 100644 --- a/assets/common/items/armor/mail/orichalcum/chest.ron +++ b/assets/common/items/armor/mail/orichalcum/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Orichalcum Chestguard", description: "An ancient alloy. Myths remain of heroes who wore this metal.", kind: Armor(( - kind: Chest("Orichalcum"), + kind: Chest, stats: ( protection: Some(Normal(72.0)), poise_resilience: Some(Normal(18.0)), diff --git a/assets/common/items/armor/mail/orichalcum/foot.ron b/assets/common/items/armor/mail/orichalcum/foot.ron index c51dcac769..21a20435db 100644 --- a/assets/common/items/armor/mail/orichalcum/foot.ron +++ b/assets/common/items/armor/mail/orichalcum/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Orichalcum Warboots", description: "An ancient alloy. Myths remain of heroes who wore this metal.", kind: Armor(( - kind: Foot("Orichalcum"), + kind: Foot, stats: ( protection: Some(Normal(24.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/mail/orichalcum/hand.ron b/assets/common/items/armor/mail/orichalcum/hand.ron index 856f10e2c8..12ef25e47a 100644 --- a/assets/common/items/armor/mail/orichalcum/hand.ron +++ b/assets/common/items/armor/mail/orichalcum/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Orichalcum Gloves", description: "An ancient alloy. Myths remain of heroes who wore this metal.", kind: Armor(( - kind: Hand("Orichalcum"), + kind: Hand, stats: ( protection: Some(Normal(24.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/mail/orichalcum/pants.ron b/assets/common/items/armor/mail/orichalcum/pants.ron index 9e4ab7b209..7bce407f49 100644 --- a/assets/common/items/armor/mail/orichalcum/pants.ron +++ b/assets/common/items/armor/mail/orichalcum/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Orichalcum Legplates", description: "An ancient alloy. Myths remain of heroes who wore this metal.", kind: Armor(( - kind: Pants("Orichalcum"), + kind: Pants, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(12.0)), diff --git a/assets/common/items/armor/mail/orichalcum/shoulder.ron b/assets/common/items/armor/mail/orichalcum/shoulder.ron index c29b9d5b8e..5e9d5d772f 100644 --- a/assets/common/items/armor/mail/orichalcum/shoulder.ron +++ b/assets/common/items/armor/mail/orichalcum/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Orichalcum Mantle", description: "An ancient alloy. Myths remain of heroes who wore this armor.", kind: Armor(( - kind: Shoulder("Orichalcum"), + kind: Shoulder, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(12.0)), diff --git a/assets/common/items/armor/mail/steel/back.ron b/assets/common/items/armor/mail/steel/back.ron index 30331844ef..937edd98a9 100644 --- a/assets/common/items/armor/mail/steel/back.ron +++ b/assets/common/items/armor/mail/steel/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Steel Cape", description: "Metal alloy interlocking plates to improve protection.", kind: Armor(( - kind: Back("Steel"), + kind: Back, stats: ( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(1.5)), diff --git a/assets/common/items/armor/mail/steel/belt.ron b/assets/common/items/armor/mail/steel/belt.ron index 7ee03457af..2cc06b8318 100644 --- a/assets/common/items/armor/mail/steel/belt.ron +++ b/assets/common/items/armor/mail/steel/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Steel Belt", description: "Metal alloy interlocking plates to improve protection.", kind: Armor(( - kind: Belt("Steel"), + kind: Belt, stats: ( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(1.5)), diff --git a/assets/common/items/armor/mail/steel/chest.ron b/assets/common/items/armor/mail/steel/chest.ron index 60646c98ba..b641bd5dcf 100644 --- a/assets/common/items/armor/mail/steel/chest.ron +++ b/assets/common/items/armor/mail/steel/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Steel Cuirass", description: "The metal alloy provides a somewhat lighter and stronger cuirass.", kind: Armor(( - kind: Chest("Steel"), + kind: Chest, stats: ( protection: Some(Normal(36.0)), poise_resilience: Some(Normal(9.0)), diff --git a/assets/common/items/armor/mail/steel/foot.ron b/assets/common/items/armor/mail/steel/foot.ron index eb292dd6b2..fb37a1a8ce 100644 --- a/assets/common/items/armor/mail/steel/foot.ron +++ b/assets/common/items/armor/mail/steel/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Steel Boots", description: "Metal alloy boots providing a more comfortable and durable protection.", kind: Armor(( - kind: Foot("Steel"), + kind: Foot, stats: ( protection: Some(Normal(12.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/armor/mail/steel/hand.ron b/assets/common/items/armor/mail/steel/hand.ron index c4140d271c..dbc3d7cb44 100644 --- a/assets/common/items/armor/mail/steel/hand.ron +++ b/assets/common/items/armor/mail/steel/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Steel Gauntlets", description: "The metal alloy provides better protection and lighter weight, a quite comfortable gauntlet.", kind: Armor(( - kind: Hand("Steel"), + kind: Hand, stats: ( protection: Some(Normal(12.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/armor/mail/steel/pants.ron b/assets/common/items/armor/mail/steel/pants.ron index c8070cea11..67a3e6d8f6 100644 --- a/assets/common/items/armor/mail/steel/pants.ron +++ b/assets/common/items/armor/mail/steel/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Steel Chausses", description: "The metal alloy provides improvements to fit, durability, and lightness.", kind: Armor(( - kind: Pants("Steel"), + kind: Pants, stats: ( protection: Some(Normal(24.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/mail/steel/shoulder.ron b/assets/common/items/armor/mail/steel/shoulder.ron index 5a173b322c..48f1716e23 100644 --- a/assets/common/items/armor/mail/steel/shoulder.ron +++ b/assets/common/items/armor/mail/steel/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Steel Shoulders", description: "The metal alloy plates provide better protection and comfort.", kind: Armor(( - kind: Shoulder("Steel"), + kind: Shoulder, stats: ( protection: Some(Normal(24.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/merchant/back.ron b/assets/common/items/armor/merchant/back.ron index 97fd444f71..109014c231 100644 --- a/assets/common/items/armor/merchant/back.ron +++ b/assets/common/items/armor/merchant/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Merchant Backpack", description: "", kind: Armor(( - kind: Back("Merchant"), + kind: Back, stats: ( protection: Some(Normal(1.0)), crit_power: Some(0.017), diff --git a/assets/common/items/armor/merchant/belt.ron b/assets/common/items/armor/merchant/belt.ron index fe40048d53..455dbc7a8c 100644 --- a/assets/common/items/armor/merchant/belt.ron +++ b/assets/common/items/armor/merchant/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Merchant Belt", description: "", kind: Armor(( - kind: Belt("Merchant"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/merchant/chest.ron b/assets/common/items/armor/merchant/chest.ron index a75b8943cb..cd0ef00a04 100644 --- a/assets/common/items/armor/merchant/chest.ron +++ b/assets/common/items/armor/merchant/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Merchant Jacket", description: "", kind: Armor(( - kind: Chest("Merchant"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/merchant/foot.ron b/assets/common/items/armor/merchant/foot.ron index c423cbe877..899238121b 100644 --- a/assets/common/items/armor/merchant/foot.ron +++ b/assets/common/items/armor/merchant/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Merchant Boots", description: "", kind: Armor(( - kind: Foot("Merchant"), + kind: Foot, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/merchant/hand.ron b/assets/common/items/armor/merchant/hand.ron index d487f1ddda..f2c09b2230 100644 --- a/assets/common/items/armor/merchant/hand.ron +++ b/assets/common/items/armor/merchant/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Merchant Gloves", description: "", kind: Armor(( - kind: Hand("Merchant"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/merchant/pants.ron b/assets/common/items/armor/merchant/pants.ron index a35db9f3f3..cabc3f94a3 100644 --- a/assets/common/items/armor/merchant/pants.ron +++ b/assets/common/items/armor/merchant/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Merchant Pants", description: "", kind: Armor(( - kind: Pants("Merchant"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/merchant/shoulder.ron b/assets/common/items/armor/merchant/shoulder.ron index 4fc829c369..5c91273921 100644 --- a/assets/common/items/armor/merchant/shoulder.ron +++ b/assets/common/items/armor/merchant/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Merchant Mantle", description: "", kind: Armor(( - kind: Shoulder("Merchant"), + kind: Shoulder, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/armor/merchant/turban.ron b/assets/common/items/armor/merchant/turban.ron index 3fa30f3812..a9954c3c24 100644 --- a/assets/common/items/armor/merchant/turban.ron +++ b/assets/common/items/armor/merchant/turban.ron @@ -2,7 +2,7 @@ ItemDef( name: "Impressive Turban", description: "Fancy.", kind: Armor(( - kind: Head("Merchant"), + kind: Head, stats: ( protection: Some(Normal(5.0)), poise_resilience: Some(Normal(2.0)), @@ -11,5 +11,5 @@ ItemDef( ), )), quality: Epic, - tags: [], + tags: [], ) diff --git a/assets/common/items/armor/misc/back/admin.ron b/assets/common/items/armor/misc/back/admin.ron index e0e83866a7..a86bdc537f 100644 --- a/assets/common/items/armor/misc/back/admin.ron +++ b/assets/common/items/armor/misc/back/admin.ron @@ -2,7 +2,7 @@ ItemDef( name: "Admin's Cape", description: "With great power comes\ngreat responsibility.", kind: Armor(( - kind: Back("Admin"), + kind: Back, stats: ( protection: Some(Invincible), poise_resilience: Some(Invincible), diff --git a/assets/common/items/armor/misc/back/backpack.ron b/assets/common/items/armor/misc/back/backpack.ron index a8924f8809..ebec547266 100644 --- a/assets/common/items/armor/misc/back/backpack.ron +++ b/assets/common/items/armor/misc/back/backpack.ron @@ -2,7 +2,7 @@ ItemDef( name: "Traveler's Backpack", description: "Comfort and capacity united.", kind: Armor(( - kind: Back("Backpack"), + kind: Back, stats: ( ), )), diff --git a/assets/common/items/armor/misc/back/dungeon_purple.ron b/assets/common/items/armor/misc/back/dungeon_purple.ron index 317cdcdb82..7a151c8dc9 100644 --- a/assets/common/items/armor/misc/back/dungeon_purple.ron +++ b/assets/common/items/armor/misc/back/dungeon_purple.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Cultist Cape", description: "Smells like dark magic and candles.", kind: Armor(( - kind: Back("DungeonPurple"), + kind: Back, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/misc/back/short_0.ron b/assets/common/items/armor/misc/back/short_0.ron index a0ac2b1a45..cb18fefe77 100644 --- a/assets/common/items/armor/misc/back/short_0.ron +++ b/assets/common/items/armor/misc/back/short_0.ron @@ -2,7 +2,7 @@ ItemDef( name: "Short leather Cape", description: "Probably made of the finest leather.", kind: Armor(( - kind: Back("Short0"), + kind: Back, stats: ( protection: Some(Normal(0.3)), ), diff --git a/assets/common/items/armor/misc/back/short_1.ron b/assets/common/items/armor/misc/back/short_1.ron index 0aff199482..f44e539ee8 100644 --- a/assets/common/items/armor/misc/back/short_1.ron +++ b/assets/common/items/armor/misc/back/short_1.ron @@ -2,7 +2,7 @@ ItemDef( name: "Green Blanket", description: "Keeps your shoulders warm.", kind: Armor(( - kind: Back("Short1"), + kind: Back, stats: ( protection: Some(Normal(0.1)), ), diff --git a/assets/common/items/armor/misc/bag/heavy_seabag.ron b/assets/common/items/armor/misc/bag/heavy_seabag.ron index 83e6504458..a5e7e33195 100644 --- a/assets/common/items/armor/misc/bag/heavy_seabag.ron +++ b/assets/common/items/armor/misc/bag/heavy_seabag.ron @@ -3,7 +3,7 @@ ItemDef( description: "Commonly used by sailors.", kind: Armor( ( - kind: Bag("BluePouch"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/knitted_red_pouch.ron b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron index 7aaf7a7040..24ec2e6584 100644 --- a/assets/common/items/armor/misc/bag/knitted_red_pouch.ron +++ b/assets/common/items/armor/misc/bag/knitted_red_pouch.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made from some patches of dyed cloth.", kind: Armor( ( - kind: Bag("RedSmall"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/liana_kit.ron b/assets/common/items/armor/misc/bag/liana_kit.ron index b14f1bb106..f42179cafc 100644 --- a/assets/common/items/armor/misc/bag/liana_kit.ron +++ b/assets/common/items/armor/misc/bag/liana_kit.ron @@ -3,7 +3,7 @@ ItemDef( description: "Woven from dried lianas.", kind: Armor( ( - kind: Bag("GreenMid"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron index 066ea494b7..9d962cd2a7 100644 --- a/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron +++ b/assets/common/items/armor/misc/bag/mindflayer_spellbag.ron @@ -3,7 +3,7 @@ ItemDef( description: "You can almost feel the Mindflayer's\nevil presence flowing through the fabric.", kind: Armor( ( - kind: Bag("PurpleSkull"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/reliable_backpack.ron b/assets/common/items/armor/misc/bag/reliable_backpack.ron index e57611e031..92908529d4 100644 --- a/assets/common/items/armor/misc/bag/reliable_backpack.ron +++ b/assets/common/items/armor/misc/bag/reliable_backpack.ron @@ -3,7 +3,7 @@ ItemDef( description: "It will never give you up.", kind: Armor( ( - kind: Bag("LeatherLarge"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron b/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron index df945426cc..1d46064448 100644 --- a/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron +++ b/assets/common/items/armor/misc/bag/soulkeeper_cursed.ron @@ -3,7 +3,7 @@ ItemDef( description: "WIP", kind: Armor( ( - kind: Bag("RedFace"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/soulkeeper_pure.ron b/assets/common/items/armor/misc/bag/soulkeeper_pure.ron index 33d4bf3cfc..4c12cd25bb 100644 --- a/assets/common/items/armor/misc/bag/soulkeeper_pure.ron +++ b/assets/common/items/armor/misc/bag/soulkeeper_pure.ron @@ -3,7 +3,7 @@ ItemDef( description: "WIP", kind: Armor( ( - kind: Bag("BlueFace"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron index 903cdc43af..e91f0b0267 100644 --- a/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron +++ b/assets/common/items/armor/misc/bag/sturdy_red_backpack.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made from a large amount of dyed cloth patches.", kind: Armor( ( - kind: Bag("RedLarge"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron index a94dcc0f37..33114f70f9 100644 --- a/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron +++ b/assets/common/items/armor/misc/bag/tiny_leather_pouch.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made from a few patches of leather.", kind: Armor( ( - kind: Bag("LeatherSmall"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/tiny_red_pouch.ron b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron index 3515347806..6b285ae354 100644 --- a/assets/common/items/armor/misc/bag/tiny_red_pouch.ron +++ b/assets/common/items/armor/misc/bag/tiny_red_pouch.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made from a single patch of dyed cloth.", kind: Armor( ( - kind: Bag("RedTiny"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/troll_hide_pack.ron b/assets/common/items/armor/misc/bag/troll_hide_pack.ron index 44c930c60f..238c72819b 100644 --- a/assets/common/items/armor/misc/bag/troll_hide_pack.ron +++ b/assets/common/items/armor/misc/bag/troll_hide_pack.ron @@ -3,7 +3,7 @@ ItemDef( description: "Trolls were definitely hurt\nin the making of this.", kind: Armor( ( - kind: Bag("GreenLarge"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/bag/woven_red_bag.ron b/assets/common/items/armor/misc/bag/woven_red_bag.ron index 3c21d267da..a2d614a97a 100644 --- a/assets/common/items/armor/misc/bag/woven_red_bag.ron +++ b/assets/common/items/armor/misc/bag/woven_red_bag.ron @@ -3,7 +3,7 @@ ItemDef( description: "Made from some patches of dyed cloth.", kind: Armor( ( - kind: Bag("RedMed"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/armor/misc/chest/worker_green_0.ron b/assets/common/items/armor/misc/chest/worker_green_0.ron index e5e3facd2a..938279980a 100644 --- a/assets/common/items/armor/misc/chest/worker_green_0.ron +++ b/assets/common/items/armor/misc/chest/worker_green_0.ron @@ -2,7 +2,7 @@ ItemDef( name: "Green Worker Shirt", description: "Was used by a farmer, until recently.", kind: Armor(( - kind: Chest("WorkerGreen0"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/chest/worker_green_1.ron b/assets/common/items/armor/misc/chest/worker_green_1.ron index 81a74a6b4f..938279980a 100644 --- a/assets/common/items/armor/misc/chest/worker_green_1.ron +++ b/assets/common/items/armor/misc/chest/worker_green_1.ron @@ -2,7 +2,7 @@ ItemDef( name: "Green Worker Shirt", description: "Was used by a farmer, until recently.", kind: Armor(( - kind: Chest("WorkerGreen1"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/chest/worker_orange_0.ron b/assets/common/items/armor/misc/chest/worker_orange_0.ron index 29b6258879..a6ac7d1e7e 100644 --- a/assets/common/items/armor/misc/chest/worker_orange_0.ron +++ b/assets/common/items/armor/misc/chest/worker_orange_0.ron @@ -2,7 +2,7 @@ ItemDef( name: "Orange Worker Shirt", description: "Was used by a farmer, until recently.", kind: Armor(( - kind: Chest("WorkerOrange0"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/chest/worker_orange_1.ron b/assets/common/items/armor/misc/chest/worker_orange_1.ron index 5a653d32c9..a6ac7d1e7e 100644 --- a/assets/common/items/armor/misc/chest/worker_orange_1.ron +++ b/assets/common/items/armor/misc/chest/worker_orange_1.ron @@ -2,7 +2,7 @@ ItemDef( name: "Orange Worker Shirt", description: "Was used by a farmer, until recently.", kind: Armor(( - kind: Chest("WorkerOrange1"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/chest/worker_purple_0.ron b/assets/common/items/armor/misc/chest/worker_purple_0.ron index 564bd08de0..d2a8b95fc4 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_0.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_0.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Worker Shirt", description: "Resilient and reliable.", kind: Armor(( - kind: Chest("WorkerPurple0"), + kind: Chest, stats: ( protection: Some(Normal(0.1)), ), diff --git a/assets/common/items/armor/misc/chest/worker_purple_1.ron b/assets/common/items/armor/misc/chest/worker_purple_1.ron index 5b6d0622fd..5d2bd5e1d6 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_1.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_1.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Worker Shirt", description: "Was used by a farmer, until recently.", kind: Armor(( - kind: Chest("WorkerPurple1"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/chest/worker_purple_brown.ron b/assets/common/items/armor/misc/chest/worker_purple_brown.ron index 5bc2f97202..d2a8b95fc4 100644 --- a/assets/common/items/armor/misc/chest/worker_purple_brown.ron +++ b/assets/common/items/armor/misc/chest/worker_purple_brown.ron @@ -2,7 +2,7 @@ ItemDef( name: "Purple Worker Shirt", description: "Resilient and reliable.", kind: Armor(( - kind: Chest("WorkerPurpBrown"), + kind: Chest, stats: ( protection: Some(Normal(0.1)), ), diff --git a/assets/common/items/armor/misc/chest/worker_red_0.ron b/assets/common/items/armor/misc/chest/worker_red_0.ron index 950d4c832f..095950f9ad 100644 --- a/assets/common/items/armor/misc/chest/worker_red_0.ron +++ b/assets/common/items/armor/misc/chest/worker_red_0.ron @@ -2,7 +2,7 @@ ItemDef( name: "Red Worker Shirt", description: "Was used by a farmer, until recently.", kind: Armor(( - kind: Chest("WorkerRed0"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/chest/worker_red_1.ron b/assets/common/items/armor/misc/chest/worker_red_1.ron index 8226d90359..095950f9ad 100644 --- a/assets/common/items/armor/misc/chest/worker_red_1.ron +++ b/assets/common/items/armor/misc/chest/worker_red_1.ron @@ -2,7 +2,7 @@ ItemDef( name: "Red Worker Shirt", description: "Was used by a farmer, until recently.", kind: Armor(( - kind: Chest("WorkerRed1"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/chest/worker_yellow_0.ron b/assets/common/items/armor/misc/chest/worker_yellow_0.ron index 44e58991c7..ac44dd94fd 100644 --- a/assets/common/items/armor/misc/chest/worker_yellow_0.ron +++ b/assets/common/items/armor/misc/chest/worker_yellow_0.ron @@ -2,7 +2,7 @@ ItemDef( name: "Yellow Worker Shirt", description: "Was used by a farmer, until recently.", kind: Armor(( - kind: Chest("WorkerYellow0"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/chest/worker_yellow_1.ron b/assets/common/items/armor/misc/chest/worker_yellow_1.ron index c1606c8c2f..ac44dd94fd 100644 --- a/assets/common/items/armor/misc/chest/worker_yellow_1.ron +++ b/assets/common/items/armor/misc/chest/worker_yellow_1.ron @@ -2,7 +2,7 @@ ItemDef( name: "Yellow Worker Shirt", description: "Was used by a farmer, until recently.", kind: Armor(( - kind: Chest("WorkerYellow1"), + kind: Chest, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/foot/jackalope_slippers.ron b/assets/common/items/armor/misc/foot/jackalope_slippers.ron index 64d9035e73..9af13267b0 100644 --- a/assets/common/items/armor/misc/foot/jackalope_slippers.ron +++ b/assets/common/items/armor/misc/foot/jackalope_slippers.ron @@ -2,7 +2,7 @@ ItemDef( name: "Fluffy Jackalope Slippers", description: "So warm and cozy!", kind: Armor(( - kind: Foot("Jackalope"), + kind: Foot, stats: ( ), )), diff --git a/assets/common/items/armor/misc/foot/sandals.ron b/assets/common/items/armor/misc/foot/sandals.ron index 8e2802e8b4..2fc027e6ec 100644 --- a/assets/common/items/armor/misc/foot/sandals.ron +++ b/assets/common/items/armor/misc/foot/sandals.ron @@ -2,7 +2,7 @@ ItemDef( name: "Worn out Sandals", description: "Loyal companions.", kind: Armor(( - kind: Foot("Sandal"), + kind: Foot, stats: ( ), )), diff --git a/assets/common/items/armor/misc/head/bamboo_twig.ron b/assets/common/items/armor/misc/head/bamboo_twig.ron index 3d77c99542..e89b112c44 100644 --- a/assets/common/items/armor/misc/head/bamboo_twig.ron +++ b/assets/common/items/armor/misc/head/bamboo_twig.ron @@ -2,7 +2,7 @@ ItemDef( name: "Bamboo Twig", description: "A tiny stray shoot from a larger bamboo shaft.", kind: Armor(( - kind: Head("BambooTwig"), + kind: Head, stats: ( energy_reward: Some(0.033), ), diff --git a/assets/common/items/armor/misc/head/bandana/red.ron b/assets/common/items/armor/misc/head/bandana/red.ron index 6ae1e654ee..856ddff385 100644 --- a/assets/common/items/armor/misc/head/bandana/red.ron +++ b/assets/common/items/armor/misc/head/bandana/red.ron @@ -2,7 +2,7 @@ ItemDef( name: "Red Bandana", description: "Very sneaky, but also, bright red.", kind: Armor(( - kind: Head("Red"), + kind: Head, stats: ( crit_power: Some(0.008), stealth: Some(0.15), diff --git a/assets/common/items/armor/misc/head/bandana/thief.ron b/assets/common/items/armor/misc/head/bandana/thief.ron index 7eedb47242..485b2b8e79 100644 --- a/assets/common/items/armor/misc/head/bandana/thief.ron +++ b/assets/common/items/armor/misc/head/bandana/thief.ron @@ -2,7 +2,7 @@ ItemDef( name: "Thief Bandana", description: "Common bandit's mask.", kind: Armor(( - kind: Head("Thief"), + kind: Head, stats: ( crit_power: Some(0.006), stealth: Some(0.18), diff --git a/assets/common/items/armor/misc/head/boreal_warhelm.ron b/assets/common/items/armor/misc/head/boreal_warhelm.ron index ffc4ab4ab0..dec4aa8b4e 100644 --- a/assets/common/items/armor/misc/head/boreal_warhelm.ron +++ b/assets/common/items/armor/misc/head/boreal_warhelm.ron @@ -2,7 +2,7 @@ ItemDef( name: "Boreal Warhelmet", description: "I wonder where it's pointing...", kind: Armor(( - kind: Head("BorealWarhelm"), + kind: Head, stats: ( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/armor/misc/head/crown.ron b/assets/common/items/armor/misc/head/crown.ron index 999170c6fd..fc5b4c8902 100644 --- a/assets/common/items/armor/misc/head/crown.ron +++ b/assets/common/items/armor/misc/head/crown.ron @@ -2,7 +2,7 @@ ItemDef( name: "Crown", description: "Fit for a king.", kind: Armor(( - kind: Head("Crown"), + kind: Head, stats: ( protection: Some(Normal(12.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/misc/head/exclamation.ron b/assets/common/items/armor/misc/head/exclamation.ron index 1df8426a26..a150df9f51 100644 --- a/assets/common/items/armor/misc/head/exclamation.ron +++ b/assets/common/items/armor/misc/head/exclamation.ron @@ -2,7 +2,7 @@ ItemDef( name: "Exclamation hat", description: "You feel like bestowing quests.", kind: Armor(( - kind: Head("Exclamation"), + kind: Head, stats: ( ), )), diff --git a/assets/common/items/armor/misc/head/headband.ron b/assets/common/items/armor/misc/head/headband.ron index 35ad4696d6..930ed92218 100644 --- a/assets/common/items/armor/misc/head/headband.ron +++ b/assets/common/items/armor/misc/head/headband.ron @@ -2,7 +2,7 @@ ItemDef( name: "Headband", description: "yep.", kind: Armor(( - kind: Head("Headband"), + kind: Head, stats: ( ), )), diff --git a/assets/common/items/armor/misc/head/helmet.ron b/assets/common/items/armor/misc/head/helmet.ron index 89b831d2bd..fa196633fe 100644 --- a/assets/common/items/armor/misc/head/helmet.ron +++ b/assets/common/items/armor/misc/head/helmet.ron @@ -2,7 +2,7 @@ ItemDef( name: "Helmet", description: "yep.", kind: Armor(( - kind: Head("Helmet"), + kind: Head, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/armor/misc/head/hog_hood.ron b/assets/common/items/armor/misc/head/hog_hood.ron index d29853fb61..3c3eb0d382 100644 --- a/assets/common/items/armor/misc/head/hog_hood.ron +++ b/assets/common/items/armor/misc/head/hog_hood.ron @@ -2,7 +2,7 @@ ItemDef( name: "Wild Hog Hood", description: "Wear the guise of the great swine you felled, so you may honor his sacrifice.", kind: Armor(( - kind: Head("HogHood"), + kind: Head, stats: ( protection: Some(Normal(5.0)), poise_resilience: Some(Normal(-1.0)), diff --git a/assets/common/items/armor/misc/head/hood.ron b/assets/common/items/armor/misc/head/hood.ron index aa2fb808ec..558b800aa4 100644 --- a/assets/common/items/armor/misc/head/hood.ron +++ b/assets/common/items/armor/misc/head/hood.ron @@ -2,7 +2,7 @@ ItemDef( name: "Hood", description: "Become one with the treetops.", kind: Armor(( - kind: Head("Hood"), + kind: Head, stats: ( protection: Some(Normal(3.0)), crit_power: Some(0.021), diff --git a/assets/common/items/armor/misc/head/hood_dark.ron b/assets/common/items/armor/misc/head/hood_dark.ron index cbc1d0f874..fa1f6d6864 100644 --- a/assets/common/items/armor/misc/head/hood_dark.ron +++ b/assets/common/items/armor/misc/head/hood_dark.ron @@ -2,7 +2,7 @@ ItemDef( name: "Dark Hood", description: "Tis a bit thicker.", kind: Armor(( - kind: Head("DarkHood"), + kind: Head, stats: ( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/misc/head/mitre.ron b/assets/common/items/armor/misc/head/mitre.ron index 940c241149..bc27b34aaa 100644 --- a/assets/common/items/armor/misc/head/mitre.ron +++ b/assets/common/items/armor/misc/head/mitre.ron @@ -2,7 +2,7 @@ ItemDef( name: "Mitre", description: "Calls strength from above.", kind: Armor(( - kind: Head("Mitre"), + kind: Head, stats: ( poise_resilience: Some(Normal(1.5)), energy_max: Some(7.0), diff --git a/assets/common/items/armor/misc/head/spikeguard.ron b/assets/common/items/armor/misc/head/spikeguard.ron index 736729d542..5b8739f57e 100644 --- a/assets/common/items/armor/misc/head/spikeguard.ron +++ b/assets/common/items/armor/misc/head/spikeguard.ron @@ -2,7 +2,7 @@ ItemDef( name: "Spiked Faceguard", description: "Introvert headgear.", kind: Armor(( - kind: Head("Spikeguard"), + kind: Head, stats: ( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/armor/misc/head/straw.ron b/assets/common/items/armor/misc/head/straw.ron index 6dc8760bf4..efbe059006 100644 --- a/assets/common/items/armor/misc/head/straw.ron +++ b/assets/common/items/armor/misc/head/straw.ron @@ -2,7 +2,7 @@ ItemDef( name: "Straw Hat", description: "Simple and stylish.", kind: Armor(( - kind: Head("Straw"), + kind: Head, stats: ( energy_max: Some(4.0), energy_reward: Some(0.02), diff --git a/assets/common/items/armor/misc/head/wanderers_hat.ron b/assets/common/items/armor/misc/head/wanderers_hat.ron index 3b1af5ffbf..0e40e461e8 100644 --- a/assets/common/items/armor/misc/head/wanderers_hat.ron +++ b/assets/common/items/armor/misc/head/wanderers_hat.ron @@ -2,7 +2,7 @@ ItemDef( name: "Wanderer's Hat", description: "A practical hat: light, shady and relatively easy to replace. The perfect headwear for those who feel at home on the highways and byways of Veloren.", kind: Armor(( - kind: Head("WanderersHat"), + kind: Head, stats: ( poise_resilience: Some(Normal(1.0)), crit_power: Some(0.033), diff --git a/assets/common/items/armor/misc/head/winged_coronet.ron b/assets/common/items/armor/misc/head/winged_coronet.ron index 648a756f7d..ddc7ee8dc7 100644 --- a/assets/common/items/armor/misc/head/winged_coronet.ron +++ b/assets/common/items/armor/misc/head/winged_coronet.ron @@ -2,7 +2,7 @@ ItemDef( name: "Winged Coronet", description: "You feel more connected with nature.", kind: Armor(( - kind: Head("WingedCoronet"), + kind: Head, stats: ( protection: Some(Normal(2.0)), energy_max: Some(4.0), diff --git a/assets/common/items/armor/misc/neck/amethyst.ron b/assets/common/items/armor/misc/neck/amethyst.ron index 1ff6c38b9f..8bd909e749 100644 --- a/assets/common/items/armor/misc/neck/amethyst.ron +++ b/assets/common/items/armor/misc/neck/amethyst.ron @@ -2,7 +2,7 @@ ItemDef( name: "Amethyst Necklace", description: "A tin necklace lined with amethyst gems.", kind: Armor(( - kind: Neck("Amethyst"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), energy_reward: Some(0.1), diff --git a/assets/common/items/armor/misc/neck/ankh_of_life.ron b/assets/common/items/armor/misc/neck/ankh_of_life.ron index ca65b0b4f3..ef7628ceb3 100644 --- a/assets/common/items/armor/misc/neck/ankh_of_life.ron +++ b/assets/common/items/armor/misc/neck/ankh_of_life.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ankh of Life", description: "A unique necklace of unkown origin... You can feel the power flowing through it.", kind: Armor(( - kind: Neck("Ankh"), + kind: Neck, stats: ( protection: Some(Normal(2.0)), energy_max: Some(20), diff --git a/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron b/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron index 6408dd1582..18b153adf8 100644 --- a/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron +++ b/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron @@ -2,7 +2,7 @@ ItemDef( name: "Carcanet of Wrath", description: "A necklace that gives even the most feeble beings immense amounts of power.", kind: Armor(( - kind: Neck("Carcanet"), + kind: Neck, stats: ( protection: Some(Normal(2.0)), crit_power: Some(0.2), diff --git a/assets/common/items/armor/misc/neck/diamond.ron b/assets/common/items/armor/misc/neck/diamond.ron index 36fc12ab8c..1de4343436 100644 --- a/assets/common/items/armor/misc/neck/diamond.ron +++ b/assets/common/items/armor/misc/neck/diamond.ron @@ -2,7 +2,7 @@ ItemDef( name: "Diamond Necklace", description: "An expensive gold necklace, ornate with exquisite diamonds.", kind: Armor(( - kind: Neck("Diamond"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), energy_reward: Some(-0.1), diff --git a/assets/common/items/armor/misc/neck/emerald.ron b/assets/common/items/armor/misc/neck/emerald.ron index 24bcb703dd..f3ec3f12c4 100644 --- a/assets/common/items/armor/misc/neck/emerald.ron +++ b/assets/common/items/armor/misc/neck/emerald.ron @@ -2,7 +2,7 @@ ItemDef( name: "Emerald Necklace", description: "A cobalt necklace, bearing beautiful emerald gems.", kind: Armor(( - kind: Neck("Emerald"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), energy_max: Some(20.0), diff --git a/assets/common/items/armor/misc/neck/fang.ron b/assets/common/items/armor/misc/neck/fang.ron index 42d00774ec..d8e8743b82 100644 --- a/assets/common/items/armor/misc/neck/fang.ron +++ b/assets/common/items/armor/misc/neck/fang.ron @@ -2,7 +2,7 @@ ItemDef( name: "Fang Necklace", description: "Only the most savage beings can handle the power of this necklace...", kind: Armor(( - kind: Neck("Fang"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), crit_power: Some(0.07), diff --git a/assets/common/items/armor/misc/neck/gem_of_resilience.ron b/assets/common/items/armor/misc/neck/gem_of_resilience.ron index 566bc2c7b0..9dc66d6570 100644 --- a/assets/common/items/armor/misc/neck/gem_of_resilience.ron +++ b/assets/common/items/armor/misc/neck/gem_of_resilience.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gem of Resilience", description: "Surrounded by a discrete magical glow.", kind: Armor(( - kind: Neck("ResilienceGem"), + kind: Neck, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/misc/neck/gold.ron b/assets/common/items/armor/misc/neck/gold.ron index edee941c8a..3f30fd7f9e 100644 --- a/assets/common/items/armor/misc/neck/gold.ron +++ b/assets/common/items/armor/misc/neck/gold.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gold Necklace", description: "An expensive gold necklace... looks stolen.", kind: Armor(( - kind: Neck("Gold"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), energy_max: Some(10), diff --git a/assets/common/items/armor/misc/neck/haniwa_talisman.ron b/assets/common/items/armor/misc/neck/haniwa_talisman.ron index 80a9b54184..2ac41151be 100644 --- a/assets/common/items/armor/misc/neck/haniwa_talisman.ron +++ b/assets/common/items/armor/misc/neck/haniwa_talisman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Talisman", description: "A talisman depicting a figure of unkown origin.", kind: Armor(( - kind: Neck("Haniwa"), + kind: Neck, stats: ( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron index cca0241419..5df9721eb0 100644 --- a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron +++ b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron @@ -2,7 +2,7 @@ ItemDef( name: "Honeycomb Pendant", description: "This necklace is always spewing out honey...", kind: Armor(( - kind: Neck("Honeycomb"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), energy_max: Some(10), diff --git a/assets/common/items/armor/misc/neck/pendant_of_protection.ron b/assets/common/items/armor/misc/neck/pendant_of_protection.ron index 06b6e2a29b..1082cdf6d7 100644 --- a/assets/common/items/armor/misc/neck/pendant_of_protection.ron +++ b/assets/common/items/armor/misc/neck/pendant_of_protection.ron @@ -2,7 +2,7 @@ ItemDef( name: "Pendant of Protection", description: "You feel as if something is always watching you...", kind: Armor(( - kind: Neck("Pendant"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/misc/neck/ruby.ron b/assets/common/items/armor/misc/neck/ruby.ron index 15b8a555b0..50edf3d2a2 100644 --- a/assets/common/items/armor/misc/neck/ruby.ron +++ b/assets/common/items/armor/misc/neck/ruby.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ruby Necklace", description: "An ornate silver necklace, embedded with beautiful rubies.", kind: Armor(( - kind: Neck("Ruby"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), energy_reward: Some(0.2), diff --git a/assets/common/items/armor/misc/neck/sapphire.ron b/assets/common/items/armor/misc/neck/sapphire.ron index 35632206cc..7975f181e4 100644 --- a/assets/common/items/armor/misc/neck/sapphire.ron +++ b/assets/common/items/armor/misc/neck/sapphire.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sapphire Necklace", description: "A sturdy iron necklace, with polished sapphire gems embedded into it.", kind: Armor(( - kind: Neck("Sapphire"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), crit_power: Some(0.05), diff --git a/assets/common/items/armor/misc/neck/scratched.ron b/assets/common/items/armor/misc/neck/scratched.ron index adf335e578..acbf33970a 100644 --- a/assets/common/items/armor/misc/neck/scratched.ron +++ b/assets/common/items/armor/misc/neck/scratched.ron @@ -2,7 +2,7 @@ ItemDef( name: "Scratched Necklace", description: "The string is about to snap...", kind: Armor(( - kind: Neck("Scratched"), + kind: Neck, stats: ( protection: Some(Normal(0.5)), ), diff --git a/assets/common/items/armor/misc/neck/shell.ron b/assets/common/items/armor/misc/neck/shell.ron index 8ab03ef5c6..b10e05ab9b 100644 --- a/assets/common/items/armor/misc/neck/shell.ron +++ b/assets/common/items/armor/misc/neck/shell.ron @@ -2,7 +2,7 @@ ItemDef( name: "Seashell Necklace", description: "Contains the guardian aura of the ocean", kind: Armor(( - kind: Neck("Shell"), + kind: Neck, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/misc/neck/topaz.ron b/assets/common/items/armor/misc/neck/topaz.ron index b2695842c3..9799a1d7d2 100644 --- a/assets/common/items/armor/misc/neck/topaz.ron +++ b/assets/common/items/armor/misc/neck/topaz.ron @@ -2,7 +2,7 @@ ItemDef( name: "Topaz Necklace", description: "A copper necklace, with topaz embedded in the center.", kind: Armor(( - kind: Neck("Topaz"), + kind: Neck, stats: ( protection: Some(Normal(1.0)), energy_max: Some(10.0), diff --git a/assets/common/items/armor/misc/pants/hunting.ron b/assets/common/items/armor/misc/pants/hunting.ron index 76ba67b81a..e2f2423e1c 100644 --- a/assets/common/items/armor/misc/pants/hunting.ron +++ b/assets/common/items/armor/misc/pants/hunting.ron @@ -2,7 +2,7 @@ ItemDef( name: "Hunting Pants", description: "Crafted from soft, supple leather.", kind: Armor(( - kind: Pants("Hunting"), + kind: Pants, stats: ( protection: Some(Normal(8.0)), ), diff --git a/assets/common/items/armor/misc/pants/worker_blue.ron b/assets/common/items/armor/misc/pants/worker_blue.ron index b3402d917f..786d4a76b6 100644 --- a/assets/common/items/armor/misc/pants/worker_blue.ron +++ b/assets/common/items/armor/misc/pants/worker_blue.ron @@ -2,7 +2,7 @@ ItemDef( name: "Blue Worker Pants", description: "Resilient and reliable.", kind: Armor(( - kind: Pants("WorkerBlue"), + kind: Pants, stats: ( protection: Some(Normal(0.1)), ), diff --git a/assets/common/items/armor/misc/pants/worker_brown.ron b/assets/common/items/armor/misc/pants/worker_brown.ron index 04a90ae1e9..bd74a3eae0 100644 --- a/assets/common/items/armor/misc/pants/worker_brown.ron +++ b/assets/common/items/armor/misc/pants/worker_brown.ron @@ -2,7 +2,7 @@ ItemDef( name: "Comfortable Worker Pants", description: "Resilient and reliable.", kind: Armor(( - kind: Pants("WorkerBrown"), + kind: Pants, stats: ( protection: Some(Normal(0.1)), ), diff --git a/assets/common/items/armor/misc/ring/amethyst.ron b/assets/common/items/armor/misc/ring/amethyst.ron index 763a97f80d..c3eecc612f 100644 --- a/assets/common/items/armor/misc/ring/amethyst.ron +++ b/assets/common/items/armor/misc/ring/amethyst.ron @@ -2,7 +2,7 @@ ItemDef( name: "Amethyst Ring", description: "A tin ring with an amethyst gem.", kind: Armor(( - kind: Ring("Amethyst"), + kind: Ring, stats: ( protection: Some(Normal(0.5)), energy_reward: Some(0.05), diff --git a/assets/common/items/armor/misc/ring/diamond.ron b/assets/common/items/armor/misc/ring/diamond.ron index 2ad50313a4..3f09aa5bac 100644 --- a/assets/common/items/armor/misc/ring/diamond.ron +++ b/assets/common/items/armor/misc/ring/diamond.ron @@ -2,7 +2,7 @@ ItemDef( name: "Diamond Ring", description: "A gold ring with an expensive diamond.", kind: Armor(( - kind: Ring("Diamond"), + kind: Ring, stats: ( protection: Some(Normal(0.5)), energy_reward: Some(-0.05), diff --git a/assets/common/items/armor/misc/ring/emerald.ron b/assets/common/items/armor/misc/ring/emerald.ron index d52ae2482f..93342fb359 100644 --- a/assets/common/items/armor/misc/ring/emerald.ron +++ b/assets/common/items/armor/misc/ring/emerald.ron @@ -2,7 +2,7 @@ ItemDef( name: "Emerald Ring", description: "A cobalt ring with an emerald gem.", kind: Armor(( - kind: Ring("Emerald"), + kind: Ring, stats: ( protection: Some(Normal(0.5)), energy_max: Some(10.0), diff --git a/assets/common/items/armor/misc/ring/gold.ron b/assets/common/items/armor/misc/ring/gold.ron index a5c11c9e08..e24093d9c2 100644 --- a/assets/common/items/armor/misc/ring/gold.ron +++ b/assets/common/items/armor/misc/ring/gold.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gold Ring", description: "A plain gold ring... almost as if it is missing a gem.", kind: Armor(( - kind: Ring("Gold"), + kind: Ring, stats: ( protection: Some(Normal(0.5)), energy_max: Some(5), diff --git a/assets/common/items/armor/misc/ring/ruby.ron b/assets/common/items/armor/misc/ring/ruby.ron index 02be92f414..d34e09d4ce 100644 --- a/assets/common/items/armor/misc/ring/ruby.ron +++ b/assets/common/items/armor/misc/ring/ruby.ron @@ -2,7 +2,7 @@ ItemDef( name: "Ruby Ring", description: "A silver ring with a ruby gem.", kind: Armor(( - kind: Ring("Ruby"), + kind: Ring, stats: ( protection: Some(Normal(0.5)), energy_reward: Some(0.1), diff --git a/assets/common/items/armor/misc/ring/sapphire.ron b/assets/common/items/armor/misc/ring/sapphire.ron index 7a39a5a6b2..58e8097309 100644 --- a/assets/common/items/armor/misc/ring/sapphire.ron +++ b/assets/common/items/armor/misc/ring/sapphire.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sapphire Ring", description: "An iron ring with a sapphire gem.", kind: Armor(( - kind: Ring("Sapphire"), + kind: Ring, stats: ( protection: Some(Normal(0.5)), crit_power: Some(0.025), diff --git a/assets/common/items/armor/misc/ring/scratched.ron b/assets/common/items/armor/misc/ring/scratched.ron index 5567edf760..315a0b7a3f 100644 --- a/assets/common/items/armor/misc/ring/scratched.ron +++ b/assets/common/items/armor/misc/ring/scratched.ron @@ -2,7 +2,7 @@ ItemDef( name: "Scratched Ring", description: "Barely fits your finger.", kind: Armor(( - kind: Ring("Scratched"), + kind: Ring, stats: ( protection: Some(Normal(0.5)), ), diff --git a/assets/common/items/armor/misc/ring/topaz.ron b/assets/common/items/armor/misc/ring/topaz.ron index e6bd556269..edf33cc8cc 100644 --- a/assets/common/items/armor/misc/ring/topaz.ron +++ b/assets/common/items/armor/misc/ring/topaz.ron @@ -2,7 +2,7 @@ ItemDef( name: "Topaz Ring", description: "A copper ring with a topaz gem.", kind: Armor(( - kind: Ring("Topaz"), + kind: Ring, stats: ( protection: Some(Normal(0.5)), energy_max: Some(5.0), diff --git a/assets/common/items/armor/misc/shoulder/iron_spikes.ron b/assets/common/items/armor/misc/shoulder/iron_spikes.ron index c7a5ac7895..64da796f5d 100644 --- a/assets/common/items/armor/misc/shoulder/iron_spikes.ron +++ b/assets/common/items/armor/misc/shoulder/iron_spikes.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron Spiked Pauldrons", description: "The heavy, rough iron plate has an interlocking spikes shoved through several slots in the center to dissuade attackers.", kind: Armor(( - kind: Shoulder("IronSpikes"), + kind: Shoulder, stats: ( protection: Some(Normal(12.0)), ), diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron index 33777c71fe..31c859cbf5 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_0.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_0.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron and Leather Spaulders", description: "Leather shoulders decorated with heavy iron hooks provide protection to the wearer.", kind: Armor(( - kind: Shoulder("IronLeather0"), + kind: Shoulder, stats: ( protection: Some(Normal(9.0)), ), diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron index 0ee0a58ae7..ef12d2191e 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_1.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_1.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron and Leather Spaulders", description: "Leather inset with heavy iron spikes provide solid protection to the wearer.", kind: Armor(( - kind: Shoulder("IronLeather1"), + kind: Shoulder, stats: ( protection: Some(Normal(9.0)), ), diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron index 43740f20c4..5e02d5c81e 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_2.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_2.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron and Leather Spaulders", description: "Leather inset with heavy iron bands provide protection to the wearer.", kind: Armor(( - kind: Shoulder("IronLeather2"), + kind: Shoulder, stats: ( protection: Some(Normal(9.0)), ), diff --git a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron index 6e13593461..162f1ba0ad 100644 --- a/assets/common/items/armor/misc/shoulder/leather_iron_3.ron +++ b/assets/common/items/armor/misc/shoulder/leather_iron_3.ron @@ -2,7 +2,7 @@ ItemDef( name: "Iron and Leather Spaulders", description: "Leather inset with iron fragments provide protection to the wearer.", kind: Armor(( - kind: Shoulder("IronLeather3"), + kind: Shoulder, stats: ( protection: Some(Normal(9.0)), ), diff --git a/assets/common/items/armor/misc/shoulder/leather_strip.ron b/assets/common/items/armor/misc/shoulder/leather_strip.ron index d5b82ece37..35d8ba5211 100644 --- a/assets/common/items/armor/misc/shoulder/leather_strip.ron +++ b/assets/common/items/armor/misc/shoulder/leather_strip.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leather Strips", description: "Tanned animal hide strips formed into loose shoulder pads.", kind: Armor(( - kind: Shoulder("LeatherStrip"), + kind: Shoulder, stats: ( protection: Some(Normal(4.0)), ), diff --git a/assets/common/items/armor/misc/tabard/admin.ron b/assets/common/items/armor/misc/tabard/admin.ron index 7da8d3b99b..c1850e712f 100644 --- a/assets/common/items/armor/misc/tabard/admin.ron +++ b/assets/common/items/armor/misc/tabard/admin.ron @@ -2,7 +2,7 @@ ItemDef( name: "Admin's Tabard", description: "With great power comes great responsibility.", kind: Armor(( - kind: Tabard("Admin"), + kind: Tabard, stats: ( protection: Some(Invincible), poise_resilience: Some(Invincible), diff --git a/assets/common/items/armor/pirate/belt.ron b/assets/common/items/armor/pirate/belt.ron index ca72b26865..af3d57e02b 100644 --- a/assets/common/items/armor/pirate/belt.ron +++ b/assets/common/items/armor/pirate/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Pirate Belt", description: "", kind: Armor(( - kind: Belt("Pirate"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/pirate/chest.ron b/assets/common/items/armor/pirate/chest.ron index a34fdda738..a1f025115e 100644 --- a/assets/common/items/armor/pirate/chest.ron +++ b/assets/common/items/armor/pirate/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Pirate Jacket", description: "", kind: Armor(( - kind: Chest("Pirate"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/pirate/foot.ron b/assets/common/items/armor/pirate/foot.ron index 3283d40c3b..b4149b8ee8 100644 --- a/assets/common/items/armor/pirate/foot.ron +++ b/assets/common/items/armor/pirate/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Pirate Boots", description: "", kind: Armor(( - kind: Foot("Pirate"), + kind: Foot, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/pirate/hand.ron b/assets/common/items/armor/pirate/hand.ron index 9928043b18..670c7c27e0 100644 --- a/assets/common/items/armor/pirate/hand.ron +++ b/assets/common/items/armor/pirate/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Pirate Gloves", description: "", kind: Armor(( - kind: Hand("Pirate"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/pirate/hat.ron b/assets/common/items/armor/pirate/hat.ron index cba6ec6d04..2a19e2de44 100644 --- a/assets/common/items/armor/pirate/hat.ron +++ b/assets/common/items/armor/pirate/hat.ron @@ -2,7 +2,7 @@ ItemDef( name: "Pirate Hat", description: "It seems like a parrot was perched up here.", kind: Armor(( - kind: Head("Pirate"), + kind: Head, stats: ( protection: Some(Normal(4.0)), energy_reward: Some(0.025), diff --git a/assets/common/items/armor/pirate/pants.ron b/assets/common/items/armor/pirate/pants.ron index 584343e6f3..45e73ad5c5 100644 --- a/assets/common/items/armor/pirate/pants.ron +++ b/assets/common/items/armor/pirate/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Pirate Pants", description: "", kind: Armor(( - kind: Pants("Pirate"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/pirate/shoulder.ron b/assets/common/items/armor/pirate/shoulder.ron index ca143f2e79..6e4057bbd4 100644 --- a/assets/common/items/armor/pirate/shoulder.ron +++ b/assets/common/items/armor/pirate/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Pirate Mantle", description: "", kind: Armor(( - kind: Shoulder("Pirate"), + kind: Shoulder, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/armor/rugged/chest.ron b/assets/common/items/armor/rugged/chest.ron index 40631464f5..8fb5fe94e5 100644 --- a/assets/common/items/armor/rugged/chest.ron +++ b/assets/common/items/armor/rugged/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Rugged Shirt", description: "Smells like Adventure.", kind: Armor(( - kind: Chest("Rugged"), + kind: Chest, stats: ( protection: Some(Normal(3.0)), ), diff --git a/assets/common/items/armor/rugged/pants.ron b/assets/common/items/armor/rugged/pants.ron index d228eab28c..5db0546175 100644 --- a/assets/common/items/armor/rugged/pants.ron +++ b/assets/common/items/armor/rugged/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Rugged Commoner's Pants", description: "They remind you of the old days.", kind: Armor(( - kind: Pants("Rugged"), + kind: Pants, stats: ( protection: Some(Normal(1.0)), ), diff --git a/assets/common/items/armor/savage/back.ron b/assets/common/items/armor/savage/back.ron index 132c941e85..6a3cbb895a 100644 --- a/assets/common/items/armor/savage/back.ron +++ b/assets/common/items/armor/savage/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Savage Cape", description: "Brings the fury of the barbarians.", kind: Armor(( - kind: Back("Savage"), + kind: Back, stats: ( protection: Some(Normal(4.0)), ), diff --git a/assets/common/items/armor/savage/belt.ron b/assets/common/items/armor/savage/belt.ron index 3e9cf75793..22155e97e2 100644 --- a/assets/common/items/armor/savage/belt.ron +++ b/assets/common/items/armor/savage/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Savage Belt", description: "Brings the fury of the barbarians.", kind: Armor(( - kind: Belt("Savage"), + kind: Belt, stats: ( protection: Some(Normal(4.0)), ), diff --git a/assets/common/items/armor/savage/chest.ron b/assets/common/items/armor/savage/chest.ron index 7130e816ff..bb89369aab 100644 --- a/assets/common/items/armor/savage/chest.ron +++ b/assets/common/items/armor/savage/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Savage Cuirass", description: "Brings the fury of the barbarians.", kind: Armor(( - kind: Chest("Savage"), + kind: Chest, stats: ( protection: Some(Normal(25.0)), ), diff --git a/assets/common/items/armor/savage/foot.ron b/assets/common/items/armor/savage/foot.ron index 3c7f76855f..c1d7da6792 100644 --- a/assets/common/items/armor/savage/foot.ron +++ b/assets/common/items/armor/savage/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Savage Boots", description: "Brings the fury of the barbarians.", kind: Armor(( - kind: Foot("Savage"), + kind: Foot, stats: ( protection: Some(Normal(5.0)), ), diff --git a/assets/common/items/armor/savage/hand.ron b/assets/common/items/armor/savage/hand.ron index ea129028a2..0103a68c57 100644 --- a/assets/common/items/armor/savage/hand.ron +++ b/assets/common/items/armor/savage/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Savage Gauntlets", description: "Brings the fury of the barbarians.", kind: Armor(( - kind: Hand("Savage"), + kind: Hand, stats: ( protection: Some(Normal(10.0)), ), diff --git a/assets/common/items/armor/savage/pants.ron b/assets/common/items/armor/savage/pants.ron index 51b8938621..2285a564f3 100644 --- a/assets/common/items/armor/savage/pants.ron +++ b/assets/common/items/armor/savage/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Savage Chausses", description: "Brings the fury of the barbarians.", kind: Armor(( - kind: Pants("Savage"), + kind: Pants, stats: ( protection: Some(Normal(20.0)), ), diff --git a/assets/common/items/armor/savage/shoulder.ron b/assets/common/items/armor/savage/shoulder.ron index cfb00a360b..5664a8d3e8 100644 --- a/assets/common/items/armor/savage/shoulder.ron +++ b/assets/common/items/armor/savage/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Savage Shoulder Pad", description: "Brings the fury of the barbarians.", kind: Armor(( - kind: Shoulder("Savage"), + kind: Shoulder, stats: ( protection: Some(Normal(15.0)), ), diff --git a/assets/common/items/armor/tarasque/belt.ron b/assets/common/items/armor/tarasque/belt.ron index b707344566..32dbede6bb 100644 --- a/assets/common/items/armor/tarasque/belt.ron +++ b/assets/common/items/armor/tarasque/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Tarasque Belt", description: "Shattered band of a tarasque shell, making for a strong belt.", kind: Armor(( - kind: Belt("Tarasque"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), ), diff --git a/assets/common/items/armor/tarasque/chest.ron b/assets/common/items/armor/tarasque/chest.ron index aeb7cd07b8..ba1bc4e39a 100644 --- a/assets/common/items/armor/tarasque/chest.ron +++ b/assets/common/items/armor/tarasque/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Tarasque Cuirass", description: "The rough protective underbelly and back of a tarasque's shell, formed to fit humanoid proportions.", kind: Armor(( - kind: Chest("Tarasque"), + kind: Chest, stats: ( protection: Some(Normal(25.0)), ), diff --git a/assets/common/items/armor/tarasque/foot.ron b/assets/common/items/armor/tarasque/foot.ron index 3cf5ff0822..0080de1253 100644 --- a/assets/common/items/armor/tarasque/foot.ron +++ b/assets/common/items/armor/tarasque/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Tarasque Boots", description: "Tarasque claws form the outside of these boots, protecting the wearer's feet.", kind: Armor(( - kind: Foot("Tarasque"), + kind: Foot, stats: ( protection: Some(Normal(8.0)), ), diff --git a/assets/common/items/armor/tarasque/hand.ron b/assets/common/items/armor/tarasque/hand.ron index 10024be53c..c5bb8c2bf3 100644 --- a/assets/common/items/armor/tarasque/hand.ron +++ b/assets/common/items/armor/tarasque/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Tarasque Gauntlets", description: "Shattered fragments from a tarasque shell shaped into a protective gauntlets.", kind: Armor(( - kind: Hand("Tarasque"), + kind: Hand, stats: ( protection: Some(Normal(6.0)), ), diff --git a/assets/common/items/armor/tarasque/pants.ron b/assets/common/items/armor/tarasque/pants.ron index 1af3161f69..7003613f9e 100644 --- a/assets/common/items/armor/tarasque/pants.ron +++ b/assets/common/items/armor/tarasque/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Tarasque Chausses", description: "Fragmented tarasque shell tied together to form protective leg armor.", kind: Armor(( - kind: Pants("Tarasque"), + kind: Pants, stats: ( protection: Some(Normal(20.0)), ), diff --git a/assets/common/items/armor/tarasque/shoulder.ron b/assets/common/items/armor/tarasque/shoulder.ron index 4c27c4dbbf..38dee07b82 100644 --- a/assets/common/items/armor/tarasque/shoulder.ron +++ b/assets/common/items/armor/tarasque/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Tarasque Shoulder Pad", description: "Spiky tarasque shell fragments formed to fit as shoulder guards.", kind: Armor(( - kind: Shoulder("Tarasque"), + kind: Shoulder, stats: ( protection: Some(Normal(16.0)), ), diff --git a/assets/common/items/armor/twigs/belt.ron b/assets/common/items/armor/twigs/belt.ron index 5d6f2d6fa3..9420385506 100644 --- a/assets/common/items/armor/twigs/belt.ron +++ b/assets/common/items/armor/twigs/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Twig Belt", description: "Small bits of nature magically held together into the shape of a belt.", kind: Armor(( - kind: Belt("Twigs"), + kind: Belt, stats: ( protection: Some(Normal(2.0)), ), diff --git a/assets/common/items/armor/twigs/chest.ron b/assets/common/items/armor/twigs/chest.ron index d8e46a4b96..03a50f5d7f 100644 --- a/assets/common/items/armor/twigs/chest.ron +++ b/assets/common/items/armor/twigs/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Twig Shirt", description: "Small sticks magically imbued to hold together to form a shirt.", kind: Armor(( - kind: Chest("Twigs"), + kind: Chest, stats: ( protection: Some(Normal(15.0)), ), diff --git a/assets/common/items/armor/twigs/foot.ron b/assets/common/items/armor/twigs/foot.ron index 20d03710c8..8e3b095e5a 100644 --- a/assets/common/items/armor/twigs/foot.ron +++ b/assets/common/items/armor/twigs/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Twig Boots", description: "Small twigs intertwined and imbued with magic to provide simple protection.", kind: Armor(( - kind: Foot("Twigs"), + kind: Foot, stats: ( protection: Some(Normal(3.0)), ), diff --git a/assets/common/items/armor/twigs/hand.ron b/assets/common/items/armor/twigs/hand.ron index 93d50358d8..99b1f1a6c0 100644 --- a/assets/common/items/armor/twigs/hand.ron +++ b/assets/common/items/armor/twigs/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Twig Wraps", description: "Magically imbued twigs interlocked into simple hand wraps.", kind: Armor(( - kind: Hand("Twigs"), + kind: Hand, stats: ( protection: Some(Normal(6.0)), ), diff --git a/assets/common/items/armor/twigs/pants.ron b/assets/common/items/armor/twigs/pants.ron index 92657b7898..41689bf033 100644 --- a/assets/common/items/armor/twigs/pants.ron +++ b/assets/common/items/armor/twigs/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Twig Pants", description: "Magically imbued twigs formed into links similar to chainmail.", kind: Armor(( - kind: Pants("Twigs"), + kind: Pants, stats: ( protection: Some(Normal(12.0)), ), diff --git a/assets/common/items/armor/twigs/shoulder.ron b/assets/common/items/armor/twigs/shoulder.ron index 7a5bc7d117..7c78b58cdf 100644 --- a/assets/common/items/armor/twigs/shoulder.ron +++ b/assets/common/items/armor/twigs/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Twiggy Shoulders", description: "Spaulders made from tightly tied twigs.", kind: Armor(( - kind: Shoulder("Twigs"), + kind: Shoulder, stats: ( protection: Some(Normal(9.0)), ), diff --git a/assets/common/items/armor/twigsflowers/belt.ron b/assets/common/items/armor/twigsflowers/belt.ron index 0aff9e33e3..a6acdc69ad 100644 --- a/assets/common/items/armor/twigsflowers/belt.ron +++ b/assets/common/items/armor/twigsflowers/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Flowery Belt", description: "Magically imbued twigs, held together with a flower intertwining its stem to hold the belt together.", kind: Armor(( - kind: Belt("TwigsFlowers"), + kind: Belt, stats: ( protection: Some(Normal(2.0)), ), diff --git a/assets/common/items/armor/twigsflowers/chest.ron b/assets/common/items/armor/twigsflowers/chest.ron index c3f673a827..8f8dc0d02f 100644 --- a/assets/common/items/armor/twigsflowers/chest.ron +++ b/assets/common/items/armor/twigsflowers/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Flowery Shirt", description: "Magically imbued twigs decorated with flowers and their stems, letting others know your intentions of peace and love.", kind: Armor(( - kind: Chest("TwigsFlowers"), + kind: Chest, stats: ( protection: Some(Normal(15.0)), ), diff --git a/assets/common/items/armor/twigsflowers/foot.ron b/assets/common/items/armor/twigsflowers/foot.ron index 7579ae2d49..8ede598869 100644 --- a/assets/common/items/armor/twigsflowers/foot.ron +++ b/assets/common/items/armor/twigsflowers/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Flowery Boots", description: "Woven and magically imbued, these boots of twigs and flowers provide simple protection and peace to the wearer.", kind: Armor(( - kind: Foot("TwigsFlowers"), + kind: Foot, stats: ( protection: Some(Normal(3.0)), ), diff --git a/assets/common/items/armor/twigsflowers/hand.ron b/assets/common/items/armor/twigsflowers/hand.ron index e22f92b92f..589656142b 100644 --- a/assets/common/items/armor/twigsflowers/hand.ron +++ b/assets/common/items/armor/twigsflowers/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Flowery Wraps", description: "Wrapped and intertwined twigs held together with magic and flowers with their stems, providing peace and protection for the wearer.", kind: Armor(( - kind: Hand("TwigsFlowers"), + kind: Hand, stats: ( protection: Some(Normal(6.0)), ), diff --git a/assets/common/items/armor/twigsflowers/pants.ron b/assets/common/items/armor/twigsflowers/pants.ron index 7adb896ce2..c01e979d34 100644 --- a/assets/common/items/armor/twigsflowers/pants.ron +++ b/assets/common/items/armor/twigsflowers/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Flowery Pants", description: "Chainmail woven twigs enhanced with flower stems to provide protection and peace.", kind: Armor(( - kind: Pants("TwigsFlowers"), + kind: Pants, stats: ( protection: Some(Normal(12.0)), ), diff --git a/assets/common/items/armor/twigsflowers/shoulder.ron b/assets/common/items/armor/twigsflowers/shoulder.ron index cb8457ae3f..8f4e90485c 100644 --- a/assets/common/items/armor/twigsflowers/shoulder.ron +++ b/assets/common/items/armor/twigsflowers/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Flowery Shoulders", description: "Flowers join the tied twigs to provide protection and peace to the wearer.", kind: Armor(( - kind: Shoulder("TwigsFlowers"), + kind: Shoulder, stats: ( protection: Some(Normal(9.0)), ), diff --git a/assets/common/items/armor/twigsleaves/belt.ron b/assets/common/items/armor/twigsleaves/belt.ron index 92252fff6d..f997759fc7 100644 --- a/assets/common/items/armor/twigsleaves/belt.ron +++ b/assets/common/items/armor/twigsleaves/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leafy Belt", description: "Dried leaves cover over the standard twig belt, providing a slightly different texture.", kind: Armor(( - kind: Belt("TwigsLeaves"), + kind: Belt, stats: ( protection: Some(Normal(2.0)), ), diff --git a/assets/common/items/armor/twigsleaves/chest.ron b/assets/common/items/armor/twigsleaves/chest.ron index 1140473079..ee23ca8bde 100644 --- a/assets/common/items/armor/twigsleaves/chest.ron +++ b/assets/common/items/armor/twigsleaves/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leafy Shirt", description: "Leaves cover the magically imbued twig shirt, providing a more natural appearance.", kind: Armor(( - kind: Chest("TwigsLeaves"), + kind: Chest, stats: ( protection: Some(Normal(15.0)), ), diff --git a/assets/common/items/armor/twigsleaves/foot.ron b/assets/common/items/armor/twigsleaves/foot.ron index d388dc3a90..a88e622b94 100644 --- a/assets/common/items/armor/twigsleaves/foot.ron +++ b/assets/common/items/armor/twigsleaves/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leafy Boots", description: "Leaves cover the magically entwined twigs to provide simple protection from the elements.", kind: Armor(( - kind: Foot("TwigsLeaves"), + kind: Foot, stats: ( protection: Some(Normal(3.0)), ), diff --git a/assets/common/items/armor/twigsleaves/hand.ron b/assets/common/items/armor/twigsleaves/hand.ron index b2198c084c..3044838a39 100644 --- a/assets/common/items/armor/twigsleaves/hand.ron +++ b/assets/common/items/armor/twigsleaves/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leafy Wraps", description: "Leaves help hide the magic-interlocking twigs, and provide mild protection from the elements.", kind: Armor(( - kind: Hand("TwigsLeaves"), + kind: Hand, stats: ( protection: Some(Normal(6.0)), ), diff --git a/assets/common/items/armor/twigsleaves/pants.ron b/assets/common/items/armor/twigsleaves/pants.ron index 4a9e16fb87..d7ae46010e 100644 --- a/assets/common/items/armor/twigsleaves/pants.ron +++ b/assets/common/items/armor/twigsleaves/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leafy Pants", description: "Leaves cover the magically imbued chainmail twigs, providing protection from the elements.", kind: Armor(( - kind: Pants("TwigsLeaves"), + kind: Pants, stats: ( protection: Some(Normal(12.0)), ), diff --git a/assets/common/items/armor/twigsleaves/shoulder.ron b/assets/common/items/armor/twigsleaves/shoulder.ron index 01bec87b0c..74fc1240a6 100644 --- a/assets/common/items/armor/twigsleaves/shoulder.ron +++ b/assets/common/items/armor/twigsleaves/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Leafy Shoulders", description: "Leaves cover over the twigs to provide better protection from the elements.", kind: Armor(( - kind: Shoulder("TwigsLeaves"), + kind: Shoulder, stats: ( protection: Some(Normal(9.0)), ), diff --git a/assets/common/items/armor/velorite_mage/back.ron b/assets/common/items/armor/velorite_mage/back.ron index 2fb8603c94..8dbaff339b 100644 --- a/assets/common/items/armor/velorite_mage/back.ron +++ b/assets/common/items/armor/velorite_mage/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Velorite Battlemage Cloak", description: "Keeps your shoulders warm.", kind: Armor(( - kind: Back("VeloriteMage"), + kind: Back, stats: ( protection: Some(Normal(2.8)), ), diff --git a/assets/common/items/armor/velorite_mage/belt.ron b/assets/common/items/armor/velorite_mage/belt.ron index f837edb3e1..e442408075 100644 --- a/assets/common/items/armor/velorite_mage/belt.ron +++ b/assets/common/items/armor/velorite_mage/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Velorite Battlemage Belt", description: "", kind: Armor(( - kind: Belt("VeloriteMage"), + kind: Belt, stats: ( protection: Some(Normal(5.8)), ), diff --git a/assets/common/items/armor/velorite_mage/chest.ron b/assets/common/items/armor/velorite_mage/chest.ron index 7844662f9c..e2a8a7d3f2 100644 --- a/assets/common/items/armor/velorite_mage/chest.ron +++ b/assets/common/items/armor/velorite_mage/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Velorite Battlemage Vest", description: "", kind: Armor(( - kind: Chest("VeloriteMage"), + kind: Chest, stats: ( protection: Some(Normal(28.0)), ), diff --git a/assets/common/items/armor/velorite_mage/foot.ron b/assets/common/items/armor/velorite_mage/foot.ron index 4b98317500..5e297f763e 100644 --- a/assets/common/items/armor/velorite_mage/foot.ron +++ b/assets/common/items/armor/velorite_mage/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Velorite Battlemage Boots", description: "", kind: Armor(( - kind: Foot("VeloriteMage"), + kind: Foot, stats: ( protection: Some(Normal(5.9)), ), diff --git a/assets/common/items/armor/velorite_mage/hand.ron b/assets/common/items/armor/velorite_mage/hand.ron index 9c62361972..9fb091069f 100644 --- a/assets/common/items/armor/velorite_mage/hand.ron +++ b/assets/common/items/armor/velorite_mage/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Velorite Battlemage Gauntlets", description: "", kind: Armor(( - kind: Hand("VeloriteMage"), + kind: Hand, stats: ( protection: Some(Normal(11.5)), ), diff --git a/assets/common/items/armor/velorite_mage/pants.ron b/assets/common/items/armor/velorite_mage/pants.ron index 3eed9ee5a7..3cc05ec91d 100644 --- a/assets/common/items/armor/velorite_mage/pants.ron +++ b/assets/common/items/armor/velorite_mage/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Velorite Battlemage Kilt", description: "", kind: Armor(( - kind: Pants("VeloriteMage"), + kind: Pants, stats: ( protection: Some(Normal(23.0)), ), diff --git a/assets/common/items/armor/velorite_mage/shoulder.ron b/assets/common/items/armor/velorite_mage/shoulder.ron index 2bf162312a..df74499612 100644 --- a/assets/common/items/armor/velorite_mage/shoulder.ron +++ b/assets/common/items/armor/velorite_mage/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Velorite Battlemage Guards", description: "", kind: Armor(( - kind: Shoulder("VeloriteMage"), + kind: Shoulder, stats: ( protection: Some(Normal(17.0)), ), diff --git a/assets/common/items/armor/witch/back.ron b/assets/common/items/armor/witch/back.ron index 818a75c6f6..ac7056b722 100644 --- a/assets/common/items/armor/witch/back.ron +++ b/assets/common/items/armor/witch/back.ron @@ -2,7 +2,7 @@ ItemDef( name: "Witch Cape", description: "", kind: Armor(( - kind: Back("Witch"), + kind: Back, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/armor/witch/belt.ron b/assets/common/items/armor/witch/belt.ron index 76e3282b4e..0b8528f6fb 100644 --- a/assets/common/items/armor/witch/belt.ron +++ b/assets/common/items/armor/witch/belt.ron @@ -2,7 +2,7 @@ ItemDef( name: "Witch Belt", description: "", kind: Armor(( - kind: Belt("Witch"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/armor/witch/chest.ron b/assets/common/items/armor/witch/chest.ron index 097341f125..5d64b12537 100644 --- a/assets/common/items/armor/witch/chest.ron +++ b/assets/common/items/armor/witch/chest.ron @@ -2,7 +2,7 @@ ItemDef( name: "Witch Robe", description: "", kind: Armor(( - kind: Chest("Witch"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/armor/witch/foot.ron b/assets/common/items/armor/witch/foot.ron index b6ac2c9330..f94a5224ac 100644 --- a/assets/common/items/armor/witch/foot.ron +++ b/assets/common/items/armor/witch/foot.ron @@ -2,7 +2,7 @@ ItemDef( name: "Witch Boots", description: "", kind: Armor(( - kind: Foot("Witch"), + kind: Foot, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/witch/hand.ron b/assets/common/items/armor/witch/hand.ron index b5689b5f5e..ec9b468538 100644 --- a/assets/common/items/armor/witch/hand.ron +++ b/assets/common/items/armor/witch/hand.ron @@ -2,7 +2,7 @@ ItemDef( name: "Witch Handwarmers", description: "", kind: Armor(( - kind: Hand("Witch"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/armor/witch/hat.ron b/assets/common/items/armor/witch/hat.ron index 6d7032c5ba..8b05a818d0 100644 --- a/assets/common/items/armor/witch/hat.ron +++ b/assets/common/items/armor/witch/hat.ron @@ -2,7 +2,7 @@ ItemDef( name: "Witch Hat", description: "Draws strength from dark arts.", kind: Armor(( - kind: Head("Witch"), + kind: Head, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.5)), diff --git a/assets/common/items/armor/witch/pants.ron b/assets/common/items/armor/witch/pants.ron index a2b2e87f18..f3c640cf36 100644 --- a/assets/common/items/armor/witch/pants.ron +++ b/assets/common/items/armor/witch/pants.ron @@ -2,7 +2,7 @@ ItemDef( name: "Witch Skirt", description: "", kind: Armor(( - kind: Pants("Witch"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/armor/witch/shoulder.ron b/assets/common/items/armor/witch/shoulder.ron index d36c6c6d38..56e2946c2f 100644 --- a/assets/common/items/armor/witch/shoulder.ron +++ b/assets/common/items/armor/witch/shoulder.ron @@ -2,7 +2,7 @@ ItemDef( name: "Witch Mantle", description: "", kind: Armor(( - kind: Shoulder("Witch"), + kind: Shoulder, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/boss_drops/exp_flask.ron b/assets/common/items/boss_drops/exp_flask.ron index 9e4c61d063..a6a37b9d6c 100644 --- a/assets/common/items/boss_drops/exp_flask.ron +++ b/assets/common/items/boss_drops/exp_flask.ron @@ -2,7 +2,6 @@ ItemDef( name: "Flask of Velorite Dust", description: "Take with plenty of water", kind: Ingredient( - kind: "PotionExp", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/boss_drops/lantern.ron b/assets/common/items/boss_drops/lantern.ron index b98710e474..3e7ca21c6d 100644 --- a/assets/common/items/boss_drops/lantern.ron +++ b/assets/common/items/boss_drops/lantern.ron @@ -3,7 +3,6 @@ ItemDef( description: "Illuminates even the darkest dungeon\nA great monster was slain for this item", kind: Lantern( ( - kind: "Magic", color: (r: 128, g: 26, b: 255), strength_thousandths: 8500, flicker_thousandths: 300, diff --git a/assets/common/items/boss_drops/xp_potion.ron b/assets/common/items/boss_drops/xp_potion.ron index aac6a51cf1..2f7ec6e8f3 100644 --- a/assets/common/items/boss_drops/xp_potion.ron +++ b/assets/common/items/boss_drops/xp_potion.ron @@ -2,7 +2,6 @@ ItemDef( name: "Potion of Skill", description: "It doesn't seem to be doing anything...", kind: Ingredient( - kind: "Potion", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/calendar/christmas/armor/misc/head/woolly_wintercap.ron b/assets/common/items/calendar/christmas/armor/misc/head/woolly_wintercap.ron index 23bf565419..efe5ad85ff 100644 --- a/assets/common/items/calendar/christmas/armor/misc/head/woolly_wintercap.ron +++ b/assets/common/items/calendar/christmas/armor/misc/head/woolly_wintercap.ron @@ -2,7 +2,7 @@ ItemDef( name: "Woolly Wintercap", description: "Simple, stylish, and festive.", kind: Armor(( - kind: Head("WoollyWintercap"), + kind: Head, stats: ( protection: Some(Normal(0.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/crafting_ing/animal_misc/bone.ron b/assets/common/items/crafting_ing/animal_misc/bone.ron index ce2419018c..0f78484fd1 100644 --- a/assets/common/items/crafting_ing/animal_misc/bone.ron +++ b/assets/common/items/crafting_ing/animal_misc/bone.ron @@ -2,7 +2,6 @@ ItemDef( name: "Thick Bone", description: "A bone sturdy enough to craft with.", kind: Ingredient( - kind: "Bone", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/claw.ron b/assets/common/items/crafting_ing/animal_misc/claw.ron index 52e61f16eb..97ab6066fc 100644 --- a/assets/common/items/crafting_ing/animal_misc/claw.ron +++ b/assets/common/items/crafting_ing/animal_misc/claw.ron @@ -2,7 +2,6 @@ ItemDef( name: "Predator Claw", description: "Incredibly sharp claw from a predatory animal.\n\nThis can be used when crafting weapons.", kind: Ingredient( - kind: "Claw", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/elegant_crest.ron b/assets/common/items/crafting_ing/animal_misc/elegant_crest.ron index 5fb34f0f0e..ea1f3cd565 100644 --- a/assets/common/items/crafting_ing/animal_misc/elegant_crest.ron +++ b/assets/common/items/crafting_ing/animal_misc/elegant_crest.ron @@ -2,7 +2,6 @@ ItemDef( name: "Elegant Crest", description: "A flawless crest from some majestic creature.\n\nThis can be used when crafting weapons.", kind: Ingredient( - kind: "ElegantCrest", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/ember.ron b/assets/common/items/crafting_ing/animal_misc/ember.ron index 09429a73f5..4b0112b607 100644 --- a/assets/common/items/crafting_ing/animal_misc/ember.ron +++ b/assets/common/items/crafting_ing/animal_misc/ember.ron @@ -2,7 +2,6 @@ ItemDef( name: "Ember", description: "A flicking ember left by a fiery creature.", kind: Ingredient( - kind: "Ember", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/feather.ron b/assets/common/items/crafting_ing/animal_misc/feather.ron index a9e2efd177..3875f2b610 100644 --- a/assets/common/items/crafting_ing/animal_misc/feather.ron +++ b/assets/common/items/crafting_ing/animal_misc/feather.ron @@ -2,7 +2,6 @@ ItemDef( name: "Feather", description: "Feather from a bird.", kind: Ingredient( - kind: "Feather", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/fur.ron b/assets/common/items/crafting_ing/animal_misc/fur.ron index 49871b8969..181dee601d 100644 --- a/assets/common/items/crafting_ing/animal_misc/fur.ron +++ b/assets/common/items/crafting_ing/animal_misc/fur.ron @@ -2,7 +2,6 @@ ItemDef( name: "Soft Fur", description: "Soft fur from an animal.", kind: Ingredient( - kind: "Fur", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron b/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron index 525c0489fb..dbd2a5a076 100644 --- a/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron +++ b/assets/common/items/crafting_ing/animal_misc/grim_eyeball.ron @@ -2,7 +2,6 @@ ItemDef( name: "Grim Eyeball", description: "Casts a petrifying gaze.", kind: Ingredient( - kind: "GrimEyeball", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/icy_fang.ron b/assets/common/items/crafting_ing/animal_misc/icy_fang.ron index 4dedd2e1de..d738953227 100644 --- a/assets/common/items/crafting_ing/animal_misc/icy_fang.ron +++ b/assets/common/items/crafting_ing/animal_misc/icy_fang.ron @@ -2,7 +2,6 @@ ItemDef( name: "Icy Shard", description: "Looted from a frosty creature.", kind: Ingredient( - kind: "IcyShard", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/large_horn.ron b/assets/common/items/crafting_ing/animal_misc/large_horn.ron index 135a23f3f9..a92228938c 100644 --- a/assets/common/items/crafting_ing/animal_misc/large_horn.ron +++ b/assets/common/items/crafting_ing/animal_misc/large_horn.ron @@ -2,7 +2,6 @@ ItemDef( name: "Large Horn", description: "A huge sharp horn from an animal.\n\nThis can be used when crafting weapons.", kind: Ingredient( - kind: "LargeHorn", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/lively_vine.ron b/assets/common/items/crafting_ing/animal_misc/lively_vine.ron index 27c0942f91..ec6ab743c3 100644 --- a/assets/common/items/crafting_ing/animal_misc/lively_vine.ron +++ b/assets/common/items/crafting_ing/animal_misc/lively_vine.ron @@ -2,7 +2,6 @@ ItemDef( name: "Lively Vine", description: "I think it just moved.", kind: Ingredient( - kind: "LivelyVine", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/long_tusk.ron b/assets/common/items/crafting_ing/animal_misc/long_tusk.ron index 7cb4bd9772..0be80aa325 100644 --- a/assets/common/items/crafting_ing/animal_misc/long_tusk.ron +++ b/assets/common/items/crafting_ing/animal_misc/long_tusk.ron @@ -2,7 +2,6 @@ ItemDef( name: "Long Tusk", description: "A pointy tusk from some beast.\n\nThis can be used when crafting weapons.", kind: Ingredient( - kind: "LongTusk", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/phoenix_feather.ron b/assets/common/items/crafting_ing/animal_misc/phoenix_feather.ron index 7c53d3e502..f9ae1acd4a 100644 --- a/assets/common/items/crafting_ing/animal_misc/phoenix_feather.ron +++ b/assets/common/items/crafting_ing/animal_misc/phoenix_feather.ron @@ -2,7 +2,6 @@ ItemDef( name: "Phoenix Feather", description: "Said to have magical properties.", kind: Ingredient( - kind: "PhoenixFeather", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron b/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron index 52103ed2dd..84d6c95b93 100644 --- a/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron +++ b/assets/common/items/crafting_ing/animal_misc/raptor_feather.ron @@ -2,7 +2,6 @@ ItemDef( name: "Raptor Feather", description: "Large colorful feather from a raptor.", kind: Ingredient( - kind: "RaptorFeather", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron b/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron index 25f739efb1..1ecc74eb4c 100644 --- a/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron +++ b/assets/common/items/crafting_ing/animal_misc/sharp_fang.ron @@ -2,7 +2,6 @@ ItemDef( name: "Sharp Fang", description: "Incredibly sharp tooth from a predatory animal.\n\nThis can be used when crafting weapons.", kind: Ingredient( - kind: "SharpFang", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/strong_pincer.ron b/assets/common/items/crafting_ing/animal_misc/strong_pincer.ron index bbba627265..67ea846220 100644 --- a/assets/common/items/crafting_ing/animal_misc/strong_pincer.ron +++ b/assets/common/items/crafting_ing/animal_misc/strong_pincer.ron @@ -2,7 +2,6 @@ ItemDef( name: "Strong Pincer", description: "The pincer of some creature, it is very tough.\n\nThis can be used when crafting weapons.", kind: Ingredient( - kind: "StrongPincer", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/venom_sac.ron b/assets/common/items/crafting_ing/animal_misc/venom_sac.ron index e654f8b72a..05323404ce 100644 --- a/assets/common/items/crafting_ing/animal_misc/venom_sac.ron +++ b/assets/common/items/crafting_ing/animal_misc/venom_sac.ron @@ -2,7 +2,6 @@ ItemDef( name: "Venom Sac", description: "A venomous sac from a poisonous creature.", kind: Ingredient( - kind: "VenomSac", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/animal_misc/viscous_ooze.ron b/assets/common/items/crafting_ing/animal_misc/viscous_ooze.ron index 8f585d8627..63bdfc4b73 100644 --- a/assets/common/items/crafting_ing/animal_misc/viscous_ooze.ron +++ b/assets/common/items/crafting_ing/animal_misc/viscous_ooze.ron @@ -2,7 +2,6 @@ ItemDef( name: "Viscous Ooze", description: "A measure of viscous ooze from a slimy creature.", kind: Ingredient( - kind: "ViscousOoze", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/bowl.ron b/assets/common/items/crafting_ing/bowl.ron index a72367e0e8..92fd47fde2 100644 --- a/assets/common/items/crafting_ing/bowl.ron +++ b/assets/common/items/crafting_ing/bowl.ron @@ -2,7 +2,6 @@ ItemDef( name: "Bowl", description: "A simple bowl for preparing meals.", kind: Ingredient( - kind: "Bowl", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/cactus.ron b/assets/common/items/crafting_ing/cactus.ron index 41e93f55a4..6196dc45f7 100644 --- a/assets/common/items/crafting_ing/cactus.ron +++ b/assets/common/items/crafting_ing/cactus.ron @@ -2,7 +2,6 @@ ItemDef( name: "Cactus", description: "Grows in warm and dry places.", kind: Ingredient( - kind: "Cactus", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/cloth/cotton.ron b/assets/common/items/crafting_ing/cloth/cotton.ron index d6281abb39..7c0574d6a8 100644 --- a/assets/common/items/crafting_ing/cloth/cotton.ron +++ b/assets/common/items/crafting_ing/cloth/cotton.ron @@ -2,7 +2,6 @@ ItemDef( name: "Cotton", description: "Easy to work with and multi-functional.", kind: Ingredient( - kind: "Cotton", descriptor: "Cotton", ), quality: Low, diff --git a/assets/common/items/crafting_ing/cloth/lifecloth.ron b/assets/common/items/crafting_ing/cloth/lifecloth.ron index 431bff8701..d773332db8 100644 --- a/assets/common/items/crafting_ing/cloth/lifecloth.ron +++ b/assets/common/items/crafting_ing/cloth/lifecloth.ron @@ -2,7 +2,6 @@ ItemDef( name: "Lifecloth", description: "A fabric imbued with special properties.", kind: Ingredient( - kind: "Lifecloth", descriptor: "Lifecloth", ), quality: High, diff --git a/assets/common/items/crafting_ing/cloth/linen.ron b/assets/common/items/crafting_ing/cloth/linen.ron index 77edf0f6cc..4d950958db 100644 --- a/assets/common/items/crafting_ing/cloth/linen.ron +++ b/assets/common/items/crafting_ing/cloth/linen.ron @@ -2,7 +2,6 @@ ItemDef( name: "Linen", description: "A textile made from flax fibers.", kind: Ingredient( - kind: "Linen", descriptor: "Linen", ), quality: Low, diff --git a/assets/common/items/crafting_ing/cloth/linen_red.ron b/assets/common/items/crafting_ing/cloth/linen_red.ron index ec96b18882..ce9e4fac67 100644 --- a/assets/common/items/crafting_ing/cloth/linen_red.ron +++ b/assets/common/items/crafting_ing/cloth/linen_red.ron @@ -2,7 +2,6 @@ ItemDef( name: "Red Linen", description: "A flax fiber textile, dyed to stand out.", kind: Ingredient( - kind: "LinenRed", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/cloth/moonweave.ron b/assets/common/items/crafting_ing/cloth/moonweave.ron index 18adec779d..27275a93fa 100644 --- a/assets/common/items/crafting_ing/cloth/moonweave.ron +++ b/assets/common/items/crafting_ing/cloth/moonweave.ron @@ -2,7 +2,6 @@ ItemDef( name: "Moonweave", description: "A light yet very sturdy textile.", kind: Ingredient( - kind: "Moonweave", descriptor: "Moonwoven", ), quality: Epic, diff --git a/assets/common/items/crafting_ing/cloth/silk.ron b/assets/common/items/crafting_ing/cloth/silk.ron index 54d1b41f4e..123704f7ea 100644 --- a/assets/common/items/crafting_ing/cloth/silk.ron +++ b/assets/common/items/crafting_ing/cloth/silk.ron @@ -2,7 +2,6 @@ ItemDef( name: "Silk", description: "A fine and strong fibre produced by spiders.", kind: Ingredient( - kind: "Silk", descriptor: "Silken", ), quality: Moderate, diff --git a/assets/common/items/crafting_ing/cloth/sunsilk.ron b/assets/common/items/crafting_ing/cloth/sunsilk.ron index ec27181a9d..778edbc73f 100644 --- a/assets/common/items/crafting_ing/cloth/sunsilk.ron +++ b/assets/common/items/crafting_ing/cloth/sunsilk.ron @@ -2,7 +2,6 @@ ItemDef( name: "Sunsilk", description: "A supernaturally strong textile.", kind: Ingredient( - kind: "Sunsilk", descriptor: "Sunsilken", ), quality: Legendary, diff --git a/assets/common/items/crafting_ing/cloth/wool.ron b/assets/common/items/crafting_ing/cloth/wool.ron index e64de1c2e9..3e5cf0b84b 100644 --- a/assets/common/items/crafting_ing/cloth/wool.ron +++ b/assets/common/items/crafting_ing/cloth/wool.ron @@ -2,7 +2,6 @@ ItemDef( name: "Soft Wool", description: "Soft wool from an animal.", kind: Ingredient( - kind: "Wool", descriptor: "Woolen", ), quality: Common, diff --git a/assets/common/items/crafting_ing/cotton_boll.ron b/assets/common/items/crafting_ing/cotton_boll.ron index 19aed66b12..3002b986ab 100644 --- a/assets/common/items/crafting_ing/cotton_boll.ron +++ b/assets/common/items/crafting_ing/cotton_boll.ron @@ -2,7 +2,6 @@ ItemDef( name: "Cotton Boll", description: "Plucked from a common cotton plant.", kind: Ingredient( - kind: "CottonBoll", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/empty_vial.ron b/assets/common/items/crafting_ing/empty_vial.ron index 5b5d854640..ad9288e47e 100644 --- a/assets/common/items/crafting_ing/empty_vial.ron +++ b/assets/common/items/crafting_ing/empty_vial.ron @@ -2,7 +2,6 @@ ItemDef( name: "Empty Vial", description: "Can be filled with fluids.", kind: Ingredient( - kind: "EmptyVial", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/hide/animal_hide.ron b/assets/common/items/crafting_ing/hide/animal_hide.ron index 2be329cbf1..3c26171d31 100644 --- a/assets/common/items/crafting_ing/hide/animal_hide.ron +++ b/assets/common/items/crafting_ing/hide/animal_hide.ron @@ -2,7 +2,6 @@ ItemDef( name: "Animal Hide", description: "A pelt from an animal. Becomes leather.", kind: Ingredient( - kind: "AnimalHide", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/hide/carapace.ron b/assets/common/items/crafting_ing/hide/carapace.ron index f82af32dac..9536cf8a82 100644 --- a/assets/common/items/crafting_ing/hide/carapace.ron +++ b/assets/common/items/crafting_ing/hide/carapace.ron @@ -2,7 +2,6 @@ ItemDef( name: "Hard Carapace", description: "Tough, hard carapace.", kind: Ingredient( - kind: "Carapace", descriptor: "Carapace", ), quality: High, diff --git a/assets/common/items/crafting_ing/hide/dragon_scale.ron b/assets/common/items/crafting_ing/hide/dragon_scale.ron index 0914ed89f9..2ee0b3905c 100644 --- a/assets/common/items/crafting_ing/hide/dragon_scale.ron +++ b/assets/common/items/crafting_ing/hide/dragon_scale.ron @@ -2,7 +2,6 @@ ItemDef( name: "Dragon Scale", description: "Tough scale from a legendary beast.", kind: Ingredient( - kind: "DragonScale", descriptor: "Dragonscale", ), quality: Legendary, diff --git a/assets/common/items/crafting_ing/hide/leather_troll.ron b/assets/common/items/crafting_ing/hide/leather_troll.ron index c6c41b7199..8610a81b3b 100644 --- a/assets/common/items/crafting_ing/hide/leather_troll.ron +++ b/assets/common/items/crafting_ing/hide/leather_troll.ron @@ -2,7 +2,6 @@ ItemDef( name: "Troll Hide", description: "Looted from cave trolls.", kind: Ingredient( - kind: "TrollLeather", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/hide/plate.ron b/assets/common/items/crafting_ing/hide/plate.ron index 296c7bef12..6bea861155 100644 --- a/assets/common/items/crafting_ing/hide/plate.ron +++ b/assets/common/items/crafting_ing/hide/plate.ron @@ -2,7 +2,6 @@ ItemDef( name: "Plate", description: "Durable plate from an armored animal.", kind: Ingredient( - kind: "Plate", descriptor: "Plate", ), quality: Epic, diff --git a/assets/common/items/crafting_ing/hide/rugged_hide.ron b/assets/common/items/crafting_ing/hide/rugged_hide.ron index 359cdaeb20..2f82c6184f 100644 --- a/assets/common/items/crafting_ing/hide/rugged_hide.ron +++ b/assets/common/items/crafting_ing/hide/rugged_hide.ron @@ -2,7 +2,6 @@ ItemDef( name: "Rugged Hide", description: "A durable pelt, favored by leatherworkers.", kind: Ingredient( - kind: "RuggedHide", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/hide/scales.ron b/assets/common/items/crafting_ing/hide/scales.ron index 5dfa58b1bd..7f061e0032 100644 --- a/assets/common/items/crafting_ing/hide/scales.ron +++ b/assets/common/items/crafting_ing/hide/scales.ron @@ -2,7 +2,6 @@ ItemDef( name: "Scale", description: "Shiny scale from an animal.", kind: Ingredient( - kind: "Scale", descriptor: "Scale", ), quality: Moderate, diff --git a/assets/common/items/crafting_ing/hide/tough_hide.ron b/assets/common/items/crafting_ing/hide/tough_hide.ron index 56721a1366..a63fcd3d2d 100644 --- a/assets/common/items/crafting_ing/hide/tough_hide.ron +++ b/assets/common/items/crafting_ing/hide/tough_hide.ron @@ -2,7 +2,6 @@ ItemDef( name: "Tough Hide", description: "A pelt from something fierce. Becomes leather.", kind: Ingredient( - kind: "ToughHide", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/honey.ron b/assets/common/items/crafting_ing/honey.ron index 6ad17b3696..813cf010fb 100644 --- a/assets/common/items/crafting_ing/honey.ron +++ b/assets/common/items/crafting_ing/honey.ron @@ -2,7 +2,6 @@ ItemDef( name: "Honey", description: "From a beehive.", kind: Ingredient( - kind: "Honey", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/leather/leather_strips.ron b/assets/common/items/crafting_ing/leather/leather_strips.ron index 40e37b250f..6abdaac8ea 100644 --- a/assets/common/items/crafting_ing/leather/leather_strips.ron +++ b/assets/common/items/crafting_ing/leather/leather_strips.ron @@ -2,7 +2,6 @@ ItemDef( name: "Leather Strips", description: "Simple and versatile.", kind: Ingredient( - kind: "LeatherStrips", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/leather/rigid_leather.ron b/assets/common/items/crafting_ing/leather/rigid_leather.ron index ef9e4b44e3..ea0736f805 100644 --- a/assets/common/items/crafting_ing/leather/rigid_leather.ron +++ b/assets/common/items/crafting_ing/leather/rigid_leather.ron @@ -2,7 +2,6 @@ ItemDef( name: "Rigid Leather", description: "Light but layered, perfect for protection.", kind: Ingredient( - kind: "RigidLeather", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/leather/simple_leather.ron b/assets/common/items/crafting_ing/leather/simple_leather.ron index 1150ba824a..035d3d7855 100644 --- a/assets/common/items/crafting_ing/leather/simple_leather.ron +++ b/assets/common/items/crafting_ing/leather/simple_leather.ron @@ -2,7 +2,6 @@ ItemDef( name: "Simple Leather", description: "Light and flexible.", kind: Ingredient( - kind: "SimpleLeather", descriptor: "Raw Hide", ), quality: Low, diff --git a/assets/common/items/crafting_ing/leather/thick_leather.ron b/assets/common/items/crafting_ing/leather/thick_leather.ron index c64f7191d6..58d7d22a23 100644 --- a/assets/common/items/crafting_ing/leather/thick_leather.ron +++ b/assets/common/items/crafting_ing/leather/thick_leather.ron @@ -2,7 +2,6 @@ ItemDef( name: "Thick Leather", description: "Strong and durable.", kind: Ingredient( - kind: "ThickLeather", descriptor: "Leather", ), quality: Common, diff --git a/assets/common/items/crafting_ing/mindflayer_bag_damaged.ron b/assets/common/items/crafting_ing/mindflayer_bag_damaged.ron index ccc3624697..a36ba69f53 100644 --- a/assets/common/items/crafting_ing/mindflayer_bag_damaged.ron +++ b/assets/common/items/crafting_ing/mindflayer_bag_damaged.ron @@ -2,7 +2,6 @@ ItemDef( name: "Glowing Remains", description: "Looted from an evil being.\n\nWith some additional work it can surely be\nbrought back to its former glory...", kind: Ingredient( - kind: "FlayerBagDamaged", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/oil.ron b/assets/common/items/crafting_ing/oil.ron index 1dff0d0ca2..c7016dd318 100644 --- a/assets/common/items/crafting_ing/oil.ron +++ b/assets/common/items/crafting_ing/oil.ron @@ -2,7 +2,6 @@ ItemDef( name: "Oil", description: "A measure of thick, sludgy oil.", kind: Ingredient( - kind: "Oil", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/rock.ron b/assets/common/items/crafting_ing/rock.ron index 518839ef3c..c182c760c2 100644 --- a/assets/common/items/crafting_ing/rock.ron +++ b/assets/common/items/crafting_ing/rock.ron @@ -2,7 +2,6 @@ ItemDef( name: "Rock", description: "A solid made up of a bunch of different minerals.", kind: Ingredient( - kind: "Rock", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/seashells.ron b/assets/common/items/crafting_ing/seashells.ron index 52d2eb039e..5ebd5befbd 100644 --- a/assets/common/items/crafting_ing/seashells.ron +++ b/assets/common/items/crafting_ing/seashells.ron @@ -2,7 +2,6 @@ ItemDef( name: "Seashells", description: "Shells from a sea creature.", kind: Ingredient( - kind: "Seashells", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/sticky_thread.ron b/assets/common/items/crafting_ing/sticky_thread.ron index 06aaa57b4f..40d27a35c5 100644 --- a/assets/common/items/crafting_ing/sticky_thread.ron +++ b/assets/common/items/crafting_ing/sticky_thread.ron @@ -2,7 +2,6 @@ ItemDef( name: "Sticky Thread", description: "A messy spider extract, but a tailor may have use for it.", kind: Ingredient( - kind: "StickyThread", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/stones.ron b/assets/common/items/crafting_ing/stones.ron index c522787b9b..89fef2afe4 100644 --- a/assets/common/items/crafting_ing/stones.ron +++ b/assets/common/items/crafting_ing/stones.ron @@ -2,7 +2,6 @@ ItemDef( name: "Stones", description: "Pebbles from the ground.", kind: Ingredient( - kind: "Stones", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_ing/twigs.ron b/assets/common/items/crafting_ing/twigs.ron index bc73c26e52..0621ac8564 100644 --- a/assets/common/items/crafting_ing/twigs.ron +++ b/assets/common/items/crafting_ing/twigs.ron @@ -2,7 +2,6 @@ ItemDef( name: "Twigs", description: "Found near trees.", kind: Ingredient( - kind: "Twigs", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_tools/mortar_pestle.ron b/assets/common/items/crafting_tools/mortar_pestle.ron index 4809d0cb97..7d9428a6f8 100644 --- a/assets/common/items/crafting_tools/mortar_pestle.ron +++ b/assets/common/items/crafting_tools/mortar_pestle.ron @@ -2,7 +2,6 @@ ItemDef( name: "Mortar and Pestle", description: "Crushes and grinds things into\na fine powder or paste.\nUsed to craft various items.", kind: Ingredient( - kind: "MortarPestle", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/crafting_tools/sewing_set.ron b/assets/common/items/crafting_tools/sewing_set.ron index 7389c5248e..99d93ecb38 100644 --- a/assets/common/items/crafting_tools/sewing_set.ron +++ b/assets/common/items/crafting_tools/sewing_set.ron @@ -2,7 +2,6 @@ ItemDef( name: "Sewing Set", description: "Used to craft various items.", kind: Ingredient( - kind: "SewingSet", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/debug/admin.ron b/assets/common/items/debug/admin.ron index 9e16b20059..fd8be70261 100644 --- a/assets/common/items/debug/admin.ron +++ b/assets/common/items/debug/admin.ron @@ -3,7 +3,7 @@ ItemDef( description: "With great power comes\ngreat responsibility.", kind: Armor( ( - kind: Tabard("Admin"), + kind: Tabard, stats: ( protection: Some(Invincible), poise_resilience: Some(Invincible), diff --git a/assets/common/items/debug/admin_back.ron b/assets/common/items/debug/admin_back.ron index 1d5eaa7e57..2cc17d2a3f 100644 --- a/assets/common/items/debug/admin_back.ron +++ b/assets/common/items/debug/admin_back.ron @@ -3,7 +3,7 @@ ItemDef( description: "With great power comes\ngreat responsibility.", kind: Armor( ( - kind: Back("Admin"), + kind: Back, stats: ( ), ) diff --git a/assets/common/items/debug/admin_black_hole.ron b/assets/common/items/debug/admin_black_hole.ron index c87c57bcc7..61a4fb8f21 100644 --- a/assets/common/items/debug/admin_black_hole.ron +++ b/assets/common/items/debug/admin_black_hole.ron @@ -3,7 +3,7 @@ ItemDef( description: "It just works.", kind: Armor( ( - kind: Bag("BlackHole"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/debug/cultist_belt.ron b/assets/common/items/debug/cultist_belt.ron index 149a764f86..0b839e15b9 100644 --- a/assets/common/items/debug/cultist_belt.ron +++ b/assets/common/items/debug/cultist_belt.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Armor( ( - kind: Belt("VeloriteMage"), + kind: Belt, stats: ( ), ) diff --git a/assets/common/items/debug/cultist_boots.ron b/assets/common/items/debug/cultist_boots.ron index b1e9d4c2ee..c8aeac9f82 100644 --- a/assets/common/items/debug/cultist_boots.ron +++ b/assets/common/items/debug/cultist_boots.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Armor( ( - kind: Foot("VeloriteMage"), + kind: Foot, stats: ( ), ) diff --git a/assets/common/items/debug/cultist_chest_blue.ron b/assets/common/items/debug/cultist_chest_blue.ron index 502baee287..65a2aace85 100644 --- a/assets/common/items/debug/cultist_chest_blue.ron +++ b/assets/common/items/debug/cultist_chest_blue.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Armor( ( - kind: Chest("VeloriteMage"), + kind: Chest, stats: ( ), ) diff --git a/assets/common/items/debug/cultist_hands_blue.ron b/assets/common/items/debug/cultist_hands_blue.ron index f579b6ce21..efa6a5d811 100644 --- a/assets/common/items/debug/cultist_hands_blue.ron +++ b/assets/common/items/debug/cultist_hands_blue.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Armor( ( - kind: Hand("VeloriteMage"), + kind: Hand, stats: ( ), ) diff --git a/assets/common/items/debug/cultist_legs_blue.ron b/assets/common/items/debug/cultist_legs_blue.ron index 9b369832c7..c3ad7986d8 100644 --- a/assets/common/items/debug/cultist_legs_blue.ron +++ b/assets/common/items/debug/cultist_legs_blue.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Armor( ( - kind: Pants("VeloriteMage"), + kind: Pants, stats: ( ), ) diff --git a/assets/common/items/debug/cultist_shoulder_blue.ron b/assets/common/items/debug/cultist_shoulder_blue.ron index be67773b13..32b80bef80 100644 --- a/assets/common/items/debug/cultist_shoulder_blue.ron +++ b/assets/common/items/debug/cultist_shoulder_blue.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Armor( ( - kind: Shoulder("VeloriteMage"), + kind: Shoulder, stats: ( ), ) diff --git a/assets/common/items/debug/dungeon_purple.ron b/assets/common/items/debug/dungeon_purple.ron index 03b4549240..6fe0f1b327 100644 --- a/assets/common/items/debug/dungeon_purple.ron +++ b/assets/common/items/debug/dungeon_purple.ron @@ -3,7 +3,7 @@ ItemDef( description: "Where did I put my banhammer again?", kind: Armor( ( - kind: Back("VeloriteMage"), + kind: Back, stats: ( ), ) diff --git a/assets/common/items/flowers/blue.ron b/assets/common/items/flowers/blue.ron index 6a8db95598..0a927a6aa6 100644 --- a/assets/common/items/flowers/blue.ron +++ b/assets/common/items/flowers/blue.ron @@ -2,7 +2,6 @@ ItemDef( name: "Blue Flower", description: "Matches the color of the sky.", kind: Ingredient( - kind: "Flower", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/flowers/moonbell.ron b/assets/common/items/flowers/moonbell.ron index 69d24c5e88..e21ee43093 100644 --- a/assets/common/items/flowers/moonbell.ron +++ b/assets/common/items/flowers/moonbell.ron @@ -2,7 +2,6 @@ ItemDef( name: "Moonbell", description: "It glistens brilliantly, but only under moonlight.", kind: Ingredient( - kind: "Moonbell", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/flowers/pink.ron b/assets/common/items/flowers/pink.ron index a88add9439..e02738bd98 100644 --- a/assets/common/items/flowers/pink.ron +++ b/assets/common/items/flowers/pink.ron @@ -2,7 +2,6 @@ ItemDef( name: "Pink Flower", description: "Looks like a lollipop.", kind: Ingredient( - kind: "Flower", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/flowers/plant_fiber.ron b/assets/common/items/flowers/plant_fiber.ron index b569b48145..a964f7b111 100644 --- a/assets/common/items/flowers/plant_fiber.ron +++ b/assets/common/items/flowers/plant_fiber.ron @@ -2,7 +2,6 @@ ItemDef( name: "Plant Fiber", description: "A length of raw plant material.", kind: Ingredient( - kind: "PlantFiber", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/flowers/pyrebloom.ron b/assets/common/items/flowers/pyrebloom.ron index b00f317423..2efc344388 100644 --- a/assets/common/items/flowers/pyrebloom.ron +++ b/assets/common/items/flowers/pyrebloom.ron @@ -2,7 +2,6 @@ ItemDef( name: "Pyrebloom", description: "Warm to the touch, long after picking.", kind: Ingredient( - kind: "Pyrebloom", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/flowers/red.ron b/assets/common/items/flowers/red.ron index 033d5123a7..9f0a061094 100644 --- a/assets/common/items/flowers/red.ron +++ b/assets/common/items/flowers/red.ron @@ -2,7 +2,6 @@ ItemDef( name: "Red Flower", description: "Can be used as a dying ingredient.", kind: Ingredient( - kind: "FlowerRed", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/flowers/sunflower.ron b/assets/common/items/flowers/sunflower.ron index 13fb409c38..52b6f78f74 100644 --- a/assets/common/items/flowers/sunflower.ron +++ b/assets/common/items/flowers/sunflower.ron @@ -2,7 +2,6 @@ ItemDef( name: "Sunflower", description: "Smells like summer.", kind: Ingredient( - kind: "Flower", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/flowers/white.ron b/assets/common/items/flowers/white.ron index 4d0ed63d21..11f19282e1 100644 --- a/assets/common/items/flowers/white.ron +++ b/assets/common/items/flowers/white.ron @@ -2,7 +2,6 @@ ItemDef( name: "White flower", description: "Pure and precious.", kind: Ingredient( - kind: "Flower", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/flowers/wild_flax.ron b/assets/common/items/flowers/wild_flax.ron index 91b0f86e6c..2ff999de1a 100644 --- a/assets/common/items/flowers/wild_flax.ron +++ b/assets/common/items/flowers/wild_flax.ron @@ -2,7 +2,6 @@ ItemDef( name: "Wild Flax", description: "Could be used to spin some simple cloth.", kind: Ingredient( - kind: "WildFlax", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/flowers/yellow.ron b/assets/common/items/flowers/yellow.ron index 9a330e53f3..3a049b913f 100644 --- a/assets/common/items/flowers/yellow.ron +++ b/assets/common/items/flowers/yellow.ron @@ -2,7 +2,6 @@ ItemDef( name: "Yellow Flower", description: "Glows like the sun.", kind: Ingredient( - kind: "Flower", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/glider/basic_red.ron b/assets/common/items/glider/basic_red.ron index 143a11b15d..10fd8d9650 100644 --- a/assets/common/items/glider/basic_red.ron +++ b/assets/common/items/glider/basic_red.ron @@ -1,11 +1,7 @@ ItemDef( name: "Red Cloth Glider", description: "A simple glider, but with a striking red color.", - kind: Glider( - ( - kind: "RedCloth", - ), - ), + kind: Glider, quality: Moderate, tags: [], ) diff --git a/assets/common/items/glider/basic_white.ron b/assets/common/items/glider/basic_white.ron index 44531fd86b..f2897ec2a4 100644 --- a/assets/common/items/glider/basic_white.ron +++ b/assets/common/items/glider/basic_white.ron @@ -1,11 +1,7 @@ ItemDef( name: "Plain Cloth Glider", description: "Simple, but classy.", - kind: Glider( - ( - kind: "PlainCloth", - ), - ), + kind: Glider, quality: Moderate, tags: [], ) diff --git a/assets/common/items/glider/blue.ron b/assets/common/items/glider/blue.ron index ec786ea4e1..cf4a2e48fa 100644 --- a/assets/common/items/glider/blue.ron +++ b/assets/common/items/glider/blue.ron @@ -1,11 +1,7 @@ ItemDef( name: "Blue Falcon", description: "Sky colored.", - kind: Glider( - ( - kind: "Blue0", - ), - ), + kind: Glider, quality: High, tags: [], ) diff --git a/assets/common/items/glider/butterfly3.ron b/assets/common/items/glider/butterfly3.ron index f191a901db..f4a547ef3b 100644 --- a/assets/common/items/glider/butterfly3.ron +++ b/assets/common/items/glider/butterfly3.ron @@ -1,11 +1,7 @@ ItemDef( name: "Moonlit Love", description: "Love is in the air.", - kind: Glider( - ( - kind: "ButterflyLove", - ), - ), + kind: Glider, quality: Epic, tags: [], ) diff --git a/assets/common/items/glider/cloverleaf.ron b/assets/common/items/glider/cloverleaf.ron index 0b5ce1fc0b..776befa896 100644 --- a/assets/common/items/glider/cloverleaf.ron +++ b/assets/common/items/glider/cloverleaf.ron @@ -1,11 +1,7 @@ ItemDef( name: "Cloverleaf", description: "Brings luck to its owner.", - kind: Glider( - ( - kind: "Starter", - ), - ), + kind: Glider, quality: Moderate, tags: [], ) diff --git a/assets/common/items/glider/leaves.ron b/assets/common/items/glider/leaves.ron index bbf8d49ad7..d8157b24de 100644 --- a/assets/common/items/glider/leaves.ron +++ b/assets/common/items/glider/leaves.ron @@ -1,11 +1,7 @@ ItemDef( name: "Leaves Glider", description: "Soar among the trees", - kind: Glider( - ( - kind: "Leaves", - ), - ), + kind: Glider, quality: Moderate, tags: [], ) diff --git a/assets/common/items/glider/monarch.ron b/assets/common/items/glider/monarch.ron index 76b0045064..b6bc7a57ef 100644 --- a/assets/common/items/glider/monarch.ron +++ b/assets/common/items/glider/monarch.ron @@ -1,11 +1,7 @@ ItemDef( name: "Orange Monarch", description: "The delicate wings flutter faintly.", - kind: Glider( - ( - kind: "ButterflyMonarch", - ), - ), + kind: Glider, quality: High, tags: [], ) diff --git a/assets/common/items/glider/moonrise.ron b/assets/common/items/glider/moonrise.ron index 4089616c53..673b51cfd5 100644 --- a/assets/common/items/glider/moonrise.ron +++ b/assets/common/items/glider/moonrise.ron @@ -1,11 +1,7 @@ ItemDef( name: "Aquatic Night", description: "The stars are beautiful tonight.", - kind: Glider( - ( - kind: "Moonrise", - ), - ), + kind: Glider, quality: Epic, tags: [], ) diff --git a/assets/common/items/glider/morpho.ron b/assets/common/items/glider/morpho.ron index 3e90929395..6a400deba1 100644 --- a/assets/common/items/glider/morpho.ron +++ b/assets/common/items/glider/morpho.ron @@ -1,11 +1,7 @@ ItemDef( name: "Blue Morpho", description: "The delicate wings flutter faintly.", - kind: Glider( - ( - kind: "ButterflyMorpho", - ), - ), + kind: Glider, quality: High, tags: [], ) diff --git a/assets/common/items/glider/moth.ron b/assets/common/items/glider/moth.ron index 5a94eb3a51..437bcdca4f 100644 --- a/assets/common/items/glider/moth.ron +++ b/assets/common/items/glider/moth.ron @@ -1,11 +1,7 @@ ItemDef( name: "Green Luna", description: "The delicate wings flutter faintly.", - kind: Glider( - ( - kind: "MothLuna", - ), - ), + kind: Glider, quality: High, tags: [], ) diff --git a/assets/common/items/glider/sandraptor.ron b/assets/common/items/glider/sandraptor.ron index 7871d6117e..b60c4f0460 100644 --- a/assets/common/items/glider/sandraptor.ron +++ b/assets/common/items/glider/sandraptor.ron @@ -1,11 +1,7 @@ ItemDef( name: "Sand Raptor Wings", description: "Take flight with the wings of a predator.", - kind: Glider( - ( - kind: "SandRaptor", - ), - ), + kind: Glider, quality: High, tags: [], ) diff --git a/assets/common/items/glider/skullgrin.ron b/assets/common/items/glider/skullgrin.ron index cab8b6904e..ba46cf9000 100644 --- a/assets/common/items/glider/skullgrin.ron +++ b/assets/common/items/glider/skullgrin.ron @@ -1,11 +1,7 @@ ItemDef( name: "Skullgrin", description: "Death from above.", - kind: Glider( - ( - kind: "Purple0", - ), - ), + kind: Glider, quality: Legendary, tags: [], ) diff --git a/assets/common/items/glider/snowraptor.ron b/assets/common/items/glider/snowraptor.ron index 6e24427fa0..4e56632b6d 100644 --- a/assets/common/items/glider/snowraptor.ron +++ b/assets/common/items/glider/snowraptor.ron @@ -1,11 +1,7 @@ ItemDef( name: "Snow Raptor Wings", description: "Take flight with the wings of a predator.", - kind: Glider( - ( - kind: "SnowRaptor", - ), - ), + kind: Glider, quality: High, tags: [], ) diff --git a/assets/common/items/glider/sunset.ron b/assets/common/items/glider/sunset.ron index 86ba095e52..d0d3fa0921 100644 --- a/assets/common/items/glider/sunset.ron +++ b/assets/common/items/glider/sunset.ron @@ -1,11 +1,7 @@ ItemDef( name: "Horizon", description: "It isn't high noon.", - kind: Glider( - ( - kind: "Sunset", - ), - ), + kind: Glider, quality: Epic, tags: [], ) diff --git a/assets/common/items/glider/woodraptor.ron b/assets/common/items/glider/woodraptor.ron index fb905d0d74..1d0c9801de 100644 --- a/assets/common/items/glider/woodraptor.ron +++ b/assets/common/items/glider/woodraptor.ron @@ -1,11 +1,7 @@ ItemDef( name: "Wood Raptor Wings", description: "Take flight with the wings of a predator.", - kind: Glider( - ( - kind: "WoodRaptor", - ), - ), + kind: Glider, quality: High, tags: [], ) diff --git a/assets/common/items/grasses/long.ron b/assets/common/items/grasses/long.ron index 8318f7a5cd..34640966b3 100644 --- a/assets/common/items/grasses/long.ron +++ b/assets/common/items/grasses/long.ron @@ -2,7 +2,6 @@ ItemDef( name: "Long Grass", description: "Greener than an orc's snout.", kind: Ingredient( - kind: "Grass", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/grasses/medium.ron b/assets/common/items/grasses/medium.ron index 404c5bd12d..61570ea5a4 100644 --- a/assets/common/items/grasses/medium.ron +++ b/assets/common/items/grasses/medium.ron @@ -2,7 +2,6 @@ ItemDef( name: "Medium Grass", description: "Greener than an orc's snout.", kind: Ingredient( - kind: "Grass", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/grasses/short.ron b/assets/common/items/grasses/short.ron index 23507f064d..bfbc3d8651 100644 --- a/assets/common/items/grasses/short.ron +++ b/assets/common/items/grasses/short.ron @@ -2,7 +2,6 @@ ItemDef( name: "Short Grass", description: "Greener than an orc's snout.", kind: Ingredient( - kind: "Grass", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/lantern/black_0.ron b/assets/common/items/lantern/black_0.ron index bc71f40c61..b778335c86 100644 --- a/assets/common/items/lantern/black_0.ron +++ b/assets/common/items/lantern/black_0.ron @@ -3,7 +3,6 @@ ItemDef( description: "Used by city guards.", kind: Lantern( ( - kind: "Black0", color: (r: 255, g: 128, b: 26), strength_thousandths: 5000, flicker_thousandths: 150, diff --git a/assets/common/items/lantern/blue_0.ron b/assets/common/items/lantern/blue_0.ron index a464e756a7..55ba3750d6 100644 --- a/assets/common/items/lantern/blue_0.ron +++ b/assets/common/items/lantern/blue_0.ron @@ -3,7 +3,6 @@ ItemDef( description: "This lantern is surprisingly cold when lit.", kind: Lantern( ( - kind: "Blue0", color: (r: 55, g: 100, b: 255), strength_thousandths: 7000, flicker_thousandths: 300, diff --git a/assets/common/items/lantern/geode_purp.ron b/assets/common/items/lantern/geode_purp.ron index 8278353341..43fe5d7f33 100644 --- a/assets/common/items/lantern/geode_purp.ron +++ b/assets/common/items/lantern/geode_purp.ron @@ -3,7 +3,6 @@ ItemDef( description: "Emits a calming glow", kind: Lantern( ( - kind: "GeodePurp", color: (r: 144, g: 88, b: 181), strength_thousandths: 8000, flicker_thousandths: 600, diff --git a/assets/common/items/lantern/green_0.ron b/assets/common/items/lantern/green_0.ron index 05dc2ecc27..1fffdee208 100644 --- a/assets/common/items/lantern/green_0.ron +++ b/assets/common/items/lantern/green_0.ron @@ -3,7 +3,6 @@ ItemDef( description: "It has an opening that could fit a ring...", kind: Lantern( ( - kind: "Green0", color: (r: 145, g: 255, b: 145), strength_thousandths: 6000, flicker_thousandths: 250, diff --git a/assets/common/items/lantern/polaris.ron b/assets/common/items/lantern/polaris.ron index 11e912ca94..39d58ddfab 100644 --- a/assets/common/items/lantern/polaris.ron +++ b/assets/common/items/lantern/polaris.ron @@ -3,7 +3,6 @@ ItemDef( description: "Christmas Lantern.", kind: Lantern( ( - kind: "PolarisLantern", color: (r: 67, g: 170, b: 255), strength_thousandths: 8000, flicker_thousandths: 600, diff --git a/assets/common/items/lantern/pumpkin.ron b/assets/common/items/lantern/pumpkin.ron index 8fdc8bd881..c48f087619 100644 --- a/assets/common/items/lantern/pumpkin.ron +++ b/assets/common/items/lantern/pumpkin.ron @@ -3,7 +3,6 @@ ItemDef( description: "Did it just blink?!", kind: Lantern( ( - kind: "PumpkinLantern", color: (r: 31, g: 255, b: 22), strength_thousandths: 8000, flicker_thousandths: 600, diff --git a/assets/common/items/lantern/red_0.ron b/assets/common/items/lantern/red_0.ron index 93b717d962..d9c6a6878c 100644 --- a/assets/common/items/lantern/red_0.ron +++ b/assets/common/items/lantern/red_0.ron @@ -3,7 +3,6 @@ ItemDef( description: "Caution: contents hot", kind: Lantern( ( - kind: "Red0", color: (r: 255, g: 70, b: 70), strength_thousandths: 5000, flicker_thousandths: 250, diff --git a/assets/common/items/log/bamboo.ron b/assets/common/items/log/bamboo.ron index 2e589450a6..1951d1c279 100644 --- a/assets/common/items/log/bamboo.ron +++ b/assets/common/items/log/bamboo.ron @@ -2,7 +2,6 @@ ItemDef( name: "Bamboo", description: "A giant woody grass.\n\nThis can be used when crafting wooden weapons.", kind: Ingredient( - kind: "Bamboo", descriptor: "Bamboo", ), quality: Common, diff --git a/assets/common/items/log/eldwood.ron b/assets/common/items/log/eldwood.ron index f81712e51e..d30dbde36d 100644 --- a/assets/common/items/log/eldwood.ron +++ b/assets/common/items/log/eldwood.ron @@ -2,7 +2,6 @@ ItemDef( name: "Eldwood Logs", description: "Old logs that emanate magic.\n\nThis can be used when crafting wooden weapons.", kind: Ingredient( - kind: "EldwoodLogs", descriptor: "Eldwood", ), quality: Legendary, diff --git a/assets/common/items/log/frostwood.ron b/assets/common/items/log/frostwood.ron index b500d1c455..86fcdad7f6 100644 --- a/assets/common/items/log/frostwood.ron +++ b/assets/common/items/log/frostwood.ron @@ -2,7 +2,6 @@ ItemDef( name: "Frostwood Logs", description: "Chilly wood that comes from cold biomes. Cold to the touch.\n\nThis can be used when crafting wooden weapons.", kind: Ingredient( - kind: "FrostwoodLogs", descriptor: "Frostwood", ), quality: Epic, diff --git a/assets/common/items/log/hardwood.ron b/assets/common/items/log/hardwood.ron index 69b399faf9..fc9105e71d 100644 --- a/assets/common/items/log/hardwood.ron +++ b/assets/common/items/log/hardwood.ron @@ -2,7 +2,6 @@ ItemDef( name: "Hardwood Logs", description: "Extra thick and sturdy logs.\n\nThis can be used when crafting wooden weapons.", kind: Ingredient( - kind: "HardwoodLogs", descriptor: "Hardwood", ), quality: Moderate, diff --git a/assets/common/items/log/ironwood.ron b/assets/common/items/log/ironwood.ron index 7a253c18ce..de965c9713 100644 --- a/assets/common/items/log/ironwood.ron +++ b/assets/common/items/log/ironwood.ron @@ -2,7 +2,6 @@ ItemDef( name: "Ironwood Logs", description: "A particularly sturdy wood.\n\nThis can be used when crafting wooden weapons.", kind: Ingredient( - kind: "IronwoodLogs", descriptor: "Ironwood", ), quality: High, diff --git a/assets/common/items/log/wood.ron b/assets/common/items/log/wood.ron index a9a708fac2..bd8f43ddd6 100644 --- a/assets/common/items/log/wood.ron +++ b/assets/common/items/log/wood.ron @@ -2,7 +2,6 @@ ItemDef( name: "Wood Logs", description: "Regular, sturdy wooden logs.\n\nThis can be used when crafting wooden weapons.", kind: Ingredient( - kind: "WoodLogs", descriptor: "Wooden", ), quality: Low, diff --git a/assets/common/items/mineral/gem/amethyst.ron b/assets/common/items/mineral/gem/amethyst.ron index 5f75d00ea5..660f58269d 100644 --- a/assets/common/items/mineral/gem/amethyst.ron +++ b/assets/common/items/mineral/gem/amethyst.ron @@ -2,7 +2,6 @@ ItemDef( name: "Amethyst", description: "A precious purple gem.", kind: Ingredient( - kind: "Amethyst", descriptor: "Amethyst", ), quality: Common, diff --git a/assets/common/items/mineral/gem/diamond.ron b/assets/common/items/mineral/gem/diamond.ron index 6225a3d916..0ee510d9f9 100644 --- a/assets/common/items/mineral/gem/diamond.ron +++ b/assets/common/items/mineral/gem/diamond.ron @@ -2,7 +2,6 @@ ItemDef( name: "Diamond", description: "A sparkling silver gem.", kind: Ingredient( - kind: "Diamond", descriptor: "Diamond", ), quality: Epic, diff --git a/assets/common/items/mineral/gem/emerald.ron b/assets/common/items/mineral/gem/emerald.ron index 16f915ddea..f7416a95a6 100644 --- a/assets/common/items/mineral/gem/emerald.ron +++ b/assets/common/items/mineral/gem/emerald.ron @@ -2,7 +2,6 @@ ItemDef( name: "Emerald", description: "A vibrant viridian gem.", kind: Ingredient( - kind: "Emerald", descriptor: "Emerald", ), quality: High, diff --git a/assets/common/items/mineral/gem/ruby.ron b/assets/common/items/mineral/gem/ruby.ron index 64426e4298..6420321963 100644 --- a/assets/common/items/mineral/gem/ruby.ron +++ b/assets/common/items/mineral/gem/ruby.ron @@ -2,7 +2,6 @@ ItemDef( name: "Ruby", description: "A superbly scarlet gem.", kind: Ingredient( - kind: "Ruby", descriptor: "Ruby", ), quality: High, diff --git a/assets/common/items/mineral/gem/sapphire.ron b/assets/common/items/mineral/gem/sapphire.ron index b9421b666e..442f3e4601 100644 --- a/assets/common/items/mineral/gem/sapphire.ron +++ b/assets/common/items/mineral/gem/sapphire.ron @@ -2,7 +2,6 @@ ItemDef( name: "Sapphire", description: "A colorful cobalt gem.", kind: Ingredient( - kind: "Sapphire", descriptor: "Sapphire", ), quality: High, diff --git a/assets/common/items/mineral/gem/topaz.ron b/assets/common/items/mineral/gem/topaz.ron index ea3acdbdd6..3050042362 100644 --- a/assets/common/items/mineral/gem/topaz.ron +++ b/assets/common/items/mineral/gem/topaz.ron @@ -2,7 +2,6 @@ ItemDef( name: "Topaz", description: "An outstanding orange gem.", kind: Ingredient( - kind: "Topaz", descriptor: "Topaz", ), quality: Common, diff --git a/assets/common/items/mineral/ingot/bloodsteel.ron b/assets/common/items/mineral/ingot/bloodsteel.ron index 32748b840b..5f727c1fb1 100644 --- a/assets/common/items/mineral/ingot/bloodsteel.ron +++ b/assets/common/items/mineral/ingot/bloodsteel.ron @@ -2,7 +2,6 @@ ItemDef( name: "Bloodsteel Ingot", description: "An alloy of bloodstone and iron.\n\nThis can be used when crafting metal weapons.", kind: Ingredient( - kind: "BloodsteelIngot", descriptor: "Bloodsteel", ), quality: Epic, diff --git a/assets/common/items/mineral/ingot/bronze.ron b/assets/common/items/mineral/ingot/bronze.ron index 58738864ee..d4a3d26aee 100644 --- a/assets/common/items/mineral/ingot/bronze.ron +++ b/assets/common/items/mineral/ingot/bronze.ron @@ -2,7 +2,6 @@ ItemDef( name: "Bronze Ingot", description: "A sturdy alloy made from combining copper and tin.\n\nThis can be used when crafting metal weapons.", kind: Ingredient( - kind: "BronzeIngot", descriptor: "Bronze", ), quality: Low, diff --git a/assets/common/items/mineral/ingot/cobalt.ron b/assets/common/items/mineral/ingot/cobalt.ron index 22c83a844f..ca8c18936d 100644 --- a/assets/common/items/mineral/ingot/cobalt.ron +++ b/assets/common/items/mineral/ingot/cobalt.ron @@ -2,7 +2,6 @@ ItemDef( name: "Cobalt Ingot", description: "A strikingly blue ingot.\n\nThis can be used when crafting metal weapons.", kind: Ingredient( - kind: "CobaltIngot", descriptor: "Cobalt", ), quality: High, diff --git a/assets/common/items/mineral/ingot/copper.ron b/assets/common/items/mineral/ingot/copper.ron index 044a6d79e9..4446b33d37 100644 --- a/assets/common/items/mineral/ingot/copper.ron +++ b/assets/common/items/mineral/ingot/copper.ron @@ -2,7 +2,6 @@ ItemDef( name: "Copper Ingot", description: "An ingot with a unique brown color.", kind: Ingredient( - kind: "CopperIngot", descriptor: "Copper", ), quality: Low, diff --git a/assets/common/items/mineral/ingot/gold.ron b/assets/common/items/mineral/ingot/gold.ron index a246244eab..bdbaa29df5 100644 --- a/assets/common/items/mineral/ingot/gold.ron +++ b/assets/common/items/mineral/ingot/gold.ron @@ -2,7 +2,6 @@ ItemDef( name: "Gold Ingot", description: "An ingot made of refined metallic gold.", kind: Ingredient( - kind: "GoldIngot", descriptor: "Golden", ), quality: Epic, diff --git a/assets/common/items/mineral/ingot/iron.ron b/assets/common/items/mineral/ingot/iron.ron index 1e84963b2d..8bb190f229 100644 --- a/assets/common/items/mineral/ingot/iron.ron +++ b/assets/common/items/mineral/ingot/iron.ron @@ -2,7 +2,6 @@ ItemDef( name: "Iron Ingot", description: "An incredibly commonplace metal.\n\nThis can be used when crafting metal weapons.", kind: Ingredient( - kind: "IronIngot", descriptor: "Iron", ), quality: Common, diff --git a/assets/common/items/mineral/ingot/orichalcum.ron b/assets/common/items/mineral/ingot/orichalcum.ron index 85e2c2f4d5..26d82e1424 100644 --- a/assets/common/items/mineral/ingot/orichalcum.ron +++ b/assets/common/items/mineral/ingot/orichalcum.ron @@ -2,7 +2,6 @@ ItemDef( name: "Orichalcum Ingot", description: "An ingot made of refined orichalcum.\n\nThis can be used when crafting metal weapons.", kind: Ingredient( - kind: "OrichalcumIngot", descriptor: "Orichalcum", ), quality: Legendary, diff --git a/assets/common/items/mineral/ingot/silver.ron b/assets/common/items/mineral/ingot/silver.ron index 424aec0d72..a65b4739da 100644 --- a/assets/common/items/mineral/ingot/silver.ron +++ b/assets/common/items/mineral/ingot/silver.ron @@ -2,7 +2,6 @@ ItemDef( name: "Silver Ingot", description: "An ingot made of refined metallic silver.", kind: Ingredient( - kind: "SilverIngot", descriptor: "Silver", ), quality: Epic, diff --git a/assets/common/items/mineral/ingot/steel.ron b/assets/common/items/mineral/ingot/steel.ron index 721ed93948..b6c3cdc34d 100644 --- a/assets/common/items/mineral/ingot/steel.ron +++ b/assets/common/items/mineral/ingot/steel.ron @@ -2,7 +2,6 @@ ItemDef( name: "Steel Ingot", description: "An alloy of iron and coal that is much tougher than its components.\n\nThis can be used when crafting metal weapons.", kind: Ingredient( - kind: "SteelIngot", descriptor: "Steel", ), quality: Moderate, diff --git a/assets/common/items/mineral/ingot/tin.ron b/assets/common/items/mineral/ingot/tin.ron index f5e971d51d..93ecf2c25e 100644 --- a/assets/common/items/mineral/ingot/tin.ron +++ b/assets/common/items/mineral/ingot/tin.ron @@ -2,7 +2,6 @@ ItemDef( name: "Tin Ingot", description: "An ingot primarily used to make bronze.", kind: Ingredient( - kind: "TinIngot", descriptor: "Tin", ), quality: Common, diff --git a/assets/common/items/mineral/ore/bloodstone.ron b/assets/common/items/mineral/ore/bloodstone.ron index 0e1f143b74..f7fc8e5d90 100644 --- a/assets/common/items/mineral/ore/bloodstone.ron +++ b/assets/common/items/mineral/ore/bloodstone.ron @@ -2,7 +2,6 @@ ItemDef( name: "Bloodstone Ore", description: "A deep red ore.", kind: Ingredient( - kind: "BloodstoneOre", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/ore/coal.ron b/assets/common/items/mineral/ore/coal.ron index f27f10fdc8..88ecdaaf33 100644 --- a/assets/common/items/mineral/ore/coal.ron +++ b/assets/common/items/mineral/ore/coal.ron @@ -2,7 +2,6 @@ ItemDef( name: "Coal", description: "A dark, combustible energy source.", kind: Ingredient( - kind: "Coal", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/ore/cobalt.ron b/assets/common/items/mineral/ore/cobalt.ron index fd7995a621..bd1ed4eade 100644 --- a/assets/common/items/mineral/ore/cobalt.ron +++ b/assets/common/items/mineral/ore/cobalt.ron @@ -2,7 +2,6 @@ ItemDef( name: "Cobalt Ore", description: "A blue, shiny ore.", kind: Ingredient( - kind: "CobaltOre", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/ore/copper.ron b/assets/common/items/mineral/ore/copper.ron index de73bf003b..415094ef15 100644 --- a/assets/common/items/mineral/ore/copper.ron +++ b/assets/common/items/mineral/ore/copper.ron @@ -2,7 +2,6 @@ ItemDef( name: "Copper Ore", description: "A brown metal. Key part of bronze.", kind: Ingredient( - kind: "CopperOre", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/ore/gold.ron b/assets/common/items/mineral/ore/gold.ron index 21b45e6f4f..1a95f01a77 100644 --- a/assets/common/items/mineral/ore/gold.ron +++ b/assets/common/items/mineral/ore/gold.ron @@ -2,7 +2,6 @@ ItemDef( name: "Gold Ore", description: "A precious yellow metal.", kind: Ingredient( - kind: "GoldOre", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/ore/iron.ron b/assets/common/items/mineral/ore/iron.ron index 14b320289a..4eb93945dc 100644 --- a/assets/common/items/mineral/ore/iron.ron +++ b/assets/common/items/mineral/ore/iron.ron @@ -2,7 +2,6 @@ ItemDef( name: "Iron Ore", description: "An incredibly common but incredibly versatile metal.", kind: Ingredient( - kind: "IronOre", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/ore/silver.ron b/assets/common/items/mineral/ore/silver.ron index cb245f7e9b..9e1539b235 100644 --- a/assets/common/items/mineral/ore/silver.ron +++ b/assets/common/items/mineral/ore/silver.ron @@ -2,7 +2,6 @@ ItemDef( name: "Silver Ore", description: "A precious shiny greyish-white metal.", kind: Ingredient( - kind: "SilverOre", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/ore/tin.ron b/assets/common/items/mineral/ore/tin.ron index ebc3cb7b60..c1ee473e7d 100644 --- a/assets/common/items/mineral/ore/tin.ron +++ b/assets/common/items/mineral/ore/tin.ron @@ -2,7 +2,6 @@ ItemDef( name: "Tin Ore", description: "A silvery metal. One of the components of bronze.", kind: Ingredient( - kind: "TinOre", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/ore/velorite.ron b/assets/common/items/mineral/ore/velorite.ron index 31814bcf67..97b7cc76a2 100644 --- a/assets/common/items/mineral/ore/velorite.ron +++ b/assets/common/items/mineral/ore/velorite.ron @@ -2,7 +2,6 @@ ItemDef( name: "Velorite", description: "Just a slight touch makes you feel\nthe knowledge of ancient times", kind: Ingredient( - kind: "Velorite", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/ore/veloritefrag.ron b/assets/common/items/mineral/ore/veloritefrag.ron index 78d1d5de87..bc58807383 100644 --- a/assets/common/items/mineral/ore/veloritefrag.ron +++ b/assets/common/items/mineral/ore/veloritefrag.ron @@ -2,7 +2,6 @@ ItemDef( name: "Velorite Fragment", description: "Small runes sparkle on its surface", kind: Ingredient( - kind: "VeloriteFrag", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/stone/basalt.ron b/assets/common/items/mineral/stone/basalt.ron index fee4ba2cb9..86eab024c3 100644 --- a/assets/common/items/mineral/stone/basalt.ron +++ b/assets/common/items/mineral/stone/basalt.ron @@ -2,7 +2,6 @@ ItemDef( name: "Basalt", description: "A dark volcanic rock.", kind: Ingredient( - kind: "Basalt", descriptor: "Basalt", ), quality: High, diff --git a/assets/common/items/mineral/stone/coal.ron b/assets/common/items/mineral/stone/coal.ron index 273b31e3b0..19eeead7e5 100644 --- a/assets/common/items/mineral/stone/coal.ron +++ b/assets/common/items/mineral/stone/coal.ron @@ -2,7 +2,6 @@ ItemDef( name: "Coal", description: "A black rock that happens to be really good at burning.", kind: Ingredient( - kind: "Coal", // Descriptor not needed descriptor: "", ), diff --git a/assets/common/items/mineral/stone/granite.ron b/assets/common/items/mineral/stone/granite.ron index 473a0cbd0d..5315706878 100644 --- a/assets/common/items/mineral/stone/granite.ron +++ b/assets/common/items/mineral/stone/granite.ron @@ -2,7 +2,6 @@ ItemDef( name: "Granite", description: "A light-colored igneous rock.", kind: Ingredient( - kind: "Granite", descriptor: "Granite", ), quality: Common, diff --git a/assets/common/items/mineral/stone/obsidian.ron b/assets/common/items/mineral/stone/obsidian.ron index a120e71305..11e74062e9 100644 --- a/assets/common/items/mineral/stone/obsidian.ron +++ b/assets/common/items/mineral/stone/obsidian.ron @@ -2,7 +2,6 @@ ItemDef( name: "Obsidian", description: "An igneous rock that comes from melted rock.", kind: Ingredient( - kind: "Obsidian", descriptor: "Obsidian", ), quality: Epic, diff --git a/assets/common/items/npc_armor/arthropod/generic.ron b/assets/common/items/npc_armor/arthropod/generic.ron index dc7cdba71b..36d89c759d 100644 --- a/assets/common/items/npc_armor/arthropod/generic.ron +++ b/assets/common/items/npc_armor/arthropod/generic.ron @@ -2,7 +2,7 @@ ItemDef( name: "Arthropod Armor", description: "Worn by arthropods.", kind: Armor(( - kind: Chest("Arthropod"), + kind: Chest, stats: ( protection: Some(Normal(60.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/back/backpack_blue.ron b/assets/common/items/npc_armor/back/backpack_blue.ron index c71dd727c3..961415aecc 100644 --- a/assets/common/items/npc_armor/back/backpack_blue.ron +++ b/assets/common/items/npc_armor/back/backpack_blue.ron @@ -3,7 +3,7 @@ ItemDef( description: "Keeps all your stuff together.", kind: Armor( ( - kind: Back("BackpackBlue"), + kind: Back, stats: ( protection: Some(Normal(0.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/npc_armor/back/leather_blue.ron b/assets/common/items/npc_armor/back/leather_blue.ron index ed00fb82f0..eb1e248716 100644 --- a/assets/common/items/npc_armor/back/leather_blue.ron +++ b/assets/common/items/npc_armor/back/leather_blue.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Armor( ( - kind: Back("LeatherBlue"), + kind: Back, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/npc_armor/biped_large/generic.ron b/assets/common/items/npc_armor/biped_large/generic.ron index 4ef56f5761..70656fa808 100644 --- a/assets/common/items/npc_armor/biped_large/generic.ron +++ b/assets/common/items/npc_armor/biped_large/generic.ron @@ -2,7 +2,7 @@ ItemDef( name: "Generic Biped Large", description: "Worn by bipeds.", kind: Armor(( - kind: Chest("GenericBipedLarge"), + kind: Chest, stats: ( protection: Some(Normal(45.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_large/harvester.ron b/assets/common/items/npc_armor/biped_large/harvester.ron index 500da4ba81..dce7f19bdd 100644 --- a/assets/common/items/npc_armor/biped_large/harvester.ron +++ b/assets/common/items/npc_armor/biped_large/harvester.ron @@ -2,7 +2,7 @@ ItemDef( name: "Harvester Shirt", description: "Made of sunflowers.", kind: Armor(( - kind: Chest("Harvester"), + kind: Chest, stats: ( protection: Some(Normal(0.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/npc_armor/biped_large/mindflayer.ron b/assets/common/items/npc_armor/biped_large/mindflayer.ron index fda20d43e4..64ab3c4ab0 100644 --- a/assets/common/items/npc_armor/biped_large/mindflayer.ron +++ b/assets/common/items/npc_armor/biped_large/mindflayer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Mindflayer Armor", description: "Worn by mindflayer.", kind: Armor(( - kind: Chest("Mindflayer"), + kind: Chest, stats: ( protection: Some(Normal(110.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_large/minotaur.ron b/assets/common/items/npc_armor/biped_large/minotaur.ron index c96a2c9e5e..78d6b923f8 100644 --- a/assets/common/items/npc_armor/biped_large/minotaur.ron +++ b/assets/common/items/npc_armor/biped_large/minotaur.ron @@ -2,7 +2,7 @@ ItemDef( name: "Minotaur Armor", description: "The best defense is a good offense.", kind: Armor(( - kind: Chest("Minotaur"), + kind: Chest, stats: ( protection: Some(Normal(0.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/npc_armor/biped_large/tidal_warrior.ron b/assets/common/items/npc_armor/biped_large/tidal_warrior.ron index 246965bca1..b431f21e16 100644 --- a/assets/common/items/npc_armor/biped_large/tidal_warrior.ron +++ b/assets/common/items/npc_armor/biped_large/tidal_warrior.ron @@ -2,7 +2,7 @@ ItemDef( name: "Tidal Warrior Armor", description: "Made of fish scales.", kind: Armor(( - kind: Chest("Tidal Warrior"), + kind: Chest, stats: ( protection: Some(Normal(20.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/npc_armor/biped_large/warlock.ron b/assets/common/items/npc_armor/biped_large/warlock.ron index 5de8478b78..bb5e21eea3 100644 --- a/assets/common/items/npc_armor/biped_large/warlock.ron +++ b/assets/common/items/npc_armor/biped_large/warlock.ron @@ -2,7 +2,7 @@ ItemDef( name: "Giant Warlock Chest", description: "Made of darkest silk.", kind: Armor(( - kind: Chest("GiantWarlock"), + kind: Chest, stats: ( protection: Some(Normal(250.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_large/warlord.ron b/assets/common/items/npc_armor/biped_large/warlord.ron index b4a863c7b5..082c8153de 100644 --- a/assets/common/items/npc_armor/biped_large/warlord.ron +++ b/assets/common/items/npc_armor/biped_large/warlord.ron @@ -2,7 +2,7 @@ ItemDef( name: "Giant Warlord Chest", description: "Made of darkest steel.", kind: Armor(( - kind: Chest("GiantWarlord"), + kind: Chest, stats: ( protection: Some(Normal(300.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_large/yeti.ron b/assets/common/items/npc_armor/biped_large/yeti.ron index 8f9ef5b8a7..b8747d1d45 100644 --- a/assets/common/items/npc_armor/biped_large/yeti.ron +++ b/assets/common/items/npc_armor/biped_large/yeti.ron @@ -2,7 +2,7 @@ ItemDef( name: "Yeti Hide", description: "Strong as Yeti itself.", kind: Armor(( - kind: Chest("Yeti"), + kind: Chest, stats: ( protection: Some(Normal(0.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron index 777e016d6a..0ac97b340e 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/hunter.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Hunter", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("AdletHunter"), + kind: Chest, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron index 21af4e8623..e90b181cfc 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/icepicker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Icepicker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("AdletIcepicker"), + kind: Chest, stats: ( protection: Some(Normal(14.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron index adcb17c66e..1fa8d16d10 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/tracker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Tracker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("AdletTracker"), + kind: Chest, stats: ( protection: Some(Normal(14.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron index fc18c89f7a..65b4fa1098 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/hunter.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Hunter", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("AdletHunter"), + kind: Foot, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron index 900a2c27e7..4f356da837 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/icepicker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Icepicker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("AdletIcepicker"), + kind: Foot, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron index 9f1e42093b..97669252d3 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/tracker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Tracker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("AdletTracker"), + kind: Foot, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron index 8b863c1fd3..b2ca5da52b 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/hunter.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Hunter", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("AdletHunter"), + kind: Hand, stats: ( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron index 8349e550e4..93df5ddefc 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/icepicker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Icepicker", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("AdletIcepicker"), + kind: Hand, stats: ( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron index 298713e2c8..0f97b5875c 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/tracker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Tracker", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("AdletTracker"), + kind: Hand, stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron index 4d11bad1ea..8410595650 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/hunter.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Hunter", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("AdletHunter"), + kind: Head, stats: ( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron index 037dc2325d..8afbde00cb 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/icepicker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Icepicker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("AdletIcepicker"), + kind: Head, stats: ( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron index 3988e10da3..194ab58c4f 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/tracker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Tracker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("AdletTracker"), + kind: Head, stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron index 2afd5fe438..d02fdd386c 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/hunter.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Hunter", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("AdletHunter"), + kind: Pants, stats: ( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron index f88a7e376d..416e50a734 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/icepicker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Icepicker", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("AdletIcepicker"), + kind: Pants, stats: ( protection: Some(Normal(9.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron index 27eb242799..f1050c1258 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/tracker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Tracker", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("AdletTracker"), + kind: Pants, stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron index db67f5145a..e1abaab103 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/hunter.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Hunter", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("AdletHunter"), + kind: Belt, stats: ( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron index 10e01fcdee..c80a2deb27 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/icepicker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Icepicker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("AdletIcepicker"), + kind: Belt, stats: ( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron index f175d4f1bf..d574106b66 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/tracker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Adlet Tracker", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("AdletTracker"), + kind: Belt, stats: ( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(3.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/chieftain.ron index c3b04a0279..b257f8e899 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/chieftain.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling Chieftain", description: "Only worn by the most spiritual of Gnarlings.", kind: Armor(( - kind: Chest("GnarlingChieftain"), + kind: Chest, stats: ( protection: Some(Normal(80.0)), poise_resilience: Some(Normal(60.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/logger.ron index aaca5ea570..67641f8c56 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/logger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("GnarlingLogger"), + kind: Chest, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/mugger.ron index 7e91678eef..67641f8c56 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/mugger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("GnarlingMugger"), + kind: Chest, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/stalker.ron index c408a6903b..67641f8c56 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/stalker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("GnarlingStalker"), + kind: Chest, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/chieftain.ron index cb231f09da..fbc7ae85cc 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/chieftain.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling Chieftain", description: "Only worn by the most spiritual of Gnarlings.", kind: Armor(( - kind: Foot("GnarlingChieftain"), + kind: Foot, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/logger.ron index 16dd3f8546..11ee37c806 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/logger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("GnarlingLogger"), + kind: Foot, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/mugger.ron index fbdcd1806d..11ee37c806 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/mugger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("GnarlingMugger"), + kind: Foot, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/stalker.ron index 38a874b186..11ee37c806 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/stalker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("GnarlingStalker"), + kind: Foot, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/chieftain.ron index ca47fde275..7a4e114a4e 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/chieftain.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling Chieftain", description: "Only worn by the most spiritual of Gnarlings.", kind: Armor(( - kind: Hand("GnarlingChieftain"), + kind: Hand, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/logger.ron index 0f38363d1e..722403412c 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/logger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("GnarlingLogger"), + kind: Hand, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/mugger.ron index f577fca1cc..722403412c 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/mugger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("GnarlingMugger"), + kind: Hand, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/stalker.ron index eef03b9d07..722403412c 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/stalker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("GnarlingStalker"), + kind: Hand, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/chieftain.ron index 068ddd64b4..d4ef9e74de 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/chieftain.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling Chieftain", description: "Only worn by the most spiritual of Gnarlings.", kind: Armor(( - kind: Head("GnarlingChieftain"), + kind: Head, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/logger.ron index 3eba187a1f..65924ac48a 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/logger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("GnarlingLogger"), + kind: Head, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/mugger.ron index d63180546d..65924ac48a 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/mugger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("GnarlingMugger"), + kind: Head, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/stalker.ron index 9280371fcf..65924ac48a 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/stalker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("GnarlingStalker"), + kind: Head, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/chieftain.ron index df09389aaa..0f7941c9c5 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/chieftain.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling Chieftain", description: "Only worn by the most spiritual of Gnarlings.", kind: Armor(( - kind: Pants("GnarlingChieftain"), + kind: Pants, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/logger.ron index 729ce1c3e0..05f1a06528 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/logger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("GnarlingLogger"), + kind: Pants, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/mugger.ron index 88d0704533..05f1a06528 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/mugger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("GnarlingMugger"), + kind: Pants, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/stalker.ron index 98c1e7fb22..05f1a06528 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/stalker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("GnarlingStalker"), + kind: Pants, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/chieftain.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/chieftain.ron index 176559e98b..4e5816cc17 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/chieftain.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/chieftain.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling Chieftain", description: "Only worn by the most spiritual of Gnarlings.", kind: Armor(( - kind: Belt("GnarlingChieftain"), + kind: Belt, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/logger.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/logger.ron index 22b28de875..5e3a77e0db 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/logger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/logger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("GnarlingLogger"), + kind: Belt, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/mugger.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/mugger.ron index 61de0184f9..5e3a77e0db 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/mugger.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/mugger.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("GnarlingMugger"), + kind: Belt, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/stalker.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/stalker.ron index b7c8bcef3d..5e3a77e0db 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/stalker.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/stalker.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("GnarlingStalker"), + kind: Belt, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron index 3bdf0fb947..091d0b677f 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/chest/rogue.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Rogue", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("GnollRogue"), + kind: Chest, stats: ( protection: Some(Normal(38.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron index 9b8dc0b866..ecb8caf124 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/chest/shaman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Shaman", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("GnollShaman"), + kind: Chest, stats: ( protection: Some(Normal(38.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron index 8a7613de0e..656f037145 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/chest/trapper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Trapper", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("GnollTrapper"), + kind: Chest, stats: ( protection: Some(Normal(38.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron index 8645198598..4b8c121d5c 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/foot/rogue.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Rogue", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("GnollRogue"), + kind: Foot, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron index 70e912d463..3c0c777663 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/foot/shaman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Shaman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("GnollShaman"), + kind: Foot, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron index 6b44ba046b..6f5d8da6ce 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/foot/trapper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Trapper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("GnollTrapper"), + kind: Foot, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron index cc9bbd4362..8400d5e26e 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/hand/rogue.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Rogue", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("GnollRogue"), + kind: Hand, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron index 8ad6f39a09..075bab1412 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/hand/shaman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Shaman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("GnollShaman"), + kind: Hand, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron index 367d2d2e1f..c04c3715ef 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/hand/trapper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Trapper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("GnollTrapper"), + kind: Hand, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron index 177a91728e..d1a830aa38 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/head/rogue.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Rogue", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("GnollRogue"), + kind: Head, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron index a58ac27b9b..4de39e0d20 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/head/shaman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Shaman", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("GnollShaman"), + kind: Head, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron index d3567dd7ce..9acc85ceba 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/head/trapper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Trapper", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("GnollTrapper"), + kind: Head, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron index a7e90590f4..231dcf35a8 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/pants/rogue.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Rogue", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("GnollRogue"), + kind: Pants, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron index f178eac495..8e14b9b686 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/pants/shaman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Shaman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("GnollShaman"), + kind: Pants, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron index 592d8ff757..a8b90f974b 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/pants/trapper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Trapper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("GnollTrapper"), + kind: Pants, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron b/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron index 13c4344c72..7c4e7b447d 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/tail/rogue.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Rogue", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("GnollRogue"), + kind: Belt, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron b/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron index 6791fbb867..03de5106f8 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/tail/shaman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Shaman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("GnollShaman"), + kind: Belt, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron b/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron index 1fe212f49f..a3c3af43f3 100644 --- a/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron +++ b/assets/common/items/npc_armor/biped_small/gnoll/tail/trapper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnoll Trapper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("GnollTrapper"), + kind: Belt, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnome/chest/gnome.ron b/assets/common/items/npc_armor/biped_small/gnome/chest/gnome.ron index ddafd674b7..460442d22e 100644 --- a/assets/common/items/npc_armor/biped_small/gnome/chest/gnome.ron +++ b/assets/common/items/npc_armor/biped_small/gnome/chest/gnome.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnome", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("Gnome"), + kind: Chest, stats: ( protection: Some(Normal(36.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnome/foot/gnome.ron b/assets/common/items/npc_armor/biped_small/gnome/foot/gnome.ron index 0596305538..5bad9544c1 100644 --- a/assets/common/items/npc_armor/biped_small/gnome/foot/gnome.ron +++ b/assets/common/items/npc_armor/biped_small/gnome/foot/gnome.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnome", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("Gnome"), + kind: Foot, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnome/hand/gnome.ron b/assets/common/items/npc_armor/biped_small/gnome/hand/gnome.ron index 0a0a05fd33..f716e77820 100644 --- a/assets/common/items/npc_armor/biped_small/gnome/hand/gnome.ron +++ b/assets/common/items/npc_armor/biped_small/gnome/hand/gnome.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnome", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("Gnome"), + kind: Hand, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnome/head/gnome.ron b/assets/common/items/npc_armor/biped_small/gnome/head/gnome.ron index 7dce4a9063..07a648f0fa 100644 --- a/assets/common/items/npc_armor/biped_small/gnome/head/gnome.ron +++ b/assets/common/items/npc_armor/biped_small/gnome/head/gnome.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnome", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("Gnome"), + kind: Head, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/gnome/pants/gnome.ron b/assets/common/items/npc_armor/biped_small/gnome/pants/gnome.ron index 9a35c8f315..40ff7b84e7 100644 --- a/assets/common/items/npc_armor/biped_small/gnome/pants/gnome.ron +++ b/assets/common/items/npc_armor/biped_small/gnome/pants/gnome.ron @@ -2,7 +2,7 @@ ItemDef( name: "Gnome", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("Gnome"), + kind: Pants, stats: ( protection: Some(Normal(1.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron index 70c0646bed..a1bcdd504d 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/archer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Archer", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("HaniwaArcher"), + kind: Chest, stats: ( protection: Some(Normal(38.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron index 4b9b02a100..267d0a1764 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/guard.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Guard", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("HaniwaGuard"), + kind: Chest, stats: ( protection: Some(Normal(38.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron index f528d0c996..2faefb85b5 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/soldier.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Soldier", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("HaniwaSoldier"), + kind: Chest, stats: ( protection: Some(Normal(38.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron index 9566812bbe..b76247b1c0 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/archer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Archer", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("HaniwaArcher"), + kind: Foot, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron index 62f058b19f..f0a0fbd587 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/guard.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Guard", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("HaniwaGuard"), + kind: Foot, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron index 9c96451721..2282404d90 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/soldier.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Soldier", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("HaniwaSoldier"), + kind: Foot, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron index 5ab38fdd9d..d23d708fec 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/archer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Archer", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("HaniwaArcher"), + kind: Hand, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron index 06dc1cbd73..b49d7a3958 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/guard.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Guard", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("HaniwaGuard"), + kind: Hand, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron index b86e72a951..0f6884bd87 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/soldier.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Soldier", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("HaniwaSoldier"), + kind: Hand, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron index 6608999c84..0aec9a9fb6 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/archer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Archer", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("HaniwaArcher"), + kind: Head, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron index d5de63c1aa..8f91dfec86 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/guard.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Guard", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("HaniwaGuard"), + kind: Head, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron index 9b44cd0eaa..38357a1390 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/soldier.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Soldier", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("HaniwaSoldier"), + kind: Head, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron index 8d5820b527..8adba3a93f 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/archer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Archer", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("HaniwaArcher"), + kind: Pants, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron index 2f925fbe23..9bd3c310f2 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/guard.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Guard", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("HaniwaGuard"), + kind: Pants, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron index a720c04d42..e58aa11316 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/soldier.ron @@ -2,7 +2,7 @@ ItemDef( name: "Haniwa Soldier", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("HaniwaSoldier"), + kind: Pants, stats: ( protection: Some(Normal(19.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron b/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron index df1bbba307..857b638354 100644 --- a/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/chest/husk.ron @@ -2,7 +2,7 @@ ItemDef( name: "Husk", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("Husk"), + kind: Chest, stats: ( protection: Some(Normal(18.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron b/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron index 999e22161b..ee146fffec 100644 --- a/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/foot/husk.ron @@ -2,7 +2,7 @@ ItemDef( name: "Husk", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("Husk"), + kind: Foot, stats: ( protection: Some(Normal(14.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron b/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron index a97b9b2227..c57bf790b9 100644 --- a/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/hand/husk.ron @@ -2,7 +2,7 @@ ItemDef( name: "Husk", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("Husk"), + kind: Hand, stats: ( protection: Some(Normal(14.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/husk/head/husk.ron b/assets/common/items/npc_armor/biped_small/husk/head/husk.ron index d7bea65d7e..11eee82cde 100644 --- a/assets/common/items/npc_armor/biped_small/husk/head/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/head/husk.ron @@ -2,7 +2,7 @@ ItemDef( name: "Husk", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("Husk"), + kind: Head, stats: ( protection: Some(Normal(14.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron b/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron index c40f056595..588a3efcde 100644 --- a/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/pants/husk.ron @@ -2,7 +2,7 @@ ItemDef( name: "Husk", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("Husk"), + kind: Pants, stats: ( protection: Some(Normal(14.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron b/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron index df924f7e46..4a923bbcea 100644 --- a/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron +++ b/assets/common/items/npc_armor/biped_small/husk/tail/husk.ron @@ -2,7 +2,7 @@ ItemDef( name: "Husk", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("Husk"), + kind: Belt, stats: ( protection: Some(Normal(14.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron index 1239ff24c4..d7d5a14715 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron @@ -2,7 +2,7 @@ ItemDef( name: "Kappa", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("Kappa"), + kind: Chest, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron index 5894d15b27..ef2da0f6ab 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron @@ -2,7 +2,7 @@ ItemDef( name: "Kappa", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("Kappa"), + kind: Foot, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron index 420a5243e3..4634f0b064 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron @@ -2,7 +2,7 @@ ItemDef( name: "Kappa", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("Kappa"), + kind: Hand, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron index dc3b4ea936..2c6092c11f 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron @@ -2,7 +2,7 @@ ItemDef( name: "Kappa", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("Kappa"), + kind: Head, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron index 4553fb644f..083569e070 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron @@ -2,7 +2,7 @@ ItemDef( name: "Kappa", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("Kappa"), + kind: Pants, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron index 7c89dd1e8c..3b4058ccf9 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron @@ -2,7 +2,7 @@ ItemDef( name: "Kappa", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("Kappa"), + kind: Belt, stats: ( protection: Some(Normal(2.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/mandragora/chest/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/chest/mandragora.ron index fdb85a1315..4b03356c25 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/chest/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/chest/mandragora.ron @@ -2,7 +2,7 @@ ItemDef( name: "Mandragora", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("Mandragora"), + kind: Chest, stats: ( protection: Some(Normal(26.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/mandragora/foot/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/foot/mandragora.ron index f03850eeca..4161e5ab31 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/foot/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/foot/mandragora.ron @@ -2,7 +2,7 @@ ItemDef( name: "Mandragora", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Foot("Mandragora"), + kind: Foot, stats: ( protection: Some(Normal(26.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/mandragora/hand/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/hand/mandragora.ron index 054a5a9aa8..97c66acc0b 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/hand/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/hand/mandragora.ron @@ -2,7 +2,7 @@ ItemDef( name: "Mandragora", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Hand("Mandragora"), + kind: Hand, stats: ( protection: Some(Normal(26.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/mandragora/pants/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/pants/mandragora.ron index b1e0701153..46e7c724a0 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/pants/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/pants/mandragora.ron @@ -2,7 +2,7 @@ ItemDef( name: "Mandragora", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Pants("Mandragora"), + kind: Pants, stats: ( protection: Some(Normal(26.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/mandragora/tail/mandragora.ron b/assets/common/items/npc_armor/biped_small/mandragora/tail/mandragora.ron index 7e5f635119..e47f9136b4 100644 --- a/assets/common/items/npc_armor/biped_small/mandragora/tail/mandragora.ron +++ b/assets/common/items/npc_armor/biped_small/mandragora/tail/mandragora.ron @@ -2,7 +2,7 @@ ItemDef( name: "Mandragora", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Belt("Mandragora"), + kind: Belt, stats: ( protection: Some(Normal(26.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron index 8f084a7283..a9a9c11888 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/hoplite.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Hoplite", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("MyrmidonHoplite"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron index 96b5e888b4..86f9ea24e3 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/marksman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Marksman", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("MyrmidonMarksman"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron index 20e1db8a8b..733067d963 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/strategian.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Strategian", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("MyrmidonStrategian"), + kind: Chest, stats: ( protection: Some(Normal(48.0)), poise_resilience: Some(Normal(6.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron index 241df6552e..66b634772b 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/hoplite.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Hoplite", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("MyrmidonHoplite"), + kind: Foot, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron index 5ac421ea47..3b44625119 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/marksman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Marksman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("MyrmidonMarksman"), + kind: Foot, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron index 5a1f4e5141..6d5ed97d32 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/strategian.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Strategian", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("MyrmidonStrategian"), + kind: Foot, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron index a4288c682d..1f70bcd483 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/hoplite.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Hoplite", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("MyrmidonHoplite"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron index b6de403e14..8c26b14ef8 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/marksman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Marksman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("MyrmidonMarksman"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron index 7783017101..ed867cfbd9 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/strategian.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Strategian", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("MyrmidonStrategian"), + kind: Hand, stats: ( protection: Some(Normal(16.0)), poise_resilience: Some(Normal(2.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron index c2f200ed60..b9fcc60529 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/hoplite.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Hoplite", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("MyrmidonHoplite"), + kind: Head, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron index 115c9c483a..afcdab96d8 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/marksman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Marksman", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("MyrmidonMarksman"), + kind: Head, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron index 0d56b94a68..925d54eaff 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/strategian.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Strategian", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("MyrmidonStrategian"), + kind: Head, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron index fc0bcc1b5a..1f5277ce4a 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/hoplite.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Hoplite", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("MyrmidonHoplite"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron index 1ac2cd3293..0a95b15743 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/marksman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Marksman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("MyrmidonMarksman"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron index 41982d0a8d..bb4c5f945d 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/strategian.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Strategian", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("MyrmidonStrategian"), + kind: Pants, stats: ( protection: Some(Normal(32.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron index e1ba3d5dd7..3c9eed2b67 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/hoplite.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Hoplite", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("MyrmidonHoplite"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron index 6e7916239f..d3c14e1c5a 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/marksman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Marksman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("MyrmidonMarksman"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron index 5d00a67f39..8db6e2d945 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/strategian.ron @@ -2,7 +2,7 @@ ItemDef( name: "Myrmidon Strategian", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("MyrmidonStrategian"), + kind: Belt, stats: ( protection: Some(Normal(8.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron index 52b189de5b..cb30f63650 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sniper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sniper", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("SahaginSniper"), + kind: Chest, stats: ( protection: Some(Normal(26.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron index 9b6e173673..d4190998cc 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sorcerer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sorcerer", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("SahaginSorcerer"), + kind: Chest, stats: ( protection: Some(Normal(26.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron index 29541f67a1..e6c635286c 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/spearman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Spearman", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Chest("SahaginSpearman"), + kind: Chest, stats: ( protection: Some(Normal(26.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron index e84cf54719..b37a1646fb 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sniper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sniper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("SahaginSniper"), + kind: Foot, stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron index accab58b8b..96b81707d4 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sorcerer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sorcerer", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("SahaginSorcerer"), + kind: Foot, stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron index fa28d964e7..dcb0f2e397 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/spearman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Spearman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Foot("SahaginSpearman"), + kind: Foot, stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron index 7ec1c8c781..59b7545126 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sniper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sniper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("SahaginSniper"), + kind: Hand, stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron index 90fb5c6538..16b803e23f 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sorcerer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sorcerer", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("SahaginSorcerer"), + kind: Hand, stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron index 433652f025..192a7573d2 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/spearman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Spearman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Hand("SahaginSpearman"), + kind: Hand, stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron index b62e87e189..38fff5003f 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sniper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sniper", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("SahaginSniper"), + kind: Head, stats: ( protection: Some(Normal(13.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron index 4afff7f3d7..ee79058fcb 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sorcerer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sorcerer", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("SahaginSorcerer"), + kind: Head, stats: ( protection: Some(Normal(13.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron index 8ebb88ba5b..06dca8623d 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/spearman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Spearman", description: "Ceremonial attire used by members.", kind: Armor(( - kind: Head("SahaginSpearman"), + kind: Head, stats: ( protection: Some(Normal(13.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron index 84133dc260..366610bfc5 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sniper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sniper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("SahaginSniper"), + kind: Pants, stats: ( protection: Some(Normal(13.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron index 04a8bfc7f0..c58754c1d2 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sorcerer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sorcerer", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("SahaginSorcerer"), + kind: Pants, stats: ( protection: Some(Normal(13.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron index 5fd66d22d8..51a71ce5fb 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/spearman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Spearman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Pants("SahaginSpearman"), + kind: Pants, stats: ( protection: Some(Normal(13.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron index ab9d29bf48..e6c79bf4b5 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sniper.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sniper", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("SahaginSniper"), + kind: Belt, stats: ( protection: Some(Normal(5.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron index e046d635c0..3e7e3237d3 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sorcerer.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Sorcerer", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("SahaginSorcerer"), + kind: Belt, stats: ( protection: Some(Normal(5.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron index 39ccc407d1..30fecdfc50 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/spearman.ron @@ -2,7 +2,7 @@ ItemDef( name: "Sahagin Spearman", description: "Ceremonial attire used by members..", kind: Armor(( - kind: Belt("SahaginSpearman"), + kind: Belt, stats: ( protection: Some(Normal(5.0)), poise_resilience: Some(Normal(4.0)), diff --git a/assets/common/items/npc_armor/chest/leather_blue.ron b/assets/common/items/npc_armor/chest/leather_blue.ron index 0b97c4a146..fb67f07482 100644 --- a/assets/common/items/npc_armor/chest/leather_blue.ron +++ b/assets/common/items/npc_armor/chest/leather_blue.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Armor( ( - kind: Chest("LeatherBlue"), + kind: Chest, stats: ( protection: Some(Normal(40.0)), poise_resilience: Some(Normal(10.0)), diff --git a/assets/common/items/npc_armor/chest/plate_red.ron b/assets/common/items/npc_armor/chest/plate_red.ron index 605ee7484b..68ef1c6b9c 100644 --- a/assets/common/items/npc_armor/chest/plate_red.ron +++ b/assets/common/items/npc_armor/chest/plate_red.ron @@ -3,7 +3,7 @@ ItemDef( description: "A chestplate forged from iron.", kind: Armor( ( - kind: Chest("PlateRed"), + kind: Chest, stats: ( protection: Some(Normal(5.0)), poise_resilience: Some(Normal(5.0)), diff --git a/assets/common/items/npc_armor/golem/claygolem.ron b/assets/common/items/npc_armor/golem/claygolem.ron index c40e50d0a9..d08b389a6b 100644 --- a/assets/common/items/npc_armor/golem/claygolem.ron +++ b/assets/common/items/npc_armor/golem/claygolem.ron @@ -2,7 +2,7 @@ ItemDef( name: "Clay Golem Armor", description: "Worn by clay golem.", kind: Armor(( - kind: Chest("Clay Golem"), + kind: Chest, stats: ( protection: Some(Normal(180.0)), poise_resilience: Some(Normal(1.0)), diff --git a/assets/common/items/npc_armor/golem/woodgolem.ron b/assets/common/items/npc_armor/golem/woodgolem.ron index 6f97bc29ea..ea53c39a6c 100644 --- a/assets/common/items/npc_armor/golem/woodgolem.ron +++ b/assets/common/items/npc_armor/golem/woodgolem.ron @@ -2,7 +2,7 @@ ItemDef( name: "Wood Golem Armor", description: "Yeet", kind: Armor(( - kind: Chest("Wood Golem"), + kind: Chest, stats: ( protection: Some(Normal(60.0)), poise_resilience: Some(Normal(60.0)), diff --git a/assets/common/items/npc_armor/pants/leather_blue.ron b/assets/common/items/npc_armor/pants/leather_blue.ron index e3a9092501..3096866336 100644 --- a/assets/common/items/npc_armor/pants/leather_blue.ron +++ b/assets/common/items/npc_armor/pants/leather_blue.ron @@ -3,7 +3,7 @@ ItemDef( description: "", kind: Armor( ( - kind: Pants("LeatherBlue"), + kind: Pants, stats: ( protection: Some(Normal(20.0)), poise_resilience: Some(Normal(10.0)), diff --git a/assets/common/items/npc_armor/pants/plate_red.ron b/assets/common/items/npc_armor/pants/plate_red.ron index f1ca3ef5b7..f9e47e00c7 100644 --- a/assets/common/items/npc_armor/pants/plate_red.ron +++ b/assets/common/items/npc_armor/pants/plate_red.ron @@ -3,7 +3,7 @@ ItemDef( description: "Greaves forged from iron.", kind: Armor( ( - kind: Pants("PlateRed"), + kind: Pants, stats: ( protection: Some(Normal(10.0)), poise_resilience: Some(Normal(10.0)), diff --git a/assets/common/items/npc_armor/quadruped_low/generic.ron b/assets/common/items/npc_armor/quadruped_low/generic.ron index 833eaaeab1..4286b7a772 100644 --- a/assets/common/items/npc_armor/quadruped_low/generic.ron +++ b/assets/common/items/npc_armor/quadruped_low/generic.ron @@ -2,7 +2,7 @@ ItemDef( name: "Quad Low Generic", description: "Scaly.", kind: Armor(( - kind: Chest("QuadrupedLowGeneric"), + kind: Chest, stats: ( protection: Some(Normal(40.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/npc_armor/quadruped_low/shell.ron b/assets/common/items/npc_armor/quadruped_low/shell.ron index 2da9810784..bb5cbf8dfe 100644 --- a/assets/common/items/npc_armor/quadruped_low/shell.ron +++ b/assets/common/items/npc_armor/quadruped_low/shell.ron @@ -2,7 +2,7 @@ ItemDef( name: "Quad Low Shell", description: "Shell.", kind: Armor(( - kind: Chest("QuadrupedLowShell"), + kind: Chest, stats: ( protection: Some(Normal(320.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/npc_armor/theropod/rugged.ron b/assets/common/items/npc_armor/theropod/rugged.ron index 41fc4dc222..7a6c2837ac 100644 --- a/assets/common/items/npc_armor/theropod/rugged.ron +++ b/assets/common/items/npc_armor/theropod/rugged.ron @@ -2,7 +2,7 @@ ItemDef( name: "Theropod Rugged", description: "stronk.", kind: Armor(( - kind: Chest("TheropodRugged"), + kind: Chest, stats: ( protection: Some(Normal(80.0)), poise_resilience: Some(Normal(0.0)), diff --git a/assets/common/items/testing/test_bag_18_slot.ron b/assets/common/items/testing/test_bag_18_slot.ron index 1092c9a600..f7fb152e5e 100644 --- a/assets/common/items/testing/test_bag_18_slot.ron +++ b/assets/common/items/testing/test_bag_18_slot.ron @@ -3,7 +3,7 @@ ItemDef( description: "Used for unit tests do not delete", kind: Armor( ( - kind: Bag("TestBag18Slot"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/testing/test_bag_9_slot.ron b/assets/common/items/testing/test_bag_9_slot.ron index 31c8f69da4..d945eb49f5 100644 --- a/assets/common/items/testing/test_bag_9_slot.ron +++ b/assets/common/items/testing/test_bag_9_slot.ron @@ -3,7 +3,7 @@ ItemDef( description: "Used for unit tests do not delete", kind: Armor( ( - kind: Bag("TestBag9Slot"), + kind: Bag, stats: ( ), ) diff --git a/assets/common/items/testing/test_boots.ron b/assets/common/items/testing/test_boots.ron index 93bb83e0f6..69fc368493 100644 --- a/assets/common/items/testing/test_boots.ron +++ b/assets/common/items/testing/test_boots.ron @@ -3,7 +3,7 @@ ItemDef( description: "Hopefully this test doesn't break!", kind: Armor( ( - kind: Foot("Dark"), + kind: Foot, stats: ( ), ) diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index c68bd86cc5..4e89f79b85 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -611,37 +611,7 @@ ], threshold: 0.3, ), - Inventory(CollectedItem("Diamond")): ( - files: [ - "voxygen.audio.sfx.inventory.collect_gemstone", - ], - threshold: 0.3, - ), - Inventory(CollectedItem("Ruby")): ( - files: [ - "voxygen.audio.sfx.inventory.collect_gemstone", - ], - threshold: 0.3, - ), - Inventory(CollectedItem("Emerald")): ( - files: [ - "voxygen.audio.sfx.inventory.collect_gemstone", - ], - threshold: 0.3, - ), - Inventory(CollectedItem("Sapphire")): ( - files: [ - "voxygen.audio.sfx.inventory.collect_gemstone", - ], - threshold: 0.3, - ), - Inventory(CollectedItem("Topaz")): ( - files: [ - "voxygen.audio.sfx.inventory.collect_gemstone", - ], - threshold: 0.3, - ), - Inventory(CollectedItem("Amethyst")): ( + Inventory(CollectedItem("Gemstone")): ( files: [ "voxygen.audio.sfx.inventory.collect_gemstone", ], diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 51e92339cd..dab00ef2ac 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -3,89 +3,89 @@ // VoxTrans(specifier, offset, (x_rot, y_rot, z_rot), zoom) ({ // Crafting Stations - Tool("Anvil"): VoxTrans( + Simple("Anvil"): VoxTrans( "voxel.sprite.anvil.anvil-0", (0.5, 0.5, 0.0), (0.0, 60.0, 90.0), 1.0, ), - Tool("Cauldron"): VoxTrans( + Simple("Cauldron"): VoxTrans( "voxel.sprite.cauldron.cauldron-0", (0.0, 0.0, 0.0), (-50.0, 40.0, 30.0), 1.0, ), - Tool("CookingPot"): VoxTrans( + Simple("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( + Simple("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( + Simple("Forge"): VoxTrans( "voxel.object.forge", (0.0, 0.0, 0.0), (-80.0, 20.0, 0.0), 1.0, ), - Tool("Loom"): VoxTrans( + Simple("Loom"): VoxTrans( "voxel.object.loom", (0.0, 0.0, 0.0), (-100.0, 00.0, 0.0), 1.0, ), - Tool("SpinningWheel"): VoxTrans( + Simple("SpinningWheel"): VoxTrans( "voxel.object.spinning_wheel", (0.0, 0.0, 0.0), (-70.0, 10.0, 0.0), 1.0, ), - Tool("TanningRack"): VoxTrans( + Simple("TanningRack"): VoxTrans( "voxel.object.tanning_rack", (0.0, 0.0, 0.0), (-90.0, 20.0, 0.0), 1.0, ), - Tool("DismantlingBench"): VoxTrans( + Simple("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( + Simple("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( + Simple("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( + Simple("example_axe"): VoxTrans( "voxel.weapon.axe.2haxe_malachite-0", (0.0, 0.0, 0.0), (-90.0, 70.0, 0.0), 1.0, ), - Tool("example_hammer"): VoxTrans( + Simple("example_hammer"): VoxTrans( "voxel.weapon.hammer.greatmace.bloodsteel-2h", (-1.0, 0.0, 0.0), (-70.0, 55.0, 0.0), 1.0, ), - Tool("example_bow"): VoxTrans( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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, ), @@ -258,32 +258,32 @@ "voxel.weapon.bow.warbow.eldwood", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.sagitta"): VoxTrans( + Simple("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( + Simple("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( + Simple("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( + Simple("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, ), // Daggers - Tool("common.items.weapons.dagger.starter_dagger"): VoxTrans( + Simple("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( + Simple("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( + Simple("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, ), @@ -456,27 +456,27 @@ "voxel.weapon.sword.zweihander.orichalcum-2h", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.sword.caladbolg"): VoxTrans( + Simple("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.cultist"): VoxTrans( + Simple("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( + Simple("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( + Simple("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.starter"): VoxTrans( + Simple("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.debug.admin_sword"): VoxTrans( + Simple("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, ), @@ -601,7 +601,7 @@ "voxel.weapon.sword.sawblade.orichalcum-1h", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.sword_1h.starter"): VoxTrans( + Simple("common.items.weapons.sword_1h.starter"): VoxTrans( "voxel.weapon.sword.starter_1h", (-1.0, 1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), @@ -774,15 +774,15 @@ "voxel.weapon.axe.poleaxe.orichalcum-2h", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.axe.starter_axe"): VoxTrans( + Simple("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.malachite_axe-0"): VoxTrans( + Simple("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( + Simple("common.items.weapons.axe.parashu"): VoxTrans( "voxel.weapon.axe.parashu", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1, ), @@ -1052,27 +1052,27 @@ "voxel.weapon.hammer.warhammer.orichalcum-2h", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.hammer.hammer_1"): VoxTrans( + Simple("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( + Simple("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.flimsy_hammer"): VoxTrans( + Simple("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.mjolnir"): VoxTrans( + Simple("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( + Simple("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( + Simple("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, ), @@ -1342,19 +1342,19 @@ "voxel.weapon.staff.staff.eldwood", (0.0, 0.0, 0.0), (-130.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.staff.staff_1"): VoxTrans( + Simple("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( + Simple("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.cultist_staff"): VoxTrans( + Simple("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.laevateinn"): VoxTrans( + Simple("common.items.weapons.staff.laevateinn"): VoxTrans( "voxel.weapon.staff.laevateinn", (1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.1, ), @@ -1527,2037 +1527,2046 @@ "voxel.weapon.sceptre.sceptre.eldwood", (0.0, 0.0, 0.0), (-130.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.sceptre.starter_sceptre"): VoxTrans( + Simple("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.root_evil"): VoxTrans( + Simple("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( + Simple("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( + Simple("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.amethyst"): VoxTrans( + Simple("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( + Simple("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"): VoxTrans( + Simple("common.items.lantern.black_0"): VoxTrans( "voxel.lantern.black-0", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Lantern("Green0"): VoxTrans( + Simple("common.items.lantern.green_0"): VoxTrans( "voxel.lantern.green-0", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Lantern("Magic"): VoxTrans( + Simple("common.items.boss_drops.lantern"): VoxTrans( "voxel.lantern.magic_lantern", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Lantern("Blue0"): VoxTrans( + Simple("common.items.lantern.blue_0"): VoxTrans( "voxel.lantern.blue-0", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Lantern("Red0"): VoxTrans( + Simple("common.items.lantern.red_0"): VoxTrans( "voxel.lantern.red-0", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Lantern("GeodePurp"): VoxTrans( + Simple("common.items.lantern.geode_purp"): VoxTrans( "voxel.lantern.geode_purp", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Lantern("PumpkinLantern"): VoxTrans( + Simple("common.items.lantern.pumpkin"): VoxTrans( "voxel.lantern.pumpkin", (0.0, 0.0, 0.0), (-100.0, 205.0, 7.0), 0.9, ), - Lantern("PolarisLantern"): VoxTrans( + Simple("common.items.lantern.polaris"): VoxTrans( "voxel.lantern.polaris", (0.0, 0.0, 0.0), (-90.0, 120.0, 0.0), 0.9, ), // Farming Equipment - Tool("common.items.weapons.tool.broom"): VoxTrans( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("common.items.utility.coins"): VoxTrans( "voxel.object.v-coin", (0.0, 0.0, 0.0), (-10.0, 15.0, 0.0), 0.8, ), - Utility(Collar): VoxTrans( + Simple("common.items.utility.collar"): VoxTrans( "voxel.object.collar", (0.1, 0.0, 0.0), (-60.0, 20.0, 10.0), 0.9, ), // Armor // Starter Parts - Armor(Foot("Sandal")): VoxTrans( + Simple("common.items.armor.misc.foot.sandals"): 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( + Simple("common.items.armor.rugged.pants"): VoxTrans( "voxel.armor.rugged.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Chest("Rugged")): VoxTrans( + Simple("common.items.armor.rugged.chest"): VoxTrans( "voxel.armor.rugged.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Chest("WorkerPurpBrown")): VoxTrans( + Simple("common.items.armor.misc.chest.worker_purple_brown"): 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( + Simple("common.items.armor.misc.pants.worker_brown"): 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( + Simple("common.items.armor.cultist.chest"): VoxTrans( "voxel.armor.cultist.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Cultist")): VoxTrans( + Simple("common.items.armor.cultist.pants"): VoxTrans( "voxel.armor.cultist.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Cultist")): VoxTrans( + Simple("common.items.armor.cultist.belt"): VoxTrans( "voxel.armor.cultist.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Cultist")): VoxTrans( + Simple("common.items.armor.cultist.foot"): VoxTrans( "voxel.armor.cultist.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Cultist")): VoxTrans( + Simple("common.items.armor.cultist.hand"): VoxTrans( "voxel.armor.cultist.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Cultist")): VoxTrans( + Simple("common.items.armor.cultist.shoulder"): 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( + Simple("common.items.armor.cultist.bandana"): 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( + Simple("common.items.armor.misc.pants.worker_blue"): 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( + Simple("common.items.armor.misc.chest.worker_green_0"): 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( + Simple("common.items.armor.misc.chest.worker_green_1"): 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( + Simple("common.items.armor.misc.chest.worker_red_0"): 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( + Simple("common.items.armor.misc.chest.worker_red_1"): 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( + Simple("common.items.armor.misc.chest.worker_purple_0"): 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( + Simple("common.items.armor.misc.chest.worker_purple_1"): 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( + Simple("common.items.armor.misc.chest.worker_yellow_0"): 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( + Simple("common.items.armor.misc.chest.worker_yellow_1"): 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( + Simple("common.items.armor.misc.chest.worker_orange_0"): 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( + Simple("common.items.armor.misc.chest.worker_orange_1"): VoxTrans( "voxel.armor.misc.chest.shirt_white", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), // Merchant - Armor(Chest("Merchant")): VoxTrans( + Simple("common.items.armor.merchant.chest"): VoxTrans( "voxel.armor.merchant.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Merchant")): VoxTrans( + Simple("common.items.armor.merchant.pants"): VoxTrans( "voxel.armor.merchant.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Merchant")): VoxTrans( + Simple("common.items.armor.merchant.belt"): VoxTrans( "voxel.armor.merchant.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Merchant")): VoxTrans( + Simple("common.items.armor.merchant.foot"): VoxTrans( "voxel.armor.merchant.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Merchant")): VoxTrans( + Simple("common.items.armor.merchant.hand"): VoxTrans( "voxel.armor.merchant.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Merchant")): VoxTrans( + Simple("common.items.armor.merchant.shoulder"): VoxTrans( "voxel.armor.merchant.shoulder_l", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Chest("Merchant")): VoxTrans( - "voxel.armor.merchant.chest", - (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, - ), - Armor(Pants("Merchant")): VoxTrans( - "voxel.armor.merchant.pants", - (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, - ), - Armor(Hand("Merchant")): VoxTrans( - "voxel.armor.merchant.hand", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, - ), - Armor(Head("Merchant")): VoxTrans( + Simple("common.items.armor.merchant.turban"): VoxTrans( "voxel.armor.merchant.turban", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Merchant")): VoxTrans( + Simple("common.items.armor.merchant.back"): VoxTrans( "voxel.armor.merchant.back", (0.0, 0.0, 0.0), (-90.0, 45.0,0.0), 0.9, ), // Velorite Battlemage Set - Armor(Chest("VeloriteMage")): VoxTrans( + Simple("common.items.armor.velorite_mage.chest"): VoxTrans( "voxel.armor.velorite_battlemage.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("VeloriteMage")): VoxTrans( + Simple("common.items.armor.velorite_mage.pants"): VoxTrans( "voxel.armor.velorite_battlemage.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("VeloriteMage")): VoxTrans( + Simple("common.items.armor.velorite_mage.belt"): VoxTrans( "voxel.armor.velorite_battlemage.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("VeloriteMage")): VoxTrans( + Simple("common.items.armor.velorite_mage.foot"): VoxTrans( "voxel.armor.velorite_battlemage.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("VeloriteMage")): VoxTrans( + Simple("common.items.armor.velorite_mage.hand"): VoxTrans( "voxel.armor.velorite_battlemage.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("VeloriteMage")): VoxTrans( + Simple("common.items.armor.velorite_mage.shoulder"): VoxTrans( "voxel.armor.velorite_battlemage.shoulder", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Back("VeloriteMage")): VoxTrans( + Simple("common.items.armor.velorite_mage.back"): VoxTrans( + "voxel.armor.velorite_battlemage.back", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, + ), + // Admin Set + Simple("common.items.debug.cultist_chest_blue"): VoxTrans( + "voxel.armor.velorite_battlemage.chest", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, + ), + Simple("common.items.debug.cultist_legs_blue"): VoxTrans( + "voxel.armor.velorite_battlemage.pants", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Simple("common.items.debug.cultist_belt"): VoxTrans( + "voxel.armor.velorite_battlemage.belt", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Simple("common.items.debug.cultist_boots"): VoxTrans( + "voxel.armor.velorite_battlemage.foot", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Simple("common.items.debug.cultist_hands_blue"): VoxTrans( + "voxel.armor.velorite_battlemage.hand", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Simple("common.items.debug.cultist_shoulder_blue"): VoxTrans( + "voxel.armor.velorite_battlemage.shoulder", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, + ), + Simple("common.items.debug.dungeon_purple"): 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( + Simple("common.items.armor.assassin.chest"): VoxTrans( "voxel.armor.assassin.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Assassin")): VoxTrans( + Simple("common.items.armor.assassin.pants"): VoxTrans( "voxel.armor.assassin.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Assassin")): VoxTrans( + Simple("common.items.armor.assassin.belt"): VoxTrans( "voxel.armor.assassin.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Assassin")): VoxTrans( + Simple("common.items.armor.assassin.foot"): VoxTrans( "voxel.armor.assassin.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Assassin")): VoxTrans( + Simple("common.items.armor.assassin.hand"): VoxTrans( "voxel.armor.assassin.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Assassin")): VoxTrans( + Simple("common.items.armor.assassin.shoulder"): 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( + Simple("common.items.armor.leather_plate.chest"): VoxTrans( "voxel.armor.leather_plate.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("LeatherPlate")): VoxTrans( + Simple("common.items.armor.leather_plate.pants"): VoxTrans( "voxel.armor.leather_plate.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("LeatherPlate")): VoxTrans( + Simple("common.items.armor.leather_plate.belt"): VoxTrans( "voxel.armor.leather_plate.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("LeatherPlate")): VoxTrans( + Simple("common.items.armor.leather_plate.foot"): VoxTrans( "voxel.armor.leather_plate.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("LeatherPlate")): VoxTrans( + Simple("common.items.armor.leather_plate.hand"): VoxTrans( "voxel.armor.leather_plate.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("LeatherPlate")): VoxTrans( + Simple("common.items.armor.leather_plate.shoulder"): 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( + Simple("common.items.armor.ferocious.chest"): VoxTrans( "voxel.armor.ferocious.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Ferocious")): VoxTrans( + Simple("common.items.armor.ferocious.pants"): VoxTrans( "voxel.armor.ferocious.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Ferocious")): VoxTrans( + Simple("common.items.armor.ferocious.belt"): VoxTrans( "voxel.armor.ferocious.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Ferocious")): VoxTrans( + Simple("common.items.armor.ferocious.foot"): VoxTrans( "voxel.armor.ferocious.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Ferocious")): VoxTrans( + Simple("common.items.armor.ferocious.hand"): VoxTrans( "voxel.armor.ferocious.hand", (0.0, 0.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), - Armor(Shoulder("Ferocious")): VoxTrans( + Simple("common.items.armor.ferocious.shoulder"): VoxTrans( "voxel.armor.ferocious.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Ferocious")): VoxTrans( + Simple("common.items.armor.ferocious.back"): 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( + Simple("common.items.npc_armor.chest.leather_blue"): VoxTrans( "voxel.armor.leather_blue.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("BlueLeather")): VoxTrans( + Simple("common.items.npc_armor.chest.leather_blue"): 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( + Simple("common.items.armor.cloth_blue.chest"): VoxTrans( "voxel.armor.cloth_blue.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("ClothBlue")): VoxTrans( + Simple("common.items.armor.cloth_blue.pants"): VoxTrans( "voxel.armor.cloth_blue.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("ClothBlue")): VoxTrans( + Simple("common.items.armor.cloth_blue.belt"): VoxTrans( "voxel.armor.cloth_blue.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("ClothBlue")): VoxTrans( + Simple("common.items.armor.cloth_blue.foot"): VoxTrans( "voxel.armor.cloth_blue.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("ClothBlue")): VoxTrans( + Simple("common.items.armor.cloth_blue.hand"): VoxTrans( "voxel.armor.cloth_blue.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("ClothBlue0")): VoxTrans( + Simple("common.items.armor.cloth_blue.shoulder_0"): 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( + Simple("common.items.armor.cloth_blue.shoulder_1"): 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( + Simple("common.items.armor.cloth_green.chest"): VoxTrans( "voxel.armor.cloth_green.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("ClothGreen")): VoxTrans( + Simple("common.items.armor.cloth_green.pants"): VoxTrans( "voxel.armor.cloth_green.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("ClothGreen")): VoxTrans( + Simple("common.items.armor.cloth_green.belt"): VoxTrans( "voxel.armor.cloth_green.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("ClothGreen")): VoxTrans( + Simple("common.items.armor.cloth_green.foot"): VoxTrans( "voxel.armor.cloth_green.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("ClothGreen")): VoxTrans( + Simple("common.items.armor.cloth_green.hand"): VoxTrans( "voxel.armor.cloth_green.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("ClothGreen")): VoxTrans( + Simple("common.items.armor.cloth_green.shoulder"): VoxTrans( "voxel.armor.cloth_green.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), ////// - Armor(Chest("ClothPurple")): VoxTrans( + Simple("common.items.armor.cloth_purple.chest"): VoxTrans( "voxel.armor.cloth_purple.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("ClothPurple")): VoxTrans( + Simple("common.items.armor.cloth_purple.pants"): VoxTrans( "voxel.armor.cloth_purple.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("ClothPurple")): VoxTrans( + Simple("common.items.armor.cloth_purple.belt"): VoxTrans( "voxel.armor.cloth_purple.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("ClothPurple")): VoxTrans( + Simple("common.items.armor.cloth_purple.foot"): VoxTrans( "voxel.armor.cloth_purple.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("ClothPurple")): VoxTrans( + Simple("common.items.armor.cloth_purple.hand"): VoxTrans( "voxel.armor.cloth_purple.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("ClothPurple")): VoxTrans( + Simple("common.items.armor.cloth_purple.shoulder"): VoxTrans( "voxel.armor.cloth_purple.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Shoulder("IronSpikes")): VoxTrans( + Simple("common.items.armor.misc.shoulder.iron_spikes"): 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( + Simple("common.items.armor.misc.shoulder.leather_iron_3"): 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( + Simple("common.items.armor.misc.shoulder.leather_iron_2"): 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( + Simple("common.items.armor.misc.shoulder.leather_iron_1"): 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( + Simple("common.items.armor.misc.shoulder.leather_iron_0"): 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( + Simple("common.items.armor.misc.shoulder.leather_strip"): 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( + Simple("common.items.armor.misc.foot.jackalope_slippers"): 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( + Simple("common.items.armor.twigs.chest"): VoxTrans( "voxel.armor.twigs.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Twigs")): VoxTrans( + Simple("common.items.armor.twigs.pants"): VoxTrans( "voxel.armor.twigs.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Twigs")): VoxTrans( + Simple("common.items.armor.twigs.belt"): VoxTrans( "voxel.armor.twigs.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Twigs")): VoxTrans( + Simple("common.items.armor.twigs.foot"): VoxTrans( "voxel.armor.twigs.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Twigs")): VoxTrans( + Simple("common.items.armor.twigs.hand"): VoxTrans( "voxel.armor.twigs.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Twigs")): VoxTrans( + Simple("common.items.armor.twigs.shoulder"): 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( + Simple("common.items.armor.twigsleaves.chest"): VoxTrans( "voxel.armor.twigsleaves.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("TwigsLeaves")): VoxTrans( + Simple("common.items.armor.twigsleaves.pants"): VoxTrans( "voxel.armor.twigsleaves.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("TwigsLeaves")): VoxTrans( + Simple("common.items.armor.twigsleaves.belt"): VoxTrans( "voxel.armor.twigsleaves.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("TwigsLeaves")): VoxTrans( + Simple("common.items.armor.twigsleaves.foot"): VoxTrans( "voxel.armor.twigsleaves.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("TwigsLeaves")): VoxTrans( + Simple("common.items.armor.twigsleaves.hand"): VoxTrans( "voxel.armor.twigsleaves.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("TwigsLeaves")): VoxTrans( + Simple("common.items.armor.twigsleaves.shoulder"): 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( + Simple("common.items.armor.twigsflowers.chest"): VoxTrans( "voxel.armor.twigsflowers.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("TwigsFlowers")): VoxTrans( + Simple("common.items.armor.twigsflowers.pants"): VoxTrans( "voxel.armor.twigsflowers.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("TwigsFlowers")): VoxTrans( + Simple("common.items.armor.twigsflowers.belt"): VoxTrans( "voxel.armor.twigsflowers.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("TwigsFlowers")): VoxTrans( + Simple("common.items.armor.twigsflowers.foot"): VoxTrans( "voxel.armor.twigsflowers.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("TwigsFlowers")): VoxTrans( + Simple("common.items.armor.twigsflowers.hand"): VoxTrans( "voxel.armor.twigsflowers.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("TwigsFlowers")): VoxTrans( + Simple("common.items.armor.twigsflowers.shoulder"): 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( + Simple("common.items.armor.tarasque.chest"): VoxTrans( "voxel.armor.tarasque.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Tarasque")): VoxTrans( + Simple("common.items.armor.tarasque.pants"): VoxTrans( "voxel.armor.tarasque.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Tarasque")): VoxTrans( + Simple("common.items.armor.tarasque.belt"): VoxTrans( "voxel.armor.tarasque.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Tarasque")): VoxTrans( + Simple("common.items.armor.tarasque.foot"): VoxTrans( "voxel.armor.tarasque.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Tarasque")): VoxTrans( + Simple("common.items.armor.tarasque.hand"): VoxTrans( "voxel.armor.tarasque.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Tarasque")): VoxTrans( + Simple("common.items.armor.tarasque.shoulder"): 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( + Simple("common.items.armor.bonerattler.chest"): VoxTrans( "voxel.armor.bonerattler.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Bonerattler")): VoxTrans( + Simple("common.items.armor.bonerattler.pants"): VoxTrans( "voxel.armor.bonerattler.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Bonerattler")): VoxTrans( + Simple("common.items.armor.bonerattler.belt"): VoxTrans( "voxel.armor.bonerattler.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Bonerattler")): VoxTrans( + Simple("common.items.armor.bonerattler.foot"): VoxTrans( "voxel.armor.bonerattler.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Bonerattler")): VoxTrans( + Simple("common.items.armor.bonerattler.hand"): VoxTrans( "voxel.armor.bonerattler.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Bonerattler")): VoxTrans( + Simple("common.items.armor.bonerattler.shoulder"): 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( + Simple("common.items.armor.hide.rawhide.chest"): VoxTrans( "voxel.armor.hide.rawhide.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Rawhide")): VoxTrans( + Simple("common.items.armor.hide.rawhide.pants"): VoxTrans( "voxel.armor.hide.rawhide.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Rawhide")): VoxTrans( + Simple("common.items.armor.hide.rawhide.belt"): VoxTrans( "voxel.armor.hide.rawhide.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Rawhide")): VoxTrans( + Simple("common.items.armor.hide.rawhide.foot"): VoxTrans( "voxel.armor.hide.rawhide.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Rawhide")): VoxTrans( + Simple("common.items.armor.hide.rawhide.hand"): VoxTrans( "voxel.armor.hide.rawhide.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Rawhide")): VoxTrans( + Simple("common.items.armor.hide.rawhide.shoulder"): VoxTrans( "voxel.armor.hide.rawhide.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Rawhide")): VoxTrans( + Simple("common.items.armor.hide.rawhide.back"): 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( + Simple("common.items.armor.hide.leather.chest"): VoxTrans( "voxel.armor.hide.leather.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Leather")): VoxTrans( + Simple("common.items.armor.hide.leather.pants"): VoxTrans( "voxel.armor.hide.leather.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Leather")): VoxTrans( + Simple("common.items.armor.hide.leather.belt"): VoxTrans( "voxel.armor.hide.leather.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Leather")): VoxTrans( + Simple("common.items.armor.hide.leather.foot"): VoxTrans( "voxel.armor.hide.leather.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Leather")): VoxTrans( + Simple("common.items.armor.hide.leather.hand"): VoxTrans( "voxel.armor.hide.leather.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Leather")): VoxTrans( + Simple("common.items.armor.hide.leather.shoulder"): VoxTrans( "voxel.armor.hide.leather.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Leather")): VoxTrans( + Simple("common.items.armor.hide.leather.back"): 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( + Simple("common.items.armor.hide.scale.chest"): VoxTrans( "voxel.armor.hide.scale.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Scale")): VoxTrans( + Simple("common.items.armor.hide.scale.pants"): VoxTrans( "voxel.armor.hide.scale.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Scale")): VoxTrans( + Simple("common.items.armor.hide.scale.belt"): VoxTrans( "voxel.armor.hide.scale.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Scale")): VoxTrans( + Simple("common.items.armor.hide.scale.foot"): VoxTrans( "voxel.armor.hide.scale.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Scale")): VoxTrans( + Simple("common.items.armor.hide.scale.hand"): VoxTrans( "voxel.armor.hide.scale.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Scale")): VoxTrans( + Simple("common.items.armor.hide.scale.shoulder"): VoxTrans( "voxel.armor.hide.scale.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Scale")): VoxTrans( + Simple("common.items.armor.hide.scale.back"): 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( + Simple("common.items.armor.hide.carapace.chest"): VoxTrans( "voxel.armor.hide.carapace.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Carapace")): VoxTrans( + Simple("common.items.armor.hide.carapace.pants"): VoxTrans( "voxel.armor.hide.carapace.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Carapace")): VoxTrans( + Simple("common.items.armor.hide.carapace.belt"): VoxTrans( "voxel.armor.hide.carapace.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Carapace")): VoxTrans( + Simple("common.items.armor.hide.carapace.foot"): VoxTrans( "voxel.armor.hide.carapace.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Carapace")): VoxTrans( + Simple("common.items.armor.hide.carapace.hand"): VoxTrans( "voxel.armor.hide.carapace.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Carapace")): VoxTrans( + Simple("common.items.armor.hide.carapace.shoulder"): VoxTrans( "voxel.armor.hide.carapace.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Carapace")): VoxTrans( + Simple("common.items.armor.hide.carapace.back"): 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( + Simple("common.items.armor.hide.primal.chest"): VoxTrans( "voxel.armor.hide.primal.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Primal")): VoxTrans( + Simple("common.items.armor.hide.primal.pants"): VoxTrans( "voxel.armor.hide.primal.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Primal")): VoxTrans( + Simple("common.items.armor.hide.primal.belt"): VoxTrans( "voxel.armor.hide.primal.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Primal")): VoxTrans( + Simple("common.items.armor.hide.primal.foot"): VoxTrans( "voxel.armor.hide.primal.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Primal")): VoxTrans( + Simple("common.items.armor.hide.primal.hand"): VoxTrans( "voxel.armor.hide.primal.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Primal")): VoxTrans( + Simple("common.items.armor.hide.primal.shoulder"): VoxTrans( "voxel.armor.hide.primal.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Primal")): VoxTrans( + Simple("common.items.armor.hide.primal.back"): 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( + Simple("common.items.armor.hide.dragonscale.chest"): VoxTrans( "voxel.armor.hide.dragonscale.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Dragonscale")): VoxTrans( + Simple("common.items.armor.hide.dragonscale.pants"): VoxTrans( "voxel.armor.hide.dragonscale.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Dragonscale")): VoxTrans( + Simple("common.items.armor.hide.dragonscale.belt"): VoxTrans( "voxel.armor.hide.dragonscale.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Dragonscale")): VoxTrans( + Simple("common.items.armor.hide.dragonscale.foot"): VoxTrans( "voxel.armor.hide.dragonscale.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Dragonscale")): VoxTrans( + Simple("common.items.armor.hide.dragonscale.hand"): VoxTrans( "voxel.armor.hide.dragonscale.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Dragonscale")): VoxTrans( + Simple("common.items.armor.hide.dragonscale.shoulder"): VoxTrans( "voxel.armor.hide.dragonscale.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Dragonscale")): VoxTrans( + Simple("common.items.armor.hide.dragonscale.back"): 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( + Simple("common.items.armor.savage.chest"): VoxTrans( "voxel.armor.savage.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Savage")): VoxTrans( + Simple("common.items.armor.savage.pants"): VoxTrans( "voxel.armor.savage.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Savage")): VoxTrans( + Simple("common.items.armor.savage.belt"): VoxTrans( "voxel.armor.savage.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Savage")): VoxTrans( + Simple("common.items.armor.savage.foot"): VoxTrans( "voxel.armor.savage.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Savage")): VoxTrans( + Simple("common.items.armor.savage.hand"): VoxTrans( "voxel.armor.savage.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Savage")): VoxTrans( + Simple("common.items.armor.savage.shoulder"): VoxTrans( "voxel.armor.savage.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Savage")): VoxTrans( + Simple("common.items.armor.savage.back"): 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( + Simple("common.items.armor.cloth.linen.chest"): VoxTrans( "voxel.armor.cloth.linen.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Linen")): VoxTrans( + Simple("common.items.armor.cloth.linen.pants"): VoxTrans( "voxel.armor.cloth.linen.pants", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Linen")): VoxTrans( + Simple("common.items.armor.cloth.linen.belt"): VoxTrans( "voxel.armor.cloth.linen.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Linen")): VoxTrans( + Simple("common.items.armor.cloth.linen.foot"): VoxTrans( "voxel.armor.cloth.linen.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Linen")): VoxTrans( + Simple("common.items.armor.cloth.linen.hand"): VoxTrans( "voxel.armor.cloth.linen.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Linen")): VoxTrans( + Simple("common.items.armor.cloth.linen.shoulder"): VoxTrans( "voxel.armor.cloth.linen.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Linen")): VoxTrans( + Simple("common.items.armor.cloth.linen.back"): 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( + Simple("common.items.armor.cloth.woolen.chest"): VoxTrans( "voxel.armor.cloth.woolen.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Woolen")): VoxTrans( + Simple("common.items.armor.cloth.woolen.pants"): VoxTrans( "voxel.armor.cloth.woolen.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Woolen")): VoxTrans( + Simple("common.items.armor.cloth.woolen.belt"): VoxTrans( "voxel.armor.cloth.woolen.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Woolen")): VoxTrans( + Simple("common.items.armor.cloth.woolen.foot"): VoxTrans( "voxel.armor.cloth.woolen.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Woolen")): VoxTrans( + Simple("common.items.armor.cloth.woolen.hand"): VoxTrans( "voxel.armor.cloth.woolen.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Woolen")): VoxTrans( + Simple("common.items.armor.cloth.woolen.shoulder"): VoxTrans( "voxel.armor.cloth.woolen.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Woolen")): VoxTrans( + Simple("common.items.armor.cloth.woolen.back"): 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( + Simple("common.items.armor.cloth.silken.chest"): VoxTrans( "voxel.armor.cloth.silken.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Silken")): VoxTrans( + Simple("common.items.armor.cloth.silken.pants"): VoxTrans( "voxel.armor.cloth.silken.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Silken")): VoxTrans( + Simple("common.items.armor.cloth.silken.belt"): VoxTrans( "voxel.armor.cloth.silken.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Silken")): VoxTrans( + Simple("common.items.armor.cloth.silken.foot"): VoxTrans( "voxel.armor.cloth.silken.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Silken")): VoxTrans( + Simple("common.items.armor.cloth.silken.hand"): VoxTrans( "voxel.armor.cloth.silken.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Silken")): VoxTrans( + Simple("common.items.armor.cloth.silken.shoulder"): VoxTrans( "voxel.armor.cloth.silken.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Silken")): VoxTrans( + Simple("common.items.armor.cloth.silken.back"): 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( + Simple("common.items.armor.cloth.druid.chest"): VoxTrans( "voxel.armor.cloth.druid.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Druid")): VoxTrans( + Simple("common.items.armor.cloth.druid.pants"): VoxTrans( "voxel.armor.cloth.druid.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Druid")): VoxTrans( + Simple("common.items.armor.cloth.druid.belt"): VoxTrans( "voxel.armor.cloth.druid.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Druid")): VoxTrans( + Simple("common.items.armor.cloth.druid.foot"): VoxTrans( "voxel.armor.cloth.druid.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Druid")): VoxTrans( + Simple("common.items.armor.cloth.druid.hand"): VoxTrans( "voxel.armor.cloth.druid.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Druid")): VoxTrans( + Simple("common.items.armor.cloth.druid.shoulder"): VoxTrans( "voxel.armor.cloth.druid.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Druid")): VoxTrans( + Simple("common.items.armor.cloth.druid.back"): 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( + Simple("common.items.armor.cloth.moonweave.chest"): VoxTrans( "voxel.armor.cloth.moonweave.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Moonweave")): VoxTrans( + Simple("common.items.armor.cloth.moonweave.pants"): VoxTrans( "voxel.armor.cloth.moonweave.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Moonweave")): VoxTrans( + Simple("common.items.armor.cloth.moonweave.belt"): VoxTrans( "voxel.armor.cloth.moonweave.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Moonweave")): VoxTrans( + Simple("common.items.armor.cloth.moonweave.foot"): VoxTrans( "voxel.armor.cloth.moonweave.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Moonweave")): VoxTrans( + Simple("common.items.armor.cloth.moonweave.hand"): VoxTrans( "voxel.armor.cloth.moonweave.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Moonweave")): VoxTrans( + Simple("common.items.armor.cloth.moonweave.shoulder"): VoxTrans( "voxel.armor.cloth.moonweave.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Moonweave")): VoxTrans( + Simple("common.items.armor.cloth.moonweave.back"): 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( + Simple("common.items.armor.cloth.sunsilk.chest"): VoxTrans( "voxel.armor.cloth.sunsilk.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Sunsilk")): VoxTrans( + Simple("common.items.armor.cloth.sunsilk.pants"): VoxTrans( "voxel.armor.cloth.sunsilk.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Sunsilk")): VoxTrans( + Simple("common.items.armor.cloth.sunsilk.belt"): VoxTrans( "voxel.armor.cloth.sunsilk.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Sunsilk")): VoxTrans( + Simple("common.items.armor.cloth.sunsilk.foot"): VoxTrans( "voxel.armor.cloth.sunsilk.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Sunsilk")): VoxTrans( + Simple("common.items.armor.cloth.sunsilk.hand"): VoxTrans( "voxel.armor.cloth.sunsilk.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Sunsilk")): VoxTrans( + Simple("common.items.armor.cloth.sunsilk.shoulder"): VoxTrans( "voxel.armor.cloth.sunsilk.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Sunsilk")): VoxTrans( + Simple("common.items.armor.cloth.sunsilk.back"): 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( + Simple("common.items.armor.mail.bronze.chest"): VoxTrans( "voxel.armor.mail.bronze.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Bronze")): VoxTrans( + Simple("common.items.armor.mail.bronze.pants"): VoxTrans( "voxel.armor.mail.bronze.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Bronze")): VoxTrans( + Simple("common.items.armor.mail.bronze.belt"): VoxTrans( "voxel.armor.mail.bronze.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Bronze")): VoxTrans( + Simple("common.items.armor.mail.bronze.foot"): VoxTrans( "voxel.armor.mail.bronze.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Bronze")): VoxTrans( + Simple("common.items.armor.mail.bronze.hand"): VoxTrans( "voxel.armor.mail.bronze.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Bronze")): VoxTrans( + Simple("common.items.armor.mail.bronze.shoulder"): VoxTrans( "voxel.armor.mail.bronze.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Bronze")): VoxTrans( + Simple("common.items.armor.mail.bronze.back"): 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( + Simple("common.items.armor.mail.iron.chest"): VoxTrans( "voxel.armor.mail.iron.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Iron")): VoxTrans( + Simple("common.items.armor.mail.iron.pants"): VoxTrans( "voxel.armor.mail.iron.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Iron")): VoxTrans( + Simple("common.items.armor.mail.iron.belt"): VoxTrans( "voxel.armor.mail.iron.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Iron")): VoxTrans( + Simple("common.items.armor.mail.iron.foot"): VoxTrans( "voxel.armor.mail.iron.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Iron")): VoxTrans( + Simple("common.items.armor.mail.iron.hand"): VoxTrans( "voxel.armor.mail.iron.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Iron")): VoxTrans( + Simple("common.items.armor.mail.iron.shoulder"): VoxTrans( "voxel.armor.mail.iron.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Iron")): VoxTrans( + Simple("common.items.armor.mail.iron.back"): 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( + Simple("common.items.armor.mail.steel.chest"): VoxTrans( "voxel.armor.mail.steel.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Steel")): VoxTrans( + Simple("common.items.armor.mail.steel.pants"): VoxTrans( "voxel.armor.mail.steel.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Steel")): VoxTrans( + Simple("common.items.armor.mail.steel.belt"): VoxTrans( "voxel.armor.mail.steel.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Steel")): VoxTrans( + Simple("common.items.armor.mail.steel.foot"): VoxTrans( "voxel.armor.mail.steel.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Steel")): VoxTrans( + Simple("common.items.armor.mail.steel.hand"): VoxTrans( "voxel.armor.mail.steel.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Steel")): VoxTrans( + Simple("common.items.armor.mail.steel.shoulder"): VoxTrans( "voxel.armor.mail.steel.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Steel")): VoxTrans( + Simple("common.items.armor.mail.steel.back"): 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( + Simple("common.items.armor.mail.cobalt.chest"): VoxTrans( "voxel.armor.mail.cobalt.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Cobalt")): VoxTrans( + Simple("common.items.armor.mail.cobalt.pants"): VoxTrans( "voxel.armor.mail.cobalt.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Cobalt")): VoxTrans( + Simple("common.items.armor.mail.cobalt.belt"): VoxTrans( "voxel.armor.mail.cobalt.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Cobalt")): VoxTrans( + Simple("common.items.armor.mail.cobalt.foot"): VoxTrans( "voxel.armor.mail.cobalt.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Cobalt")): VoxTrans( + Simple("common.items.armor.mail.cobalt.hand"): VoxTrans( "voxel.armor.mail.cobalt.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Cobalt")): VoxTrans( + Simple("common.items.armor.mail.cobalt.shoulder"): VoxTrans( "voxel.armor.mail.cobalt.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Cobalt")): VoxTrans( + Simple("common.items.armor.mail.cobalt.back"): 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( + Simple("common.items.armor.mail.bloodsteel.chest"): VoxTrans( "voxel.armor.mail.bloodsteel.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Bloodsteel")): VoxTrans( + Simple("common.items.armor.mail.bloodsteel.pants"): VoxTrans( "voxel.armor.mail.bloodsteel.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Bloodsteel")): VoxTrans( + Simple("common.items.armor.mail.bloodsteel.belt"): VoxTrans( "voxel.armor.mail.bloodsteel.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Bloodsteel")): VoxTrans( + Simple("common.items.armor.mail.bloodsteel.foot"): VoxTrans( "voxel.armor.mail.bloodsteel.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Bloodsteel")): VoxTrans( + Simple("common.items.armor.mail.bloodsteel.hand"): VoxTrans( "voxel.armor.mail.bloodsteel.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Bloodsteel")): VoxTrans( + Simple("common.items.armor.mail.bloodsteel.shoulder"): VoxTrans( "voxel.armor.mail.bloodsteel.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Bloodsteel")): VoxTrans( + Simple("common.items.armor.mail.bloodsteel.back"): 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( + Simple("common.items.armor.mail.orichalcum.chest"): VoxTrans( "voxel.armor.mail.orichalcum.chest", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), - Armor(Pants("Orichalcum")): VoxTrans( + Simple("common.items.armor.mail.orichalcum.pants"): VoxTrans( "voxel.armor.mail.orichalcum.pants", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Belt("Orichalcum")): VoxTrans( + Simple("common.items.armor.mail.orichalcum.belt"): VoxTrans( "voxel.armor.mail.orichalcum.belt", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Foot("Orichalcum")): VoxTrans( + Simple("common.items.armor.mail.orichalcum.foot"): VoxTrans( "voxel.armor.mail.orichalcum.foot", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Hand("Orichalcum")): VoxTrans( + Simple("common.items.armor.mail.orichalcum.hand"): VoxTrans( "voxel.armor.mail.orichalcum.hand", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Shoulder("Orichalcum")): VoxTrans( + Simple("common.items.armor.mail.orichalcum.shoulder"): VoxTrans( "voxel.armor.mail.orichalcum.shoulder", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Back("Orichalcum")): VoxTrans( + Simple("common.items.armor.mail.orichalcum.back"): 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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.back.short_0"): 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( + Simple("common.items.armor.misc.back.short_1"): 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( + Simple("common.items.armor.misc.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( + Simple("common.items.debug.admin_back"): VoxTrans( + "voxel.armor.misc.back.admin", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Simple("common.items.armor.misc.back.dungeon_purple"): 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( + Simple("common.items.npc_armor.back.leather_blue"): VoxTrans( "voxel.armor.leather_blue.back", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Back("Backpack")): VoxTrans( + Simple("common.items.armor.misc.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( + Simple("common.items.npc_armor.back.backpack_blue"): 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( + Simple("common.items.armor.witch.hat"): VoxTrans( "voxel.armor.witch.hat", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Head("HogHood")): VoxTrans( + Simple("common.items.armor.misc.head.hog_hood"): VoxTrans( "voxel.armor.misc.head.hog_hood", (0.0, 2.0, -0.0), (-110.0, 210.0,15.0), 1.4, ), - Armor(Head("BambooTwig")): VoxTrans( + Simple("common.items.armor.misc.head.bamboo_twig"): VoxTrans( "voxel.armor.misc.head.bamboo_twig", (2.5, 4.5, 0.0), (-120.0, -240.0,1.0), 2.3, ), - Armor(Head("Pirate")): VoxTrans( + Simple("common.items.armor.pirate.hat"): VoxTrans( "voxel.armor.pirate.hat", (1.0, 2.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), - Armor(Head("Thief")): VoxTrans( + Simple("common.items.armor.misc.head.bandana.thief"): VoxTrans( "voxel.armor.misc.head.bandana.thief", (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9, ), - Armor(Head("WanderersHat")): VoxTrans( + Simple("common.items.armor.misc.head.wanderers_hat"): VoxTrans( "voxel.armor.misc.head.wanderers_hat", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), - Armor(Head("Red")): VoxTrans( + Simple("common.items.armor.misc.head.bandana.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.head.hood"): VoxTrans( "voxel.armor.misc.head.hood", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), - Armor(Head("DarkHood")): VoxTrans( + Simple("common.items.armor.misc.head.hood_dark"): VoxTrans( "voxel.armor.misc.head.hood_dark", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), - Armor(Head("Crown")): VoxTrans( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.head.spikeguard"): VoxTrans( "voxel.armor.misc.head.spikeguard", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), - Armor(Head("WingedCoronet")): VoxTrans( + Simple("common.items.armor.misc.head.winged_coronet"): VoxTrans( "voxel.armor.misc.head.winged_coronet", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), - Armor(Head("BorealWarhelm")): VoxTrans( + Simple("common.items.armor.misc.head.boreal_warhelm"): VoxTrans( "voxel.armor.misc.head.boreal_warhelm", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), - Armor(Head("WoollyWintercap")): VoxTrans( + Simple("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): VoxTrans( "voxel.armor.misc.head.woolly_wintercap", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), - Armor(Head("Helmet")): VoxTrans( + Simple("common.items.armor.misc.head.helmet"): VoxTrans( "voxel.armor.misc.head.helmet", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), // Rings - Armor(Ring("Scratched")): VoxTrans( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.cultist.ring"): VoxTrans( "voxel.armor.cultist.ring", (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9, ), // Necks - Armor(Neck("Ankh")): VoxTrans( + Simple("common.items.armor.misc.neck.ankh_of_life"): 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( + Simple("common.items.armor.misc.neck.carcanet_of_wrath"): 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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.neck.honeycomb_pendant"): 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( + Simple("common.items.armor.misc.neck.haniwa_talisman"): 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( + Simple("common.items.armor.misc.neck.pendant_of_protection"): 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( + Simple("common.items.armor.misc.neck.gem_of_resilience"): 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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.cultist.necklace"): VoxTrans( "voxel.armor.cultist.necklace", (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9, ), - Armor(Neck("Ruby")): VoxTrans( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.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( + Simple("common.items.armor.misc.neck.scratched"): VoxTrans( "voxel.armor.misc.neck.scratched", (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9, ), // Tabards - Armor(Tabard("Admin")): VoxTrans( + Simple("common.items.armor.misc.tabard.admin"): VoxTrans( + "voxel.armor.tabard_admin", + (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9, + ), + Simple("common.items.debug.admin"): VoxTrans( "voxel.armor.tabard_admin", (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9, ), // Heads - Armor(Head("Leather")): VoxTrans( + Simple("common.items.armor.hide.leather.head"): 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( + Simple("common.items.armor.assassin.head"): 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( + Simple("common.items.armor.misc.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")): VoxTrans( + Simple("common.items.armor.misc.bag.soulkeeper_cursed"): VoxTrans( "voxel.armor.misc.bag.soulkeeper_cursed", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Armor(Bag("BlackHole")): VoxTrans( + Simple("common.items.debug.admin_black_hole"): VoxTrans( "voxel.armor.misc.bag.admin_black_hole", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Armor(Bag("BlueFace")): VoxTrans( + Simple("common.items.armor.misc.bag.soulkeeper_pure"): VoxTrans( "voxel.armor.misc.bag.soulkeeper_pure", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Armor(Bag("PurpleSkull")): VoxTrans( + Simple("common.items.armor.misc.bag.mindflayer_spellbag"): VoxTrans( "voxel.armor.misc.bag.mindflayer_spellbag", (0.0, 0.1, 0.0), (-75.0, 20.0, 5.0), 0.8, ), - Armor(Bag("GreenLarge")): VoxTrans( + Simple("common.items.armor.misc.bag.troll_hide_pack"): VoxTrans( "voxel.armor.misc.bag.troll_hide_pack", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Armor(Bag("LeatherLarge")): VoxTrans( + Simple("common.items.armor.misc.bag.reliable_backpack"): VoxTrans( "voxel.armor.misc.bag.reliable_backpack", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Armor(Bag("GreenMid")): VoxTrans( + Simple("common.items.armor.misc.bag.liana_kit"): VoxTrans( "voxel.armor.misc.bag.liana_kit", (0.5, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Armor(Bag("LeatherSmall")): VoxTrans( + Simple("common.items.armor.misc.bag.tiny_leather_pouch"): VoxTrans( "voxel.armor.misc.bag.tiny_leather_pouch", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.8, ), - Armor(Bag("RedLarge")): VoxTrans( + Simple("common.items.armor.misc.bag.sturdy_red_backpack"): VoxTrans( "voxel.armor.misc.bag.sturdy_red_backpack", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Armor(Bag("RedMed")): VoxTrans( + Simple("common.items.armor.misc.bag.woven_red_bag"): VoxTrans( "voxel.armor.misc.bag.woven_red_bag", (0.5, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Armor(Bag("RedSmall")): VoxTrans( + Simple("common.items.armor.misc.bag.knitted_red_pouch"): VoxTrans( "voxel.armor.misc.bag.knitted_red_pouch", (0.3, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.8, ), - Armor(Bag("RedTiny")): VoxTrans( + Simple("common.items.armor.misc.bag.tiny_red_pouch"): VoxTrans( "voxel.armor.misc.bag.tiny_red_pouch", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), - Armor(Bag("BluePouch")): VoxTrans( + Simple("common.items.armor.misc.bag.heavy_seabag"): VoxTrans( "voxel.armor.misc.bag.heavy_seabag", (0.0, 0.0, 0.0), (-75.0, 20.0, 5.0), 0.9, ), // Consumables - Consumable("common.items.food.apple"): VoxTrans( + Simple("common.items.food.apple"): VoxTrans( "voxel.object.apple_half", (-0.5, 0.5, 0.0), (-60.0, -45.0, -15.0), 0.9, ), - Consumable("common.items.food.coconut"): VoxTrans( + Simple("common.items.food.coconut"): VoxTrans( "voxel.object.coconut_half", (0.1, -0.5, 0.0), (-55.0, 30.0, 20.0), 0.8, ), - Consumable("common.items.food.cactus_colada"): VoxTrans( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("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"): VoxTrans( + Simple("common.items.food.cheese"): VoxTrans( "voxel.object.cheese", (0.0, 0.0, 0.0), (-60.0, 27.0, 17.0), 0.7, ), - Consumable("common.items.food.blue_cheese"): VoxTrans( + Simple("common.items.food.blue_cheese"): VoxTrans( "voxel.object.blue_cheese", (0.0, 0.0, 0.0), (-60.0, -10.0, 0.0), 0.8, ), - Consumable("common.items.food.mushroom"): VoxTrans( + Simple("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( + Simple("common.items.mineral.ore.velorite"): VoxTrans( "voxel.sprite.velorite.velorite_ore", (0.0, -1.0, 0.0), (-50.0, 40.0, 20.0), 0.8, ), - Ingredient("VeloriteFrag"): VoxTrans( + Simple("common.items.mineral.ore.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"): VoxTrans( + Simple("common.items.food.apple_mushroom_curry"): VoxTrans( "voxel.object.mushroom_curry", (0.0, 0.0, 0.0), (-50.0, 20.0, 17.0), 0.9, ), - Consumable("common.items.food.spore_corruption"): VoxTrans( + Simple("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"): VoxTrans( + Simple("common.items.food.apple_stick"): VoxTrans( "voxel.object.apple_stick", (-0.5, -0.3, 0.0), (-55.0, 60.0, 5.0), 1.0, ), - Consumable("common.items.food.mushroom_stick"): VoxTrans( + Simple("common.items.food.mushroom_stick"): VoxTrans( "voxel.object.mushroom_stick", (0.3, 0.0, 0.0), (-55.0, 60.0, 5.0), 1.0, ), - Consumable("common.items.food.sunflower_icetea"): VoxTrans( + Simple("common.items.food.sunflower_icetea"): VoxTrans( "voxel.object.sunflower_ice_tea", (0.0, 0.0, 0.0), (-50.0, -60.0, -35.0), 0.9, ), - Consumable("common.items.food.carrot"): VoxTrans( + Simple("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( + Simple("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( + Simple("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( + Simple("common.items.food.meat.fish_raw"): VoxTrans( "voxel.sprite.food.meat.fish_raw", (0.1, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Consumable("common.items.food.meat.fish_cooked"): VoxTrans( + Simple("common.items.food.meat.fish_cooked"): VoxTrans( "voxel.sprite.food.meat.fish_cooked", (0.1, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Consumable("common.items.food.meat.bird_raw"): VoxTrans( + Simple("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( + Simple("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( + Simple("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( + Simple("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( + Simple("common.items.food.meat.beast_small_raw"): VoxTrans( "voxel.sprite.food.meat.beast_small_raw", (1.1, 0.0, 0.0), (-50.0, 30.0, 0.0), 1.0, ), - Consumable("common.items.food.meat.beast_small_cooked"): VoxTrans( + Simple("common.items.food.meat.beast_small_cooked"): VoxTrans( "voxel.sprite.food.meat.beast_small_cooked", (1.1, 0.0, 0.0), (-50.0, 30.0, 0.0), 1.0, ), - Consumable("common.items.food.meat.tough_raw"): VoxTrans( + Simple("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), 0.9, ), - Consumable("common.items.food.meat.tough_cooked"): VoxTrans( + Simple("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), 0.9, ), - Consumable("common.items.food.meat.beast_large_raw"): VoxTrans( + Simple("common.items.food.meat.beast_large_raw"): VoxTrans( "voxel.sprite.food.meat.beast_large_raw", (0.4, 0.0, 0.0), (-60.0, 35.0, 0.0), 0.9, ), - Consumable("common.items.food.meat.beast_large_cooked"): VoxTrans( + Simple("common.items.food.meat.beast_large_cooked"): VoxTrans( "voxel.sprite.food.meat.beast_large_cooked", (0.4, 0.0, 0.0), (-60.0, 35.0, 0.0), 0.9, ), - Consumable("common.items.food.plainsalad"): VoxTrans( + Simple("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( + Simple("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( + Simple("common.items.utility.bomb"): VoxTrans( "voxel.object.bomb", (0.0, 0.5, 0.0), (-50.0, 40.0, 20.0), 0.8, ), - Throwable(Firework(Blue)): VoxTrans( + Simple("common.items.utility.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( + Simple("common.items.utility.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( + Simple("common.items.utility.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( + Simple("common.items.utility.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( + Simple("common.items.utility.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( + Simple("common.items.utility.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( + Simple("common.items.utility.training_dummy"): 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( + Simple("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"): VoxTrans( + Simple("common.items.crafting_tools.sewing_set"): VoxTrans( "voxel.object.sewing_set", (0.0, -0.1, 0.0), (-45.0, 15.0, 15.0), 1.0, ), - Ingredient("Flower"): VoxTrans( + Simple("common.items.flowers.sunflower"): VoxTrans( "voxel.sprite.flowers.sunflower_1", (-2.0, -0.5, -1.0), (-60.0, 40.0, 20.0), 1.1, ), - Ingredient("FlowerRed"): VoxTrans( + Simple("common.items.flowers.red"): 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( + Simple("common.items.grasses.long"): VoxTrans( "voxel.sprite.grass.grass_long_5", (0.0, 0.0, 0.0), (-90.0, 50.0, 0.0), 1.0, ), - Ingredient("Stones"): VoxTrans( + Simple("common.items.crafting_ing.stones"): VoxTrans( "voxel.sprite.rocks.rock-0", (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8, ), - Ingredient("Cactus"): VoxTrans( + Simple("common.items.crafting_ing.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( + Simple("common.items.crafting_ing.seashells"): VoxTrans( "voxel.sprite.seashells.shell-0", (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8, ), - Ingredient("IcyShard"): VoxTrans( + Simple("common.items.crafting_ing.animal_misc.icy_fang"): VoxTrans( "voxel.object.ice_shard", (0.0, 0.0, 0.0), (10.0, -20.0, 30.0), 1.0, ), - Ingredient("FlayerBagDamaged"): VoxTrans( + Simple("common.items.crafting_ing.mindflayer_bag_damaged"): VoxTrans( "voxel.object.glowing_remains", (0.0, 0.0, 0.0), (-20.0, 20.0, .0), 0.9, ), - Ingredient("RaptorFeather"): VoxTrans( + Simple("common.items.crafting_ing.animal_misc.raptor_feather"): VoxTrans( "voxel.object.raptor_feather", (-0.2, 0.0, 0.0), (10.0, 30.0, -2.0), 1.0, ), - Ingredient("Twigs"): VoxTrans( + Simple("common.items.crafting_ing.twigs"): VoxTrans( "voxel.sprite.twigs.twigs-0", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("AnimalHide"): VoxTrans( + Simple("common.items.crafting_ing.hide.animal_hide"): 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( + Simple("common.items.crafting_ing.hide.tough_hide"): 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( + Simple("common.items.crafting_ing.hide.rugged_hide"): 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( + Simple("common.items.crafting_ing.leather.simple_leather"): 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( + Simple("common.items.crafting_ing.leather.thick_leather"): VoxTrans( "voxel.sprite.crafting_ing.leather.thick_leather", (-0.3, 0.0, 0.0), (-20.0, 15.0, 20.0), 0.9, ), - Ingredient("RigidLeather"): VoxTrans( + Simple("common.items.crafting_ing.leather.rigid_leather"): 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( + Simple("common.items.crafting_ing.hide.leather_troll"): 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( + Simple("common.items.crafting_ing.leather.leather_strips"): VoxTrans( "voxel.sprite.crafting_ing.leather.leather_strips", (0.5, 0.0, 0.0), (-20.0, 10.0, 60.0), 1.0, ), - Ingredient("Plate"): VoxTrans( + Simple("common.items.crafting_ing.hide.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( + Simple("common.items.crafting_ing.hide.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( + Simple("common.items.crafting_ing.hide.scales"): VoxTrans( "voxel.sprite.crafting_ing.hide.scale", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.8, ), - Ingredient("DragonScale"): VoxTrans( + Simple("common.items.crafting_ing.hide.dragon_scale"): 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( + Simple("common.items.crafting_ing.animal_misc.claw"): VoxTrans( "voxel.sprite.crafting_ing.animal_misc.claw", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("ElegantCrest"): VoxTrans( + Simple("common.items.crafting_ing.animal_misc.elegant_crest"): VoxTrans( "voxel.object.elegant_crest", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("VenomSac"): VoxTrans( + Simple("common.items.crafting_ing.animal_misc.venom_sac"): 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( + Simple("common.items.crafting_ing.animal_misc.lively_vine"): 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( + Simple("common.items.crafting_ing.animal_misc.sharp_fang"): VoxTrans( "voxel.sprite.crafting_ing.animal_misc.sharp_fang", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 1.0, ), - Ingredient("StrongPincer"): VoxTrans( + Simple("common.items.crafting_ing.animal_misc.strong_pincer"): VoxTrans( "voxel.object.strong_pincer", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("Fur"): VoxTrans( + Simple("common.items.crafting_ing.animal_misc.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( + Simple("common.items.crafting_ing.animal_misc.large_horn"): VoxTrans( "voxel.sprite.crafting_ing.animal_misc.large_horn", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("LongTusk"): VoxTrans( + Simple("common.items.crafting_ing.animal_misc.long_tusk"): VoxTrans( "voxel.object.long_tusk", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("GrimEyeball"): VoxTrans( + Simple("common.items.crafting_ing.animal_misc.grim_eyeball"): 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( + Simple("common.items.flowers.plant_fiber"): VoxTrans( "voxel.sprite.crafting_ing.plant_fiber", (0.0, 0.0, 0.0), (-20.0, 10.0, 20.0), 0.9, ), - Ingredient("Moonbell"): VoxTrans( + Simple("common.items.flowers.moonbell"): VoxTrans( "voxel.sprite.flowers.moonbell", (0.0, 0.0, 0.0), (-65.0, 40.0, 20.0), 0.9, ), - Ingredient("Pyrebloom"): VoxTrans( + Simple("common.items.flowers.pyrebloom"): VoxTrans( "voxel.sprite.flowers.pyrebloom", (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.9, ), - Ingredient("WildFlax"): VoxTrans( + Simple("common.items.flowers.wild_flax"): VoxTrans( "voxel.sprite.flowers.flax", (0.0, 0.0, 0.0), (-75.0, 0.0, 20.0), 0.8, ), - Ingredient("CottonBoll"): VoxTrans( + Simple("common.items.crafting_ing.cotton_boll"): VoxTrans( "voxel.sprite.crafting_ing.cotton_boll", (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, ), - Ingredient("Cotton"): VoxTrans( + Simple("common.items.crafting_ing.cloth.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( + Simple("common.items.crafting_ing.cloth.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( + Simple("common.items.crafting_ing.cloth.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( + Simple("common.items.crafting_ing.cloth.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( + Simple("common.items.crafting_ing.cloth.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( + Simple("common.items.crafting_ing.cloth.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( + Simple("common.items.crafting_ing.cloth.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( + Simple("common.items.crafting_ing.cloth.linen_red"): 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( + Simple("common.items.crafting_ing.sticky_thread"): VoxTrans( "voxel.sprite.crafting_ing.sticky_thread", (0.0, 0.0, 0.0), (-65.0, 0.0, 20.0), 0.9, ), - Ingredient("SilverIngot"): VoxTrans( + Simple("common.items.mineral.ingot.silver"): VoxTrans( "voxel.sprite.mineral.ingot.silver", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("GoldIngot"): VoxTrans( + Simple("common.items.mineral.ingot.gold"): VoxTrans( "voxel.sprite.mineral.ingot.gold", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("OrichalcumIngot"): VoxTrans( + Simple("common.items.mineral.ingot.orichalcum"): VoxTrans( "voxel.sprite.mineral.ingot.orichalcum", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("BloodsteelIngot"): VoxTrans( + Simple("common.items.mineral.ingot.bloodsteel"): VoxTrans( "voxel.sprite.mineral.ingot.bloodsteel", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("BronzeIngot"): VoxTrans( + Simple("common.items.mineral.ingot.bronze"): VoxTrans( "voxel.sprite.mineral.ingot.bronze", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("CobaltIngot"): VoxTrans( + Simple("common.items.mineral.ingot.cobalt"): VoxTrans( "voxel.sprite.mineral.ingot.cobalt", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("CopperIngot"): VoxTrans( + Simple("common.items.mineral.ingot.copper"): VoxTrans( "voxel.sprite.mineral.ingot.copper", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("IronIngot"): VoxTrans( + Simple("common.items.mineral.ingot.iron"): VoxTrans( "voxel.sprite.mineral.ingot.iron", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("SteelIngot"): VoxTrans( + Simple("common.items.mineral.ingot.steel"): VoxTrans( "voxel.sprite.mineral.ingot.steel", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("TinIngot"): VoxTrans( + Simple("common.items.mineral.ingot.tin"): VoxTrans( "voxel.sprite.mineral.ingot.tin", (0.0, 0.0, 0.0), (70.0, 30.0, 170.0), 0.85, ), - Ingredient("GoldOre"): VoxTrans( + Simple("common.items.mineral.ore.gold"): VoxTrans( "voxel.sprite.mineral.ore.gold", (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9, ), - Ingredient("SilverOre"): VoxTrans( + Simple("common.items.mineral.ore.silver"): VoxTrans( "voxel.sprite.mineral.ore.silver", (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9, ), - Ingredient("BloodstoneOre"): VoxTrans( + Simple("common.items.mineral.ore.bloodstone"): VoxTrans( "voxel.sprite.mineral.ore.bloodstone", (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9, ), - Ingredient("CobaltOre"): VoxTrans( + Simple("common.items.mineral.ore.cobalt"): VoxTrans( "voxel.sprite.mineral.ore.cobalt", (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9, ), - Ingredient("CopperOre"): VoxTrans( + Simple("common.items.mineral.ore.copper"): VoxTrans( "voxel.sprite.mineral.ore.copper", (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9, ), - Ingredient("IronOre"): VoxTrans( + Simple("common.items.mineral.ore.iron"): VoxTrans( "voxel.sprite.mineral.ore.iron", (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9, ), - Ingredient("TinOre"): VoxTrans( + Simple("common.items.mineral.ore.tin"): VoxTrans( "voxel.sprite.mineral.ore.tin", (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9, ), - Ingredient("Coal"): VoxTrans( + Simple("common.items.mineral.stone.coal"): VoxTrans( "voxel.sprite.mineral.ore.coal", (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9, ), - Ingredient("Honey"): VoxTrans( + Simple("common.items.mineral.ore.coal"): VoxTrans( + "voxel.sprite.mineral.ore.coal", + (0.0, 0.0, 0.0), (-60.0, 30.0, 15.0), 0.9, + ), + Simple("common.items.crafting_ing.honey"): VoxTrans( "voxel.object.honey", (1.0, 0.0, 0.0), (-20.0, 20.0, -30.0), 0.9, ), - Ingredient("MortarPestle"): VoxTrans( + Simple("common.items.crafting_tools.mortar_pestle"): VoxTrans( "voxel.object.mortar_pestle", (0.0, 0.0, 0.0), (-40.0, 15.0, 17.0), 0.8, ), - Ingredient("EmptyVial"): VoxTrans( + Simple("common.items.crafting_ing.empty_vial"): VoxTrans( "voxel.object.potion_empty", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Ingredient("Bowl"): VoxTrans( + Simple("common.items.crafting_ing.bowl"): VoxTrans( "voxel.sprite.crafting_ing.bowl", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Ingredient("Oil"): VoxTrans( + Simple("common.items.crafting_ing.oil"): VoxTrans( "voxel.sprite.crafting_ing.oil", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Ingredient("ViscousOoze"): VoxTrans( + Simple("common.items.crafting_ing.animal_misc.viscous_ooze"): 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( + Simple("common.items.crafting_ing.animal_misc.phoenix_feather"): VoxTrans( "voxel.sprite.crafting_ing.animal_misc.phoenix_feather", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.2, ), - Ingredient("Bamboo"): VoxTrans( + Simple("common.items.log.bamboo"): VoxTrans( "voxel.sprite.wood.item.bamboo", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Ingredient("EldwoodLogs"): VoxTrans( + Simple("common.items.log.eldwood"): VoxTrans( "voxel.sprite.wood.item.eldwood", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Ingredient("FrostwoodLogs"): VoxTrans( + Simple("common.items.log.frostwood"): VoxTrans( "voxel.sprite.wood.item.frostwood", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Ingredient("HardwoodLogs"): VoxTrans( + Simple("common.items.log.hardwood"): VoxTrans( "voxel.sprite.wood.item.hardwood", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Ingredient("IronwoodLogs"): VoxTrans( + Simple("common.items.log.ironwood"): VoxTrans( "voxel.sprite.wood.item.ironwood", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), - Ingredient("WoodLogs"): VoxTrans( + Simple("common.items.log.wood"): VoxTrans( "voxel.sprite.wood.item.wood", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), // Gliders - Glider("Starter"): VoxTrans( + Simple("common.items.glider.cloverleaf"): VoxTrans( "voxel.glider.starter", (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, ), - Glider("PlainCloth"): VoxTrans( + Simple("common.items.glider.basic_white"): VoxTrans( "voxel.glider.basic_white", (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, ), - Glider("RedCloth"): VoxTrans( + Simple("common.items.glider.basic_red"): VoxTrans( "voxel.glider.basic_red", (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, ), - Glider("Blue0"): VoxTrans( + Simple("common.items.glider.blue"): VoxTrans( "voxel.glider.blue", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("ButterflyMorpho"): VoxTrans( + Simple("common.items.glider.morpho"): VoxTrans( "voxel.glider.butterfly1", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("ButterflyMonarch"): VoxTrans( + Simple("common.items.glider.monarch"): VoxTrans( "voxel.glider.butterfly2", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("ButterflyLove"): VoxTrans( + Simple("common.items.glider.butterfly3"): VoxTrans( "voxel.glider.butterfly3", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("MothLuna"): VoxTrans( + Simple("common.items.glider.moth"): VoxTrans( "voxel.glider.moth", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("SandRaptor"): VoxTrans( + Simple("common.items.glider.sandraptor"): VoxTrans( "voxel.glider.sandraptor", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("SnowRaptor"): VoxTrans( + Simple("common.items.glider.snowraptor"): VoxTrans( "voxel.glider.snowraptor", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("WoodRaptor"): VoxTrans( + Simple("common.items.glider.woodraptor"): VoxTrans( "voxel.glider.woodraptor", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("Sunset"): VoxTrans( + Simple("common.items.glider.sunset"): VoxTrans( "voxel.glider.sunset", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("Moonrise"): VoxTrans( + Simple("common.items.glider.moonrise"): VoxTrans( "voxel.glider.moonrise", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("Purple0"): VoxTrans( + Simple("common.items.glider.skullgrin"): VoxTrans( "voxel.glider.cultists", (5.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), - Glider("Leaves"): VoxTrans( + Simple("common.items.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( + Simple("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, ), // Misc - Tool("common.items.weapons.tool.golf_club"): VoxTrans( + Simple("common.items.weapons.tool.golf_club"): VoxTrans( "voxel.weapon.tool.golf_club", (2.0, -1.0, 0.0), (-135.0, 25.0, 0.0), 1.1, ), // Gems - Ingredient("Amethyst"): VoxTrans( + Simple("common.items.mineral.gem.amethyst"): VoxTrans( "voxel.sprite.mineral.gem.amethystgem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), - Ingredient("Topaz"): VoxTrans( + Simple("common.items.mineral.gem.topaz"): VoxTrans( "voxel.sprite.mineral.gem.topazgem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), - Ingredient("Sapphire"): VoxTrans( + Simple("common.items.mineral.gem.sapphire"): VoxTrans( "voxel.sprite.mineral.gem.sapphiregem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.6, ), - Ingredient("Emerald"): VoxTrans( + Simple("common.items.mineral.gem.emerald"): VoxTrans( "voxel.sprite.mineral.gem.emeraldgem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), - Ingredient("Ruby"): VoxTrans( + Simple("common.items.mineral.gem.ruby"): VoxTrans( "voxel.sprite.mineral.gem.rubygem", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), - Ingredient("Diamond"): VoxTrans( + Simple("common.items.mineral.gem.diamond"): VoxTrans( "voxel.sprite.mineral.gem.diamondgem", (0.0, 0.0, 0.0), (-55.0, 30.0, 20.0), 0.6, ), @@ -3731,15 +3740,15 @@ "voxel.weapon.component.sword.zweihander.orichalcum", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.sword.long"): VoxTrans( + Simple("common.items.modular.weapon.secondary.sword.long"): VoxTrans( "voxel.weapon.component.sword.hilt.long", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 0.7, ), - Tool("common.items.modular.weapon.secondary.sword.medium"): VoxTrans( + Simple("common.items.modular.weapon.secondary.sword.medium"): VoxTrans( "voxel.weapon.component.sword.hilt.medium", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 0.7, ), - Tool("common.items.modular.weapon.secondary.sword.short"): VoxTrans( + Simple("common.items.modular.weapon.secondary.sword.short"): VoxTrans( "voxel.weapon.component.sword.hilt.short", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 0.7, ), @@ -3912,15 +3921,15 @@ "voxel.weapon.component.axe.poleaxe.orichalcum", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.axe.long"): VoxTrans( + Simple("common.items.modular.weapon.secondary.axe.long"): VoxTrans( "voxel.weapon.component.axe.haft.long", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.axe.medium"): VoxTrans( + Simple("common.items.modular.weapon.secondary.axe.medium"): VoxTrans( "voxel.weapon.component.axe.haft.medium", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.axe.short"): VoxTrans( + Simple("common.items.modular.weapon.secondary.axe.short"): VoxTrans( "voxel.weapon.component.axe.haft.short", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 1.0, ), @@ -4093,15 +4102,15 @@ "voxel.weapon.component.hammer.warhammer.orichalcum", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.hammer.long"): VoxTrans( + Simple("common.items.modular.weapon.secondary.hammer.long"): VoxTrans( "voxel.weapon.component.hammer.shaft.long", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.hammer.medium"): VoxTrans( + Simple("common.items.modular.weapon.secondary.hammer.medium"): VoxTrans( "voxel.weapon.component.hammer.shaft.medium", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.hammer.short"): VoxTrans( + Simple("common.items.modular.weapon.secondary.hammer.short"): VoxTrans( "voxel.weapon.component.hammer.shaft.short", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 1.0, ), @@ -4274,15 +4283,15 @@ "voxel.weapon.component.bow.warbow.eldwood", (0.0, 0.0, 0.0), (0.0, 90.0, 0.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.bow.long"): VoxTrans( + Simple("common.items.modular.weapon.secondary.bow.long"): VoxTrans( "voxel.weapon.component.bow.grip.long", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 0.7, ), - Tool("common.items.modular.weapon.secondary.bow.medium"): VoxTrans( + Simple("common.items.modular.weapon.secondary.bow.medium"): VoxTrans( "voxel.weapon.component.bow.grip.medium", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 0.7, ), - Tool("common.items.modular.weapon.secondary.bow.short"): VoxTrans( + Simple("common.items.modular.weapon.secondary.bow.short"): VoxTrans( "voxel.weapon.component.bow.grip.short", (0.0, 0.0, 0.0), (180.0, 210.0, 135.0), 0.7, ), @@ -4455,15 +4464,15 @@ "voxel.weapon.component.staff.staff.eldwood", (0.0, 0.0, 0.0), (-130.0, 90.0, 0.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.staff.heavy"): VoxTrans( + Simple("common.items.modular.weapon.secondary.staff.heavy"): VoxTrans( "voxel.weapon.component.staff.core.heavy", (0.0, 0.0, 0.0), (-100.0, 210.0, 15.0), 0.7, ), - Tool("common.items.modular.weapon.secondary.staff.medium"): VoxTrans( + Simple("common.items.modular.weapon.secondary.staff.medium"): VoxTrans( "voxel.weapon.component.staff.core.medium", (0.0, 0.0, 0.0), (-100.0, 210.0, 15.0), 0.7, ), - Tool("common.items.modular.weapon.secondary.staff.light"): VoxTrans( + Simple("common.items.modular.weapon.secondary.staff.light"): VoxTrans( "voxel.weapon.component.staff.core.light", (0.0, 0.0, 0.0), (-100.0, 210.0, 15.0), 0.7, ), @@ -4636,15 +4645,15 @@ "voxel.weapon.component.sceptre.sceptre.eldwood", (0.0, 0.0, 0.0), (-130.0, 90.0, 0.0), 1.0, ), - Tool("common.items.modular.weapon.secondary.sceptre.heavy"): VoxTrans( + Simple("common.items.modular.weapon.secondary.sceptre.heavy"): VoxTrans( "voxel.weapon.component.sceptre.core.heavy", (0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 0.7, ), - Tool("common.items.modular.weapon.secondary.sceptre.medium"): VoxTrans( + Simple("common.items.modular.weapon.secondary.sceptre.medium"): VoxTrans( "voxel.weapon.component.sceptre.core.medium", (0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 0.7, ), - Tool("common.items.modular.weapon.secondary.sceptre.light"): VoxTrans( + Simple("common.items.modular.weapon.secondary.sceptre.light"): VoxTrans( "voxel.weapon.component.sceptre.core.light", (0.0, 0.0, 0.0), (-100.0, 250.0, 15.0), 0.7, ), diff --git a/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron b/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron index 61d082d9de..890b349daf 100644 --- a/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_chest_manifest.ron @@ -3,76 +3,76 @@ vox_spec: ("armor_none", (-5.0, -3.5, 1.0)), ), map: { - "Gnome": ( + "common.items.npc_armor.biped_small.gnome.chest.gnome": ( vox_spec: ("npc.gnome.male.chest", (-5.0, -3.0, -2.5)), ), - "SahaginSpearman": ( + "common.items.npc_armor.biped_small.sahagin.chest.spearman": ( vox_spec: ("npc.sahagin.spearman.chest", (-4.5, -8.0, -8.0)), ), - "SahaginSorcerer": ( + "common.items.npc_armor.biped_small.sahagin.chest.sorcerer": ( vox_spec: ("npc.sahagin.sorcerer.chest", (-4.5, -8.0, -8.0)), ), - "SahaginSniper": ( + "common.items.npc_armor.biped_small.sahagin.chest.sniper": ( vox_spec: ("npc.sahagin.sniper.chest", (-4.5, -8.0, -8.0)), ), - "AdletHunter": ( + "common.items.npc_armor.biped_small.adlet.chest.hunter": ( vox_spec: ("npc.adlet.hunter.chest", (-5.0, -3.5, -2.0)), ), - "AdletIcepicker": ( + "common.items.npc_armor.biped_small.adlet.chest.icepicker": ( vox_spec: ("npc.adlet.icepicker.chest", (-5.0, -3.5, -2.0)), ), - "AdletTracker": ( + "common.items.npc_armor.biped_small.adlet.chest.tracker": ( vox_spec: ("npc.adlet.tracker.chest", (-5.0, -3.5, -2.0)), ), - "GnarlingMugger": ( + "common.items.npc_armor.biped_small.gnarling.chest.mugger": ( vox_spec: ("npc.gnarling.mugger.chest", (-4.5, -3.5, -2.5)), ), - "GnarlingStalker": ( + "common.items.npc_armor.biped_small.gnarling.chest.stalker": ( vox_spec: ("npc.gnarling.stalker.chest", (-4.5, -3.5, -2.5)), ), - "GnarlingLogger": ( + "common.items.npc_armor.biped_small.gnarling.chest.logger": ( vox_spec: ("npc.gnarling.logger.chest", (-4.5, -3.5, -2.5)), ), - "GnarlingChieftain": ( + "common.items.npc_armor.biped_small.gnarling.chest.chieftain": ( vox_spec: ("npc.gnarling.chieftain.chest", (-4.5, -3.5, -1.0)), ), - "Mandragora": ( + "common.items.npc_armor.biped_small.mandragora.chest.mandragora": ( vox_spec: ("npc.mandragora.male.chest", (-11.0, -11.0, 0.0)), ), - "Kappa": ( + "common.items.npc_armor.biped_small.kappa.chest.kappa": ( vox_spec: ("npc.kappa.male.chest", (-6.5, -8.0, -7.0)), ), "Cactid": ( vox_spec: ("npc.cactid.male.chest", (-3.0, -3.0, -2.5)), ), - "GnollShaman": ( + "common.items.npc_armor.biped_small.gnoll.chest.shaman": ( vox_spec: ("npc.gnoll.shaman.chest", (-5.0, -4.5, -6.0)), ), - "GnollRogue": ( + "common.items.npc_armor.biped_small.gnoll.chest.rogue": ( vox_spec: ("npc.gnoll.rogue.chest", (-5.0, -4.5, -6.0)), ), - "GnollTrapper": ( + "common.items.npc_armor.biped_small.gnoll.chest.trapper": ( vox_spec: ("npc.gnoll.trapper.chest", (-5.0, -4.5, -6.0)), ), - "HaniwaGuard": ( + "common.items.npc_armor.biped_small.haniwa.chest.guard": ( vox_spec: ("npc.haniwa.guard.chest", (-6.5, -4.0, -3.0)), ), - "HaniwaArcher": ( + "common.items.npc_armor.biped_small.haniwa.chest.archer": ( vox_spec: ("npc.haniwa.archer.chest", (-6.5, -4.0, -3.0)), ), - "HaniwaSoldier": ( + "common.items.npc_armor.biped_small.haniwa.chest.soldier": ( vox_spec: ("npc.haniwa.soldier.chest", (-6.5, -4.0, -3.0)), ), - "MyrmidonHoplite": ( + "common.items.npc_armor.biped_small.myrmidon.chest.hoplite": ( vox_spec: ("npc.myrmidon.hoplite.chest", (-5.5, -4.0, -3.0)), ), - "MyrmidonStrategian": ( + "common.items.npc_armor.biped_small.myrmidon.chest.strategian": ( vox_spec: ("npc.myrmidon.strategian.chest", (-5.5, -4.0, -3.0)), ), - "MyrmidonMarksman": ( + "common.items.npc_armor.biped_small.myrmidon.chest.marksman": ( vox_spec: ("npc.myrmidon.marksman.chest", (-5.5, -4.0, -3.0)), ), - "Husk": ( + "common.items.npc_armor.biped_small.husk.chest.husk": ( vox_spec: ("npc.husk.male.chest", (-6.0, -4.5, -4.0)), ), }, diff --git a/assets/voxygen/voxel/biped_small_armor_foot_manifest.ron b/assets/voxygen/voxel/biped_small_armor_foot_manifest.ron index 66324f4d89..756663b8c2 100644 --- a/assets/voxygen/voxel/biped_small_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_foot_manifest.ron @@ -8,7 +8,7 @@ ) ), map: { - "Gnome": ( + "common.items.npc_armor.biped_small.gnome.foot.gnome": ( left: ( vox_spec: ("npc.gnome.male.foot_r", (-1.5, -2.0, -4.0)), ), @@ -16,7 +16,7 @@ vox_spec: ("npc.gnome.male.foot_r", (-1.5, -2.0, -4.0)), ) ), - "SahaginSpearman": ( + "common.items.npc_armor.biped_small.sahagin.foot.spearman": ( left: ( vox_spec: ("npc.sahagin.spearman.foot_r", (-2.5, -2.0, -8.0)), ), @@ -24,7 +24,7 @@ vox_spec: ("npc.sahagin.spearman.foot_r", (-2.5, -2.0, -8.0)), ) ), - "SahaginSorcerer": ( + "common.items.npc_armor.biped_small.sahagin.foot.sorcerer": ( left: ( vox_spec: ("npc.sahagin.sorcerer.foot_r", (-2.5, -2.0, -8.0)), ), @@ -32,7 +32,7 @@ vox_spec: ("npc.sahagin.sorcerer.foot_r", (-2.5, -2.0, -8.0)), ) ), - "SahaginSniper": ( + "common.items.npc_armor.biped_small.sahagin.foot.sniper": ( left: ( vox_spec: ("npc.sahagin.sniper.foot_r", (-2.5, -2.0, -8.0)), ), @@ -40,7 +40,7 @@ vox_spec: ("npc.sahagin.sniper.foot_r", (-2.5, -2.0, -8.0)), ) ), - "AdletHunter": ( + "common.items.npc_armor.biped_small.adlet.foot.hunter": ( left: ( vox_spec: ("npc.adlet.hunter.foot_r", (-1.5, -3.0, -7.0)), ), @@ -48,7 +48,7 @@ vox_spec: ("npc.adlet.hunter.foot_r", (-1.5, -3.0, -7.0)), ) ), - "AdletTracker": ( + "common.items.npc_armor.biped_small.adlet.foot.tracker": ( left: ( vox_spec: ("npc.adlet.tracker.foot_r", (-1.5, -3.0, -7.0)), ), @@ -56,7 +56,7 @@ vox_spec: ("npc.adlet.tracker.foot_r", (-1.5, -3.0, -7.0)), ) ), - "AdletIcepicker": ( + "common.items.npc_armor.biped_small.adlet.foot.icepicker": ( left: ( vox_spec: ("npc.adlet.icepicker.foot_r", (-1.5, -3.0, -7.0)), ), @@ -64,7 +64,7 @@ vox_spec: ("npc.adlet.icepicker.foot_r", (-1.5, -3.0, -7.0)), ) ), - "GnarlingMugger": ( + "common.items.npc_armor.biped_small.gnarling.foot.mugger": ( left: ( vox_spec: ("npc.gnarling.mugger.foot_r", (-1.0, -2.0, -5.0)), ), @@ -72,7 +72,7 @@ vox_spec: ("npc.gnarling.mugger.foot_r", (-1.0, -2.0, -5.0)), ) ), - "GnarlingStalker": ( + "common.items.npc_armor.biped_small.gnarling.foot.stalker": ( left: ( vox_spec: ("npc.gnarling.stalker.foot_r", (-1.0, -2.0, -5.0)), ), @@ -80,7 +80,7 @@ vox_spec: ("npc.gnarling.stalker.foot_r", (-1.0, -2.0, -5.0)), ) ), - "GnarlingLogger": ( + "common.items.npc_armor.biped_small.gnarling.foot.logger": ( left: ( vox_spec: ("npc.gnarling.logger.foot_r", (-1.0, -2.0, -5.0)), ), @@ -88,7 +88,7 @@ vox_spec: ("npc.gnarling.logger.foot_r", (-1.0, -2.0, -5.0)), ) ), - "GnarlingChieftain": ( + "common.items.npc_armor.biped_small.gnarling.foot.chieftain": ( left: ( vox_spec: ("npc.gnarling.chieftain.foot_r", (-1.0, -2.0, -5.0)), ), @@ -96,7 +96,7 @@ vox_spec: ("npc.gnarling.chieftain.foot_r", (-1.0, -2.0, -5.0)), ) ), - "Mandragora": ( + "common.items.npc_armor.biped_small.mandragora.foot.mandragora": ( left: ( vox_spec: ("npc.mandragora.male.foot_r", (-1.0, -1.5, -4.0)), ), @@ -104,7 +104,7 @@ vox_spec: ("npc.mandragora.male.foot_r", (-1.0, -1.5, -4.0)), ) ), - "Kappa": ( + "common.items.npc_armor.biped_small.kappa.foot.kappa": ( left: ( vox_spec: ("npc.kappa.male.foot_r", (-2.5, -3.0, -9.0)), ), @@ -120,7 +120,7 @@ vox_spec: ("npc.cactid.male.foot_r", (-1.5, -2.0, -5.0)), ) ), - "GnollRogue": ( + "common.items.npc_armor.biped_small.gnoll.foot.rogue": ( left: ( vox_spec: ("npc.gnoll.rogue.foot_r", (-1.5, -3.0, -7.0)), ), @@ -128,7 +128,7 @@ vox_spec: ("npc.gnoll.rogue.foot_r", (-1.5, -3.0, -7.0)), ) ), - "GnollTrapper": ( + "common.items.npc_armor.biped_small.gnoll.foot.trapper": ( left: ( vox_spec: ("npc.gnoll.trapper.foot_r", (-1.5, -3.0, -7.0)), ), @@ -136,7 +136,7 @@ vox_spec: ("npc.gnoll.trapper.foot_r", (-1.5, -3.0, -7.0)), ) ), - "GnollShaman": ( + "common.items.npc_armor.biped_small.gnoll.foot.shaman": ( left: ( vox_spec: ("npc.gnoll.shaman.foot_r", (-1.5, -3.0, -7.0)), ), @@ -144,7 +144,7 @@ vox_spec: ("npc.gnoll.shaman.foot_r", (-1.5, -3.0, -7.0)), ) ), - "HaniwaGuard": ( + "common.items.npc_armor.biped_small.haniwa.foot.guard": ( left: ( vox_spec: ("npc.haniwa.guard.foot_r", (-2.0, -2.5, -8.0)), ), @@ -152,7 +152,7 @@ vox_spec: ("npc.haniwa.guard.foot_r", (-2.0, -2.5, -8.0)), ) ), - "HaniwaArcher": ( + "common.items.npc_armor.biped_small.haniwa.foot.archer": ( left: ( vox_spec: ("npc.haniwa.archer.foot_r", (-2.0, -2.5, -8.0)), ), @@ -160,7 +160,7 @@ vox_spec: ("npc.haniwa.archer.foot_r", (-2.0, -2.5, -8.0)), ) ), - "HaniwaSoldier": ( + "common.items.npc_armor.biped_small.haniwa.foot.soldier": ( left: ( vox_spec: ("npc.haniwa.soldier.foot_r", (-2.0, -2.5, -8.0)), ), @@ -168,7 +168,7 @@ vox_spec: ("npc.haniwa.soldier.foot_r", (-2.0, -2.5, -8.0)), ) ), - "MyrmidonHoplite": ( + "common.items.npc_armor.biped_small.myrmidon.foot.hoplite": ( left: ( vox_spec: ("npc.myrmidon.hoplite.foot_r", (-1.5, -2.5, -7.0)), ), @@ -176,7 +176,7 @@ vox_spec: ("npc.myrmidon.hoplite.foot_r", (-1.5, -2.5, -7.0)), ) ), - "MyrmidonMarksman": ( + "common.items.npc_armor.biped_small.myrmidon.foot.marksman": ( left: ( vox_spec: ("npc.myrmidon.marksman.foot_r", (-1.5, -2.5, -7.0)), ), @@ -184,7 +184,7 @@ vox_spec: ("npc.myrmidon.marksman.foot_r", (-1.5, -2.5, -7.0)), ) ), - "MyrmidonStrategian": ( + "common.items.npc_armor.biped_small.myrmidon.foot.strategian": ( left: ( vox_spec: ("npc.myrmidon.strategian.foot_r", (-1.5, -2.5, -7.0)), ), @@ -192,7 +192,7 @@ vox_spec: ("npc.myrmidon.strategian.foot_r", (-1.5, -2.5, -7.0)), ) ), - "Husk": ( + "common.items.npc_armor.biped_small.husk.foot.husk": ( left: ( vox_spec: ("npc.husk.male.foot_r", (-2.0, -3.5, -7.0)), ), diff --git a/assets/voxygen/voxel/biped_small_armor_hand_manifest.ron b/assets/voxygen/voxel/biped_small_armor_hand_manifest.ron index 9b1f543ff4..4eaf9a28bf 100644 --- a/assets/voxygen/voxel/biped_small_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_hand_manifest.ron @@ -8,7 +8,7 @@ ) ), map: { - "Gnome": ( + "common.items.npc_armor.biped_small.gnome.hand.gnome": ( left: ( vox_spec: ("npc.gnome.male.hand_r", (-4.0, -2.0, -5.0)), ), @@ -16,7 +16,7 @@ vox_spec: ("npc.gnome.male.hand_r", (0.0, -2.0, -5.0)), ) ), - "SahaginSpearman": ( + "common.items.npc_armor.biped_small.sahagin.hand.spearman": ( left: ( vox_spec: ("npc.sahagin.spearman.hand_r", (-7.0, -4.0, -13.0)), ), @@ -24,7 +24,7 @@ vox_spec: ("npc.sahagin.spearman.hand_r", (0.0, -4.0, -13.0)), ) ), - "SahaginSorcerer": ( + "common.items.npc_armor.biped_small.sahagin.hand.sorcerer": ( left: ( vox_spec: ("npc.sahagin.sorcerer.hand_r", (-7.0, -4.0, -13.0)), ), @@ -32,7 +32,7 @@ vox_spec: ("npc.sahagin.sorcerer.hand_r", (0.0, -4.0, -13.0)), ) ), - "SahaginSniper": ( + "common.items.npc_armor.biped_small.sahagin.hand.sniper": ( left: ( vox_spec: ("npc.sahagin.sniper.hand_r", (-7.0, -4.0, -13.0)), ), @@ -40,7 +40,7 @@ vox_spec: ("npc.sahagin.sniper.hand_r", (0.0, -4.0, -13.0)), ) ), - "AdletTracker": ( + "common.items.npc_armor.biped_small.adlet.hand.tracker": ( left: ( vox_spec: ("npc.adlet.tracker.hand_r", (-4.0, -2.0, -7.0)), ), @@ -48,7 +48,7 @@ vox_spec: ("npc.adlet.tracker.hand_r", (0.0, -2.0, -7.0)), ) ), - "AdletHunter": ( + "common.items.npc_armor.biped_small.adlet.hand.hunter": ( left: ( vox_spec: ("npc.adlet.hunter.hand_r", (-4.0, -2.0, -7.0)), ), @@ -56,7 +56,7 @@ vox_spec: ("npc.adlet.hunter.hand_r", (0.0, -2.0, -7.0)), ) ), - "AdletIcepicker": ( + "common.items.npc_armor.biped_small.adlet.hand.icepicker": ( left: ( vox_spec: ("npc.adlet.icepicker.hand_r", (-4.0, -2.0, -7.0)), ), @@ -64,7 +64,7 @@ vox_spec: ("npc.adlet.icepicker.hand_r", (0.0, -2.0, -7.0)), ) ), - "GnarlingMugger": ( + "common.items.npc_armor.biped_small.gnarling.hand.mugger": ( left: ( vox_spec: ("npc.gnarling.mugger.hand_r", (-3.0, -1.5, -7.0)), ), @@ -72,7 +72,7 @@ vox_spec: ("npc.gnarling.mugger.hand_r", (0.0, -1.5, -7.0)), ) ), - "GnarlingStalker": ( + "common.items.npc_armor.biped_small.gnarling.hand.stalker": ( left: ( vox_spec: ("npc.gnarling.stalker.hand_r", (-3.0, -1.5, -7.0)), ), @@ -80,7 +80,7 @@ vox_spec: ("npc.gnarling.stalker.hand_r", (0.0, -1.5, -7.0)), ) ), - "GnarlingLogger": ( + "common.items.npc_armor.biped_small.gnarling.hand.logger": ( left: ( vox_spec: ("npc.gnarling.logger.hand_r", (-3.0, -1.5, -7.0)), ), @@ -88,7 +88,7 @@ vox_spec: ("npc.gnarling.logger.hand_r", (0.0, -1.5, -7.0)), ) ), - "GnarlingChieftain": ( + "common.items.npc_armor.biped_small.gnarling.hand.chieftain": ( left: ( vox_spec: ("npc.gnarling.chieftain.hand_r", (-3.5, -0.5, -8.0)), ), @@ -96,7 +96,7 @@ vox_spec: ("npc.gnarling.chieftain.hand_r", (-0.5, -0.5, -8.0)), ) ), - "Mandragora": ( + "common.items.npc_armor.biped_small.mandragora.hand.mandragora": ( left: ( vox_spec: ("npc.mandragora.male.hand_r", (-4.0, -1.5, -7.0)), ), @@ -104,7 +104,7 @@ vox_spec: ("npc.mandragora.male.hand_r", (0.0, -1.5, -7.0)), ) ), - "Kappa": ( + "common.items.npc_armor.biped_small.kappa.hand.kappa": ( left: ( vox_spec: ("npc.kappa.male.hand_r", (-6.0, -4.0, -12.0)), ), @@ -120,7 +120,7 @@ vox_spec: ("npc.cactid.male.hand_r", (0.0, -1.5, -2.5)), ) ), - "GnollRogue": ( + "common.items.npc_armor.biped_small.gnoll.hand.rogue": ( left: ( vox_spec: ("npc.gnoll.rogue.hand_r", (-6.0, -2.0, -9.0)), ), @@ -128,7 +128,7 @@ vox_spec: ("npc.gnoll.rogue.hand_r", (0.0, -2.0, -9.0)), ) ), - "GnollTrapper": ( + "common.items.npc_armor.biped_small.gnoll.hand.trapper": ( left: ( vox_spec: ("npc.gnoll.trapper.hand_r", (-6.0, -2.0, -9.0)), ), @@ -136,7 +136,7 @@ vox_spec: ("npc.gnoll.trapper.hand_r", (0.0, -2.0, -9.0)), ) ), - "GnollShaman": ( + "common.items.npc_armor.biped_small.gnoll.hand.shaman": ( left: ( vox_spec: ("npc.gnoll.shaman.hand_r", (-6.0, -2.0, -9.0)), ), @@ -144,7 +144,7 @@ vox_spec: ("npc.gnoll.shaman.hand_r", (0.0, -2.0, -9.0)), ) ), - "HaniwaGuard": ( + "common.items.npc_armor.biped_small.haniwa.hand.guard": ( left: ( vox_spec: ("npc.haniwa.guard.hand_r", (-4.0, -2.0, -8.0)), ), @@ -152,7 +152,7 @@ vox_spec: ("npc.haniwa.guard.hand_r", (0.0, -2.0, -8.0)), ) ), - "HaniwaArcher": ( + "common.items.npc_armor.biped_small.haniwa.hand.archer": ( left: ( vox_spec: ("npc.haniwa.archer.hand_r", (-4.0, -2.0, -8.0)), ), @@ -160,7 +160,7 @@ vox_spec: ("npc.haniwa.archer.hand_r", (0.0, -2.0, -8.0)), ) ), - "HaniwaSoldier": ( + "common.items.npc_armor.biped_small.haniwa.hand.soldier": ( left: ( vox_spec: ("npc.haniwa.soldier.hand_r", (-4.0, -2.0, -8.0)), ), @@ -168,7 +168,7 @@ vox_spec: ("npc.haniwa.soldier.hand_r", (0.0, -2.0, -8.0)), ) ), - "MyrmidonHoplite": ( + "common.items.npc_armor.biped_small.myrmidon.hand.hoplite": ( left: ( vox_spec: ("npc.myrmidon.hoplite.hand_r", (-5.0, -2.0, -9.0)), ), @@ -176,7 +176,7 @@ vox_spec: ("npc.myrmidon.hoplite.hand_r", (0.0, -2.0, -9.0)), ) ), - "MyrmidonMarksman": ( + "common.items.npc_armor.biped_small.myrmidon.hand.marksman": ( left: ( vox_spec: ("npc.myrmidon.marksman.hand_r", (-5.0, -2.0, -9.0)), ), @@ -184,7 +184,7 @@ vox_spec: ("npc.myrmidon.marksman.hand_r", (0.0, -2.0, -9.0)), ) ), - "MyrmidonStrategian": ( + "common.items.npc_armor.biped_small.myrmidon.hand.strategian": ( left: ( vox_spec: ("npc.myrmidon.strategian.hand_r", (-5.0, -2.0, -9.0)), ), @@ -192,7 +192,7 @@ vox_spec: ("npc.myrmidon.strategian.hand_r", (0.0, -2.0, -9.0)), ) ), - "Husk": ( + "common.items.npc_armor.biped_small.husk.hand.husk": ( left: ( vox_spec: ("npc.husk.male.hand_r", (-7.0, -2.5, -10.0)), ), diff --git a/assets/voxygen/voxel/biped_small_armor_head_manifest.ron b/assets/voxygen/voxel/biped_small_armor_head_manifest.ron index 83b0f13b4f..ed3104e699 100644 --- a/assets/voxygen/voxel/biped_small_armor_head_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_head_manifest.ron @@ -3,76 +3,76 @@ vox_spec: ("armor.empty", (0.0, 0.0, 0.0)), ), map: { - "Gnome": ( + "common.items.npc_armor.biped_small.gnome.head.gnome": ( vox_spec: ("npc.gnome.male.head", (-8.0, -6.5, -12.0)), ), - "SahaginSpearman": ( + "common.items.npc_armor.biped_small.sahagin.head.spearman": ( vox_spec: ("npc.sahagin.spearman.head", (-2.5, 0.0, -4.5)), ), - "SahaginSorcerer": ( + "common.items.npc_armor.biped_small.sahagin.head.sorcerer": ( vox_spec: ("npc.sahagin.sorcerer.head", (-2.5, 0.0, -4.5)), ), - "SahaginSniper": ( + "common.items.npc_armor.biped_small.sahagin.head.sniper": ( vox_spec: ("npc.sahagin.sniper.head", (-2.5, 0.0, -4.5)), ), - "AdletHunter": ( + "common.items.npc_armor.biped_small.adlet.head.hunter": ( vox_spec: ("npc.adlet.hunter.head", (-7.0, -4.5, -6.0)), ), - "AdletTracker": ( + "common.items.npc_armor.biped_small.adlet.head.tracker": ( vox_spec: ("npc.adlet.tracker.head", (-7.0, -4.5, -6.0)), ), - "AdletIcepicker": ( + "common.items.npc_armor.biped_small.adlet.head.icepicker": ( vox_spec: ("npc.adlet.icepicker.head", (-7.0, -4.5, -6.0)), ), - "GnarlingMugger": ( + "common.items.npc_armor.biped_small.gnarling.head.mugger": ( vox_spec: ("npc.gnarling.mugger.head", (-6.5, -5.5, -4.5)), ), - "GnarlingStalker": ( + "common.items.npc_armor.biped_small.gnarling.head.stalker": ( vox_spec: ("npc.gnarling.stalker.head", (-6.5, -5.5, -4.5)), ), - "GnarlingLogger": ( + "common.items.npc_armor.biped_small.gnarling.head.logger": ( vox_spec: ("npc.gnarling.logger.head", (-6.5, -5.5, -4.5)), ), - "GnarlingChieftain": ( + "common.items.npc_armor.biped_small.gnarling.head.chieftain": ( vox_spec: ("npc.gnarling.chieftain.head", (-6.5, -5.5, -4.5)), ), - "Mandragora": ( + "common.items.npc_armor.biped_small.mandragora.head.mandragora": ( vox_spec: ("npc.mandragora.male.head", (0.0, 0.0, 0.0)), ), - "Kappa": ( + "common.items.npc_armor.biped_small.kappa.head.kappa": ( vox_spec: ("npc.kappa.male.chest", (-4.5, -5.0, -4.5)), ), "Cactid": ( vox_spec: ("npc.cactid.male.head", (-8.0, -4.0, -7.5)), ), - "GnollRogue": ( + "common.items.npc_armor.biped_small.gnoll.head.rogue": ( vox_spec: ("npc.gnoll.rogue.head", (-4.0, -1.5, -3.0)), ), - "GnollShaman": ( + "common.items.npc_armor.biped_small.gnoll.head.shaman": ( vox_spec: ("npc.gnoll.shaman.head", (-4.0, -1.5, -3.0)), ), - "GnollTrapper": ( + "common.items.npc_armor.biped_small.gnoll.head.trapper": ( vox_spec: ("npc.gnoll.trapper.head", (-4.0, -1.5, -3.0)), ), - "HaniwaGuard": ( + "common.items.npc_armor.biped_small.haniwa.head.guard": ( vox_spec: ("npc.haniwa.guard.head", (-5.5, -5.5, -5.5)), ), - "HaniwaArcher": ( + "common.items.npc_armor.biped_small.haniwa.head.archer": ( vox_spec: ("npc.haniwa.archer.head", (-5.5, -5.5, -5.5)), ), - "HaniwaSoldier": ( + "common.items.npc_armor.biped_small.haniwa.head.soldier": ( vox_spec: ("npc.haniwa.soldier.head", (-5.5, -5.5, -5.5)), ), - "MyrmidonHoplite": ( + "common.items.npc_armor.biped_small.myrmidon.head.hoplite": ( vox_spec: ("npc.myrmidon.hoplite.head", (-4.5, -7.0, -6.5)), ), - "MyrmidonMarksman": ( + "common.items.npc_armor.biped_small.myrmidon.head.marksman": ( vox_spec: ("npc.myrmidon.marksman.head", (-4.5, -7.0, -6.5)), ), - "MyrmidonStrategian": ( + "common.items.npc_armor.biped_small.myrmidon.head.strategian": ( vox_spec: ("npc.myrmidon.strategian.head", (-4.5, -7.0, -6.5)), ), - "Husk": ( + "common.items.npc_armor.biped_small.husk.head.husk": ( vox_spec: ("npc.husk.male.head", (-6.0, -6.0, -5.5)), ), }, diff --git a/assets/voxygen/voxel/biped_small_armor_pants_manifest.ron b/assets/voxygen/voxel/biped_small_armor_pants_manifest.ron index 911ed93a92..c4c151c92a 100644 --- a/assets/voxygen/voxel/biped_small_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_pants_manifest.ron @@ -3,76 +3,76 @@ vox_spec: ("armor.empty", (0.0, 0.0, 0.0)), ), map: { - "Gnome": ( + "common.items.npc_armor.biped_small.gnome.pants.gnome": ( vox_spec: ("npc.gnome.male.pants", (-4.0, -3.5, -2.5)), ), - "SahaginSpearman": ( + "common.items.npc_armor.biped_small.sahagin.pants.spearman": ( vox_spec: ("npc.sahagin.spearman.pants", (-2.5, -3.5, -2.0)), ), - "SahaginSorcerer": ( + "common.items.npc_armor.biped_small.sahagin.pants.sorcerer": ( vox_spec: ("npc.sahagin.sorcerer.pants", (-2.5, -3.5, -2.0)), ), - "SahaginSniper": ( + "common.items.npc_armor.biped_small.sahagin.pants.sniper": ( vox_spec: ("npc.sahagin.sniper.pants", (-2.5, -3.5, -2.0)), ), - "AdletHunter": ( + "common.items.npc_armor.biped_small.adlet.pants.hunter": ( vox_spec: ("npc.adlet.hunter.pants", (-5.0, -4.5, -3.0)), ), - "AdletTracker": ( + "common.items.npc_armor.biped_small.adlet.pants.tracker": ( vox_spec: ("npc.adlet.tracker.pants", (-5.0, -4.5, -3.0)), ), - "AdletIcepicker": ( + "common.items.npc_armor.biped_small.adlet.pants.icepicker": ( vox_spec: ("npc.adlet.icepicker.pants", (-5.0, -4.5, -3.0)), ), - "GnarlingMugger": ( + "common.items.npc_armor.biped_small.gnarling.pants.mugger": ( vox_spec: ("npc.gnarling.mugger.pants", (-3.5, -3.0, -2.5)), ), - "GnarlingStalker": ( + "common.items.npc_armor.biped_small.gnarling.pants.stalker": ( vox_spec: ("npc.gnarling.stalker.pants", (-3.5, -3.0, -2.5)), ), - "GnarlingLogger": ( + "common.items.npc_armor.biped_small.gnarling.pants.logger": ( vox_spec: ("npc.gnarling.logger.pants", (-3.5, -3.0, -2.5)), ), - "GnarlingChieftain": ( + "common.items.npc_armor.biped_small.gnarling.pants.chieftain": ( vox_spec: ("npc.gnarling.chieftain.pants", (-3.5, -3.0, -3.5)), ), - "Mandragora": ( + "common.items.npc_armor.biped_small.mandragora.pants.mandragora": ( vox_spec: ("npc.mandragora.male.pants", (-3.0, -3.0, -1.0)), ), - "Kappa": ( + "common.items.npc_armor.biped_small.kappa.pants.kappa": ( vox_spec: ("npc.kappa.male.pants", (-3.5, -4.0, -1.5)), ), "Cactid": ( vox_spec: ("npc.cactid.male.pants", (-3.0, -2.0, -1.0)), ), - "GnollRogue": ( + "common.items.npc_armor.biped_small.gnoll.pants.rogue": ( vox_spec: ("npc.gnoll.rogue.pants", (-5.0, -4.0, -3.0)), ), - "GnollShaman": ( + "common.items.npc_armor.biped_small.gnoll.pants.shaman": ( vox_spec: ("npc.gnoll.shaman.pants", (-5.0, -4.0, -3.0)), ), - "GnollTrapper": ( + "common.items.npc_armor.biped_small.gnoll.pants.trapper": ( vox_spec: ("npc.gnoll.trapper.pants", (-5.0, -4.0, -3.0)), ), - "HaniwaGuard": ( + "common.items.npc_armor.biped_small.haniwa.pants.guard": ( vox_spec: ("npc.haniwa.guard.pants", (-4.5, -4.5, -1.5)), ), - "HaniwaArcher": ( + "common.items.npc_armor.biped_small.haniwa.pants.archer": ( vox_spec: ("npc.haniwa.archer.pants", (-4.5, -4.5, -1.5)), ), - "HaniwaSoldier": ( + "common.items.npc_armor.biped_small.haniwa.pants.soldier": ( vox_spec: ("npc.haniwa.soldier.pants", (-4.5, -4.5, -1.5)), ), - "MyrmidonHoplite": ( + "common.items.npc_armor.biped_small.myrmidon.pants.hoplite": ( vox_spec: ("npc.myrmidon.hoplite.pants", (-2.5, -4.5, -1.5)), ), - "MyrmidonMarksman": ( + "common.items.npc_armor.biped_small.myrmidon.pants.marksman": ( vox_spec: ("npc.myrmidon.marksman.pants", (-2.5, -4.5, -1.5)), ), - "MyrmidonStrategian": ( + "common.items.npc_armor.biped_small.myrmidon.pants.strategian": ( vox_spec: ("npc.myrmidon.strategian.pants", (-2.5, -4.5, -1.5)), ), - "Husk": ( + "common.items.npc_armor.biped_small.husk.pants.husk": ( vox_spec: ("npc.husk.male.pants", (-5.0, -4.5, -6.0)), ), }, diff --git a/assets/voxygen/voxel/biped_small_armor_tail_manifest.ron b/assets/voxygen/voxel/biped_small_armor_tail_manifest.ron index 73a64c39ec..49963b03d6 100644 --- a/assets/voxygen/voxel/biped_small_armor_tail_manifest.ron +++ b/assets/voxygen/voxel/biped_small_armor_tail_manifest.ron @@ -3,55 +3,55 @@ vox_spec: ("armor.empty", (0.0, 0.0, 0.0)), ), map: { - "SahaginSpearman": ( + "common.items.npc_armor.biped_small.sahagin.tail.spearman": ( vox_spec: ("npc.sahagin.spearman.tail", (-1.5, -13.0, -5.0)), ), - "SahaginSorcerer": ( + "common.items.npc_armor.biped_small.sahagin.tail.sorcerer": ( vox_spec: ("npc.sahagin.sorcerer.tail", (-1.5, -13.0, -5.0)), ), - "SahaginSniper": ( + "common.items.npc_armor.biped_small.sahagin.tail.sniper": ( vox_spec: ("npc.sahagin.sniper.tail", (-1.5, -13.0, -5.0)), ), - "AdletHunter": ( + "common.items.npc_armor.biped_small.adlet.tail.hunter": ( vox_spec: ("npc.adlet.hunter.tail", (-1.0, -5.0, -1.0)), ), - "AdletTracker": ( + "common.items.npc_armor.biped_small.adlet.tail.tracker": ( vox_spec: ("npc.adlet.tracker.tail", (-1.0, -5.0, -1.0)), ), - "AdletIcepicker": ( + "common.items.npc_armor.biped_small.adlet.tail.icepicker": ( vox_spec: ("npc.adlet.icepicker.tail", (-1.0, -5.0, -1.0)), ), - "GnarlingMugger": ( + "common.items.npc_armor.biped_small.gnarling.tail.mugger": ( vox_spec: ("npc.gnarling.mugger.tail", (-1.5, -13.0, -3.0)), ), - "GnarlingStalker": ( + "common.items.npc_armor.biped_small.gnarling.tail.stalker": ( vox_spec: ("npc.gnarling.stalker.tail", (-1.5, -13.0, -3.0)), ), - "GnarlingLogger": ( + "common.items.npc_armor.biped_small.gnarling.tail.logger": ( vox_spec: ("npc.gnarling.logger.tail", (-1.5, -13.0, -3.0)), ), - "GnarlingChieftain": ( + "common.items.npc_armor.biped_small.gnarling.tail.chieftain": ( vox_spec: ("npc.gnarling.chieftain.tail", (-1.5, -14.0, -3.0)), ), - "Kappa": ( + "common.items.npc_armor.biped_small.kappa.tail.kappa": ( vox_spec: ("npc.kappa.male.tail", (-2.5, -10.0, -5.0)), ), - "GnollRogue": ( + "common.items.npc_armor.biped_small.gnoll.tail.rogue": ( vox_spec: ("npc.gnoll.rogue.tail", (-1.0, -11.0, -1.0)), ), - "GnollShaman": ( + "common.items.npc_armor.biped_small.gnoll.tail.shaman": ( vox_spec: ("npc.gnoll.shaman.tail", (-1.0, -11.0, -1.0)), ), - "GnollTrapper": ( + "common.items.npc_armor.biped_small.gnoll.tail.trapper": ( vox_spec: ("npc.gnoll.trapper.tail", (-1.0, -11.0, -1.0)), ), - "MyrmidonHoplite": ( + "common.items.npc_armor.biped_small.myrmidon.tail.hoplite": ( vox_spec: ("npc.myrmidon.hoplite.tail", (-2.5, -7.0, -2.5)), ), - "MyrmidonMarksman": ( + "common.items.npc_armor.biped_small.myrmidon.tail.marksman": ( vox_spec: ("npc.myrmidon.marksman.tail", (-2.5, -7.0, -2.5)), ), - "MyrmidonStrategian": ( + "common.items.npc_armor.biped_small.myrmidon.tail.strategian": ( vox_spec: ("npc.myrmidon.strategian.tail", (-2.5, -7.0, -2.5)), ), }, diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron index fc7b4d2c9c..d1f68b9a7a 100644 --- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron @@ -4,123 +4,127 @@ color: None ), map: { - "Short0": ( + "common.items.armor.misc.back.short_0": ( vox_spec: ("armor.misc.back.short-0", (-5.0, -1.0, -11.0)), color: None ), - "Admin": ( + "common.items.armor.misc.back.admin": ( vox_spec: ("armor.misc.back.admin", (-5.0, -1.0, -11.0)), color: None ), - "DungeonPurple": ( + "common.items.debug.admin_back": ( + vox_spec: ("armor.misc.back.admin", (-5.0, -1.0, -11.0)), + color: None + ), + "common.items.armor.misc.back.dungeon_purple": ( vox_spec: ("armor.misc.back.dungeon_purple", (-5.0, -1.0, -14.0)), color: None ), - "Short1": ( + "common.items.armor.misc.back.short_1": ( vox_spec: ("armor.misc.back.short-1", (-5.0, -1.0, -11.0)), color: None ), - "Ferocious": ( + "common.items.armor.ferocious.back": ( vox_spec: ("armor.ferocious.back", (-5.0, -1.5, -14.0)), color: None ), - "Backpack": ( + "common.items.armor.misc.back.backpack": ( vox_spec: ("armor.misc.back.backpack", (-7.0, -5.0, -10.0)), color: None ), - "BackpackBlue": ( + "common.items.npc_armor.back.backpack_blue": ( vox_spec: ("armor.misc.back.backpack-grey", (-7.0, -5.0, -10.0)), color: Some((76, 72, 178)) ), - "VeloriteMage": ( + "common.items.armor.velorite_mage.back": ( vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)), color: None ), - "LeatherBlue": ( + "common.items.npc_armor.back.leather_blue": ( vox_spec: ("armor.leather_blue.back", (-5.0, -1.0, -11.0)), color: None ), - "Rawhide": ( + "common.items.armor.hide.rawhide.back": ( vox_spec: ("armor.hide.rawhide.back", (-4.0, -1.0, -6.0)), color: None ), - "Leather": ( + "common.items.armor.hide.leather.back": ( vox_spec: ("armor.hide.leather.back", (-5.0, -1.0, -11.0)), color: None ), - "Scale": ( + "common.items.armor.hide.scale.back": ( vox_spec: ("armor.hide.scale.back", (-5.0, -2.0, -10.5)), color: None ), - "Carapace": ( + "common.items.armor.hide.carapace.back": ( vox_spec: ("armor.hide.carapace.back", (-5.0, -1.5, -10.5)), color: None ), - "Primal": ( + "common.items.armor.hide.primal.back": ( vox_spec: ("armor.hide.primal.back", (-5.0, -4.5, -10.5)), color: None ), - "Dragonscale": ( + "common.items.armor.hide.dragonscale.back": ( vox_spec: ("armor.hide.dragonscale.back", (-7.0, -2.5, -12.0)), color: None ), - "Savage": ( + "common.items.armor.savage.back": ( vox_spec: ("armor.savage.back", (-5.0, -2.5, -11.0)), color: None ), - "Linen": ( + "common.items.armor.cloth.linen.back": ( vox_spec: ("armor.cloth.linen.back", (-4.0, -2.5, -8.5)), color: None ), - "Woolen": ( + "common.items.armor.cloth.woolen.back": ( vox_spec: ("armor.cloth.woolen.back", (-5.0, -2.5, -8.5)), color: None ), - "Silken": ( + "common.items.armor.cloth.silken.back": ( vox_spec: ("armor.cloth.silken.back", (-4.0, -2.5, -11.5)), color: None ), - "Witch": ( + "common.items.armor.witch.back": ( vox_spec: ("armor.witch.back", (-4.0, -2.5, -11.5)), color: None ), - "Druid": ( + "common.items.armor.cloth.druid.back": ( vox_spec: ("armor.cloth.druid.back", (-5.0, -2.5, -11.0)), color: None ), - "Moonweave": ( + "common.items.armor.cloth.moonweave.back": ( vox_spec: ("armor.cloth.moonweave.back", (-4.0, -2.0, -12.5)), color: None ), - "Sunsilk": ( + "common.items.armor.cloth.sunsilk.back": ( vox_spec: ("armor.cloth.sunsilk.back", (-5.0, -1.5, -12.5)), color: None ), - "Bronze": ( + "common.items.armor.mail.bronze.back": ( vox_spec: ("armor.mail.bronze.back", (-4.0, -2.5, -7.0)), color: None ), - "Iron": ( + "common.items.armor.mail.iron.back": ( vox_spec: ("armor.mail.iron.back", (-4.0, -2.5, -10.0)), color: None ), - "Steel": ( + "common.items.armor.mail.steel.back": ( vox_spec: ("armor.mail.steel.back", (-4.0, -2.5, -12.0)), color: None ), - "Cobalt": ( + "common.items.armor.mail.cobalt.back": ( vox_spec: ("armor.mail.cobalt.back", (-4.0, -2.5, -12.0)), color: None ), - "Bloodsteel": ( + "common.items.armor.mail.bloodsteel.back": ( vox_spec: ("armor.mail.bloodsteel.back", (-3.5, -2.5, -12.0)), color: None ), - "Orichalcum": ( + "common.items.armor.mail.orichalcum.back": ( vox_spec: ("armor.mail.orichalcum.back", (-5.0, -4.5, -12.0)), color: None ), - "Merchant": ( + "common.items.armor.merchant.back": ( vox_spec: ("armor.merchant.back", (-9.0, -7.0, -12.0)), color: None ), diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index 9ae3a6c953..ad460ac1c9 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -20,155 +20,155 @@ vox_spec: ("armor.misc.belt.cloth_black", (-4.0, -3.5, -6.0)), color: Some((29, 26, 33)) ), - "Assassin": ( + "common.items.armor.assassin.belt": ( vox_spec: ("armor.assassin.belt", (-5.0, -3.5, 2.0)), color: None ), - "Ferocious": ( + "common.items.armor.ferocious.belt": ( vox_spec: ("armor.ferocious.belt", (-4.0, -3.5, -1.0)), color: None ), - "ClothPurple": ( + "common.items.armor.cloth_purple.belt": ( vox_spec: ("armor.cloth_purple.belt", (-5.0, -3.5, 2.0)), color: None ), - "ClothBlue": ( + "common.items.armor.cloth_blue.belt": ( vox_spec: ("armor.cloth_blue.belt", (-5.0, -3.5, 2.0)), color: None ), - "ClothGreen": ( + "common.items.armor.cloth_green.belt": ( vox_spec: ("armor.cloth_green.belt", (-5.0, -3.5, 2.0)), color: None ), - "Cultist": ( + "common.items.armor.cultist.belt": ( vox_spec: ("armor.cultist.belt", (-5.0, -3.5, 1.0)), color: None ), - "LeatherPlate": ( + "common.items.armor.leather_plate.belt": ( vox_spec: ("armor.leather_plate.belt", (-4.0, -4.5, 2.0)), color: None ), - "Twigs": ( + "common.items.armor.twigs.belt": ( vox_spec: ("armor.twigs.belt", (-4.0, -3.5, -1.0)), color: None ), - "TwigsLeaves": ( + "common.items.armor.twigsleaves.belt": ( vox_spec: ("armor.twigsleaves.belt", (-4.0, -3.5, -1.0)), color: None ), - "TwigsFlowers": ( + "common.items.armor.twigsflowers.belt": ( vox_spec: ("armor.twigsflowers.belt", (-4.0, -3.5, -1.0)), color: None ), - "Tarasque":( + "common.items.armor.tarasque.belt":( vox_spec: ("armor.tarasque.belt", (-5.0, -3.5, 2.0)), color: None ), - "Bonerattler":( + "common.items.armor.bonerattler.belt":( vox_spec: ("armor.bonerattler.belt", (-5.0, -4.5, 2.0)), color: None ), - "VeloriteMage": ( + "common.items.armor.velorite_mage.belt": ( vox_spec: ("armor.velorite_battlemage.belt", (-5.0, -3.5, 2.0)), color: None ), - "Rawhide": ( + "common.items.armor.hide.rawhide.belt": ( vox_spec: ("armor.hide.rawhide.belt", (-4.0, -3.5, 2.0)), color: None ), - "Leather": ( + "common.items.armor.hide.leather.belt": ( vox_spec: ("armor.hide.leather.belt", (-5.0, -3.5, 2.0)), color: None ), - "Scale":( + "common.items.armor.hide.scale.belt":( vox_spec: ("armor.hide.scale.belt", (-4.0, -3.5, 2.0)), color: None ), - "Carapace":( + "common.items.armor.hide.carapace.belt":( vox_spec: ("armor.hide.carapace.belt", (-4.0, -4.0, 1.5)), color: None ), - "Primal":( + "common.items.armor.hide.primal.belt":( vox_spec: ("armor.hide.primal.belt", (-4.0, -4.0, 1.0)), color: None ), - "Dragonscale":( + "common.items.armor.hide.dragonscale.belt":( vox_spec: ("armor.hide.dragonscale.belt", (-4.0, -3.5, 1.5)), color: None ), - "Savage":( + "common.items.armor.savage.belt":( vox_spec: ("armor.savage.belt", (-4.0, -4.0, 1.0)), color: None ), - "Witch":( + "common.items.armor.witch.belt":( vox_spec: ("armor.witch.belt", (-4.0, -3.5, -2.0)), color: None ), - "Pirate":( + "common.items.armor.pirate.belt":( vox_spec: ("armor.pirate.belt", (-4.0, -4.0, 2.5)), color: None ), - "Alchemist":( + "common.items.armor.alchemist.belt":( vox_spec: ("armor.alchemist.belt", (-4.0, -4.0, 2.5)), color: None ), - "Blacksmith":( + "common.items.armor.blacksmith.belt":( vox_spec: ("armor.blacksmith.belt", (-4.0, -4.0, 2.0)), color: None ), - "Chef":( + "common.items.armor.chef.belt":( vox_spec: ("armor.chef.belt", (-4.0, -4.0, 2.0)), color: None ), - "Linen":( + "common.items.armor.cloth.linen.belt":( vox_spec: ("armor.cloth.linen.belt", (-4.0, -4.0, 0.0)), color: None ), - "Woolen":( + "common.items.armor.cloth.woolen.belt":( vox_spec: ("armor.cloth.woolen.belt", (-4.0, -4.0, 1.0)), color: None ), - "Silken":( + "common.items.armor.cloth.silken.belt":( vox_spec: ("armor.cloth.silken.belt", (-4.0, -3.5, -3.0)), color: None ), - "Druid":( + "common.items.armor.cloth.druid.belt":( vox_spec: ("armor.cloth.druid.belt", (-4.0, -4.0, -0.5)), color: None ), - "Moonweave":( + "common.items.armor.cloth.moonweave.belt":( vox_spec: ("armor.cloth.moonweave.belt", (-4.0, -3.5, 1.0)), color: None ), - "Sunsilk":( + "common.items.armor.cloth.sunsilk.belt":( vox_spec: ("armor.cloth.sunsilk.belt", (-4.0, -3.5, -2.5)), color: None ), - "Bronze":( + "common.items.armor.mail.bronze.belt":( vox_spec: ("armor.mail.bronze.belt", (-4.0, -4.0, 2.0)), color: None ), - "Iron":( + "common.items.armor.mail.iron.belt":( vox_spec: ("armor.mail.iron.belt", (-4.0, -4.0, 2.0)), color: None ), - "Steel":( + "common.items.armor.mail.steel.belt":( vox_spec: ("armor.mail.steel.belt", (-5.0, -4.0, 1.0)), color: None ), - "Cobalt":( + "common.items.armor.mail.cobalt.belt":( vox_spec: ("armor.mail.cobalt.belt", (-5.0, -4.0, 1.0)), color: None ), - "Bloodsteel":( + "common.items.armor.mail.bloodsteel.belt":( vox_spec: ("armor.mail.bloodsteel.belt", (-5.0, -3.5, 1.0)), color: None ), - "Orichalcum":( + "common.items.armor.mail.orichalcum.belt":( vox_spec: ("armor.mail.orichalcum.belt", (-4.0, -3.5, 1.0)), color: None ), - "Merchant": ( + "common.items.armor.merchant.belt": ( vox_spec: ("armor.merchant.belt", (-5.0, -4.0, 2.0)), color: None ), diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index 06dd138ee1..945a11602c 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -28,11 +28,11 @@ vox_spec: ("armor.misc.chest.grayscale", (-7.0, -3.5, 2.0)), color: Some((29, 26, 33)) ), - "Ferocious": ( + "common.items.armor.ferocious.chest": ( vox_spec: ("armor.ferocious.chest", (-7.0, -3.5, 2.0)), color: None ), - "Assassin": ( + "common.items.armor.assassin.chest": ( vox_spec: ("armor.assassin.chest", (-7.0, -3.5, 2.0)), color: None ), @@ -40,205 +40,205 @@ vox_spec: ("armor.misc.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)), color: None ), - "PlateRed": ( + "common.items.npc_armor.chest.plate_red": ( vox_spec: ("armor.misc.chest.plate_grey", (-7.0, -3.5, 2.0)), color: Some((124, 38, 46)) ), - "LeatherBlue": ( + "common.items.npc_armor.chest.leather_blue": ( vox_spec: ("armor.leather_blue.chest", (-7.0, -3.5, 2.0)), color: None ), - "ClothPurple": ( + "common.items.armor.cloth_purple.chest": ( vox_spec: ("armor.cloth_purple.chest", (-7.0, -3.5, 1.0)), color: None ), - "ClothBlue": ( + "common.items.armor.cloth_blue.chest": ( vox_spec: ("armor.cloth_blue.chest", (-7.0, -3.5, 1.0)), color: None ), - "ClothGreen": ( + "common.items.armor.cloth_green.chest": ( vox_spec: ("armor.cloth_green.chest", (-7.0, -3.5, 1.0)), color: None ), - "Rugged": ( + "common.items.armor.rugged.chest": ( vox_spec: ("armor.rugged.chest", (-7.0, -3.5, 2.0)), color: None ), - "WorkerPurpBrown": ( + "common.items.armor.misc.chest.worker_purple_brown": ( vox_spec: ("armor.misc.chest.worker_purp_brown", (-7.0, -3.5, 2.0)), color: None ), // Villagers - "WorkerGreen0": ( + "common.items.armor.misc.chest.worker_green_0": ( vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)), color: Some((88, 108, 65)) ), - "WorkerGreen1": ( + "common.items.armor.misc.chest.worker_green_1": ( vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)), color: Some((88, 108, 65)) ), - "WorkerRed0": ( + "common.items.armor.misc.chest.worker_red_0": ( vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)), color: Some((124, 38, 46)) ), - "WorkerRed1": ( + "common.items.armor.misc.chest.worker_red_1": ( vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)), color: Some((124, 38, 46)) ), - "WorkerPurple0": ( + "common.items.armor.misc.chest.worker_purple_0": ( vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)), color: Some((64, 47, 56)) ), - "WorkerPurple1": ( + "common.items.armor.misc.chest.worker_purple_1": ( vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)), color: Some((64, 47, 56)) ), - "WorkerYellow0": ( + "common.items.armor.misc.chest.worker_yellow_0": ( vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)), color: Some((184, 132, 40)) ), - "WorkerYellow1": ( + "common.items.armor.misc.chest.worker_yellow_1": ( vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)), color: Some((184, 132, 40)) ), - "WorkerOrange0": ( + "common.items.armor.misc.chest.worker_orange_0": ( vox_spec: ("armor.misc.chest.worker_white", (-7.0, -3.5, 2.0)), color: Some((135, 82, 67)) ), - "WorkerOrange1": ( + "common.items.armor.misc.chest.worker_orange_1": ( vox_spec: ("armor.misc.chest.shirt_white", (-7.0, -3.5, 2.0)), color: Some((135, 82, 67)) ), - "Twigs": ( + "common.items.armor.twigs.chest": ( vox_spec: ("armor.twigs.chest", (-7.0, -3.5, 2.0)), color: None ), - "TwigsLeaves": ( + "common.items.armor.twigsleaves.chest": ( vox_spec: ("armor.twigsleaves.chest", (-7.0, -3.5, 2.0)), color: None ), - "TwigsFlowers": ( + "common.items.armor.twigsflowers.chest": ( vox_spec: ("armor.twigsflowers.chest", (-7.0, -3.5, 2.0)), color: None ), // Cultists - "Cultist": ( + "common.items.armor.cultist.chest": ( vox_spec: ("armor.cultist.chest", (-7.0, -3.5, 2.0)), color: Some((30, 0, 64)) ), - "LeatherPlate": ( + "common.items.armor.leather_plate.chest": ( vox_spec: ("armor.leather_plate.chest", (-8.0, -5.5, 2.0)), color: None ), - "Tarasque":( + "common.items.armor.tarasque.chest":( vox_spec: ("armor.tarasque.chest", (-8.0, -4.5, 2.0)), color: None ), - "Bonerattler":( + "common.items.armor.bonerattler.chest":( vox_spec: ("armor.bonerattler.chest", (-7.0, -4.5, 2.0)), color: None ), - "VeloriteMage": ( + "common.items.armor.velorite_mage.chest": ( vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)), color: None ), - "Rawhide": ( + "common.items.armor.hide.rawhide.chest": ( vox_spec: ("armor.hide.rawhide.chest", (-7.0, -3.5, 2.0)), color: None ), - "Leather": ( + "common.items.armor.hide.leather.chest": ( vox_spec: ("armor.hide.leather.chest", (-7.0, -3.5, 2.0)), color: None ), - "Scale": ( + "common.items.armor.hide.scale.chest": ( vox_spec: ("armor.hide.scale.chest", (-7.0, -3.5, 2.0)), color: None ), - "Carapace": ( + "common.items.armor.hide.carapace.chest": ( vox_spec: ("armor.hide.carapace.chest", (-7.0, -3.5, 1.5)), color: None ), - "Primal": ( + "common.items.armor.hide.primal.chest": ( vox_spec: ("armor.hide.primal.chest", (-7.0, -3.5, 0.5)), color: None ), - "Dragonscale": ( + "common.items.armor.hide.dragonscale.chest": ( vox_spec: ("armor.hide.dragonscale.chest", (-7.0, -3.5, 1.5)), color: None ), - "Savage": ( + "common.items.armor.savage.chest": ( vox_spec: ("armor.hide.savage.chest", (-7.0, -4.0, 1.0)), color: None ), - "Witch": ( + "common.items.armor.witch.chest": ( vox_spec: ("armor.witch.chest", (-7.0, -4.0, 2.0)), color: None ), - "Pirate": ( + "common.items.armor.pirate.chest": ( vox_spec: ("armor.pirate.chest", (-7.0, -4.0, 2.0)), color: None ), - "Alchemist": ( + "common.items.armor.alchemist.chest": ( vox_spec: ("armor.alchemist.chest", (-7.0, -4.0, 2.0)), color: None ), - "Blacksmith": ( + "common.items.armor.blacksmith.chest": ( vox_spec: ("armor.blacksmith.chest", (-7.0, -4.0, 2.0)), color: None ), - "Chef": ( + "common.items.armor.chef.chest": ( vox_spec: ("armor.chef.chest", (-7.0, -4.0, 2.0)), color: None ), - "Linen": ( + "common.items.armor.cloth.linen.chest": ( vox_spec: ("armor.cloth.linen.chest", (-7.0, -4.0, 2.0)), color: None ), - "Woolen": ( + "common.items.armor.cloth.woolen.chest": ( vox_spec: ("armor.cloth.woolen.chest", (-7.0, -4.0, 1.0)), color: None ), - "Silken": ( + "common.items.armor.cloth.silken.chest": ( vox_spec: ("armor.cloth.silken.chest", (-7.0, -4.0, 1.0)), color: None ), - "Druid": ( + "common.items.armor.cloth.druid.chest": ( vox_spec: ("armor.cloth.druid.chest", (-7.0, -4.0, 2.0)), color: None ), - "Moonweave": ( + "common.items.armor.cloth.moonweave.chest": ( vox_spec: ("armor.cloth.moonweave.chest", (-7.0, -4.0, 1.0)), color: None ), - "Sunsilk": ( + "common.items.armor.cloth.sunsilk.chest": ( vox_spec: ("armor.cloth.sunsilk.chest", (-7.0, -4.0, 1.0)), color: None ), - "Bronze": ( + "common.items.armor.mail.bronze.chest": ( vox_spec: ("armor.mail.bronze.chest", (-7.0, -4.0, 2.0)), color: None ), - "Iron": ( + "common.items.armor.mail.iron.chest": ( vox_spec: ("armor.mail.iron.chest", (-7.0, -4.0, 2.0)), color: None ), - "Steel": ( + "common.items.armor.mail.steel.chest": ( vox_spec: ("armor.mail.steel.chest", (-8.0, -4.0, 1.0)), color: None ), - "Cobalt": ( + "common.items.armor.mail.cobalt.chest": ( vox_spec: ("armor.mail.cobalt.chest", (-8.0, -4.0, 1.0)), color: None ), - "Bloodsteel": ( + "common.items.armor.mail.bloodsteel.chest": ( vox_spec: ("armor.mail.bloodsteel.chest", (-8.0, -4.0, 1.0)), color: None ), - "Orichalcum": ( + "common.items.armor.mail.orichalcum.chest": ( vox_spec: ("armor.mail.orichalcum.chest", (-7.0, -4.0, 1.0)), color: None ), - "Merchant": ( + "common.items.armor.merchant.chest": ( vox_spec: ("armor.merchant.chest", (-7.0, -4.0, 1.0)), color: None ), diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index 2802b43d31..6af351e9f8 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -8,7 +8,7 @@ vox_spec: ("armor.misc.foot.dark", (-2.5, -3.5, -2.0)), color: None ), - "Assassin": ( + "common.items.armor.assassin.foot": ( vox_spec: ("armor.assassin.foot", (-2.5, -3.5, -2.0)), color: None ), @@ -16,147 +16,147 @@ vox_spec: ("armor.misc.foot.dark_jester_elf", (-2.5, -3.0, -2.0)), color: None ), - "ClothPurple": ( + "common.items.armor.cloth_purple.foot": ( vox_spec: ("armor.cloth_purple.foot", (-2.5, -3.5, -2.0)), color: None ), - "Ferocious": ( + "common.items.armor.ferocious.foot": ( vox_spec: ("armor.ferocious.foot", (-2.5, -3.5, -2.0)), color: None ), - "ClothBlue": ( + "common.items.armor.cloth_blue.foot": ( vox_spec: ("armor.cloth_blue.foot", (-2.5, -3.5, -2.0)), color: None ), - "ClothGreen": ( + "common.items.armor.cloth_green.foot": ( vox_spec: ("armor.cloth_green.foot", (-2.5, -3.5, -2.0)), color: None ), - "Sandal": ( + "common.items.armor.misc.foot.sandals": ( vox_spec: ("armor.misc.foot.cloth_sandal", (-2.5, -3.5, -2.0)), color: None ), - "Cultist": ( + "common.items.armor.cultist.foot": ( vox_spec: ("armor.cultist.foot", (-2.5, -3.5, -2.0)), color: None ), - "LeatherPlate": ( + "common.items.armor.leather_plate.foot": ( vox_spec: ("armor.leather_plate.foot", (-2.5, -3.5, -2.0)), color: None ), - "Jackalope": ( + "common.items.armor.misc.foot.jackalope_slippers": ( vox_spec: ("armor.misc.foot.jackalope", (-2.5, -3.5, -2.0)), color: None ), - "Twigs": ( + "common.items.armor.twigs.foot": ( vox_spec: ("armor.twigs.foot", (-2.5, -3.5, -2.0)), color: None ), - "TwigsLeaves": ( + "common.items.armor.twigsleaves.foot": ( vox_spec: ("armor.twigsleaves.foot", (-2.5, -3.5, -2.0)), color: None ), - "TwigsFlowers": ( + "common.items.armor.twigsflowers.foot": ( vox_spec: ("armor.twigsflowers.foot", (-2.5, -3.5, -2.0)), color: None ), - "Tarasque":( + "common.items.armor.tarasque.foot":( vox_spec: ("armor.tarasque.foot", (-2.5, -3.5, -2.0)), color: None ), - "Bonerattler":( + "common.items.armor.bonerattler.foot":( vox_spec: ("armor.bonerattler.foot", (-2.5, -3.5, -2.0)), color: None ), - "VeloriteMage": ( + "common.items.armor.velorite_mage.foot": ( vox_spec: ("armor.velorite_battlemage.foot", (-2.5, -3.5, -2.0)), color: None ), - "Rawhide": ( + "common.items.armor.hide.rawhide.foot": ( vox_spec: ("armor.hide.rawhide.foot", (-2.5, -3.5, -2.0)), color: None ), - "Leather": ( + "common.items.armor.hide.leather.foot": ( vox_spec: ("armor.hide.leather.foot", (-2.5, -3.5, -2.0)), color: None ), - "Scale": ( + "common.items.armor.hide.scale.foot": ( vox_spec: ("armor.hide.scale.foot", (-2.5, -3.5, -2.0)), color: None ), - "Carapace": ( + "common.items.armor.hide.carapace.foot": ( vox_spec: ("armor.hide.carapace.foot", (-2.5, -3.5, -2.0)), color: None ), - "Primal": ( + "common.items.armor.hide.primal.foot": ( vox_spec: ("armor.hide.primal.foot", (-2.5, -3.5, -2.0)), color: None ), - "Dragonscale": ( + "common.items.armor.hide.dragonscale.foot": ( vox_spec: ("armor.hide.dragonscale.foot", (-2.5, -5.5, -2.0)), color: None ), - "Savage": ( + "common.items.armor.savage.foot": ( vox_spec: ("armor.savage.foot", (-2.5, -3.5, -2.0)), color: None ), - "Witch": ( + "common.items.armor.witch.foot": ( vox_spec: ("armor.witch.foot", (-2.5, -3.5, -2.0)), color: None ), - "Pirate": ( + "common.items.armor.pirate.foot": ( vox_spec: ("armor.pirate.foot", (-2.5, -3.5, -2.0)), color: None ), - "Linen": ( + "common.items.armor.cloth.linen.foot": ( vox_spec: ("armor.cloth.linen.foot", (-2.5, -3.5, -2.0)), color: None ), - "Woolen": ( + "common.items.armor.cloth.woolen.foot": ( vox_spec: ("armor.cloth.woolen.foot", (-2.5, -3.5, -2.0)), color: None ), - "Silken": ( + "common.items.armor.cloth.silken.foot": ( vox_spec: ("armor.cloth.silken.foot", (-2.5, -3.5, -2.0)), color: None ), - "Druid": ( + "common.items.armor.cloth.druid.foot": ( vox_spec: ("armor.cloth.druid.foot", (-2.5, -3.5, -2.0)), color: None ), - "Moonweave": ( + "common.items.armor.cloth.moonweave.foot": ( vox_spec: ("armor.cloth.moonweave.foot", (-2.5, -3.5, -2.0)), color: None ), - "Sunsilk": ( + "common.items.armor.cloth.sunsilk.foot": ( vox_spec: ("armor.cloth.sunsilk.foot", (-2.5, -3.5, -2.0)), color: None ), - "Bronze": ( + "common.items.armor.mail.bronze.foot": ( vox_spec: ("armor.mail.bronze.foot", (-2.5, -3.5, -2.0)), color: None ), - "Iron": ( + "common.items.armor.mail.iron.foot": ( vox_spec: ("armor.mail.iron.foot", (-2.5, -3.5, -2.0)), color: None ), - "Steel": ( + "common.items.armor.mail.steel.foot": ( vox_spec: ("armor.mail.steel.foot", (-2.5, -3.5, -2.0)), color: None ), - "Cobalt": ( + "common.items.armor.mail.cobalt.foot": ( vox_spec: ("armor.mail.cobalt.foot", (-2.5, -3.5, -2.0)), color: None ), - "Bloodsteel": ( + "common.items.armor.mail.bloodsteel.foot": ( vox_spec: ("armor.mail.bloodsteel.foot", (-2.5, -3.5, -2.0)), color: None ), - "Orichalcum": ( + "common.items.armor.mail.orichalcum.foot": ( vox_spec: ("armor.mail.orichalcum.foot", (-2.5, -3.5, -2.0)), color: None ), - "Merchant": ( + "common.items.armor.merchant.foot": ( vox_spec: ("armor.merchant.foot", (-2.5, -3.5, -2.0)), color: None ), diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index 17e8dc324b..526bbea91d 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -10,7 +10,7 @@ ) ), map: { - "Assassin": ( + "common.items.armor.assassin.hand": ( left: ( vox_spec: ("armor.assassin.hand", (-1.5, -1.5, -2.5)), color: None @@ -30,7 +30,7 @@ color: None ) ), - "Ferocious": ( + "common.items.armor.ferocious.hand": ( left: ( vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -3.0)), color: None @@ -40,7 +40,7 @@ color: None ) ), - "ClothPurple": ( + "common.items.armor.cloth_purple.hand": ( left: ( vox_spec: ("armor.cloth_purple.hand", (-1.5, -1.5, -2.5)), color: None @@ -50,7 +50,7 @@ color: None ) ), - "ClothBlue": ( + "common.items.armor.cloth_blue.hand": ( left: ( vox_spec: ("armor.cloth_blue.hand", (-1.5, -1.5, -2.5)), color: None @@ -60,7 +60,7 @@ color: None ) ), - "ClothGreen": ( + "common.items.armor.cloth_green.hand": ( left: ( vox_spec: ("armor.cloth_green.hand", (-1.5, -1.5, -2.5)), color: None @@ -70,7 +70,7 @@ color: None ) ), - "Cultist": ( + "common.items.armor.cultist.hand": ( left: ( vox_spec: ("armor.cultist.hand", (-3.0, -1.5, -2.5)), color: Some((30, 0, 64)) @@ -80,7 +80,7 @@ color: Some((30, 0, 64)) ) ), - "LeatherPlate": ( + "common.items.armor.leather_plate.hand": ( left: ( vox_spec: ("armor.leather_plate.hand", (-1.5, -1.5, -2.5)), color: None @@ -90,7 +90,7 @@ color: None ) ), - "Twigs": ( + "common.items.armor.twigs.hand": ( left: ( vox_spec: ("armor.twigs.hand", (-1.5, -1.5, -2.5)), color: None @@ -100,7 +100,7 @@ color: None ) ), - "TwigsLeaves": ( + "common.items.armor.twigsleaves.hand": ( left: ( vox_spec: ("armor.twigsleaves.hand", (-1.5, -1.5, -2.5)), color: None @@ -110,7 +110,7 @@ color: None ) ), - "TwigsFlowers": ( + "common.items.armor.twigsflowers.hand": ( left: ( vox_spec: ("armor.twigsflowers.hand", (-1.5, -1.5, -2.5)), color: None @@ -120,7 +120,7 @@ color: None ) ), - "Tarasque": ( + "common.items.armor.tarasque.hand": ( left: ( vox_spec: ("armor.tarasque.hand", (-2.5, -2.5, -2.5)), color: None @@ -130,7 +130,7 @@ color: None ) ), - "Bonerattler": ( + "common.items.armor.bonerattler.hand": ( left: ( vox_spec: ("armor.bonerattler.hand", (-1.5, -1.5, -2.5)), color: None @@ -140,7 +140,7 @@ color: None ) ), - "VeloriteMage": ( + "common.items.armor.velorite_mage.hand": ( left: ( vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)), color: None @@ -150,7 +150,7 @@ color: None ) ), - "Rawhide": ( + "common.items.armor.hide.rawhide.hand": ( left: ( vox_spec: ("armor.hide.rawhide.hand", (-1.5, -1.5, -2.5)), color: None @@ -160,7 +160,7 @@ color: None ) ), - "Leather": ( + "common.items.armor.hide.leather.hand": ( left: ( vox_spec: ("armor.hide.leather.hand", (-1.5, -1.5, -2.5)), color: None @@ -170,7 +170,7 @@ color: None ) ), - "Scale": ( + "common.items.armor.hide.scale.hand": ( left: ( vox_spec: ("armor.hide.scale.hand", (-3.5, -1.5, -2.5)), color: None @@ -180,7 +180,7 @@ color: None ) ), - "Carapace": ( + "common.items.armor.hide.carapace.hand": ( left: ( vox_spec: ("armor.hide.carapace.hand", (-3.5, -2.5, -3.0)), color: None @@ -190,7 +190,7 @@ color: None ) ), - "Primal": ( + "common.items.armor.hide.primal.hand": ( left: ( vox_spec: ("armor.hide.primal.hand", (-3.5, -3.5, -4.0)), color: None @@ -200,7 +200,7 @@ color: None ) ), - "Dragonscale": ( + "common.items.armor.hide.dragonscale.hand": ( left: ( vox_spec: ("armor.hide.dragonscale.hand", (-5.0, -1.5, -3.5)), color: None @@ -210,7 +210,7 @@ color: None ) ), - "Savage": ( + "common.items.armor.savage.hand": ( left: ( vox_spec: ("armor.savage.hand", (-2.5, -3.0, -4.0)), color: None @@ -220,7 +220,7 @@ color: None ) ), - "Witch": ( + "common.items.armor.witch.hand": ( left: ( vox_spec: ("armor.witch.hand", (-2.5, -2.5, -4.0)), color: None @@ -230,7 +230,7 @@ color: None ) ), - "Pirate": ( + "common.items.armor.pirate.hand": ( left: ( vox_spec: ("armor.pirate.hand", (-2.5, -2.5, -4.0)), color: None @@ -240,7 +240,7 @@ color: None ) ), - "Blacksmith": ( + "common.items.armor.blacksmith.hand": ( left: ( vox_spec: ("armor.blacksmith.hand", (-1.5, -2.5, -4.0)), color: None @@ -250,7 +250,7 @@ color: None ) ), - "Linen": ( + "common.items.armor.cloth.linen.hand": ( left: ( vox_spec: ("armor.cloth.linen.hand", (-1.5, -2.0, -3.0)), color: None @@ -260,7 +260,7 @@ color: None ) ), - "Woolen": ( + "common.items.armor.cloth.woolen.hand": ( left: ( vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -3.5)), color: None @@ -270,7 +270,7 @@ color: None ) ), - "Silken": ( + "common.items.armor.cloth.silken.hand": ( left: ( vox_spec: ("armor.cloth.silken.hand", (-2.5, -2.5, -4.0)), color: None @@ -280,7 +280,7 @@ color: None ) ), - "Druid": ( + "common.items.armor.cloth.druid.hand": ( left: ( vox_spec: ("armor.cloth.druid.hand", (-2.5, -1.0, -3.0)), color: None @@ -290,7 +290,7 @@ color: None ) ), - "Moonweave": ( + "common.items.armor.cloth.moonweave.hand": ( left: ( vox_spec: ("armor.cloth.moonweave.hand", (-2.5, -2.0, -4.0)), color: None @@ -300,7 +300,7 @@ color: None ) ), - "Sunsilk": ( + "common.items.armor.cloth.sunsilk.hand": ( left: ( vox_spec: ("armor.cloth.sunsilk.hand", (-2.5, -2.5, -4.0)), color: None @@ -310,7 +310,7 @@ color: None ) ), - "Bronze": ( + "common.items.armor.mail.bronze.hand": ( left: ( vox_spec: ("armor.mail.bronze.hand", (-2.5, -2.0, -3.0)), color: None @@ -320,7 +320,7 @@ color: None ) ), - "Iron": ( + "common.items.armor.mail.iron.hand": ( left: ( vox_spec: ("armor.mail.iron.hand", (-1.5, -1.5, -3.0)), color: None @@ -330,7 +330,7 @@ color: None ) ), - "Steel": ( + "common.items.armor.mail.steel.hand": ( left: ( vox_spec: ("armor.mail.steel.hand", (-2.5, -1.0, -4.0)), color: None @@ -340,7 +340,7 @@ color: None ) ), - "Cobalt": ( + "common.items.armor.mail.cobalt.hand": ( left: ( vox_spec: ("armor.mail.cobalt.hand", (-2.5, -2.0, -4.0)), color: None @@ -350,7 +350,7 @@ color: None ) ), - "Bloodsteel": ( + "common.items.armor.mail.bloodsteel.hand": ( left: ( vox_spec: ("armor.mail.bloodsteel.hand", (-5.0, -1.0, -4.0)), color: None @@ -360,7 +360,7 @@ color: None ) ), - "Orichalcum": ( + "common.items.armor.mail.orichalcum.hand": ( left: ( vox_spec: ("armor.mail.orichalcum.hand", (-4.5, -2.0, -4.0)), color: None @@ -370,7 +370,7 @@ color: None ) ), - "Merchant": ( + "common.items.armor.merchant.hand": ( left: ( vox_spec: ("armor.merchant.hand", (-2.5, -2.0, -4.0)), color: None diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index a6056998b2..cfa93fccd7 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -4,1204 +4,1155 @@ color: None ), map: { - (Danari, Male, "Exclamation"): ( + (Danari, Male, "common.items.armor.misc.head.exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-10.0, -10.0, 20.0)), color: None ), - (Dwarf, Male, "Exclamation"): ( + (Dwarf, Male, "common.items.armor.misc.head.exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-13.0, -10.0, 18.0)), color: None ), - (Human, Male, "Exclamation"): ( + (Human, Male, "common.items.armor.misc.head.exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-12.0, -11.0, 18.0)), color: None ), - (Orc, Male, "Exclamation"): ( + (Orc, Male, "common.items.armor.misc.head.exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -12.0, 18.0)), color: None ), - (Undead, Male, "Exclamation"): ( + (Undead, Male, "common.items.armor.misc.head.exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-14.0, -11.0, 18.0)), color: None ),//fix - (Elf, Male, "Exclamation"): ( + (Elf, Male, "common.items.armor.misc.head.exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -11.0, 18.0)), color: None ), // - (Human, Male, "Witch"): ( + (Human, Male, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-4.0, -5.0, 5.0)), color: None ), - (Human, Female, "Witch"): ( + (Human, Female, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-4.0, -5.0, 5.0)), color: None ), - (Elf, Male, "Witch"): ( + (Elf, Male, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-3.0, -5.0, 5.0)), color: None ), - (Elf, Female, "Witch"): ( + (Elf, Female, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-3.0, -6.0, 5.0)), color: None ), - (Dwarf, Male, "Witch"): ( + (Dwarf, Male, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-5.0, -4.0, 5.0)), color: None ), - (Dwarf, Female, "Witch"): ( + (Dwarf, Female, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-5.0, -4.0, 5.0)), color: None ), - (Danari, Male, "Witch"): ( + (Danari, Male, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-2.0, -5.0, 7.0)), color: None ), - (Danari, Female, "Witch"): ( + (Danari, Female, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "Witch"): ( + (Undead, Male, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "Witch"): ( + (Undead, Female, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-6.0, -5.0, 6.0)), color: None ), - (Orc, Male, "Witch"): ( + (Orc, Male, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-3.0, -3.0, 8.0)), color: None ), - (Orc, Female, "Witch"): ( + (Orc, Female, "common.items.armor.witch.hat"): ( vox_spec: ("armor.witch.hat", (-3.0, -6.0, 5.0)), color: None ), // - (Human, Male, "HogHood"): ( + (Human, Male, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-4.0, -5, -8.0)), color: None ), - (Human, Female, "HogHood"): ( + (Human, Female, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-4.0, -4, -8.0)), color: None ), - (Elf, Male, "HogHood"): ( + (Elf, Male, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-3.0, -5.0, -8.0)), color: None ), - (Elf, Female, "HogHood"): ( + (Elf, Female, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-3.0, -5.0, -8.0)), color: None ), - (Dwarf, Male, "HogHood"): ( + (Dwarf, Male, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-5.0, -4.0, -8)), color: None ), - (Dwarf, Female, "HogHood"): ( + (Dwarf, Female, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-5.0, -4.0, -8.0)), color: None ), - (Danari, Male, "HogHood"): ( + (Danari, Male, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-2.0, -5, -6)), color: None ), - (Danari, Female, "HogHood"): ( + (Danari, Female, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-2.0, -5, -6)), color: None ), - (Undead, Male, "HogHood"): ( + (Undead, Male, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-6.0, -5.0, -7.0)), color: None ), - (Undead, Female, "HogHood"): ( + (Undead, Female, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-6.0, -5.0, -8.0)), color: None ), - (Orc, Male, "HogHood"): ( + (Orc, Male, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-3.0, -4.0, -6.0)), color: None ), - (Orc, Female, "HogHood"): ( + (Orc, Female, "common.items.armor.misc.head.hog_hood"): ( vox_spec: ("armor.misc.head.hog_hood", (-3.0, -6.0, -8.0)), color: None ), // - (Danari, Male, "BambooTwig"): ( + (Danari, Male, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (1.0, 2.0, -2.0)), color: None ), - (Danari, Female, "BambooTwig"): ( + (Danari, Female, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (1.0, 2.0, -2.0)), color: None ), - (Dwarf, Male, "BambooTwig"): ( + (Dwarf, Male, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-2.0, 3.0, -5.0)), color: None - ), - (Dwarf, Female, "BambooTwig"): ( + ), + (Dwarf, Female, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-2.0, 3.0, -4.0)), color: None ), - (Human, Male, "BambooTwig"): ( + (Human, Male, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-1.0, 2.0, -4.0)), color: None ), - (Human, Female, "BambooTwig"): ( + (Human, Female, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-1.0, 3.0, -4.0)), color: None ), - (Undead, Male, "BambooTwig"): ( + (Undead, Male, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-3.0, 1.0, -2.0)), color: None ), - (Undead, Female, "BambooTwig"): ( + (Undead, Female, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-3.0, 1.0, -3.0)), color: None ), - (Elf, Male, "BambooTwig"): ( + (Elf, Male, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-0.0, 2.0, -4.0)), color: None ), - (Elf, Female, "BambooTwig"): ( + (Elf, Female, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (-0.0, 2.0, -4.0)), color: None ), - (Orc, Male, "BambooTwig"): ( + (Orc, Male, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (1.0, 3.0, -1.0)), color: None ), - (Orc, Female, "BambooTwig"): ( + (Orc, Female, "common.items.armor.misc.head.bamboo_twig"): ( vox_spec: ("armor.misc.head.bamboo_twig", (0.0, 0.0, -3.0)), color: None ), // - (Human, Male, "WanderersHat"): ( + (Human, Male, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-4, -6.0, 4.0)), color: None ), - (Human, Female, "WanderersHat"): ( + (Human, Female, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-4, -5.0, 4.0)), color: None ), - (Elf, Male, "WanderersHat"): ( + (Elf, Male, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-3, -6.0, 4.0)), color: None ), - (Elf, Female, "WanderersHat"): ( + (Elf, Female, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-3, -6.0, 4.0)), color: None ), - (Dwarf, Male, "WanderersHat"): ( + (Dwarf, Male, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-5, -5.0, 3.0)), color: None ), - (Dwarf, Female, "WanderersHat"): ( + (Dwarf, Female, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-4, -5.0, 4.0)), color: None ), - (Danari, Male, "WanderersHat"): ( + (Danari, Male, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-2, -6.0, 6.0)), color: None ), - (Danari, Female, "WanderersHat"): ( + (Danari, Female, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-2, -6.0, 6.0)), color: None ), - (Undead, Male, "WanderersHat"): ( + (Undead, Male, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-6, -6.0, 5.0)), color: None ), - (Undead, Female, "WanderersHat"): ( + (Undead, Female, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-6, -6.0, 5.0)), color: None ), - (Orc, Male, "WanderersHat"): ( + (Orc, Male, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-3.0, -4.0, 5.0)), color: None ), - (Orc, Female, "WanderersHat"): ( + (Orc, Female, "common.items.armor.misc.head.wanderers_hat"): ( vox_spec: ("armor.misc.head.wanderers_hat", (-3.0, -7.0, 4.0)), color: None ), - + // - (Human, Male, "Pirate"): ( + (Human, Male, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-4.0, -4.0, 5.0)), color: None ), - (Human, Female, "Pirate"): ( + (Human, Female, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-4.0, -4.0, 5.0)), color: None ), - (Elf, Male, "Pirate"): ( + (Elf, Male, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-3.0, -4.0, 5.0)), color: None ), - (Elf, Female, "Pirate"): ( + (Elf, Female, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-3.0, -5.0, 5.0)), color: None ), - (Dwarf, Male, "Pirate"): ( + (Dwarf, Male, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-5.0, -3.0, 5.0)), color: None ), - (Dwarf, Female, "Pirate"): ( + (Dwarf, Female, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-5.0, -3.0, 5.0)), color: None ), - (Danari, Male, "Pirate"): ( + (Danari, Male, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-2.0, -4.0, 7.0)), color: None ), - (Danari, Female, "Pirate"): ( + (Danari, Female, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-2.0, -4.0, 7.0)), color: None ), - (Undead, Male, "Pirate"): ( + (Undead, Male, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-6.0, -4.0, 7.0)), color: None ), - (Undead, Female, "Pirate"): ( + (Undead, Female, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-6.0, -4.0, 6.0)), color: None ), - (Orc, Male, "Pirate"): ( + (Orc, Male, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-3.0, -2.0, 8.0)), color: None ), - (Orc, Female, "Pirate"): ( + (Orc, Female, "common.items.armor.pirate.hat"): ( vox_spec: ("armor.pirate.hat", (-3.0, -5.0, 5.0)), color: None ), // - (Human, Male, "Blacksmith"): ( + (Human, Male, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-4.0, 0.0, -3.0)), color: None ), - (Human, Female, "Blacksmith"): ( + (Human, Female, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-4.0, 1.0, -3.0)), color: None ), - (Elf, Male, "Blacksmith"): ( + (Elf, Male, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-3.0, 0.0, -3.0)), color: None ), - (Elf, Female, "Blacksmith"): ( + (Elf, Female, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-3.0, -1.0, -3.0)), color: None ), - (Dwarf, Male, "Blacksmith"): ( + (Dwarf, Male, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-5.0, 1.0, -3.0)), color: None ), - (Dwarf, Female, "Blacksmith"): ( + (Dwarf, Female, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-5.0, 1.0, -3.0)), color: None ), - (Danari, Male, "Blacksmith"): ( + (Danari, Male, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-2.0, 0.0, -1.0)), color: None ), - (Danari, Female, "Blacksmith"): ( + (Danari, Female, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-2.0, 1.0, -1.0)), color: None ), - (Undead, Male, "Blacksmith"): ( + (Undead, Male, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-6.0, 0.0, -1.0)), color: None ), - (Undead, Female, "Blacksmith"): ( + (Undead, Female, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-6.0, 0.0, -2.0)), color: None ), - (Orc, Male, "Blacksmith"): ( + (Orc, Male, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-3.0, 2.0, 0.0)), color: None ), - (Orc, Female, "Blacksmith"): ( + (Orc, Female, "common.items.armor.blacksmith.hat"): ( vox_spec: ("armor.blacksmith.hat", (-3.0, -1.0, -3.0)), color: None ), // Alchemist Goggles - (Human, Male, "Alchemist"): ( + (Human, Male, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-4.0, 0.0, 1.0)), color: None ), - (Human, Female, "Alchemist"): ( + (Human, Female, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-4.0, 1.0, 1.0)), color: None ), - (Elf, Male, "Alchemist"): ( + (Elf, Male, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-3.0, 0.0, 1.0)), color: None ), - (Elf, Female, "Alchemist"): ( + (Elf, Female, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-3.0, -1.0, 1.0)), color: None ), - (Dwarf, Male, "Alchemist"): ( + (Dwarf, Male, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-5.0, 1.0, 1.0)), color: None ), - (Dwarf, Female, "Alchemist"): ( + (Dwarf, Female, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-5.0, 1.0, 1.0)), color: None ), - (Danari, Male, "Alchemist"): ( + (Danari, Male, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-2.0, 0.0, 3.0)), color: None ), - (Danari, Female, "Alchemist"): ( + (Danari, Female, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-2.0, 1.0, 3.0)), color: None ), - (Undead, Male, "Alchemist"): ( + (Undead, Male, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-6.0, 0.0, 3.0)), color: None ), - (Undead, Female, "Alchemist"): ( + (Undead, Female, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-6.0, 0.0, 2.0)), color: None ), - (Orc, Male, "Alchemist"): ( + (Orc, Male, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-3.0, 2.0, 4.0)), color: None ), - (Orc, Female, "Alchemist"): ( + (Orc, Female, "common.items.armor.alchemist.hat"): ( vox_spec: ("armor.alchemist.hat", (-3.0, -1.0, 1.0)), color: None ), // Chef hat - (Human, Male, "Chef"): ( + (Human, Male, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-4.0, -5.0, 5.0)), color: None ), - (Human, Female, "Chef"): ( + (Human, Female, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-4.0, -5.0, 5.0)), color: None ), - (Elf, Male, "Chef"): ( + (Elf, Male, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-3.0, -5.0, 5.0)), color: None ), - (Elf, Female, "Chef"): ( + (Elf, Female, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-3.0, -6.0, 5.0)), color: None ), - (Dwarf, Male, "Chef"): ( + (Dwarf, Male, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-5.0, -4.0, 5.0)), color: None ), - (Dwarf, Female, "Chef"): ( + (Dwarf, Female, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-5.0, -4.0, 5.0)), color: None ), - (Danari, Male, "Chef"): ( + (Danari, Male, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-2.0, -5.0, 7.0)), color: None ), - (Danari, Female, "Chef"): ( + (Danari, Female, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "Chef"): ( + (Undead, Male, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "Chef"): ( + (Undead, Female, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-6.0, -5.0, 6.0)), color: None ), - (Orc, Male, "Chef"): ( + (Orc, Male, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-3.0, -3.0, 8.0)), color: None ), - (Orc, Female, "Chef"): ( + (Orc, Female, "common.items.armor.chef.hat"): ( vox_spec: ("armor.chef.hat", (-3.0, -6.0, 5.0)), color: None ), // Straw hat - (Human, Male, "Straw"): ( + (Human, Male, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-4.0, -5.0, 5.0)), color: None ), - (Human, Female, "Straw"): ( + (Human, Female, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-4.0, -5.0, 5.0)), color: None ), - (Elf, Male, "Straw"): ( + (Elf, Male, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-3.0, -5.0, 5.0)), color: None ), - (Elf, Female, "Straw"): ( + (Elf, Female, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-3.0, -6.0, 5.0)), color: None ), - (Dwarf, Male, "Straw"): ( + (Dwarf, Male, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 5.0)), color: None ), - (Dwarf, Female, "Straw"): ( + (Dwarf, Female, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 5.0)), color: None ), - (Danari, Male, "Straw"): ( + (Danari, Male, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 7.0)), color: None ), - (Danari, Female, "Straw"): ( + (Danari, Female, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "Straw"): ( + (Undead, Male, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "Straw"): ( + (Undead, Female, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-6.0, -5.0, 6.0)), color: None ), - (Orc, Male, "Straw"): ( + (Orc, Male, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 8.0)), color: None ), - (Orc, Female, "Straw"): ( + (Orc, Female, "common.items.armor.misc.head.straw"): ( vox_spec: ("armor.misc.head.straw", (-3.0, -6.0, 5.0)), color: None ), // - (Human, Male, "Crown"): ( + (Human, Male, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-4.0, -5.0, 5.0)), color: None ), - (Human, Female, "Crown"): ( + (Human, Female, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-4.0, -5.0, 5.0)), color: None ), - (Elf, Male, "Crown"): ( + (Elf, Male, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-3.0, -5.0, 5.0)), color: None ), - (Elf, Female, "Crown"): ( + (Elf, Female, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-3.0, -6.0, 5.0)), color: None ), - (Dwarf, Male, "Crown"): ( + (Dwarf, Male, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-5.0, -4.0, 5.0)), color: None ), - (Dwarf, Female, "Crown"): ( + (Dwarf, Female, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-5.0, -4.0, 5.0)), color: None ), - (Danari, Male, "Crown"): ( + (Danari, Male, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-2.0, -5.0, 7.0)), color: None ), - (Danari, Female, "Crown"): ( + (Danari, Female, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "Crown"): ( + (Undead, Male, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "Crown"): ( + (Undead, Female, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-6.0, -5.0, 6.0)), color: None ), - (Orc, Male, "Crown"): ( + (Orc, Male, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-3.0, -3.0, 8.0)), color: None ), - (Orc, Female, "Crown"): ( + (Orc, Female, "common.items.armor.misc.head.crown"): ( vox_spec: ("armor.misc.head.crown", (-3.0, -6.0, 5.0)), color: None ), // - (Human, Male, "Mitre"): ( + (Human, Male, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-4.0, -5.0, 5.0)), color: None ), - (Human, Female, "Mitre"): ( + (Human, Female, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-4.0, -5.0, 5.0)), color: None ), - (Elf, Male, "Mitre"): ( + (Elf, Male, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-3.0, -5.0, 5.0)), color: None ), - (Elf, Female, "Mitre"): ( + (Elf, Female, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-3.0, -6.0, 5.0)), color: None ), - (Dwarf, Male, "Mitre"): ( + (Dwarf, Male, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-5.0, -4.0, 5.0)), color: None ), - (Dwarf, Female, "Mitre"): ( + (Dwarf, Female, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-5.0, -4.0, 5.0)), color: None ), - (Danari, Male, "Mitre"): ( + (Danari, Male, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-2.0, -5.0, 7.0)), color: None ), - (Danari, Female, "Mitre"): ( + (Danari, Female, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-2.0, -5.0, 7.0)), color: None ), - (Undead, Male, "Mitre"): ( + (Undead, Male, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-6.0, -5.0, 7.0)), color: None ), - (Undead, Female, "Mitre"): ( + (Undead, Female, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-6.0, -5.0, 6.0)), color: None ), - (Orc, Male, "Mitre"): ( + (Orc, Male, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-3.0, -3.0, 8.0)), color: None ), - (Orc, Female, "Mitre"): ( + (Orc, Female, "common.items.armor.misc.head.mitre"): ( vox_spec: ("armor.misc.head.mitre", (-3.0, -6.0, 5.0)), color: None ), // - (Danari, Male, "Headband"): ( + (Danari, Male, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.danari_m", (4.0, 2.0, 7.0)), color: None ), - (Danari, Female, "Headband"): ( + (Danari, Female, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.danari_f", (4.0, 2.0, 7.0)), color: None ), - (Dwarf, Male, "Headband"): ( + (Dwarf, Male, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.dwarf_m", (2.0, 3.0, 6.0)), color: None ), - (Dwarf, Female, "Headband"): ( + (Dwarf, Female, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.dwarf_f", (2.0, 3.0, 5.0)), color: None ), - (Human, Male, "Headband"): ( + (Human, Male, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.human_m", (2.0, 2.0, 5.0)), color: None ), - (Human, Female, "Headband"): ( + (Human, Female, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.human_f", (2.0, 3.0, 5.0)), color: None ), - (Orc, Male, "Headband"): ( + (Orc, Male, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.orc_m", (4.0, 3.0, 7.0)), color: None ), - (Orc, Female, "Headband"): ( + (Orc, Female, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.orc_f", (3.0, 1.0, 5.0)), color: None ), - (Undead, Male, "Headband"): ( + (Undead, Male, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.undead_m", (0.0, 2.0, 7.0)), color: Some((44, 74, 109)) ), - (Undead, Female, "Headband"): ( + (Undead, Female, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.undead_f", (0.0, 2.0, 6.0)), color: None ), - (Elf, Male, "Headband"): ( + (Elf, Male, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.elf_m", (3.0, 2.0, 5.0)), color: None ), - (Elf, Female, "Headband"): ( + (Elf, Female, "common.items.armor.misc.head.headband"): ( vox_spec: ("armor.misc.head.headband.elf_f", (3.0, 2.0, 5.0)), color: None ), // - (Human, Female, "Helmet"): ( + (Human, Female, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-4.0, -5.0, -1.0)), color: None ), - (Human, Male, "Helmet"): ( + (Human, Male, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-4.0, -5.0, -1.0)), color: None ), - (Elf, Female, "Helmet"): ( + (Elf, Female, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-3.0, -5.0, -1.0)), color: None ), - (Elf, Male, "Helmet"): ( + (Elf, Male, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-3.0, -5.0, -1.0)), color: None ), - (Orc, Female, "Helmet"): ( + (Orc, Female, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), color: None ), - (Orc, Male, "Helmet"): ( + (Orc, Male, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, 2.0)), color: None ), - (Dwarf, Female, "Helmet"): ( + (Dwarf, Female, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-5.0, -4.0, -1.0)), color: None ), - (Dwarf, Male, "Helmet"): ( + (Dwarf, Male, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), color: None ), - (Undead, Female, "Helmet"): ( + (Undead, Female, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-6.0, -5.0, -1.0)), color: None ), - (Undead, Male, "Helmet"): ( + (Undead, Male, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-6.0, -5.0, 1.0)), color: None ), - (Danari, Female, "Helmet"): ( + (Danari, Female, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-2.0, -5.0, 1.0)), color: None ), - (Danari, Male, "Helmet"): ( + (Danari, Male, "common.items.armor.misc.head.helmet"): ( vox_spec: ("armor.misc.head.helmet", (-2.0, -5.0, -1.0)), color: None ), // - (Danari, Male, "Red"): ( + (Danari, Male, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-2.0, -2.0, -8.0)), color: None ), - (Danari, Female, "Red"): ( + (Danari, Female, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-2.0, -2.0, -8.0)), color: None ), - (Dwarf, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (-5.0, -1.0, -10.0)), - color: None - ), - (Dwarf, Female, "Red"): ( + (Dwarf, Male, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-5.0, -1.0, -10.0)), color: None ), - (Human, Male, "Red"): ( + (Dwarf, Female, "common.items.armor.misc.head.bandana.red"): ( + vox_spec: ("armor.misc.head.bandana.red", (-5.0, -1.0, -10.0)), + color: None + ), + (Human, Male, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-4.0, -2.0, -10.0)), color: None ), - (Human, Female, "Red"): ( + (Human, Female, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-4.0, -2.0, -10.0)), color: None ), - (Undead, Male, "Red"): ( + (Undead, Male, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-6.0, -2.0, -8.0)), color: None ), - (Undead, Female, "Red"): ( + (Undead, Female, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-6.0, -2.0, -9.0)), color: None ), - (Elf, Male, "Red"): ( + (Elf, Male, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-3.0, -2.0, -10.0)), color: None ), - (Elf, Female, "Red"): ( + (Elf, Female, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-3.0, -2.0, -10.0)), color: None ), - (Orc, Male, "Red"): ( + (Orc, Male, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-3.0, 0.0, -8.0)), color: None ), - (Orc, Female, "Red"): ( + (Orc, Female, "common.items.armor.misc.head.bandana.red"): ( vox_spec: ("armor.misc.head.bandana.red", (-3.0, -3.0, -10.0)), color: None ), // - (Danari, Male, "Thief"): ( + (Danari, Male, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-2.0, -2.0, -8.0)), color: None ), - (Danari, Female, "Thief"): ( + (Danari, Female, "Thicommon.items.armor.misc.head.bandana.thiefef"): ( vox_spec: ("armor.misc.head.bandana.thief", (-2.0, -2.0, -8.0)), color: None ), - (Dwarf, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (-5.0, -1.0, -10.0)), - color: None - ), - (Dwarf, Female, "Thief"): ( + (Dwarf, Male, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-5.0, -1.0, -10.0)), color: None ), - (Human, Male, "Thief"): ( + (Dwarf, Female, "common.items.armor.misc.head.bandana.thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (-5.0, -1.0, -10.0)), + color: None + ), + (Human, Male, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -2.0, -10.0)), color: None ), - (Human, Female, "Thief"): ( + (Human, Female, "Thcommon.items.armor.misc.head.bandana.thiefief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -2.0, -10.0)), color: None ), - (Undead, Male, "Thief"): ( + (Undead, Male, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-6.0, -2.0, -8.0)), color: None ), - (Undead, Female, "Thief"): ( + (Undead, Female, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-6.0, -2.0, -9.0)), color: None ), - (Elf, Male, "Thief"): ( + (Elf, Male, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-3.0, -2.0, -10.0)), color: None ), - (Elf, Female, "Thief"): ( + (Elf, Female, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-3.0, -2.0, -10.0)), color: None ), - (Orc, Male, "Thief"): ( + (Orc, Male, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-3.0, 0.0, -8.0)), color: None ), - (Orc, Female, "Thief"): ( + (Orc, Female, "common.items.armor.misc.head.bandana.thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (-3.0, -3.0, -10.0)), color: None ), // - (Danari, Male, "Cultist"): ( + (Danari, Male, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)), color: None ), - (Danari, Female, "Cultist"): ( + (Danari, Female, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)), color: None ), - (Dwarf, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)), - color: None - ), - (Dwarf, Female, "Cultist"): ( + (Dwarf, Male, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)), color: None ), - (Human, Male, "Cultist"): ( + (Dwarf, Female, "common.items.armor.cultist.hat"): ( + vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)), + color: None + ), + (Human, Male, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-4.0, -2.0, -11.0)), color: None ), - (Human, Female, "Cultist"): ( + (Human, Female, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-4.0, -2.0, -10.0)), color: None ), - (Undead, Male, "Cultist"): ( + (Undead, Male, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -8.0)), color: None ), - (Undead, Female, "Cultist"): ( + (Undead, Female, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -9.0)), color: None ), - (Elf, Male, "Cultist"): ( + (Elf, Male, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)), color: None ), - (Elf, Female, "Cultist"): ( + (Elf, Female, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)), color: None ), - (Orc, Male, "Cultist"): ( + (Orc, Male, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-3.0, 0.0, -8.0)), color: None ), - (Orc, Female, "Cultist"): ( + (Orc, Female, "common.items.armor.cultist.hat"): ( vox_spec: ("armor.cultist.bandana", (-3.0, -3.0, -10.0)), color: None ), // - (Human, Male, "Hood"): ( + (Human, Male, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-4.0, -6.0, -4.0)), color: None ), - (Human, Female, "Hood"): ( + (Human, Female, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-4.0, -6.0, -4.0)), color: None ), - (Elf, Male, "Hood"): ( + (Elf, Male, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -4.0)), color: None ), - (Elf, Female, "Hood"): ( + (Elf, Female, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-3.0, -7.0, -4.0)), color: None ), - (Dwarf, Male, "Hood"): ( + (Dwarf, Male, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-5.0, -5.0, -4.0)), color: None ), - (Dwarf, Female, "Hood"): ( + (Dwarf, Female, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-5.0, -5.0, -4.0)), color: None ), - (Danari, Male, "Hood"): ( + (Danari, Male, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-2.0, -6.0, -2.0)), color: None ), - (Danari, Female, "Hood"): ( + (Danari, Female, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-2.0, -6.0, -2.0)), color: None ), - (Undead, Male, "Hood"): ( + (Undead, Male, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-6.0, -6.0, -2.0)), color: None ), - (Undead, Female, "Hood"): ( + (Undead, Female, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-6.0, -6.0, -3.0)), color: None ), - (Orc, Male, "Hood"): ( + (Orc, Male, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-3.0, -5.0, -2.0)), color: None ), - (Orc, Female, "Hood"): ( + (Orc, Female, "common.items.armor.misc.head.hood"): ( vox_spec: ("armor.misc.head.hood", (-3.0, -7.0, -4.0)), color: None ), // - (Human, Male, "DarkHood"): ( + (Human, Male, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-4.0, -6.0, -5.0)), color: None ), - (Human, Female, "DarkHood"): ( + (Human, Female, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-4.0, -6.0, -5.0)), color: None ), - (Elf, Male, "DarkHood"): ( + (Elf, Male, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-3.0, -7.0, -5.0)), color: None ), - (Elf, Female, "DarkHood"): ( + (Elf, Female, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-3.0, -7.0, -5.0)), color: None ), - (Dwarf, Male, "DarkHood"): ( + (Dwarf, Male, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-5.0, -6.0, -5.0)), color: None ), - (Dwarf, Female, "DarkHood"): ( + (Dwarf, Female, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-5.0, -6.0, -5.0)), color: None ), - (Danari, Male, "DarkHood"): ( + (Danari, Male, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-2.0, -7.0, -3.0)), color: None ), - (Danari, Female, "DarkHood"): ( + (Danari, Female, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-2.0, -7.0, -3.0)), color: None ), - (Undead, Male, "DarkHood"): ( + (Undead, Male, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-6.0, -7.0, -3.0)), color: None ), - (Undead, Female, "DarkHood"): ( + (Undead, Female, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-6.0, -7.0, -4.0)), color: None ), - (Orc, Male, "DarkHood"): ( + (Orc, Male, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -4.0)), color: None ), - (Orc, Female, "DarkHood"): ( + (Orc, Female, "common.items.armor.misc.head.hood_dark"): ( vox_spec: ("armor.misc.head.hood_dark", (-3.0, -8.0, -5.0)), color: None ), // - (Human, Male, "Spikeguard"): ( + (Human, Male, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-4.0, -4.0, -2.0)), color: None ), - (Human, Female, "Spikeguard"): ( + (Human, Female, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-4.0, -4.0, -2.0)), color: None ), - (Elf, Male, "Spikeguard"): ( + (Elf, Male, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-3.0, -4.0, -2.0)), color: None ), - (Elf, Female, "Spikeguard"): ( + (Elf, Female, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), color: None ), - (Dwarf, Male, "Spikeguard"): ( + (Dwarf, Male, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, -2.0)), color: None ), - (Dwarf, Female, "Spikeguard"): ( + (Dwarf, Female, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, -2.0)), color: None ), - (Danari, Male, "Spikeguard"): ( + (Danari, Male, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, -0.0)), color: None ), - (Danari, Female, "Spikeguard"): ( + (Danari, Female, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, -0.0)), color: None ), - (Undead, Male, "Spikeguard"): ( + (Undead, Male, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, -0.0)), color: None ), - (Undead, Female, "Spikeguard"): ( + (Undead, Female, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, -1.0)), color: None ), - (Orc, Male, "Spikeguard"): ( + (Orc, Male, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-3.0, -2.0, -0.0)), color: None ), - (Orc, Female, "Spikeguard"): ( + (Orc, Female, "common.items.armor.misc.head.spikeguard"): ( vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), color: None ), - // Village Guard Helmet - (Human, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-4.0, -6.0, -1.0)), - color: None - ), - (Human, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-4.0, -5.0, -1.0)), - color: None - ), - (Elf, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, -1.0)), - color: None - ), - (Elf, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, -1.0)), - color: None - ), - (Dwarf, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-5.0, -5.0, -1.0)), - color: None - ), - (Dwarf, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-5.0, -5.0, -1.0)), - color: None - ), - (Danari, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -6.0, 1.0)), - color: None - ), - (Danari, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -6.0, 1.0)), - color: None - ), - (Undead, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-6.0, -6.0, 0.0)), - color: None - ), - (Undead, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-6.0, -6.0, 0.0)), - color: None - ), - (Orc, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-3.0, -4.0, 1.0)), - color: None - ), - (Orc, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-3.0, -7.0, -1.0)), - color: None - ), // Merchant Turban - (Human, Male, "Merchant"): ( + (Human, Male, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-4.0, -7.0, -6.0)), color: None ), - (Human, Female, "Merchant"): ( + (Human, Female, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-4.0, -6.0, -6.0)), color: None ), - (Elf, Male, "Merchant"): ( + (Elf, Male, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-3.0, -7.0, -6.0)), color: None ), - (Elf, Female, "Merchant"): ( + (Elf, Female, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-3.0, -7.0, -6.0)), color: None ), - (Dwarf, Male, "Merchant"): ( + (Dwarf, Male, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-5.0, -6.0, -6.0)), color: None ), - (Dwarf, Female, "Merchant"): ( + (Dwarf, Female, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-5.0, -6.0, -6.0)), color: None ), - (Danari, Male, "Merchant"): ( + (Danari, Male, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-2.0, -7.0, -4.0)), color: None ), - (Danari, Female, "Merchant"): ( + (Danari, Female, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-2.0, -7.0, -4.0)), color: None ), - (Undead, Male, "Merchant"): ( + (Undead, Male, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-6.0, -7.0, -4.0)), color: None ), - (Undead, Female, "Merchant"): ( + (Undead, Female, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-6.0, -7.0, -5.0)), color: None ), - (Orc, Male, "Merchant"): ( + (Orc, Male, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-3.0, -5.0, -4.0)), color: None ), - (Orc, Female, "Merchant"): ( + (Orc, Female, "common.items.armor.merchant.hat"): ( vox_spec: ("armor.merchant.turban", (-3.0, -8.0, -6.0)), color: None ), //Winged Coronet -1, 5 - (Human, Male, "WingedCoronet"): ( + (Human, Male, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-4.0, -4.0, -1.0)), color: None ), - (Human, Female, "WingedCoronet"): ( + (Human, Female, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-4.0, -3.0, -1.0)), color: None ), - (Elf, Male, "WingedCoronet"): ( + (Elf, Male, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -4.0, -1.0)), color: None ), - (Elf, Female, "WingedCoronet"): ( + (Elf, Female, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -4.0, -1.0)), color: None ), - (Dwarf, Male, "WingedCoronet"): ( + (Dwarf, Male, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-5.0, -3.0, -2.5)), color: None ), - (Dwarf, Female, "WingedCoronet"): ( + (Dwarf, Female, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-5.0, -3.0, -2.5)), color: None ), - (Danari, Male, "WingedCoronet"): ( + (Danari, Male, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -3.0, 0.0)), color: None ), - (Danari, Female, "WingedCoronet"): ( + (Danari, Female, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -3.0, 0.0)), color: None ), - (Undead, Male, "WingedCoronet"): ( + (Undead, Male, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -5.0, 0.0)), color: None ), - (Undead, Female, "WingedCoronet"): ( + (Undead, Female, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -5.0, -1.0)), color: None ), - (Orc, Male, "WingedCoronet"): ( + (Orc, Male, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -2.0, 1.0)), color: None ), - (Orc, Female, "WingedCoronet"): ( + (Orc, Female, "common.items.armor.misc.head.winged_coronet"): ( vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -5.0, -1.0)), color: None ), // Boreal Warhelmet - (Human, Male, "BorealWarhelm"): ( + (Human, Male, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-4.0, -5.0, -4.0)), color: None ), - (Human, Female, "BorealWarhelm"): ( + (Human, Female, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-4.0, -5.0, -4.0)), color: None ), - (Elf, Male, "BorealWarhelm"): ( + (Elf, Male, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -6.0, -4.0)), color: None ), - (Elf, Female, "BorealWarhelm"): ( + (Elf, Female, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -6.0, -4.0)), color: None ), - (Dwarf, Male, "BorealWarhelm"): ( + (Dwarf, Male, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -5.0, -4.0)), color: None ), - (Dwarf, Female, "BorealWarhelm"): ( + (Dwarf, Female, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -5.0, -4.0)), color: None ), - (Danari, Male, "BorealWarhelm"): ( + (Danari, Male, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-2.0, -6.0, -2.0)), color: None ), - (Danari, Female, "BorealWarhelm"): ( + (Danari, Female, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-2.0, -6.0, -2.0)), color: None ), - (Undead, Male, "BorealWarhelm"): ( + (Undead, Male, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-6.0, -6.0, -3.0)), color: None ), - (Undead, Female, "BorealWarhelm"): ( + (Undead, Female, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-6.0, -6.0, -3.0)), color: None ), - (Orc, Male, "BorealWarhelm"): ( + (Orc, Male, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -4.0, -2.0)), color: None ), - (Orc, Female, "BorealWarhelm"): ( + (Orc, Female, "common.items.armor.misc.head.boreal_warhelm"): ( vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -7.0, -4.0)), color: None ), // Woolly Wintercap (Christmas hat+event) - (Human, Male, "WoollyWintercap"): ( + (Human, Male, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-4.0, -7.0, -3.0)), color: None ), - (Human, Female, "WoollyWintercap"): ( + (Human, Female, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-4.0, -7.0, -3.0)), color: None ), - (Elf, Male, "WoollyWintercap"): ( + (Elf, Male, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-3.0, -7.0, -4.0)), color: None ), - (Elf, Female, "WoollyWintercap"): ( + (Elf, Female, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-3.0, -8.0, -4.0)), color: None ), - (Dwarf, Male, "WoollyWintercap"): ( + (Dwarf, Male, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-5.0, -6.0, -3.0)), color: None ), - (Dwarf, Female, "WoollyWintercap"): ( + (Dwarf, Female, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-5.0, -6.0, -3.0)), color: None ), - (Danari, Male, "WoollyWintercap"): ( + (Danari, Male, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-2.0, -7.0, -2.0)), color: None ), - (Danari, Female, "WoollyWintercap"): ( + (Danari, Female, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-2.0, -7.0, -2.0)), color: None ), - (Undead, Male, "WoollyWintercap"): ( + (Undead, Male, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-6.0, -7.0, -3.0)), color: None ), - (Undead, Female, "WoollyWintercap"): ( + (Undead, Female, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-6.0, -7.0, -4.0)), color: None ), - (Orc, Male, "WoollyWintercap"): ( + (Orc, Male, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-3.0, -5.0, -2.0)), color: None ), - (Orc, Female, "WoollyWintercap"): ( + (Orc, Female, "common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): ( vox_spec: ("armor.misc.head.woolly_wintercap", (-3.0, -8.0, -4.0)), color: None ), diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index e82429dea1..912c1f4bfb 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -16,7 +16,7 @@ vox_spec: ("armor.misc.pants.grayscale", (-5.0, -3.5, 1.0)), color: Some((24, 19, 17)) ), - "Hunting": ( + "common.items.armor.misc.pants.hunting": ( vox_spec: ("armor.misc.pants.grayscale", (-5.0, -3.5, 1.0)), color: Some((49, 95, 59)) ), @@ -24,7 +24,7 @@ vox_spec: ("armor.misc.pants.grayscale", (-5.0, -3.5, 1.0)), color: Some((148, 52, 33)) ), - "Assassin": ( + "common.items.armor.assassin.pants": ( vox_spec: ("armor.assassin.pants", (-5.0, -3.5, 1.0)), color: None ), @@ -32,171 +32,171 @@ vox_spec: ("armor.misc.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)), color: None ), - "Ferocious": ( + "common.items.armor.ferocious.pants": ( vox_spec: ("armor.ferocious.pants", (-5.0, -3.5, 1.0)), color: None ), - "PlateRed": ( + "common.items.npc_armor.pants.plate_red": ( vox_spec: ("armor.misc.pants.plate_grey", (-5.0, -3.5, 1.0)), color: Some((124, 38, 46)) ), - "ClothPurple": ( + "common.items.armor.cloth_purple.pants": ( vox_spec: ("armor.cloth_purple.pants", (-5.0, -3.5, 0.0)), color: None ), - "ClothBlue": ( + "common.items.armor.cloth_blue.pants": ( vox_spec: ("armor.cloth_blue.pants", (-5.0, -3.5, 0.0)), color: None ), - "ClothGreen": ( + "common.items.armor.cloth_green.pants": ( vox_spec: ("armor.cloth_green.pants", (-5.0, -3.5, 0.0)), color: None ), - "Rugged": ( + "common.items.armor.rugged.pants": ( vox_spec: ("armor.rugged.pants", (-5.0, -3.5, 1.0)), color: None ), - "WorkerBlue": ( + "common.items.armor.misc.pants.worker_blue": ( vox_spec: ("armor.misc.pants.worker_blue", (-5.0, -3.5, 1.0)), color: None ), - "WorkerBrown": ( + "common.items.armor.misc.pants.worker_brown": ( vox_spec: ("armor.misc.pants.worker_brown", (-5.0, -3.5, 1.0)), color: None ), - "Cultist": ( + "common.items.armor.cultist.pants": ( vox_spec: ("armor.cultist.pants", (-5.0, -3.5, 1.0)), color: Some((30, 0, 64)) ), - "LeatherPlate": ( + "common.items.armor.leather_plate.pants": ( vox_spec: ("armor.leather_plate.pants", (-5.0, -4.5, 1.0)), color: None ), - "Twigs": ( + "common.items.armor.twigs.pants": ( vox_spec: ("armor.twigs.pants", (-5.0, -3.5, 0.0)), color: None ), - "TwigsLeaves": ( + "common.items.armor.twigsleaves.pants": ( vox_spec: ("armor.twigsleaves.pants", (-5.0, -3.5, 0.0)), color: None ), - "TwigsFlowers": ( + "common.items.armor.twigsflowers.pants": ( vox_spec: ("armor.twigsflowers.pants", (-6.0, -3.5, 0.0)), color: None ), - "Tarasque":( + "common.items.armor.tarasque.pants":( vox_spec: ("armor.tarasque.pants", (-6.0, -4.5, 1.0)), color: None ), - "Bonerattler":( + "common.items.armor.bonerattler.pants":( vox_spec: ("armor.bonerattler.pants", (-5.0, -3.5, 1.0)), color: None ), - "VeloriteMage": ( + "common.items.armor.velorite_mage.pants": ( vox_spec: ("armor.velorite_battlemage.pants", (-6.0, -3.5, -2.0)), color: None ), - "LeatherBlue": ( + "common.items.npc_armor.pants.leather_blue": ( vox_spec: ("armor.leather_blue.pants", (-5.0, -3.5, 1.0)), color: None ), - "Rawhide": ( + "common.items.armor.hide.rawhide.pants": ( vox_spec: ("armor.hide.rawhide.pants", (-5.0, -3.5, 1.0)), color: None ), - "Leather": ( + "common.items.armor.hide.leather.pants": ( vox_spec: ("armor.hide.leather.pants", (-5.0, -3.5, 1.0)), color: None ), - "Scale": ( + "common.items.armor.hide.scale.pants": ( vox_spec: ("armor.hide.scale.pants", (-5.0, -4.0, 0.0)), color: None ), - "Carapace": ( + "common.items.armor.hide.carapace.pants": ( vox_spec: ("armor.hide.carapace.pants", (-6.0, -4.0, 0.5)), color: None ), - "Primal": ( + "common.items.armor.hide.primal.pants": ( vox_spec: ("armor.hide.primal.pants", (-6.0, -4.0, 0.0)), color: None ), - "Dragonscale": ( + "common.items.armor.hide.dragonscale.pants": ( vox_spec: ("armor.hide.dragonscale.pants", (-5.0, -3.5, -1.5)), color: None ), - "Savage": ( + "common.items.armor.savage.pants": ( vox_spec: ("armor.savage.pants", (-5.0, -4.0, 0.5)), color: None ), - "Witch": ( + "common.items.armor.witch.pants": ( vox_spec: ("armor.witch.pants", (-5.0, -4.0, 0.5)), color: None ), - "Pirate": ( + "common.items.armor.pirate.pants": ( vox_spec: ("armor.pirate.pants", (-5.0, -4.0, 1.5)), color: None ), - "Alchemist": ( + "common.items.armor.alchemist.pants": ( vox_spec: ("armor.alchemist.pants", (-5.0, -4.0, 0.5)), color: None ), - "Blacksmith": ( + "common.items.armor.blacksmith.pants": ( vox_spec: ("armor.blacksmith.pants", (-5.0, -4.0, 0.5)), color: None ), - "Chef": ( + "common.items.armor.chef.pants": ( vox_spec: ("armor.chef.pants", (-5.0, -4.0, 0.0)), color: None ), - "Linen": ( + "common.items.armor.cloth.linen.pants": ( vox_spec: ("armor.cloth.linen.pants", (-5.0, -4.0, 0.5)), color: None ), - "Woolen": ( + "common.items.armor.cloth.woolen.pants": ( vox_spec: ("armor.cloth.woolen.pants", (-6.0, -5.0, 0.5)), color: None ), - "Silken": ( + "common.items.armor.cloth.silken.pants": ( vox_spec: ("armor.cloth.silken.pants", (-5.0, -4.0, 0.5)), color: None ), - "Druid": ( + "common.items.armor.cloth.druid.pants": ( vox_spec: ("armor.cloth.druid.pants", (-5.0, -4.0, 0.5)), color: None ), - "Moonweave": ( + "common.items.armor.cloth.moonweave.pants": ( vox_spec: ("armor.cloth.moonweave.pants", (-6.0, -5.5, 0.5)), color: None ), - "Sunsilk": ( + "common.items.armor.cloth.sunsilk.pants": ( vox_spec: ("armor.cloth.sunsilk.pants", (-6.0, -5.0, 0.5)), color: None ), - "Bronze": ( + "common.items.armor.mail.bronze.pants": ( vox_spec: ("armor.mail.bronze.pants", (-5.0, -4.0, 1.0)), color: None ), - "Iron": ( + "common.items.armor.mail.iron.pants": ( vox_spec: ("armor.mail.iron.pants", (-5.0, -4.0, 1.5)), color: None ), - "Steel": ( + "common.items.armor.mail.steel.pants": ( vox_spec: ("armor.mail.steel.pants", (-6.0, -4.0, 0.0)), color: None ), - "Cobalt": ( + "common.items.armor.mail.cobalt.pants": ( vox_spec: ("armor.mail.cobalt.pants", (-6.0, -5.0, 0.5)), color: None ), - "Bloodsteel": ( + "common.items.armor.mail.bloodsteel.pants": ( vox_spec: ("armor.mail.bloodsteel.pants", (-7.0, -4.0, 0.5)), color: None ), - "Orichalcum": ( + "common.items.armor.mail.orichalcum.pants": ( vox_spec: ("armor.mail.orichalcum.pants", (-6.0, -4.0, 0.5)), color: None ), - "Merchant": ( + "common.items.armor.merchant.pants": ( vox_spec: ("armor.merchant.pants", (-6.0, -4.0, 0.5)), color: None ), diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index da6301c000..f131607d3a 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -21,7 +21,7 @@ color: None ) ), - "Assassin": ( + "common.items.armor.assassin.shoulder": ( left: ( vox_spec: ("armor.assassin.shoulder", (-4.0, -3.5, 1.0)), color: None @@ -41,7 +41,7 @@ color: None ) ), - "Ferocious": ( + "common.items.armor.ferocious.shoulder": ( left: ( vox_spec: ("armor.ferocious.shoulder", (-6.0, -2.5, -1.0)), color: None @@ -51,7 +51,7 @@ color: None ) ), - "ClothPurple": ( + "common.items.armor.cloth_purple.shoulder": ( left: ( vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)), color: None @@ -61,7 +61,7 @@ color: None ) ), - "ClothBlue0": ( + "common.items.armor.cloth_blue.shoulder_0": ( left: ( vox_spec: ("armor.cloth_blue.shoulder_0", (-3.2, -3.5, 0.0)), color: None @@ -71,7 +71,7 @@ color: None ) ), - "ClothGreen": ( + "common.items.armor.cloth_green.shoulder": ( left: ( vox_spec: ("armor.cloth_green.shoulder", (-3.2, -3.5, 0.0)), color: None @@ -81,7 +81,7 @@ color: None ) ), - "Cultist": ( + "common.items.armor.cultist.shoulder": ( left: ( vox_spec: ("armor.cultist.shoulder", (-2.0, -3.5, 0.0)), color: Some((30, 0, 64)) @@ -91,7 +91,7 @@ color: Some((30, 0, 64)) ) ), - "LeatherPlate": ( + "common.items.armor.leather_plate.shoulder": ( left: ( vox_spec: ("armor.leather_plate.shoulder", (-4.0, -4.5 , 0.0)), color: None @@ -101,7 +101,7 @@ color: None ) ), - "Twigs": ( + "common.items.armor.twigs.shoulder": ( left: ( vox_spec: ("armor.twigs.shoulder", (-5.0, -4.5 , -1.0)), color: None @@ -111,7 +111,7 @@ color: None ) ), - "TwigsLeaves": ( + "common.items.armor.twigsleaves.shoulder": ( left: ( vox_spec: ("armor.twigsleaves.shoulder", (-5.5, -5.0 , 0.0)), color: None @@ -121,7 +121,7 @@ color: None ) ), - "TwigsFlowers": ( + "common.items.armor.twigsflowers.shoulder": ( left: ( vox_spec: ("armor.twigsflowers.shoulder", (-5.5, -5.0 , 0.0)), color: None @@ -131,7 +131,7 @@ color: None ), ), - "ClothBlue1": ( + "common.items.armor.cloth_blue.shoulder_1": ( left: ( vox_spec: ("armor.cloth_blue.shoulder_1", (-4.0, -2.5, -0.5)), color: None @@ -141,7 +141,7 @@ color: None ) ), - "IronSpikes": ( + "common.items.armor.misc.shoulder.iron_spikes": ( left: ( vox_spec: ("armor.misc.shoulder.iron_spikes", (-5.5, -3.8, -2.0)), color: None @@ -151,7 +151,7 @@ color: None ) ), - "IronLeather3": ( + "common.items.armor.misc.shoulder.leather_iron_3": ( left: ( vox_spec: ("armor.misc.shoulder.leather_iron_3", (-4.0, -2.5, -1.0)), color: None @@ -161,7 +161,7 @@ color: None ) ), - "IronLeather2": ( + "common.items.armor.misc.shoulder.leather_iron_2": ( left: ( vox_spec: ("armor.misc.shoulder.leather_iron_2", (-5.0, -2.5, -0.5)), color: None @@ -171,7 +171,7 @@ color: None ) ), - "IronLeather1": ( + "common.items.armor.misc.shoulder.leather_iron_1": ( left: ( vox_spec: ("armor.misc.shoulder.leather_iron_1", (-5.0, -2.5, -0.5)), color: None @@ -181,7 +181,7 @@ color: None ) ), - "IronLeather0": ( + "common.items.armor.misc.shoulder.leather_iron_0": ( left: ( vox_spec: ("armor.misc.shoulder.leather_iron_0", (-6.0, -2.5, -0.5)), color: None @@ -191,7 +191,7 @@ color: None ) ), - "LeatherStrip": ( + "common.items.armor.misc.shoulder.leather_strip": ( left: ( vox_spec: ("armor.misc.shoulder.leather_strip", (-3.0, -2.5, -2.0)), color: None @@ -201,7 +201,7 @@ color: None ) ), - "Tarasque": ( + "common.items.armor.tarasque.shoulder": ( left: ( vox_spec: ("armor.tarasque.shoulder", (-5.0, -3.5 , 0.0)), color: None @@ -211,7 +211,7 @@ color: None ) ), - "Bonerattler": ( + "common.items.armor.bonerattler.shoulder": ( left: ( vox_spec: ("armor.bonerattler.shoulder", (-4.0, -3.5 , 1.0)), color: None @@ -221,7 +221,7 @@ color: None ) ), - "VeloriteMage": ( + "common.items.armor.velorite_mage.shoulder": ( left: ( vox_spec: ("armor.velorite_battlemage.shoulder", (-6.0, -4.0 , 0.0)), color: None @@ -231,7 +231,7 @@ color: None ) ), - "Rawhide": ( + "common.items.armor.hide.rawhide.shoulder": ( left: ( vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.2, -0.5)), color: None @@ -241,7 +241,7 @@ color: None ) ), - "Leather": ( + "common.items.armor.hide.leather.shoulder": ( left: ( vox_spec: ("armor.hide.leather.shoulder", (-5.5, -3.2, -1.8)), color: None @@ -251,7 +251,7 @@ color: None ) ), - "Scale": ( + "common.items.armor.hide.scale.shoulder": ( left: ( vox_spec: ("armor.hide.scale.shoulder", (-3.2, -3.5 , 0.0)), color: None @@ -261,7 +261,7 @@ color: None ) ), - "Carapace": ( + "common.items.armor.hide.carapace.shoulder": ( left: ( vox_spec: ("armor.hide.carapace.shoulder", (-6.0, -4.0 , -2.0)), color: None @@ -271,7 +271,7 @@ color: None ) ), - "Primal": ( + "common.items.armor.hide.primal.shoulder": ( left: ( vox_spec: ("armor.hide.primal.shoulder", (-6.0, -4.0 , -3.0)), color: None @@ -281,7 +281,7 @@ color: None ) ), - "Dragonscale": ( + "common.items.armor.hide.dragonscale.shoulder": ( left: ( vox_spec: ("armor.hide.dragonscale.shoulder", (-9.0, -3.5 , -1.0)), color: None @@ -291,7 +291,7 @@ color: None ) ), - "Savage": ( + "common.items.armor.savage.shoulder": ( left: ( vox_spec: ("armor.savage.shoulder", (-5.5, -4.0 , -2.0)), color: None @@ -301,7 +301,7 @@ color: None ) ), - "Witch": ( + "common.items.armor.witch.shoulder": ( left: ( vox_spec: ("armor.witch.shoulder", (-5.0, -4.0 , -2.0)), color: None @@ -311,7 +311,7 @@ color: None ) ), - "Pirate": ( + "common.items.armor.pirate.shoulder": ( left: ( vox_spec: ("armor.pirate.shoulder", (-5.0, -4.0 , -2.0)), color: None @@ -321,7 +321,7 @@ color: None ) ), - "Linen": ( + "common.items.armor.cloth.linen.shoulder": ( left: ( vox_spec: ("armor.cloth.linen.shoulder", (-3.5, -4.0 , -1.0)), color: None @@ -331,7 +331,7 @@ color: None ) ), - "Woolen": ( + "common.items.armor.cloth.woolen.shoulder": ( left: ( vox_spec: ("armor.cloth.woolen.shoulder", (-5.5, -4.0 , -3.0)), color: None @@ -341,7 +341,7 @@ color: None ) ), - "Silken": ( + "common.items.armor.cloth.silken.shoulder": ( left: ( vox_spec: ("armor.cloth.silken.shoulder", (-5.0, -4.0 , -2.0)), color: None @@ -351,7 +351,7 @@ color: None ) ), - "Druid": ( + "common.items.armor.cloth.druid.shoulder": ( left: ( vox_spec: ("armor.cloth.druid.shoulder", (-4.5, -4.0 , -3.5)), color: None @@ -361,7 +361,7 @@ color: None ) ), - "Moonweave": ( + "common.items.armor.cloth.moonweave.shoulder": ( left: ( vox_spec: ("armor.cloth.moonweave.shoulder", (-4.5, -4.0 , -3.0)), color: None @@ -371,7 +371,7 @@ color: None ) ), - "Sunsilk": ( + "common.items.armor.cloth.sunsilk.shoulder": ( left: ( vox_spec: ("armor.cloth.sunsilk.shoulder", (-6.5, -4.0 , -2.0)), color: None @@ -381,7 +381,7 @@ color: None ) ), - "Bronze": ( + "common.items.armor.mail.bronze.shoulder": ( left: ( vox_spec: ("armor.mail.bronze.shoulder", (-4.5, -4.0 , 0.0)), color: None @@ -391,7 +391,7 @@ color: None ) ), - "Iron": ( + "common.items.armor.mail.iron.shoulder": ( left: ( vox_spec: ("armor.mail.iron.shoulder", (-5.5, -4.0 , -1.0)), color: None @@ -401,7 +401,7 @@ color: None ) ), - "Steel": ( + "common.items.armor.mail.steel.shoulder": ( left: ( vox_spec: ("armor.mail.steel.shoulder", (-5.5, -3.0 , -2.0)), color: None @@ -411,7 +411,7 @@ color: None ) ), - "Cobalt": ( + "common.items.armor.mail.cobalt.shoulder": ( left: ( vox_spec: ("armor.mail.cobalt.shoulder", (-5.5, -4.0 , -1.0)), color: None @@ -421,7 +421,7 @@ color: None ) ), - "Bloodsteel": ( + "common.items.armor.mail.bloodsteel.shoulder": ( left: ( vox_spec: ("armor.mail.bloodsteel.shoulder", (-6.5, -5.0 , -3.0)), color: None @@ -431,7 +431,7 @@ color: None ) ), - "Orichalcum": ( + "common.items.armor.mail.orichalcum.shoulder": ( left: ( vox_spec: ("armor.mail.orichalcum.shoulder", (-7.5, -3.0 , -2.0)), color: None @@ -441,7 +441,7 @@ color: None ) ), - "Merchant": ( + "common.items.armor.merchant.shoulder": ( left: ( vox_spec: ("armor.merchant.shoulder_l", (-3.0, -4.0 , -8.0)), color: None diff --git a/assets/voxygen/voxel/humanoid_glider_manifest.ron b/assets/voxygen/voxel/humanoid_glider_manifest.ron index 1e030a673d..4b287c6ebe 100644 --- a/assets/voxygen/voxel/humanoid_glider_manifest.ron +++ b/assets/voxygen/voxel/humanoid_glider_manifest.ron @@ -4,63 +4,63 @@ color: None ), map: { - "Starter": ( + "common.items.glider.cloverleaf": ( vox_spec: ("glider.starter", (-15.0, -5.0, 0.0)), color: None - ), - "PlainCloth": ( + ), + "common.items.glider.basic_white": ( vox_spec: ("glider.basic_white", (-25.0, -20.0, 0.0)), color: None - ), - "RedCloth": ( + ), + "common.items.glider.basic_red": ( vox_spec: ("glider.basic_red", (-25.0, -20.0, 0.0)), color: None - ), - "Blue0": ( + ), + "common.items.glider.blue": ( vox_spec: ("glider.blue", (-26.0, -26.0, 0.0)), color: None ), - "ButterflyMorpho": ( + "common.items.glider.morpho": ( vox_spec: ("glider.butterfly1", (-26.0, -13.0, 0.0)), color: None ), - "ButterflyMonarch": ( + "common.items.glider.monarch": ( vox_spec: ("glider.butterfly2", (-26.0, -13.0, 0.0)), color: None - ), - "ButterflyLove": ( + ), + "common.items.glider.butterfly3": ( vox_spec: ("glider.butterfly3", (-26.0, -13.0, 0.0)), color: None ), - "MothLuna": ( + "common.items.glider.moth": ( vox_spec: ("glider.moth", (-26.0, -22.0, 0.0)), color: None - ), - "SandRaptor": ( - vox_spec: ("glider.sandraptor", (-26.0, -25.0, 0.0)), - color: None - ), - "SnowRaptor": ( - vox_spec: ("glider.snowraptor", (-26.0, -25.0, 0.0)), - color: None - ), - "WoodRaptor": ( - vox_spec: ("glider.woodraptor", (-26.0, -25.0, 0.0)), - color: None ), - "Sunset": ( + "common.items.glider.sandraptor": ( + vox_spec: ("glider.sandraptor", (-26.0, -25.0, 0.0)), + color: None + ), + "common.items.glider.snowraptor": ( + vox_spec: ("glider.snowraptor", (-26.0, -25.0, 0.0)), + color: None + ), + "common.items.glider.woodraptor": ( + vox_spec: ("glider.woodraptor", (-26.0, -25.0, 0.0)), + color: None + ), + "common.items.glider.sunset": ( vox_spec: ("glider.sunset", (-26.0, -26.0, 0.0)), color: None ), - "Moonrise": ( + "common.items.glider.moonrise": ( vox_spec: ("glider.moonrise", (-26.0, -26.0, 0.0)), color: None ), - "Purple0": ( + "common.items.glider.skullgrin": ( vox_spec: ("glider.cultists", (-26.0, -26.0, 0.0)), color: None ), - "Leaves": ( + "common.items.glider.leaves": ( vox_spec: ("glider.leaves", (-26.0, -26.0, 0.0)), color: None ), diff --git a/assets/voxygen/voxel/humanoid_lantern_manifest.ron b/assets/voxygen/voxel/humanoid_lantern_manifest.ron index f5877b10ca..274c3ffc93 100644 --- a/assets/voxygen/voxel/humanoid_lantern_manifest.ron +++ b/assets/voxygen/voxel/humanoid_lantern_manifest.ron @@ -4,35 +4,35 @@ color: None ), map: { - "Green0": ( + "common.items.lantern.green_0": ( vox_spec: ("lantern.green-0", (-2.5, -2.0, -9.0)), color: None ), - "Magic": ( + "common.items.boss_drops.lantern": ( vox_spec: ("lantern.magic_lantern", (-2.0, -2.0, -7.0)), color: None ), - "Black0": ( + "common.items.lantern.black_0": ( vox_spec: ("lantern.black-0", (-2.5, -2.0, -8.5)), color: None ), - "Red0": ( + "common.items.lantern.red_0": ( vox_spec: ("lantern.red-0", (-2.0, -2.0, -7.0)), color: None ), - "Blue0": ( + "common.items.lantern.blue_0": ( vox_spec: ("lantern.blue-0", (-2.5, -2.0, -8.0)), color: None ), - "GeodePurp": ( + "common.items.lantern.geode_purp": ( vox_spec: ("lantern.geode_purp", (-2.5, -2.5, -9.5)), color: None ), - "PumpkinLantern": ( + "common.items.lantern.pumpkin": ( vox_spec: ("lantern.pumpkin", (-4.0, -4.0, -8.5)), color: None ), - "PolarisLantern": ( + "common.items.lantern.polaris": ( vox_spec: ("lantern.polaris", (-3.5, -4.0, -8.5)), color: None ), diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index f9755f10eb..e527866de7 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -43,10 +43,10 @@ ModularWeapon(("common.items.modular.weapon.primary.bow.ornate", "common.items.log.eldwood", Two)): "voxel.weapon.bow.ornate.eldwood", ModularWeapon(("common.items.modular.weapon.primary.bow.shortbow", "common.items.log.eldwood", Two)): "voxel.weapon.bow.shortbow.eldwood", ModularWeapon(("common.items.modular.weapon.primary.bow.warbow", "common.items.log.eldwood", Two)): "voxel.weapon.bow.warbow.eldwood", - Tool("common.items.weapons.bow.sagitta"): "voxel.weapon.bow.sagitta", - Tool("common.items.weapons.bow.starter"): "voxel.weapon.bow.starter", - Tool("common.items.weapons.bow.velorite"): "voxel.weapon.bow.velorite", - Tool("common.items.debug.velorite_bow_debug"): "voxel.weapon.bow.velorite", + Simple("common.items.weapons.bow.sagitta"): "voxel.weapon.bow.sagitta", + Simple("common.items.weapons.bow.starter"): "voxel.weapon.bow.starter", + Simple("common.items.weapons.bow.velorite"): "voxel.weapon.bow.velorite", + Simple("common.items.debug.velorite_bow_debug"): "voxel.weapon.bow.velorite", //staffs ModularWeapon(("common.items.modular.weapon.primary.staff.brand", "common.items.log.wood", Two)): "voxel.weapon.staff.brand.wood", ModularWeapon(("common.items.modular.weapon.primary.staff.grandstaff", "common.items.log.wood", Two)): "voxel.weapon.staff.grandstaff.wood", @@ -90,10 +90,10 @@ ModularWeapon(("common.items.modular.weapon.primary.staff.ornate", "common.items.log.eldwood", Two)): "voxel.weapon.staff.ornate.eldwood", ModularWeapon(("common.items.modular.weapon.primary.staff.rod", "common.items.log.eldwood", Two)): "voxel.weapon.staff.rod.eldwood", ModularWeapon(("common.items.modular.weapon.primary.staff.staff", "common.items.log.eldwood", Two)): "voxel.weapon.staff.staff.eldwood", - Tool("common.items.weapons.staff.staff_1"): "voxel.weapon.staff.firestaff_starter", - Tool("common.items.weapons.staff.starter_staff"): "voxel.weapon.staff.firestaff_starter", - Tool("common.items.weapons.staff.cultist_staff"): "voxel.weapon.staff.firestaff_cultist", - Tool("common.items.weapons.staff.laevateinn"): "voxel.weapon.staff.laevateinn", + Simple("common.items.weapons.staff.staff_1"): "voxel.weapon.staff.firestaff_starter", + Simple("common.items.weapons.staff.starter_staff"): "voxel.weapon.staff.firestaff_starter", + Simple("common.items.weapons.staff.cultist_staff"): "voxel.weapon.staff.firestaff_cultist", + Simple("common.items.weapons.staff.laevateinn"): "voxel.weapon.staff.laevateinn", // Swords ModularWeapon(("common.items.modular.weapon.primary.sword.greatsword", "common.items.mineral.ingot.bronze", Two)):"voxel.weapon.sword.greatsword.bronze-2h", ModularWeapon(("common.items.modular.weapon.primary.sword.katana", "common.items.mineral.ingot.bronze", Two)):"voxel.weapon.sword.katana.bronze-2h", @@ -137,12 +137,12 @@ ModularWeapon(("common.items.modular.weapon.primary.sword.sabre", "common.items.mineral.ingot.orichalcum", Two)): "voxel.weapon.sword.sabre.orichalcum-2h", ModularWeapon(("common.items.modular.weapon.primary.sword.sawblade", "common.items.mineral.ingot.orichalcum", Two)):"voxel.weapon.sword.sawblade.orichalcum-2h", ModularWeapon(("common.items.modular.weapon.primary.sword.zweihander", "common.items.mineral.ingot.orichalcum", Two)):"voxel.weapon.sword.zweihander.orichalcum-2h", - Tool("common.items.weapons.sword.caladbolg"): "voxel.weapon.sword.caladbolg", - Tool("common.items.weapons.sword.cultist"): "voxel.weapon.sword.cultist", - Tool("common.items.weapons.sword.frost-0"): "voxel.weapon.sword.frost-0", - Tool("common.items.weapons.sword.frost-1"): "voxel.weapon.sword.frost-1", - Tool("common.items.weapons.sword.starter"): "voxel.weapon.sword.starter", - Tool("common.items.debug.admin_sword"): "voxel.weapon.sword.frost-1", + Simple("common.items.weapons.sword.caladbolg"): "voxel.weapon.sword.caladbolg", + Simple("common.items.weapons.sword.cultist"): "voxel.weapon.sword.cultist", + Simple("common.items.weapons.sword.frost-0"): "voxel.weapon.sword.frost-0", + Simple("common.items.weapons.sword.frost-1"): "voxel.weapon.sword.frost-1", + Simple("common.items.weapons.sword.starter"): "voxel.weapon.sword.starter", + Simple("common.items.debug.admin_sword"): "voxel.weapon.sword.frost-1", // 1h Swords ModularWeapon(("common.items.modular.weapon.primary.sword.katana", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.sword.katana.bronze-1h", ModularWeapon(("common.items.modular.weapon.primary.sword.longsword", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.sword.longsword.bronze-1h", @@ -174,7 +174,7 @@ ModularWeapon(("common.items.modular.weapon.primary.sword.ornate", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.sword.ornate.orichalcum-1h", ModularWeapon(("common.items.modular.weapon.primary.sword.sabre", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.sword.sabre.orichalcum-1h", ModularWeapon(("common.items.modular.weapon.primary.sword.sawblade", "common.items.mineral.ingot.orichalcum", One)): "voxel.weapon.sword.sawblade.orichalcum-1h", - Tool("common.items.weapons.sword_1h.starter"): "voxel.weapon.sword_1h.starter", + Simple("common.items.weapons.sword_1h.starter"): "voxel.weapon.sword_1h.starter", // Axes ModularWeapon(("common.items.modular.weapon.primary.axe.axe", "common.items.mineral.ingot.bronze", Two)): "voxel.weapon.axe.axe.bronze-2h", ModularWeapon(("common.items.modular.weapon.primary.axe.battleaxe", "common.items.mineral.ingot.bronze", Two)): "voxel.weapon.axe.battleaxe.bronze-2h", @@ -218,9 +218,9 @@ ModularWeapon(("common.items.modular.weapon.primary.axe.labrys", "common.items.mineral.ingot.orichalcum", Two)): "voxel.weapon.axe.labrys.orichalcum-2h", ModularWeapon(("common.items.modular.weapon.primary.axe.ornate", "common.items.mineral.ingot.orichalcum", Two)): "voxel.weapon.axe.ornate.orichalcum-2h", ModularWeapon(("common.items.modular.weapon.primary.axe.poleaxe", "common.items.mineral.ingot.orichalcum", Two)): "voxel.weapon.axe.poleaxe.orichalcum-2h", - Tool("common.items.weapons.axe.starter_axe"): "voxel.weapon.axe.2haxe_rusty", - Tool("common.items.weapons.axe.malachite_axe-0"): "voxel.weapon.axe.2haxe_malachite-0", - Tool("common.items.weapons.axe.parashu"): "voxel.weapon.axe.parashu", + Simple("common.items.weapons.axe.starter_axe"): "voxel.weapon.axe.2haxe_rusty", + Simple("common.items.weapons.axe.malachite_axe-0"): "voxel.weapon.axe.2haxe_malachite-0", + Simple("common.items.weapons.axe.parashu"): "voxel.weapon.axe.parashu", // 1h Axes ModularWeapon(("common.items.modular.weapon.primary.axe.axe", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.axe.axe.bronze-1h", ModularWeapon(("common.items.modular.weapon.primary.axe.battleaxe", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.axe.battleaxe.bronze-1h", @@ -289,12 +289,12 @@ ModularWeapon(("common.items.modular.weapon.primary.hammer.ornate", "common.items.mineral.ingot.orichalcum", Two)):"voxel.weapon.hammer.ornate.orichalcum-2h", ModularWeapon(("common.items.modular.weapon.primary.hammer.spikedmace", "common.items.mineral.ingot.orichalcum", Two)):"voxel.weapon.hammer.spikedmace.orichalcum-2h", ModularWeapon(("common.items.modular.weapon.primary.hammer.warhammer", "common.items.mineral.ingot.orichalcum", Two)):"voxel.weapon.hammer.warhammer.orichalcum-2h", - Tool("common.items.weapons.hammer.hammer_1"): "voxel.weapon.hammer.2hhammer_rusty", - Tool("common.items.weapons.hammer.starter_hammer"): "voxel.weapon.hammer.2hhammer_rusty", - Tool("common.items.weapons.hammer.flimsy_hammer"): "voxel.weapon.hammer.2hhammer_flimsy", - Tool("common.items.weapons.hammer.mjolnir"): "voxel.weapon.hammer.2hhammer_mjolnir", - Tool("common.items.weapons.hammer.cultist_purp_2h-0"): "voxel.weapon.hammer.cult_purp-0", - Tool("common.items.weapons.hammer.burnt_drumstick"): "voxel.weapon.hammer.burnt_drumstick", + Simple("common.items.weapons.hammer.hammer_1"): "voxel.weapon.hammer.2hhammer_rusty", + Simple("common.items.weapons.hammer.starter_hammer"): "voxel.weapon.hammer.2hhammer_rusty", + Simple("common.items.weapons.hammer.flimsy_hammer"): "voxel.weapon.hammer.2hhammer_flimsy", + Simple("common.items.weapons.hammer.mjolnir"): "voxel.weapon.hammer.2hhammer_mjolnir", + Simple("common.items.weapons.hammer.cultist_purp_2h-0"): "voxel.weapon.hammer.cult_purp-0", + Simple("common.items.weapons.hammer.burnt_drumstick"): "voxel.weapon.hammer.burnt_drumstick", // 1h Hammers ModularWeapon(("common.items.modular.weapon.primary.hammer.hammer", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.hammer.hammer.bronze-1h", ModularWeapon(("common.items.modular.weapon.primary.hammer.ornate", "common.items.mineral.ingot.bronze", One)): "voxel.weapon.hammer.ornate.bronze-1h", @@ -364,562 +364,557 @@ ModularWeapon(("common.items.modular.weapon.primary.sceptre.ornate", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.ornate.eldwood", ModularWeapon(("common.items.modular.weapon.primary.sceptre.grandsceptre", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.grandsceptre.eldwood", ModularWeapon(("common.items.modular.weapon.primary.sceptre.sceptre", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.sceptre.eldwood", - Tool("common.items.weapons.sceptre.starter_sceptre"): "voxel.weapon.sceptre.wood-simple", - Tool("common.items.weapons.sceptre.root_evil"): "voxel.weapon.sceptre.root_evil", - Tool("common.items.weapons.sceptre.sceptre_velorite_0"): "voxel.weapon.sceptre.ore-nature", - Tool("common.items.weapons.sceptre.caduceus"): "voxel.weapon.sceptre.caduceus", - Tool("common.items.weapons.sceptre.amethyst"): "voxel.weapon.sceptre.amethyst", + Simple("common.items.weapons.sceptre.starter_sceptre"): "voxel.weapon.sceptre.wood-simple", + Simple("common.items.weapons.sceptre.root_evil"): "voxel.weapon.sceptre.root_evil", + Simple("common.items.weapons.sceptre.sceptre_velorite_0"): "voxel.weapon.sceptre.ore-nature", + Simple("common.items.weapons.sceptre.caduceus"): "voxel.weapon.sceptre.caduceus", + Simple("common.items.weapons.sceptre.amethyst"): "voxel.weapon.sceptre.amethyst", // Daggers - Tool("common.items.weapons.dagger.starter_dagger"): "voxel.weapon.dagger.dagger_rusty", - Tool("common.items.weapons.dagger.basic_0"): "voxel.weapon.dagger.dagger_basic-0", - Tool("common.items.weapons.dagger.cultist_0"): "voxel.weapon.dagger.dagger_cult-0", + Simple("common.items.weapons.dagger.starter_dagger"): "voxel.weapon.dagger.dagger_rusty", + Simple("common.items.weapons.dagger.basic_0"): "voxel.weapon.dagger.dagger_basic-0", + Simple("common.items.weapons.dagger.cultist_0"): "voxel.weapon.dagger.dagger_cult-0", // Shields - Tool("common.items.weapons.shield.shield_1"): "voxel.weapon.shield.wood-0", + Simple("common.items.weapons.shield.shield_1"): "voxel.weapon.shield.wood-0", // Lanterns - Lantern("Black0"): "voxel.lantern.black-0", - Lantern("Green0"): "voxel.lantern.green-0", - Lantern("Magic"): "voxel.lantern.magic_lantern", - Lantern("Blue0"): "voxel.lantern.blue-0", - Lantern("Red0"): "voxel.lantern.red-0", - Lantern("GeodePurp"): "voxel.lantern.geode_purp", - Lantern("PumpkinLantern"): "voxel.lantern.pumpkin", - Lantern("PolarisLantern"): "voxel.lantern.polaris", + Simple("common.items.lantern.black_0"): "voxel.lantern.black-0", + Simple("common.items.lantern.green_0"): "voxel.lantern.green-0", + Simple("common.items.boss_drops.lantern"): "voxel.lantern.magic_lantern", + Simple("common.items.lantern.blue_0"): "voxel.lantern.blue-0", + Simple("common.items.lantern.red_0"): "voxel.lantern.red-0", + Simple("common.items.lantern.geode_purp"): "voxel.lantern.geode_purp", + Simple("common.items.lantern.pumpkin"): "voxel.lantern.pumpkin", + Simple("common.items.lantern.polaris"): "voxel.lantern.polaris", // Farming Equipment - Tool("common.items.weapons.tool.broom"): "voxel.weapon.tool.broom-0", - Tool("common.items.weapons.tool.hoe"): "voxel.weapon.tool.hoe_green", - Tool("common.items.weapons.tool.pitchfork"): "voxel.weapon.tool.pitchfork-0", - Tool("common.items.weapons.tool.rake"): "voxel.weapon.tool.rake-0", - Tool("common.items.weapons.tool.fishing_rod"): "voxel.weapon.tool.fishing_rod_blue-0", - Tool("common.items.weapons.tool.pickaxe"): "voxel.weapon.tool.pickaxe_green-0", - Tool("common.items.weapons.tool.shovel-0"): "voxel.weapon.tool.shovel_green", - Tool("common.items.weapons.tool.shovel-1"): "voxel.weapon.tool.shovel_gold", + Simple("common.items.weapons.tool.broom"): "voxel.weapon.tool.broom-0", + Simple("common.items.weapons.tool.hoe"): "voxel.weapon.tool.hoe_green", + Simple("common.items.weapons.tool.pitchfork"): "voxel.weapon.tool.pitchfork-0", + Simple("common.items.weapons.tool.rake"): "voxel.weapon.tool.rake-0", + Simple("common.items.weapons.tool.fishing_rod"): "voxel.weapon.tool.fishing_rod_blue-0", + Simple("common.items.weapons.tool.pickaxe"): "voxel.weapon.tool.pickaxe_green-0", + Simple("common.items.weapons.tool.shovel-0"): "voxel.weapon.tool.shovel_green", + Simple("common.items.weapons.tool.shovel-1"): "voxel.weapon.tool.shovel_gold", // Picks - Tool("common.items.tool.pickaxe_stone"): "voxel.weapon.tool.pickaxe_green-0", - Tool("common.items.tool.pickaxe_steel"): "voxel.weapon.tool.pickaxe_green-1", + Simple("common.items.tool.pickaxe_stone"): "voxel.weapon.tool.pickaxe_green-0", + Simple("common.items.tool.pickaxe_steel"): "voxel.weapon.tool.pickaxe_green-1", // Other - Utility(Coins): "voxel.object.v-coin", - Utility(Collar): "voxel.object.collar", + Simple("common.items.utility.coins"): "voxel.object.v-coin", + Simple("common.items.utility.collar"): "voxel.object.collar", // Armor // Starter Parts - Armor(Foot("Sandal")): "voxel.armor.misc.foot.cloth_sandal", - Armor(Pants("Rugged")): "voxel.armor.rugged.pants", - Armor(Chest("Rugged")): "voxel.armor.rugged.chest", - Armor(Chest("WorkerPurpBrown")): "voxel.armor.misc.chest.worker_purp_brown", - Armor(Pants("WorkerBrown")): "voxel.armor.misc.pants.worker_brown", + Simple("common.items.armor.misc.foot.sandals"): "voxel.armor.misc.foot.cloth_sandal", + Simple("common.items.armor.rugged.pants"): "voxel.armor.rugged.pants", + Simple("common.items.armor.rugged.chest"): "voxel.armor.rugged.chest", + Simple("common.items.armor.misc.chest.worker_purple_brown"): "voxel.armor.misc.chest.worker_purp_brown", + Simple("common.items.armor.misc.pants.worker_brown"): "voxel.armor.misc.pants.worker_brown", // Cultist Clothing - Armor(Chest("Cultist")): "voxel.armor.cultist.chest", - Armor(Pants("Cultist")): "voxel.armor.cultist.pants", - Armor(Belt("Cultist")): "voxel.armor.cultist.belt", - Armor(Foot("Cultist")): "voxel.armor.cultist.foot", - Armor(Hand("Cultist")): "voxel.armor.cultist.hand", - Armor(Shoulder("Cultist")): "voxel.armor.cultist.shoulder", - Armor(Chest("Cultist")): "voxel.armor.cultist.chest", - Armor(Pants("Cultist")): "voxel.armor.cultist.pants", - Armor(Hand("Cultist")): "voxel.armor.cultist.hand", - Armor(Shoulder("Cultist")): "voxel.armor.cultist.shoulder", - Armor(Head("Cultist")): "voxel.armor.cultist.bandana", + Simple("common.items.armor.cultist.chest"): "voxel.armor.cultist.chest", + Simple("common.items.armor.cultist.pants"): "voxel.armor.cultist.pants", + Simple("common.items.armor.cultist.belt"): "voxel.armor.cultist.belt", + Simple("common.items.armor.cultist.foot"): "voxel.armor.cultist.foot", + Simple("common.items.armor.cultist.hand"): "voxel.armor.cultist.hand", + Simple("common.items.armor.cultist.shoulder"): "voxel.armor.cultist.shoulder", + Simple("common.items.armor.cultist.bandana"): "voxel.armor.cultist.bandana", // Villager Clothing - Armor(Pants("WorkerBlue")): "voxel.armor.misc.pants.worker_blue", - Armor(Chest("WorkerGreen0")): "voxel.armor.misc.chest.worker_green", - Armor(Chest("WorkerGreen1")): "voxel.armor.misc.chest.shirt_white", - Armor(Chest("WorkerRed0")): "voxel.armor.misc.chest.worker_green", - Armor(Chest("WorkerRed1")): "voxel.armor.misc.chest.shirt_white", - Armor(Chest("WorkerPurple0")): "voxel.armor.misc.chest.worker_green", - Armor(Chest("WorkerPurple1")): "voxel.armor.misc.chest.shirt_white", - Armor(Chest("WorkerYellow0")): "voxel.armor.misc.chest.worker_green", - Armor(Chest("WorkerYellow1")): "voxel.armor.misc.chest.shirt_white", - Armor(Chest("WorkerOrange0")): "voxel.armor.misc.chest.worker_green", - Armor(Chest("WorkerOrange1")): "voxel.armor.misc.chest.shirt_white", + Simple("common.items.armor.misc.pants.worker_blue"): "voxel.armor.misc.pants.worker_blue", + Simple("common.items.armor.misc.chest.worker_green_0"): "voxel.armor.misc.chest.worker_green", + Simple("common.items.armor.misc.chest.worker_green_1"): "voxel.armor.misc.chest.shirt_white", + Simple("common.items.armor.misc.chest.worker_red_0"): "voxel.armor.misc.chest.worker_green", + Simple("common.items.armor.misc.chest.worker_red_1"): "voxel.armor.misc.chest.shirt_white", + Simple("common.items.armor.misc.chest.worker_purple_0"): "voxel.armor.misc.chest.worker_green", + Simple("common.items.armor.misc.chest.worker_purple_1"): "voxel.armor.misc.chest.shirt_white", + Simple("common.items.armor.misc.chest.worker_yellow_0"): "voxel.armor.misc.chest.worker_green", + Simple("common.items.armor.misc.chest.worker_yellow_1"): "voxel.armor.misc.chest.shirt_white", + Simple("common.items.armor.misc.chest.worker_orange_0"): "voxel.armor.misc.chest.worker_green", + Simple("common.items.armor.misc.chest.worker_orange_1"): "voxel.armor.misc.chest.shirt_white", // Merchant - Armor(Chest("Merchant")): "voxel.armor.merchant.chest", - Armor(Pants("Merchant")): "voxel.armor.merchant.pants", - Armor(Belt("Merchant")): "voxel.armor.merchant.belt", - Armor(Foot("Merchant")): "voxel.armor.merchant.foot", - Armor(Hand("Merchant")): "voxel.armor.merchant.hand", - Armor(Shoulder("Merchant")): "voxel.armor.merchant.shoulder_l", - Armor(Chest("Merchant")): "voxel.armor.merchant.chest", - Armor(Pants("Merchant")): "voxel.armor.merchant.pants", - Armor(Hand("Merchant")): "voxel.armor.merchant.hand", - Armor(Head("Merchant")): "voxel.armor.merchant.turban", - Armor(Back("Merchant")): "voxel.armor.merchant.back", + Simple("common.items.armor.merchant.chest"): "voxel.armor.merchant.chest", + Simple("common.items.armor.merchant.pants"): "voxel.armor.merchant.pants", + Simple("common.items.armor.merchant.belt"): "voxel.armor.merchant.belt", + Simple("common.items.armor.merchant.foot"): "voxel.armor.merchant.foot", + Simple("common.items.armor.merchant.hand"): "voxel.armor.merchant.hand", + Simple("common.items.armor.merchant.shoulder"): "voxel.armor.merchant.shoulder_l", + Simple("common.items.armor.merchant.turban"): "voxel.armor.merchant.turban", + Simple("common.items.armor.merchant.back"): "voxel.armor.merchant.back", // Velorite Battlemage Set - Armor(Chest("VeloriteMage")): "voxel.armor.velorite_battlemage.chest", - Armor(Pants("VeloriteMage")): "voxel.armor.velorite_battlemage.pants", - Armor(Belt("VeloriteMage")): "voxel.armor.velorite_battlemage.belt", - Armor(Foot("VeloriteMage")): "voxel.armor.velorite_battlemage.foot", - Armor(Hand("VeloriteMage")): "voxel.armor.velorite_battlemage.hand", - Armor(Shoulder("VeloriteMage")): "voxel.armor.velorite_battlemage.shoulder", - Armor(Back("VeloriteMage")): "voxel.armor.velorite_battlemage.back", + Simple("common.items.armor.velorite_mage.chest"): "voxel.armor.velorite_battlemage.chest", + Simple("common.items.armor.velorite_mage.pants"): "voxel.armor.velorite_battlemage.pants", + Simple("common.items.armor.velorite_mage.belt"): "voxel.armor.velorite_battlemage.belt", + Simple("common.items.armor.velorite_mage.foot"): "voxel.armor.velorite_battlemage.foot", + Simple("common.items.armor.velorite_mage.hand"): "voxel.armor.velorite_battlemage.hand", + Simple("common.items.armor.velorite_mage.shoulder"): "voxel.armor.velorite_battlemage.shoulder", + Simple("common.items.armor.velorite_mage.back"): "voxel.armor.velorite_battlemage.back", // Assassin Set - Armor(Chest("Assassin")): "voxel.armor.assassin.chest", - Armor(Pants("Assassin")): "voxel.armor.assassin.pants", - Armor(Belt("Assassin")): "voxel.armor.assassin.belt", - Armor(Foot("Assassin")): "voxel.armor.assassin.foot", - Armor(Hand("Assassin")): "voxel.armor.assassin.hand", - Armor(Shoulder("Assassin")): "voxel.armor.assassin.shoulder", + Simple("common.items.armor.assassin.chest"): "voxel.armor.assassin.chest", + Simple("common.items.armor.assassin.pants"): "voxel.armor.assassin.pants", + Simple("common.items.armor.assassin.belt"): "voxel.armor.assassin.belt", + Simple("common.items.armor.assassin.foot"): "voxel.armor.assassin.foot", + Simple("common.items.armor.assassin.hand"): "voxel.armor.assassin.hand", + Simple("common.items.armor.assassin.shoulder"): "voxel.armor.assassin.shoulder", //PlateLeather Armor - Armor(Chest("LeatherPlate")): "voxel.armor.leather_plate.chest", - Armor(Pants("LeatherPlate")): "voxel.armor.leather_plate.pants", - Armor(Belt("LeatherPlate")): "voxel.armor.leather_plate.belt", - Armor(Foot("LeatherPlate")): "voxel.armor.leather_plate.foot", - Armor(Hand("LeatherPlate")): "voxel.armor.leather_plate.hand", - Armor(Shoulder("LeatherPlate")): "voxel.armor.leather_plate.shoulder", + Simple("common.items.armor.leather_plate.chest"): "voxel.armor.leather_plate.chest", + Simple("common.items.armor.leather_plate.pants"): "voxel.armor.leather_plate.pants", + Simple("common.items.armor.leather_plate.belt"): "voxel.armor.leather_plate.belt", + Simple("common.items.armor.leather_plate.foot"): "voxel.armor.leather_plate.foot", + Simple("common.items.armor.leather_plate.hand"): "voxel.armor.leather_plate.hand", + Simple("common.items.armor.leather_plate.shoulder"): "voxel.armor.leather_plate.shoulder", //Ferocious Armor - Armor(Chest("Ferocious")): "voxel.armor.ferocious.chest", - Armor(Pants("Ferocious")): "voxel.armor.ferocious.pants", - Armor(Belt("Ferocious")): "voxel.armor.ferocious.belt", - Armor(Foot("Ferocious")): "voxel.armor.ferocious.foot", - Armor(Hand("Ferocious")): "voxel.armor.ferocious.hand", - Armor(Shoulder("Ferocious")): "voxel.armor.ferocious.shoulder", - Armor(Back("Ferocious")): "voxel.armor.ferocious.back", + Simple("common.items.armor.ferocious.chest"): "voxel.armor.ferocious.chest", + Simple("common.items.armor.ferocious.pants"): "voxel.armor.ferocious.pants", + Simple("common.items.armor.ferocious.belt"): "voxel.armor.ferocious.belt", + Simple("common.items.armor.ferocious.foot"): "voxel.armor.ferocious.foot", + Simple("common.items.armor.ferocious.hand"): "voxel.armor.ferocious.hand", + Simple("common.items.armor.ferocious.shoulder"): "voxel.armor.ferocious.shoulder", + Simple("common.items.armor.ferocious.back"): "voxel.armor.ferocious.back", //Blue Leather Armor - Armor(Chest("BlueLeather")): "voxel.armor.leather_blue.chest", - Armor(Pants("BlueLeather")): "voxel.armor.leather_blue.pants", + Simple("common.items.npc_armor.chest.leather_blue"): "voxel.armor.leather_blue.chest", + Simple("common.items.npc_armor.pants.leather_blue"): "voxel.armor.leather_blue.pants", //Linen Cloth - Armor(Chest("ClothBlue")): "voxel.armor.cloth_blue.chest", - Armor(Pants("ClothBlue")): "voxel.armor.cloth_blue.pants", - Armor(Belt("ClothBlue")): "voxel.armor.cloth_blue.belt", - Armor(Foot("ClothBlue")): "voxel.armor.cloth_blue.foot", - Armor(Hand("ClothBlue")): "voxel.armor.cloth_blue.hand", - Armor(Shoulder("ClothBlue0")): "voxel.armor.cloth_blue.shoulder_0", - Armor(Shoulder("ClothBlue1")): "voxel.armor.cloth_blue.shoulder_1", + Simple("common.items.armor.cloth_blue.chest"): "voxel.armor.cloth_blue.chest", + Simple("common.items.armor.cloth_blue.pants"): "voxel.armor.cloth_blue.pants", + Simple("common.items.armor.cloth_blue.belt"): "voxel.armor.cloth_blue.belt", + Simple("common.items.armor.cloth_blue.foot"): "voxel.armor.cloth_blue.foot", + Simple("common.items.armor.cloth_blue.hand"): "voxel.armor.cloth_blue.hand", + Simple("common.items.armor.cloth_blue.shoulder_0"): "voxel.armor.cloth_blue.shoulder_0", + Simple("common.items.armor.cloth_blue.shoulder_1"): "voxel.armor.cloth_blue.shoulder_1", ////////////// - Armor(Chest("ClothGreen")): "voxel.armor.cloth_green.chest", - Armor(Pants("ClothGreen")): "voxel.armor.cloth_green.pants", - Armor(Belt("ClothGreen")): "voxel.armor.cloth_green.belt", - Armor(Foot("ClothGreen")): "voxel.armor.cloth_green.foot", - Armor(Hand("ClothGreen")): "voxel.armor.cloth_green.hand", - Armor(Shoulder("ClothGreen")): "voxel.armor.cloth_green.shoulder", + Simple("common.items.armor.cloth_green.chest"): "voxel.armor.cloth_green.chest", + Simple("common.items.armor.cloth_green.pants"): "voxel.armor.cloth_green.pants", + Simple("common.items.armor.cloth_green.belt"): "voxel.armor.cloth_green.belt", + Simple("common.items.armor.cloth_green.foot"): "voxel.armor.cloth_green.foot", + Simple("common.items.armor.cloth_green.hand"): "voxel.armor.cloth_green.hand", + Simple("common.items.armor.cloth_green.shoulder"): "voxel.armor.cloth_green.shoulder", ////// - Armor(Chest("ClothPurple")): "voxel.armor.cloth_purple.chest", - Armor(Pants("ClothPurple")): "voxel.armor.cloth_purple.pants", - Armor(Belt("ClothPurple")): "voxel.armor.cloth_purple.belt", - Armor(Foot("ClothPurple")): "voxel.armor.cloth_purple.foot", - Armor(Hand("ClothPurple")): "voxel.armor.cloth_purple.hand", - Armor(Shoulder("ClothPurple")): "voxel.armor.cloth_purple.shoulder", - Armor(Shoulder("IronSpikes")): "voxel.armor.misc.shoulder.iron_spikes", - Armor(Shoulder("IronLeather3")): "voxel.armor.misc.shoulder.leather_iron_3", - Armor(Shoulder("IronLeather2")): "voxel.armor.misc.shoulder.leather_iron_2", - Armor(Shoulder("IronLeather1")): "voxel.armor.misc.shoulder.leather_iron_1", - Armor(Shoulder("IronLeather0")): "voxel.armor.misc.shoulder.leather_iron_0", - Armor(Shoulder("LeatherStrip")): "voxel.armor.misc.shoulder.leather_strip", - Armor(Foot("Jackalope")): "voxel.armor.misc.foot.jackalope", + Simple("common.items.armor.cloth_purple.chest"): "voxel.armor.cloth_purple.chest", + Simple("common.items.armor.cloth_purple.pants"): "voxel.armor.cloth_purple.pants", + Simple("common.items.armor.cloth_purple.belt"): "voxel.armor.cloth_purple.belt", + Simple("common.items.armor.cloth_purple.foot"): "voxel.armor.cloth_purple.foot", + Simple("common.items.armor.cloth_purple.hand"): "voxel.armor.cloth_purple.hand", + Simple("common.items.armor.cloth_purple.shoulder"): "voxel.armor.cloth_purple.shoulder", + Simple("common.items.armor.misc.shoulder.iron_spikes"): "voxel.armor.misc.shoulder.iron_spikes", + Simple("common.items.armor.misc.shoulder.leather_iron_3"): "voxel.armor.misc.shoulder.leather_iron_3", + Simple("common.items.armor.misc.shoulder.leather_iron_2"): "voxel.armor.misc.shoulder.leather_iron_2", + Simple("common.items.armor.misc.shoulder.leather_iron_1"): "voxel.armor.misc.shoulder.leather_iron_1", + Simple("common.items.armor.misc.shoulder.leather_iron_0"): "voxel.armor.misc.shoulder.leather_iron_0", + Simple("common.items.armor.misc.shoulder.leather_strip"): "voxel.armor.misc.shoulder.leather_strip", + Simple("common.items.armor.misc.foot.jackalope_slippers"): "voxel.armor.misc.foot.jackalope", //Twig Set - Armor(Chest("Twigs")): "voxel.armor.twigs.chest", - Armor(Pants("Twigs")): "voxel.armor.twigs.pants", - Armor(Belt("Twigs")): "voxel.armor.twigs.belt", - Armor(Foot("Twigs")): "voxel.armor.twigs.foot", - Armor(Hand("Twigs")): "voxel.armor.twigs.hand", - Armor(Shoulder("Twigs")): "voxel.armor.twigs.shoulder", + Simple("common.items.armor.twigs.chest"): "voxel.armor.twigs.chest", + Simple("common.items.armor.twigs.pants"): "voxel.armor.twigs.pants", + Simple("common.items.armor.twigs.belt"): "voxel.armor.twigs.belt", + Simple("common.items.armor.twigs.foot"): "voxel.armor.twigs.foot", + Simple("common.items.armor.twigs.hand"): "voxel.armor.twigs.hand", + Simple("common.items.armor.twigs.shoulder"): "voxel.armor.twigs.shoulder", //TwigsLeaves Set - Armor(Chest("TwigsLeaves")): "voxel.armor.twigsleaves.chest", - Armor(Pants("TwigsLeaves")): "voxel.armor.twigsleaves.pants", - Armor(Belt("TwigsLeaves")): "voxel.armor.twigsleaves.belt", - Armor(Foot("TwigsLeaves")): "voxel.armor.twigsleaves.foot", - Armor(Hand("TwigsLeaves")): "voxel.armor.twigsleaves.hand", - Armor(Shoulder("TwigsLeaves")): "voxel.armor.twigsleaves.shoulder", + Simple("common.items.armor.twigsleaves.chest"): "voxel.armor.twigsleaves.chest", + Simple("common.items.armor.twigsleaves.pants"): "voxel.armor.twigsleaves.pants", + Simple("common.items.armor.twigsleaves.belt"): "voxel.armor.twigsleaves.belt", + Simple("common.items.armor.twigsleaves.foot"): "voxel.armor.twigsleaves.foot", + Simple("common.items.armor.twigsleaves.hand"): "voxel.armor.twigsleaves.hand", + Simple("common.items.armor.twigsleaves.shoulder"): "voxel.armor.twigsleaves.shoulder", //TwigsFlowers Set - Armor(Chest("TwigsFlowers")): "voxel.armor.twigsflowers.chest", - Armor(Pants("TwigsFlowers")): "voxel.armor.twigsflowers.pants", - Armor(Belt("TwigsFlowers")): "voxel.armor.twigsflowers.belt", - Armor(Foot("TwigsFlowers")): "voxel.armor.twigsflowers.foot", - Armor(Hand("TwigsFlowers")): "voxel.armor.twigsflowers.hand", - Armor(Shoulder("TwigsFlowers")): "voxel.armor.twigsflowers.shoulder", + Simple("common.items.armor.twigsflowers.chest"): "voxel.armor.twigsflowers.chest", + Simple("common.items.armor.twigsflowers.pants"): "voxel.armor.twigsflowers.pants", + Simple("common.items.armor.twigsflowers.belt"): "voxel.armor.twigsflowers.belt", + Simple("common.items.armor.twigsflowers.foot"): "voxel.armor.twigsflowers.foot", + Simple("common.items.armor.twigsflowers.hand"): "voxel.armor.twigsflowers.hand", + Simple("common.items.armor.twigsflowers.shoulder"): "voxel.armor.twigsflowers.shoulder", //Tarasque Set - Armor(Chest("Tarasque")): "voxel.armor.tarasque.chest", - Armor(Pants("Tarasque")): "voxel.armor.tarasque.pants", - Armor(Belt("Tarasque")): "voxel.armor.tarasque.belt", - Armor(Foot("Tarasque")): "voxel.armor.tarasque.foot", - Armor(Hand("Tarasque")): "voxel.armor.tarasque.hand", - Armor(Shoulder("Tarasque")): "voxel.armor.tarasque.shoulder", + Simple("common.items.armor.tarasque.chest"): "voxel.armor.tarasque.chest", + Simple("common.items.armor.tarasque.pants"): "voxel.armor.tarasque.pants", + Simple("common.items.armor.tarasque.belt"): "voxel.armor.tarasque.belt", + Simple("common.items.armor.tarasque.foot"): "voxel.armor.tarasque.foot", + Simple("common.items.armor.tarasque.hand"): "voxel.armor.tarasque.hand", + Simple("common.items.armor.tarasque.shoulder"): "voxel.armor.tarasque.shoulder", //Bonerattler Set - Armor(Chest("Bonerattler")): "voxel.armor.bonerattler.chest", - Armor(Pants("Bonerattler")): "voxel.armor.bonerattler.pants", - Armor(Belt("Bonerattler")): "voxel.armor.bonerattler.belt", - Armor(Foot("Bonerattler")): "voxel.armor.bonerattler.foot", - Armor(Hand("Bonerattler")): "voxel.armor.bonerattler.hand", - Armor(Shoulder("Bonerattler")): "voxel.armor.bonerattler.shoulder", + Simple("common.items.armor.bonerattler.chest"): "voxel.armor.bonerattler.chest", + Simple("common.items.armor.bonerattler.pants"): "voxel.armor.bonerattler.pants", + Simple("common.items.armor.bonerattler.belt"): "voxel.armor.bonerattler.belt", + Simple("common.items.armor.bonerattler.foot"): "voxel.armor.bonerattler.foot", + Simple("common.items.armor.bonerattler.hand"): "voxel.armor.bonerattler.hand", + Simple("common.items.armor.bonerattler.shoulder"): "voxel.armor.bonerattler.shoulder", //Rawhide Set - Armor(Chest("Rawhide")): "voxel.armor.hide.rawhide.chest", - Armor(Pants("Rawhide")): "voxel.armor.hide.rawhide.pants", - Armor(Belt("Rawhide")): "voxel.armor.hide.rawhide.belt", - Armor(Foot("Rawhide")): "voxel.armor.hide.rawhide.foot", - Armor(Hand("Rawhide")): "voxel.armor.hide.rawhide.hand", - Armor(Shoulder("Rawhide")): "voxel.armor.hide.rawhide.shoulder", - Armor(Back("Rawhide")): "voxel.armor.hide.rawhide.back", + Simple("common.items.armor.hide.rawhide.chest"): "voxel.armor.hide.rawhide.chest", + Simple("common.items.armor.hide.rawhide.pants"): "voxel.armor.hide.rawhide.pants", + Simple("common.items.armor.hide.rawhide.belt"): "voxel.armor.hide.rawhide.belt", + Simple("common.items.armor.hide.rawhide.foot"): "voxel.armor.hide.rawhide.foot", + Simple("common.items.armor.hide.rawhide.hand"): "voxel.armor.hide.rawhide.hand", + Simple("common.items.armor.hide.rawhide.shoulder"): "voxel.armor.hide.rawhide.shoulder", + Simple("common.items.armor.hide.rawhide.back"): "voxel.armor.hide.rawhide.back", //Leather set - Armor(Chest("Leather")): "voxel.armor.hide.leather.chest", - Armor(Pants("Leather")): "voxel.armor.hide.leather.pants", - Armor(Belt("Leather")): "voxel.armor.hide.leather.belt", - Armor(Foot("Leather")): "voxel.armor.hide.leather.foot", - Armor(Hand("Leather")): "voxel.armor.hide.leather.hand", - Armor(Shoulder("Leather")): "voxel.armor.hide.leather.shoulder", - Armor(Back("Leather")): "voxel.armor.hide.leather.back", + Simple("common.items.armor.hide.leather.chest"): "voxel.armor.hide.leather.chest", + Simple("common.items.armor.hide.leather.pants"): "voxel.armor.hide.leather.pants", + Simple("common.items.armor.hide.leather.belt"): "voxel.armor.hide.leather.belt", + Simple("common.items.armor.hide.leather.foot"): "voxel.armor.hide.leather.foot", + Simple("common.items.armor.hide.leather.hand"): "voxel.armor.hide.leather.hand", + Simple("common.items.armor.hide.leather.shoulder"): "voxel.armor.hide.leather.shoulder", + Simple("common.items.armor.hide.leather.back"): "voxel.armor.hide.leather.back", //Scale Set - Armor(Chest("Scale")): "voxel.armor.hide.scale.chest", - Armor(Pants("Scale")): "voxel.armor.hide.scale.pants", - Armor(Belt("Scale")): "voxel.armor.hide.scale.belt", - Armor(Foot("Scale")): "voxel.armor.hide.scale.foot", - Armor(Hand("Scale")): "voxel.armor.hide.scale.hand", - Armor(Shoulder("Scale")): "voxel.armor.hide.scale.shoulder", - Armor(Back("Scale")): "voxel.armor.hide.scale.back", + Simple("common.items.armor.hide.scale.chest"): "voxel.armor.hide.scale.chest", + Simple("common.items.armor.hide.scale.pants"): "voxel.armor.hide.scale.pants", + Simple("common.items.armor.hide.scale.belt"): "voxel.armor.hide.scale.belt", + Simple("common.items.armor.hide.scale.foot"): "voxel.armor.hide.scale.foot", + Simple("common.items.armor.hide.scale.hand"): "voxel.armor.hide.scale.hand", + Simple("common.items.armor.hide.scale.shoulder"): "voxel.armor.hide.scale.shoulder", + Simple("common.items.armor.hide.scale.back"): "voxel.armor.hide.scale.back", //Carapace Set - Armor(Chest("Carapace")): "voxel.armor.hide.carapace.chest", - Armor(Pants("Carapace")): "voxel.armor.hide.carapace.pants", - Armor(Belt("Carapace")): "voxel.armor.hide.carapace.belt", - Armor(Foot("Carapace")): "voxel.armor.hide.carapace.foot", - Armor(Hand("Carapace")): "voxel.armor.hide.carapace.hand", - Armor(Shoulder("Carapace")): "voxel.armor.hide.carapace.shoulder", - Armor(Back("Carapace")): "voxel.armor.hide.carapace.back", + Simple("common.items.armor.hide.carapace.chest"): "voxel.armor.hide.carapace.chest", + Simple("common.items.armor.hide.carapace.pants"): "voxel.armor.hide.carapace.pants", + Simple("common.items.armor.hide.carapace.belt"): "voxel.armor.hide.carapace.belt", + Simple("common.items.armor.hide.carapace.foot"): "voxel.armor.hide.carapace.foot", + Simple("common.items.armor.hide.carapace.hand"): "voxel.armor.hide.carapace.hand", + Simple("common.items.armor.hide.carapace.shoulder"): "voxel.armor.hide.carapace.shoulder", + Simple("common.items.armor.hide.carapace.back"): "voxel.armor.hide.carapace.back", //Primal Set - Armor(Chest("Primal")): "voxel.armor.hide.primal.chest", - Armor(Pants("Primal")): "voxel.armor.hide.primal.pants", - Armor(Belt("Primal")): "voxel.armor.hide.primal.belt", - Armor(Foot("Primal")): "voxel.armor.hide.primal.foot", - Armor(Hand("Primal")): "voxel.armor.hide.primal.hand", - Armor(Shoulder("Primal")): "voxel.armor.hide.primal.shoulder", - Armor(Back("Primal")): "voxel.armor.hide.primal.back", + Simple("common.items.armor.hide.primal.chest"): "voxel.armor.hide.primal.chest", + Simple("common.items.armor.hide.primal.pants"): "voxel.armor.hide.primal.pants", + Simple("common.items.armor.hide.primal.belt"): "voxel.armor.hide.primal.belt", + Simple("common.items.armor.hide.primal.foot"): "voxel.armor.hide.primal.foot", + Simple("common.items.armor.hide.primal.hand"): "voxel.armor.hide.primal.hand", + Simple("common.items.armor.hide.primal.shoulder"): "voxel.armor.hide.primal.shoulder", + Simple("common.items.armor.hide.primal.back"): "voxel.armor.hide.primal.back", //Dragonscale Set - Armor(Chest("Dragonscale")): "voxel.armor.hide.dragonscale.chest", - Armor(Pants("Dragonscale")): "voxel.armor.hide.dragonscale.pants", - Armor(Belt("Dragonscale")): "voxel.armor.hide.dragonscale.belt", - Armor(Foot("Dragonscale")): "voxel.armor.hide.dragonscale.foot", - Armor(Hand("Dragonscale")): "voxel.armor.hide.dragonscale.hand", - Armor(Shoulder("Dragonscale")): "voxel.armor.hide.dragonscale.shoulder", - Armor(Back("Dragonscale")): "voxel.armor.hide.dragonscale.back", + Simple("common.items.armor.hide.dragonscale.chest"): "voxel.armor.hide.dragonscale.chest", + Simple("common.items.armor.hide.dragonscale.pants"): "voxel.armor.hide.dragonscale.pants", + Simple("common.items.armor.hide.dragonscale.belt"): "voxel.armor.hide.dragonscale.belt", + Simple("common.items.armor.hide.dragonscale.foot"): "voxel.armor.hide.dragonscale.foot", + Simple("common.items.armor.hide.dragonscale.hand"): "voxel.armor.hide.dragonscale.hand", + Simple("common.items.armor.hide.dragonscale.shoulder"): "voxel.armor.hide.dragonscale.shoulder", + Simple("common.items.armor.hide.dragonscale.back"): "voxel.armor.hide.dragonscale.back", //Savage Set - Armor(Chest("Savage")): "voxel.armor.savage.chest", - Armor(Pants("Savage")): "voxel.armor.savage.pants", - Armor(Belt("Savage")): "voxel.armor.savage.belt", - Armor(Foot("Savage")): "voxel.armor.savage.foot", - Armor(Hand("Savage")): "voxel.armor.savage.hand", - Armor(Shoulder("Savage")): "voxel.armor.savage.shoulder", - Armor(Back("Savage")): "voxel.armor.savage.back", + Simple("common.items.armor.savage.chest"): "voxel.armor.savage.chest", + Simple("common.items.armor.savage.pants"): "voxel.armor.savage.pants", + Simple("common.items.armor.savage.belt"): "voxel.armor.savage.belt", + Simple("common.items.armor.savage.foot"): "voxel.armor.savage.foot", + Simple("common.items.armor.savage.hand"): "voxel.armor.savage.hand", + Simple("common.items.armor.savage.shoulder"): "voxel.armor.savage.shoulder", + Simple("common.items.armor.savage.back"): "voxel.armor.savage.back", //Linen Set - Armor(Chest("Linen")): "voxel.armor.cloth.linen.chest", - Armor(Pants("Linen")): "voxel.armor.cloth.linen.pants", - Armor(Belt("Linen")): "voxel.armor.cloth.linen.belt", - Armor(Foot("Linen")): "voxel.armor.cloth.linen.foot", - Armor(Hand("Linen")): "voxel.armor.cloth.linen.hand", - Armor(Shoulder("Linen")): "voxel.armor.cloth.linen.shoulder", - Armor(Back("Linen")): "voxel.armor.cloth.linen.back", + Simple("common.items.armor.cloth.linen.chest"): "voxel.armor.cloth.linen.chest", + Simple("common.items.armor.cloth.linen.pants"): "voxel.armor.cloth.linen.pants", + Simple("common.items.armor.cloth.linen.belt"): "voxel.armor.cloth.linen.belt", + Simple("common.items.armor.cloth.linen.foot"): "voxel.armor.cloth.linen.foot", + Simple("common.items.armor.cloth.linen.hand"): "voxel.armor.cloth.linen.hand", + Simple("common.items.armor.cloth.linen.shoulder"): "voxel.armor.cloth.linen.shoulder", + Simple("common.items.armor.cloth.linen.back"): "voxel.armor.cloth.linen.back", //Woolen Set - Armor(Chest("Woolen")): "voxel.armor.cloth.woolen.chest", - Armor(Pants("Woolen")): "voxel.armor.cloth.woolen.pants", - Armor(Belt("Woolen")): "voxel.armor.cloth.woolen.belt", - Armor(Foot("Woolen")): "voxel.armor.cloth.woolen.foot", - Armor(Hand("Woolen")): "voxel.armor.cloth.woolen.hand", - Armor(Shoulder("Woolen")): "voxel.armor.cloth.woolen.shoulder", - Armor(Back("Woolen")): "voxel.armor.cloth.woolen.back", + Simple("common.items.armor.cloth.woolen.chest"): "voxel.armor.cloth.woolen.chest", + Simple("common.items.armor.cloth.woolen.pants"): "voxel.armor.cloth.woolen.pants", + Simple("common.items.armor.cloth.woolen.belt"): "voxel.armor.cloth.woolen.belt", + Simple("common.items.armor.cloth.woolen.foot"): "voxel.armor.cloth.woolen.foot", + Simple("common.items.armor.cloth.woolen.hand"): "voxel.armor.cloth.woolen.hand", + Simple("common.items.armor.cloth.woolen.shoulder"): "voxel.armor.cloth.woolen.shoulder", + Simple("common.items.armor.cloth.woolen.back"): "voxel.armor.cloth.woolen.back", //Silken Set - Armor(Chest("Silken")): "voxel.armor.cloth.silken.chest", - Armor(Pants("Silken")): "voxel.armor.cloth.silken.pants", - Armor(Belt("Silken")): "voxel.armor.cloth.silken.belt", - Armor(Foot("Silken")): "voxel.armor.cloth.silken.foot", - Armor(Hand("Silken")): "voxel.armor.cloth.silken.hand", - Armor(Shoulder("Silken")): "voxel.armor.cloth.silken.shoulder", - Armor(Back("Silken")): "voxel.armor.cloth.silken.back", + Simple("common.items.armor.cloth.silken.chest"): "voxel.armor.cloth.silken.chest", + Simple("common.items.armor.cloth.silken.pants"): "voxel.armor.cloth.silken.pants", + Simple("common.items.armor.cloth.silken.belt"): "voxel.armor.cloth.silken.belt", + Simple("common.items.armor.cloth.silken.foot"): "voxel.armor.cloth.silken.foot", + Simple("common.items.armor.cloth.silken.hand"): "voxel.armor.cloth.silken.hand", + Simple("common.items.armor.cloth.silken.shoulder"): "voxel.armor.cloth.silken.shoulder", + Simple("common.items.armor.cloth.silken.back"): "voxel.armor.cloth.silken.back", //Druid Set - Armor(Chest("Druid")): "voxel.armor.cloth.druid.chest", - Armor(Pants("Druid")): "voxel.armor.cloth.druid.pants", - Armor(Belt("Druid")): "voxel.armor.cloth.druid.belt", - Armor(Foot("Druid")): "voxel.armor.cloth.druid.foot", - Armor(Hand("Druid")): "voxel.armor.cloth.druid.hand", - Armor(Shoulder("Druid")): "voxel.armor.cloth.druid.shoulder", - Armor(Back("Druid")): "voxel.armor.cloth.druid.back", + Simple("common.items.armor.cloth.druid.chest"): "voxel.armor.cloth.druid.chest", + Simple("common.items.armor.cloth.druid.pants"): "voxel.armor.cloth.druid.pants", + Simple("common.items.armor.cloth.druid.belt"): "voxel.armor.cloth.druid.belt", + Simple("common.items.armor.cloth.druid.foot"): "voxel.armor.cloth.druid.foot", + Simple("common.items.armor.cloth.druid.hand"): "voxel.armor.cloth.druid.hand", + Simple("common.items.armor.cloth.druid.shoulder"): "voxel.armor.cloth.druid.shoulder", + Simple("common.items.armor.cloth.druid.back"): "voxel.armor.cloth.druid.back", //Moonweave Set - Armor(Chest("Moonweave")): "voxel.armor.cloth.moonweave.chest", - Armor(Pants("Moonweave")): "voxel.armor.cloth.moonweave.pants", - Armor(Belt("Moonweave")): "voxel.armor.cloth.moonweave.belt", - Armor(Foot("Moonweave")): "voxel.armor.cloth.moonweave.foot", - Armor(Hand("Moonweave")): "voxel.armor.cloth.moonweave.hand", - Armor(Shoulder("Moonweave")): "voxel.armor.cloth.moonweave.shoulder", - Armor(Back("Moonweave")): "voxel.armor.cloth.moonweave.back", + Simple("common.items.armor.cloth.moonweave.chest"): "voxel.armor.cloth.moonweave.chest", + Simple("common.items.armor.cloth.moonweave.pants"): "voxel.armor.cloth.moonweave.pants", + Simple("common.items.armor.cloth.moonweave.belt"): "voxel.armor.cloth.moonweave.belt", + Simple("common.items.armor.cloth.moonweave.foot"): "voxel.armor.cloth.moonweave.foot", + Simple("common.items.armor.cloth.moonweave.hand"): "voxel.armor.cloth.moonweave.hand", + Simple("common.items.armor.cloth.moonweave.shoulder"): "voxel.armor.cloth.moonweave.shoulder", + Simple("common.items.armor.cloth.moonweave.back"): "voxel.armor.cloth.moonweave.back", //Sunsilk Set - Armor(Chest("Sunsilk")): "voxel.armor.cloth.sunsilk.chest", - Armor(Pants("Sunsilk")): "voxel.armor.cloth.sunsilk.pants", - Armor(Belt("Sunsilk")): "voxel.armor.cloth.sunsilk.belt", - Armor(Foot("Sunsilk")): "voxel.armor.cloth.sunsilk.foot", - Armor(Hand("Sunsilk")): "voxel.armor.cloth.sunsilk.hand", - Armor(Shoulder("Sunsilk")): "voxel.armor.cloth.sunsilk.shoulder", - Armor(Back("Sunsilk")): "voxel.armor.cloth.sunsilk.back", + Simple("common.items.armor.cloth.sunsilk.chest"): "voxel.armor.cloth.sunsilk.chest", + Simple("common.items.armor.cloth.sunsilk.pants"): "voxel.armor.cloth.sunsilk.pants", + Simple("common.items.armor.cloth.sunsilk.belt"): "voxel.armor.cloth.sunsilk.belt", + Simple("common.items.armor.cloth.sunsilk.foot"): "voxel.armor.cloth.sunsilk.foot", + Simple("common.items.armor.cloth.sunsilk.hand"): "voxel.armor.cloth.sunsilk.hand", + Simple("common.items.armor.cloth.sunsilk.shoulder"): "voxel.armor.cloth.sunsilk.shoulder", + Simple("common.items.armor.cloth.sunsilk.back"): "voxel.armor.cloth.sunsilk.back", //Bronze Set - Armor(Chest("Bronze")): "voxel.armor.mail.bronze.chest", - Armor(Pants("Bronze")): "voxel.armor.mail.bronze.pants", - Armor(Belt("Bronze")): "voxel.armor.mail.bronze.belt", - Armor(Foot("Bronze")): "voxel.armor.mail.bronze.foot", - Armor(Hand("Bronze")): "voxel.armor.mail.bronze.hand", - Armor(Shoulder("Bronze")): "voxel.armor.mail.bronze.shoulder", - Armor(Back("Bronze")): "voxel.armor.mail.bronze.back", + Simple("common.items.armor.mail.bronze.chest"): "voxel.armor.mail.bronze.chest", + Simple("common.items.armor.mail.bronze.pants"): "voxel.armor.mail.bronze.pants", + Simple("common.items.armor.mail.bronze.belt"): "voxel.armor.mail.bronze.belt", + Simple("common.items.armor.mail.bronze.foot"): "voxel.armor.mail.bronze.foot", + Simple("common.items.armor.mail.bronze.hand"): "voxel.armor.mail.bronze.hand", + Simple("common.items.armor.mail.bronze.shoulder"): "voxel.armor.mail.bronze.shoulder", + Simple("common.items.armor.mail.bronze.back"): "voxel.armor.mail.bronze.back", //Iron Set - Armor(Chest("Iron")): "voxel.armor.mail.iron.chest", - Armor(Pants("Iron")): "voxel.armor.mail.iron.pants", - Armor(Belt("Iron")): "voxel.armor.mail.iron.belt", - Armor(Foot("Iron")): "voxel.armor.mail.iron.foot", - Armor(Hand("Iron")): "voxel.armor.mail.iron.hand", - Armor(Shoulder("Iron")): "voxel.armor.mail.iron.shoulder", - Armor(Back("Iron")): "voxel.armor.mail.iron.back", + Simple("common.items.armor.mail.iron.chest"): "voxel.armor.mail.iron.chest", + Simple("common.items.armor.mail.iron.pants"): "voxel.armor.mail.iron.pants", + Simple("common.items.armor.mail.iron.belt"): "voxel.armor.mail.iron.belt", + Simple("common.items.armor.mail.iron.foot"): "voxel.armor.mail.iron.foot", + Simple("common.items.armor.mail.iron.hand"): "voxel.armor.mail.iron.hand", + Simple("common.items.armor.mail.iron.shoulder"): "voxel.armor.mail.iron.shoulder", + Simple("common.items.armor.mail.iron.back"): "voxel.armor.mail.iron.back", //Steel Set - Armor(Chest("Steel")): "voxel.armor.mail.steel.chest", - Armor(Pants("Steel")): "voxel.armor.mail.steel.pants", - Armor(Belt("Steel")): "voxel.armor.mail.steel.belt", - Armor(Foot("Steel")): "voxel.armor.mail.steel.foot", - Armor(Hand("Steel")): "voxel.armor.mail.steel.hand", - Armor(Shoulder("Steel")): "voxel.armor.mail.steel.shoulder", - Armor(Back("Steel")): "voxel.armor.mail.steel.back", + Simple("common.items.armor.mail.steel.chest"): "voxel.armor.mail.steel.chest", + Simple("common.items.armor.mail.steel.pants"): "voxel.armor.mail.steel.pants", + Simple("common.items.armor.mail.steel.belt"): "voxel.armor.mail.steel.belt", + Simple("common.items.armor.mail.steel.foot"): "voxel.armor.mail.steel.foot", + Simple("common.items.armor.mail.steel.hand"): "voxel.armor.mail.steel.hand", + Simple("common.items.armor.mail.steel.shoulder"): "voxel.armor.mail.steel.shoulder", + Simple("common.items.armor.mail.steel.back"): "voxel.armor.mail.steel.back", //Cobalt Set - Armor(Chest("Cobalt")): "voxel.armor.mail.cobalt.chest", - Armor(Pants("Cobalt")): "voxel.armor.mail.cobalt.pants", - Armor(Belt("Cobalt")): "voxel.armor.mail.cobalt.belt", - Armor(Foot("Cobalt")): "voxel.armor.mail.cobalt.foot", - Armor(Hand("Cobalt")): "voxel.armor.mail.cobalt.hand", - Armor(Shoulder("Cobalt")): "voxel.armor.mail.cobalt.shoulder", - Armor(Back("Cobalt")): "voxel.armor.mail.cobalt.back", + Simple("common.items.armor.mail.cobalt.chest"): "voxel.armor.mail.cobalt.chest", + Simple("common.items.armor.mail.cobalt.pants"): "voxel.armor.mail.cobalt.pants", + Simple("common.items.armor.mail.cobalt.belt"): "voxel.armor.mail.cobalt.belt", + Simple("common.items.armor.mail.cobalt.foot"): "voxel.armor.mail.cobalt.foot", + Simple("common.items.armor.mail.cobalt.hand"): "voxel.armor.mail.cobalt.hand", + Simple("common.items.armor.mail.cobalt.shoulder"): "voxel.armor.mail.cobalt.shoulder", + Simple("common.items.armor.mail.cobalt.back"): "voxel.armor.mail.cobalt.back", //Bloodsteel Set - Armor(Chest("Bloodsteel")): "voxel.armor.mail.bloodsteel.chest", - Armor(Pants("Bloodsteel")): "voxel.armor.mail.bloodsteel.pants", - Armor(Belt("Bloodsteel")): "voxel.armor.mail.bloodsteel.belt", - Armor(Foot("Bloodsteel")): "voxel.armor.mail.bloodsteel.foot", - Armor(Hand("Bloodsteel")): "voxel.armor.mail.bloodsteel.hand", - Armor(Shoulder("Bloodsteel")): "voxel.armor.mail.bloodsteel.shoulder", - Armor(Back("Bloodsteel")): "voxel.armor.mail.bloodsteel.back", + Simple("common.items.armor.mail.bloodsteel.chest"): "voxel.armor.mail.bloodsteel.chest", + Simple("common.items.armor.mail.bloodsteel.pants"): "voxel.armor.mail.bloodsteel.pants", + Simple("common.items.armor.mail.bloodsteel.belt"): "voxel.armor.mail.bloodsteel.belt", + Simple("common.items.armor.mail.bloodsteel.foot"): "voxel.armor.mail.bloodsteel.foot", + Simple("common.items.armor.mail.bloodsteel.hand"): "voxel.armor.mail.bloodsteel.hand", + Simple("common.items.armor.mail.bloodsteel.shoulder"): "voxel.armor.mail.bloodsteel.shoulder", + Simple("common.items.armor.mail.bloodsteel.back"): "voxel.armor.mail.bloodsteel.back", //Orichalcum Set - Armor(Chest("Orichalcum")): "voxel.armor.mail.orichalcum.chest", - Armor(Pants("Orichalcum")): "voxel.armor.mail.orichalcum.pants", - Armor(Belt("Orichalcum")): "voxel.armor.mail.orichalcum.belt", - Armor(Foot("Orichalcum")): "voxel.armor.mail.orichalcum.foot", - Armor(Hand("Orichalcum")): "voxel.armor.mail.orichalcum.hand", - Armor(Shoulder("Orichalcum")): "voxel.armor.mail.orichalcum.shoulder", - Armor(Back("Orichalcum")): "voxel.armor.mail.orichalcum.back", + Simple("common.items.armor.mail.orichalcum.chest"): "voxel.armor.mail.orichalcum.chest", + Simple("common.items.armor.mail.orichalcum.pants"): "voxel.armor.mail.orichalcum.pants", + Simple("common.items.armor.mail.orichalcum.belt"): "voxel.armor.mail.orichalcum.belt", + Simple("common.items.armor.mail.orichalcum.foot"): "voxel.armor.mail.orichalcum.foot", + Simple("common.items.armor.mail.orichalcum.hand"): "voxel.armor.mail.orichalcum.hand", + Simple("common.items.armor.mail.orichalcum.shoulder"): "voxel.armor.mail.orichalcum.shoulder", + Simple("common.items.armor.mail.orichalcum.back"): "voxel.armor.mail.orichalcum.back", //misc - Armor(Pants("Hunting")): "voxel.armor.misc.pants.grayscale", + Simple("common.items.armor.misc.pants.hunting"): "voxel.armor.misc.pants.grayscale", // Backs - Armor(Back("Short0")): "voxel.armor.misc.back.short-0", - Armor(Back("Short1")): "voxel.armor.misc.back.short-1", - Armor(Back("Admin")): "voxel.armor.misc.back.admin", - Armor(Back("DungeonPurple")): "voxel.armor.misc.back.dungeon_purple", - Armor(Back("LeatherBlue")): "voxel.armor.leather_blue.back", - Armor(Back("Backpack")): "voxel.armor.misc.back.backpack", - Armor(Back("BackpackBlue")): "voxel.armor.misc.back.backpack", + Simple("common.items.armor.misc.back.short_0"): "voxel.armor.misc.back.short-0", + Simple("common.items.armor.misc.back.short_1"): "voxel.armor.misc.back.short-1", + Simple("common.items.armor.misc.back.admin"): "voxel.armor.misc.back.admin", + Simple("common.items.debug.admin_back"): "voxel.armor.misc.back.admin", + Simple("common.items.armor.misc.back.dungeon_purple"): "voxel.armor.misc.back.dungeon_purple", + Simple("common.items.npc_armor.back.leather_blue"): "voxel.armor.leather_blue.back", + Simple("common.items.armor.misc.back.backpack"): "voxel.armor.misc.back.backpack", + Simple("common.items.npc_armor.back.backpack_blue"): "voxel.armor.misc.back.backpack", //Hats - Armor(Head("Witch")): "voxel.armor.witch.hat", - Armor(Head("HogHood")): "voxel.armor.misc.head.hog_hood", - Armor(Head("BambooTwig")): "voxel.armor.misc.head.bamboo_twig", - Armor(Head("Pirate")): "voxel.armor.pirate.hat", - Armor(Head("Thief")): "voxel.armor.misc.head.bandana.thief", - Armor(Head("WanderersHat")): "voxel.armor.misc.head.wanderers_hat", - Armor(Head("Red")): "voxel.armor.misc.head.bandana.red", - Armor(Head("Straw")): "voxel.armor.misc.head.straw", - Armor(Head("Hood")): "voxel.armor.misc.head.hood", - Armor(Head("DarkHood")): "voxel.armor.misc.head.hood_dark", - Armor(Head("Crown")): "voxel.armor.misc.head.crown", - Armor(Head("Mitre")): "voxel.armor.misc.head.mitre", - Armor(Head("Spikeguard")): "voxel.armor.misc.head.spikeguard", - Armor(Head("WingedCoronet")): "voxel.armor.misc.head.winged_coronet", - Armor(Head("BorealWarhelm")): "voxel.armor.misc.head.boreal_warhelm", - Armor(Head("WoollyWintercap")): "voxel.armor.misc.head.woolly_wintercap", - Armor(Head("Helmet")): "voxel.armor.misc.head.helmet", + Simple("common.items.armor.witch.hat"): "voxel.armor.witch.hat", + Simple("common.items.armor.misc.head.hog_hood"): "voxel.armor.misc.head.hog_hood", + Simple("common.items.armor.misc.head.bamboo_twig"): "voxel.armor.misc.head.bamboo_twig", + Simple("common.items.armor.pirate.hat"): "voxel.armor.pirate.hat", + Simple("common.items.armor.misc.head.bandana.thief"): "voxel.armor.misc.head.bandana.thief", + Simple("common.items.armor.misc.head.wanderers_hat"): "voxel.armor.misc.head.wanderers_hat", + Simple("common.items.armor.misc.head.bandana.red"): "voxel.armor.misc.head.bandana.red", + Simple("common.items.armor.misc.head.straw"): "voxel.armor.misc.head.straw", + Simple("common.items.armor.misc.head.hood"): "voxel.armor.misc.head.hood", + Simple("common.items.armor.misc.head.hood_dark"): "voxel.armor.misc.head.hood_dark", + Simple("common.items.armor.misc.head.crown"): "voxel.armor.misc.head.crown", + Simple("common.items.armor.misc.head.mitre"): "voxel.armor.misc.head.mitre", + Simple("common.items.armor.misc.head.spikeguard"): "voxel.armor.misc.head.spikeguard", + Simple("common.items.armor.misc.head.winged_coronet"): "voxel.armor.misc.head.winged_coronet", + Simple("common.items.armor.misc.head.boreal_warhelm"): "voxel.armor.misc.head.boreal_warhelm", + Simple("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"): "voxel.armor.misc.head.woolly_wintercap", + Simple("common.items.armor.misc.head.helmet"): "voxel.armor.misc.head.helmet", // Rings - Armor(Ring("Scratched")): "voxel.armor.misc.ring.scratched", - Armor(Ring("Gold")): "voxel.armor.misc.ring.gold", - Armor(Ring("Topaz")): "voxel.armor.misc.ring.topaz", - Armor(Ring("Amethyst")): "voxel.armor.misc.ring.amethyst", - Armor(Ring("Sapphire")): "voxel.armor.misc.ring.sapphire", - Armor(Ring("Emerald")): "voxel.armor.misc.ring.emerald", - Armor(Ring("Ruby")): "voxel.armor.misc.ring.ruby", - Armor(Ring("Diamond")): "voxel.armor.misc.ring.diamond", - Armor(Ring("Cultist")): "voxel.armor.cultist.ring", + Simple("common.items.armor.misc.ring.scratched"): "voxel.armor.misc.ring.scratched", + Simple("common.items.armor.misc.ring.gold"): "voxel.armor.misc.ring.gold", + Simple("common.items.armor.misc.ring.topaz"): "voxel.armor.misc.ring.topaz", + Simple("common.items.armor.misc.ring.amethyst"): "voxel.armor.misc.ring.amethyst", + Simple("common.items.armor.misc.ring.sapphire"): "voxel.armor.misc.ring.sapphire", + Simple("common.items.armor.misc.ring.emerald"): "voxel.armor.misc.ring.emerald", + Simple("common.items.armor.misc.ring.ruby"): "voxel.armor.misc.ring.ruby", + Simple("common.items.armor.misc.ring.diamond"): "voxel.armor.misc.ring.diamond", + Simple("common.items.armor.cultist.ring"): "voxel.armor.cultist.ring", // Necks - Armor(Neck("Ankh")): "voxel.armor.misc.neck.ankh_of_life", - Armor(Neck("Carcanet")): "voxel.armor.misc.neck.carcanet_of_wrath", - Armor(Neck("Fang")): "voxel.armor.misc.neck.fang", - Armor(Neck("Honeycomb")): "voxel.armor.misc.neck.honeycomb_pendant", - Armor(Neck("Haniwa")): "voxel.armor.misc.neck.haniwa_talisman", - Armor(Neck("Pendant")): "voxel.armor.misc.neck.pendant_of_protection", - Armor(Neck("ResilienceGem")): "voxel.armor.misc.neck.resilience_gem", - Armor(Neck("Shell")): "voxel.armor.misc.neck.shell", - Armor(Neck("Amethyst")): "voxel.armor.misc.neck.amethyst", - Armor(Neck("Diamond")): "voxel.armor.misc.neck.diamond", - Armor(Neck("Cultist")): "voxel.armor.cultist.necklace", - Armor(Neck("Ruby")): "voxel.armor.misc.neck.ruby", - Armor(Neck("Topaz")): "voxel.armor.misc.neck.topaz", - Armor(Neck("Emerald")): "voxel.armor.misc.neck.emerald", - Armor(Neck("Gold")): "voxel.armor.misc.neck.gold", - Armor(Neck("Sapphire")): "voxel.armor.misc.neck.sapphire", - Armor(Neck("Scratched")): "voxel.armor.misc.neck.scratched", + Simple("common.items.armor.misc.neck.ankh_of_life"): "voxel.armor.misc.neck.ankh_of_life", + Simple("common.items.armor.misc.neck.carcanet_of_wrath"): "voxel.armor.misc.neck.carcanet_of_wrath", + Simple("common.items.armor.misc.neck.fang"): "voxel.armor.misc.neck.fang", + Simple("common.items.armor.misc.neck.honeycomb_pendant"): "voxel.armor.misc.neck.honeycomb_pendant", + Simple("common.items.armor.misc.neck.haniwa_talisman"): "voxel.armor.misc.neck.haniwa_talisman", + Simple("common.items.armor.misc.neck.pendant_of_protection"): "voxel.armor.misc.neck.pendant_of_protection", + Simple("common.items.armor.misc.neck.gem_of_resilience"): "voxel.armor.misc.neck.resilience_gem", + Simple("common.items.armor.misc.neck.shell"): "voxel.armor.misc.neck.shell", + Simple("common.items.armor.misc.neck.amethyst"): "voxel.armor.misc.neck.amethyst", + Simple("common.items.armor.misc.neck.diamond"): "voxel.armor.misc.neck.diamond", + Simple("common.items.armor.cultist.necklace"): "voxel.armor.cultist.necklace", + Simple("common.items.armor.misc.neck.ruby"): "voxel.armor.misc.neck.ruby", + Simple("common.items.armor.misc.neck.topaz"): "voxel.armor.misc.neck.topaz", + Simple("common.items.armor.misc.neck.emerald"): "voxel.armor.misc.neck.emerald", + Simple("common.items.armor.misc.neck.gold"): "voxel.armor.misc.neck.gold", + Simple("common.items.armor.misc.neck.sapphire"): "voxel.armor.misc.neck.sapphire", + Simple("common.items.armor.misc.neck.scratched"): "voxel.armor.misc.neck.scratched", // Tabards - Armor(Tabard("Admin")): "voxel.armor.tabard_admin", + Simple("common.items.armor.misc.tabard.admin"): "voxel.armor.tabard_admin", + Simple("common.items.debug.admin"): "voxel.armor.tabard_admin", // Heads - Armor(Head("Leather")): "voxel.armor.misc.head.leather-0", - Armor(Head("Assassin")): "voxel.armor.misc.head.assa_mask-0", - Armor(Head("Exclamation")): "voxel.armor.misc.head.exclamation", + Simple("common.items.armor.hide.leather.head"): "voxel.armor.misc.head.leather-0", + Simple("common.items.armor.assassin.head"): "voxel.armor.misc.head.assa_mask-0", + Simple("common.items.armor.misc.head.exclamation"): "voxel.armor.misc.head.exclamation", // Bags - Armor(Bag("RedFace")): "voxel.armor.misc.bag.soulkeeper_cursed", - Armor(Bag("BlackHole")): "voxel.armor.misc.bag.admin_black_hole", - Armor(Bag("BlueFace")): "voxel.armor.misc.bag.soulkeeper_pure", - Armor(Bag("PurpleSkull")): "voxel.armor.misc.bag.mindflayer_spellbag", - Armor(Bag("GreenLarge")): "voxel.armor.misc.bag.troll_hide_pack", - Armor(Bag("LeatherLarge")): "voxel.armor.misc.bag.reliable_backpack", - Armor(Bag("GreenMid")): "voxel.armor.misc.bag.liana_kit", - Armor(Bag("LeatherSmall")): "voxel.armor.misc.bag.tiny_leather_pouch", - Armor(Bag("RedLarge")): "voxel.armor.misc.bag.sturdy_red_backpack", - Armor(Bag("RedMed")): "voxel.armor.misc.bag.woven_red_bag", - Armor(Bag("RedSmall")): "voxel.armor.misc.bag.knitted_red_pouch", - Armor(Bag("RedTiny")): "voxel.armor.misc.bag.tiny_red_pouch", - Armor(Bag("BluePouch")): "voxel.armor.misc.bag.heavy_seabag", + Simple("common.items.armor.misc.bag.soulkeeper_cursed"): "voxel.armor.misc.bag.soulkeeper_cursed", + Simple("common.items.debug.admin_black_hole"): "voxel.armor.misc.bag.admin_black_hole", + Simple("common.items.armor.misc.bag.soulkeeper_pure"): "voxel.armor.misc.bag.soulkeeper_pure", + Simple("common.items.armor.misc.bag.mindflayer_spellbag"): "voxel.armor.misc.bag.mindflayer_spellbag", + Simple("common.items.armor.misc.bag.troll_hide_pack"): "voxel.armor.misc.bag.troll_hide_pack", + Simple("common.items.armor.misc.bag.reliable_backpack"): "voxel.armor.misc.bag.reliable_backpack", + Simple("common.items.armor.misc.bag.liana_kit"): "voxel.armor.misc.bag.liana_kit", + Simple("common.items.armor.misc.bag.tiny_leather_pouch"): "voxel.armor.misc.bag.tiny_leather_pouch", + Simple("common.items.armor.misc.bag.sturdy_red_backpack"): "voxel.armor.misc.bag.sturdy_red_backpack", + Simple("common.items.armor.misc.bag.woven_red_bag"): "voxel.armor.misc.bag.woven_red_bag", + Simple("common.items.armor.misc.bag.knitted_red_pouch"): "voxel.armor.misc.bag.knitted_red_pouch", + Simple("common.items.armor.misc.bag.tiny_red_pouch"): "voxel.armor.misc.bag.tiny_red_pouch", + Simple("common.items.armor.misc.bag.heavy_seabag"): "voxel.armor.misc.bag.heavy_seabag", // Consumables - Consumable("common.items.food.apple"): "voxel.object.apple_half", - Consumable("common.items.food.coconut"): "voxel.object.coconut_half", - Consumable("common.items.food.cactus_colada"): "voxel.object.cactus_drink", - Consumable("common.items.consumable.potion_med"): "voxel.object.potion_red", - Consumable("common.items.consumable.potion_minor"): "voxel.object.potion_red", - Consumable("common.items.consumable.potion_big"): "voxel.object.potion_red", - Consumable("common.items.boss_drops.potions"): "voxel.object.potion_red", - Consumable("common.items.food.cheese"): "voxel.object.cheese", - Consumable("common.items.food.blue_cheese"): "voxel.object.blue_cheese", - Consumable("common.items.food.mushroom"): "voxel.sprite.mushrooms.mushroom-10", - Ingredient("Velorite"): "voxel.sprite.velorite.velorite_ore", - Ingredient("VeloriteFrag"): "voxel.sprite.velorite.velorite_1", - Consumable("common.items.food.apple_mushroom_curry"): "voxel.object.mushroom_curry", - Consumable("common.items.food.spore_corruption"): "voxel.sprite.spore.corruption_spore", - Consumable("common.items.food.apple_stick"): "voxel.object.apple_stick", - Consumable("common.items.food.mushroom_stick"): "voxel.object.mushroom_stick", - Consumable("common.items.food.sunflower_icetea"): "voxel.object.sunflower_ice_tea", - Consumable("common.items.food.carrot"): "voxel.sprite.carrot.carrot", - Consumable("common.items.food.tomato"): "voxel.sprite.tomato.tomato", - Consumable("common.items.food.lettuce"): "voxel.sprite.cabbage.cabbage", - Consumable("common.items.food.meat.fish_raw"): "voxel.sprite.food.meat.fish_raw", - Consumable("common.items.food.meat.fish_cooked"): "voxel.sprite.food.meat.fish_cooked", - Consumable("common.items.food.meat.bird_raw"): "voxel.sprite.food.meat.bird_raw", - Consumable("common.items.food.meat.bird_cooked"): "voxel.sprite.food.meat.bird_cooked", - Consumable("common.items.food.meat.bird_large_raw"): "voxel.sprite.food.meat.bird_large_raw", - Consumable("common.items.food.meat.bird_large_cooked"): "voxel.sprite.food.meat.bird_large_cooked", - Consumable("common.items.food.meat.beast_small_raw"): "voxel.sprite.food.meat.beast_small_raw", - Consumable("common.items.food.meat.beast_small_cooked"): "voxel.sprite.food.meat.beast_small_cooked", - Consumable("common.items.food.meat.tough_raw"): "voxel.sprite.food.meat.tough_raw", - Consumable("common.items.food.meat.tough_cooked"): "voxel.sprite.food.meat.tough_cooked", - Consumable("common.items.food.meat.beast_large_raw"): "voxel.sprite.food.meat.beast_large_raw", - Consumable("common.items.food.meat.beast_large_cooked"): "voxel.sprite.food.meat.beast_large_cooked", - Consumable("common.items.food.plainsalad"): "voxel.sprite.food.salad_plain", - Consumable("common.items.food.tomatosalad"): "voxel.sprite.food.salad_tomato", + Simple("common.items.food.apple"): "voxel.object.apple_half", + Simple("common.items.food.coconut"): "voxel.object.coconut_half", + Simple("common.items.food.cactus_colada"): "voxel.object.cactus_drink", + Simple("common.items.consumable.potion_med"): "voxel.object.potion_red", + Simple("common.items.consumable.potion_minor"): "voxel.object.potion_red", + Simple("common.items.consumable.potion_big"): "voxel.object.potion_red", + Simple("common.items.boss_drops.potions"): "voxel.object.potion_red", + Simple("common.items.food.cheese"): "voxel.object.cheese", + Simple("common.items.food.blue_cheese"): "voxel.object.blue_cheese", + Simple("common.items.food.mushroom"): "voxel.sprite.mushrooms.mushroom-10", + Simple("common.items.mineral.ore.velorite"): "voxel.sprite.velorite.velorite_ore", + Simple("common.items.mineral.ore.veloritefrag"): "voxel.sprite.velorite.velorite_1", + Simple("common.items.food.apple_mushroom_curry"): "voxel.object.mushroom_curry", + Simple("common.items.food.spore_corruption"): "voxel.sprite.spore.corruption_spore", + Simple("common.items.food.apple_stick"): "voxel.object.apple_stick", + Simple("common.items.food.mushroom_stick"): "voxel.object.mushroom_stick", + Simple("common.items.food.sunflower_icetea"): "voxel.object.sunflower_ice_tea", + Simple("common.items.food.carrot"): "voxel.sprite.carrot.carrot", + Simple("common.items.food.tomato"): "voxel.sprite.tomato.tomato", + Simple("common.items.food.lettuce"): "voxel.sprite.cabbage.cabbage", + Simple("common.items.food.meat.fish_raw"): "voxel.sprite.food.meat.fish_raw", + Simple("common.items.food.meat.fish_cooked"): "voxel.sprite.food.meat.fish_cooked", + Simple("common.items.food.meat.bird_raw"): "voxel.sprite.food.meat.bird_raw", + Simple("common.items.food.meat.bird_cooked"): "voxel.sprite.food.meat.bird_cooked", + Simple("common.items.food.meat.bird_large_raw"): "voxel.sprite.food.meat.bird_large_raw", + Simple("common.items.food.meat.bird_large_cooked"): "voxel.sprite.food.meat.bird_large_cooked", + Simple("common.items.food.meat.beast_small_raw"): "voxel.sprite.food.meat.beast_small_raw", + Simple("common.items.food.meat.beast_small_cooked"): "voxel.sprite.food.meat.beast_small_cooked", + Simple("common.items.food.meat.tough_raw"): "voxel.sprite.food.meat.tough_raw", + Simple("common.items.food.meat.tough_cooked"): "voxel.sprite.food.meat.tough_cooked", + Simple("common.items.food.meat.beast_large_raw"): "voxel.sprite.food.meat.beast_large_raw", + Simple("common.items.food.meat.beast_large_cooked"): "voxel.sprite.food.meat.beast_large_cooked", + Simple("common.items.food.plainsalad"): "voxel.sprite.food.salad_plain", + Simple("common.items.food.tomatosalad"): "voxel.sprite.food.salad_tomato", // Throwables - Throwable(Bomb): "voxel.object.bomb", - Throwable(Firework(Blue)): "voxel.weapon.projectile.fireworks_blue-0", - Throwable(Firework(Green)): "voxel.weapon.projectile.fireworks_green-0", - Throwable(Firework(Purple)): "voxel.weapon.projectile.fireworks_purple-0", - Throwable(Firework(Red)): "voxel.weapon.projectile.fireworks_red-0", - Throwable(Firework(White)): "voxel.weapon.projectile.fireworks_white-0", - Throwable(Firework(Yellow)): "voxel.weapon.projectile.fireworks_yellow-0", - Throwable(TrainingDummy): "voxel.object.training_dummy", + Simple("common.items.utility.bomb"): "voxel.object.bomb", + Simple("common.items.utility.firework_blue"): "voxel.weapon.projectile.fireworks_blue-0", + Simple("common.items.utility.firework_green"): "voxel.weapon.projectile.fireworks_green-0", + Simple("common.items.utility.firework_purple"): "voxel.weapon.projectile.fireworks_purple-0", + Simple("common.items.utility.firework_red"): "voxel.weapon.projectile.fireworks_red-0", + Simple("common.items.utility.firework_white"): "voxel.weapon.projectile.fireworks_white-0", + Simple("common.items.utility.firework_yellow"): "voxel.weapon.projectile.fireworks_yellow-0", + Simple("common.items.utility.training_dummy"): "voxel.object.training_dummy", // Ingredients - Tool("common.items.tool.craftsman_hammer"): "voxel.weapon.hammer.craftsman", - Ingredient("SewingSet"): "voxel.object.sewing_set", - Ingredient("Flower"): "voxel.sprite.flowers.sunflower_1", - Ingredient("FlowerRed"): "voxel.sprite.flowers.flower_red-4", - Ingredient("Sunflower"): "voxel.sprite.flowers.sunflower_1", - Ingredient("Grass"): "voxel.sprite.grass.grass_long_5", - Ingredient("Stones"): "voxel.sprite.rocks.rock-0", - Ingredient("Cactus"): "voxel.sprite.cacti.flat_cactus_med", - Ingredient("Seashells"): "voxel.sprite.seashells.shell-0", - Ingredient("IcyShard"): "voxel.object.ice_shard", - Ingredient("FlayerBagDamaged"): "voxel.object.glowing_remains", - Ingredient("RaptorFeather"): "voxel.object.raptor_feather", - Ingredient("Twigs"): "voxel.sprite.twigs.twigs-0", - Ingredient("AnimalHide"): "voxel.sprite.crafting_ing.hide.animal_hide", - Ingredient("ToughHide"): "voxel.sprite.crafting_ing.hide.tough_hide", - Ingredient("RuggedHide"): "voxel.sprite.crafting_ing.hide.rugged_hide", - Ingredient("SimpleLeather"): "voxel.sprite.crafting_ing.leather.simple_leather", - Ingredient("ThickLeather"): "voxel.sprite.crafting_ing.leather.thick_leather", - Ingredient("RigidLeather"): "voxel.sprite.crafting_ing.leather.rigid_leather", - Ingredient("TrollLeather"): "voxel.sprite.crafting_ing.hide.troll_hide", - Ingredient("LeatherStrips"): "voxel.sprite.crafting_ing.leather.leather_strips", - Ingredient("Plate"): "voxel.sprite.crafting_ing.hide.plate", - Ingredient("Carapace"): "voxel.sprite.crafting_ing.hide.carapace", - Ingredient("Scale"): "voxel.sprite.crafting_ing.hide.scale", - Ingredient("DragonScale"): "voxel.sprite.crafting_ing.hide.dragon_scale", - Ingredient("Claw"): "voxel.sprite.crafting_ing.animal_misc.claw", - Ingredient("ElegantCrest"): "voxel.object.elegant_crest", - Ingredient("VenomSac"): "voxel.sprite.crafting_ing.animal_misc.venom_sac", - Ingredient("LivelyVine"): "voxel.sprite.crafting_ing.animal_misc.lively_vine", - Ingredient("SharpFang"): "voxel.sprite.crafting_ing.animal_misc.sharp_fang", - Ingredient("StrongPincer"): "voxel.object.strong_pincer", - Ingredient("Fur"): "voxel.sprite.crafting_ing.animal_misc.fur", - Ingredient("LargeHorn"): "voxel.sprite.crafting_ing.animal_misc.large_horn", - Ingredient("LongTusk"): "voxel.object.long_tusk", - Ingredient("GrimEyeball"): "voxel.sprite.crafting_ing.animal_misc.grim_eyeball", - Ingredient("PlantFiber"): "voxel.sprite.crafting_ing.plant_fiber", - Ingredient("Moonbell"): "voxel.sprite.flowers.moonbell", - Ingredient("Pyrebloom"): "voxel.sprite.flowers.pyrebloom", - Ingredient("WildFlax"): "voxel.sprite.flowers.flax", - Ingredient("CottonBoll"): "voxel.sprite.crafting_ing.cotton_boll", - Ingredient("Cotton"): "voxel.sprite.crafting_ing.cloth.cotton", - Ingredient("Linen"): "voxel.sprite.crafting_ing.cloth.linen", - Ingredient("Wool"): "voxel.sprite.crafting_ing.cloth.wool", - Ingredient("Silk"): "voxel.sprite.crafting_ing.cloth.silk", - Ingredient("Lifecloth"): "voxel.sprite.crafting_ing.cloth.lifecloth", - Ingredient("Moonweave"): "voxel.sprite.crafting_ing.cloth.moonweave", - Ingredient("Sunsilk"): "voxel.sprite.crafting_ing.cloth.sunsilk", - Ingredient("LinenRed"): "voxel.sprite.crafting_ing.cloth.linen_red", - Ingredient("StickyThread"): "voxel.sprite.crafting_ing.sticky_thread", - Ingredient("SilverIngot"): "voxel.sprite.mineral.ingot.silver", - Ingredient("GoldIngot"): "voxel.sprite.mineral.ingot.gold", - Ingredient("OrichalcumIngot"): "voxel.sprite.mineral.ingot.orichalcum", - Ingredient("BloodsteelIngot"): "voxel.sprite.mineral.ingot.bloodsteel", - Ingredient("BronzeIngot"): "voxel.sprite.mineral.ingot.bronze", - Ingredient("CobaltIngot"): "voxel.sprite.mineral.ingot.cobalt", - Ingredient("CopperIngot"): "voxel.sprite.mineral.ingot.copper", - Ingredient("IronIngot"): "voxel.sprite.mineral.ingot.iron", - Ingredient("SteelIngot"): "voxel.sprite.mineral.ingot.steel", - Ingredient("TinIngot"): "voxel.sprite.mineral.ingot.tin", - Ingredient("GoldOre"): "voxel.sprite.mineral.ore.gold", - Ingredient("SilverOre"): "voxel.sprite.mineral.ore.silver", - Ingredient("BloodstoneOre"): "voxel.sprite.mineral.ore.bloodstone", - Ingredient("CobaltOre"): "voxel.sprite.mineral.ore.cobalt", - Ingredient("CopperOre"): "voxel.sprite.mineral.ore.copper", - Ingredient("IronOre"): "voxel.sprite.mineral.ore.iron", - Ingredient("TinOre"): "voxel.sprite.mineral.ore.tin", - Ingredient("Coal"): "voxel.sprite.mineral.ore.coal", - Ingredient("Honey"): "voxel.object.honey", - Ingredient("MortarPestle"): "voxel.object.mortar_pestle", - Ingredient("EmptyVial"): "voxel.object.potion_empty", - Ingredient("Bowl"): "voxel.sprite.crafting_ing.bowl", - Ingredient("Oil"): "voxel.sprite.crafting_ing.oil", - Ingredient("ViscousOoze"): "voxel.sprite.crafting_ing.animal_misc.viscous_ooze", - Ingredient("PhoenixFeather"): "voxel.sprite.crafting_ing.animal_misc.phoenix_feather", - Ingredient("Bamboo"): "voxel.sprite.wood.item.bamboo", - Ingredient("EldwoodLogs"): "voxel.sprite.wood.item.eldwood", - Ingredient("FrostwoodLogs"): "voxel.sprite.wood.item.frostwood", - Ingredient("HardwoodLogs"): "voxel.sprite.wood.item.hardwood", - Ingredient("IronwoodLogs"): "voxel.sprite.wood.item.ironwood", - Ingredient("WoodLogs"): "voxel.sprite.wood.item.wood", + Simple("common.items.tool.craftsman_hammer"): "voxel.weapon.hammer.craftsman", + Simple("common.items.crafting_tools.sewing_set"): "voxel.object.sewing_set", + Simple("common.items.flowers.sunflower"): "voxel.sprite.flowers.sunflower_1", + Simple("common.items.flowers.red"): "voxel.sprite.flowers.flower_red-4", + Simple("common.items.grasses.long"): "voxel.sprite.grass.grass_long_5", + Simple("common.items.crafting_ing.stones"): "voxel.sprite.rocks.rock-0", + Simple("common.items.crafting_ing.cactus"): "voxel.sprite.cacti.flat_cactus_med", + Simple("common.items.crafting_ing.seashells"): "voxel.sprite.seashells.shell-0", + Simple("common.items.crafting_ing.animal_misc.icy_fang"): "voxel.object.ice_shard", + Simple("common.items.crafting_ing.mindflayer_bag_damaged"): "voxel.object.glowing_remains", + Simple("common.items.crafting_ing.animal_misc.raptor_feather"): "voxel.object.raptor_feather", + Simple("common.items.crafting_ing.twigs"): "voxel.sprite.twigs.twigs-0", + Simple("common.items.crafting_ing.hide.animal_hide"): "voxel.sprite.crafting_ing.hide.animal_hide", + Simple("common.items.crafting_ing.hide.tough_hide"): "voxel.sprite.crafting_ing.hide.tough_hide", + Simple("common.items.crafting_ing.hide.rugged_hide"): "voxel.sprite.crafting_ing.hide.rugged_hide", + Simple("common.items.crafting_ing.leather.simple_leather"): "voxel.sprite.crafting_ing.leather.simple_leather", + Simple("common.items.crafting_ing.leather.thick_leather"): "voxel.sprite.crafting_ing.leather.thick_leather", + Simple("common.items.crafting_ing.leather.rigid_leather"): "voxel.sprite.crafting_ing.leather.rigid_leather", + Simple("common.items.crafting_ing.hide.leather_troll"): "voxel.sprite.crafting_ing.hide.troll_hide", + Simple("common.items.crafting_ing.leather.leather_strips"): "voxel.sprite.crafting_ing.leather.leather_strips", + Simple("common.items.crafting_ing.hide.plate"): "voxel.sprite.crafting_ing.hide.plate", + Simple("common.items.crafting_ing.hide.carapace"): "voxel.sprite.crafting_ing.hide.carapace", + Simple("common.items.crafting_ing.hide.scales"): "voxel.sprite.crafting_ing.hide.scale", + Simple("common.items.crafting_ing.hide.dragon_scale"): "voxel.sprite.crafting_ing.hide.dragon_scale", + Simple("common.items.crafting_ing.animal_misc.claw"): "voxel.sprite.crafting_ing.animal_misc.claw", + Simple("common.items.crafting_ing.animal_misc.elegant_crest"): "voxel.object.elegant_crest", + Simple("common.items.crafting_ing.animal_misc.venom_sac"): "voxel.sprite.crafting_ing.animal_misc.venom_sac", + Simple("common.items.crafting_ing.animal_misc.lively_vine"): "voxel.sprite.crafting_ing.animal_misc.lively_vine", + Simple("common.items.crafting_ing.animal_misc.sharp_fang"): "voxel.sprite.crafting_ing.animal_misc.sharp_fang", + Simple("common.items.crafting_ing.animal_misc.strong_pincer"): "voxel.object.strong_pincer", + Simple("common.items.crafting_ing.animal_misc.fur"): "voxel.sprite.crafting_ing.animal_misc.fur", + Simple("common.items.crafting_ing.animal_misc.large_horn"): "voxel.sprite.crafting_ing.animal_misc.large_horn", + Simple("common.items.crafting_ing.animal_misc.long_tusk"): "voxel.object.long_tusk", + Simple("common.items.crafting_ing.animal_misc.grim_eyeball"): "voxel.sprite.crafting_ing.animal_misc.grim_eyeball", + Simple("common.items.flowers.plant_fiber"): "voxel.sprite.crafting_ing.plant_fiber", + Simple("common.items.flowers.moonbell"): "voxel.sprite.flowers.moonbell", + Simple("common.items.flowers.pyrebloom"): "voxel.sprite.flowers.pyrebloom", + Simple("common.items.flowers.wild_flax"): "voxel.sprite.flowers.flax", + Simple("common.items.crafting_ing.cotton_boll"): "voxel.sprite.crafting_ing.cotton_boll", + Simple("common.items.crafting_ing.cloth.cotton"): "voxel.sprite.crafting_ing.cloth.cotton", + Simple("common.items.crafting_ing.cloth.linen"): "voxel.sprite.crafting_ing.cloth.linen", + Simple("common.items.crafting_ing.cloth.wool"): "voxel.sprite.crafting_ing.cloth.wool", + Simple("common.items.crafting_ing.cloth.silk"): "voxel.sprite.crafting_ing.cloth.silk", + Simple("common.items.crafting_ing.cloth.lifecloth"): "voxel.sprite.crafting_ing.cloth.lifecloth", + Simple("common.items.crafting_ing.cloth.moonweave"): "voxel.sprite.crafting_ing.cloth.moonweave", + Simple("common.items.crafting_ing.cloth.sunsilk"): "voxel.sprite.crafting_ing.cloth.sunsilk", + Simple("common.items.crafting_ing.cloth.linen_red"): "voxel.sprite.crafting_ing.cloth.linen_red", + Simple("common.items.crafting_ing.sticky_thread"): "voxel.sprite.crafting_ing.sticky_thread", + Simple("common.items.mineral.ingot.silver"): "voxel.sprite.mineral.ingot.silver", + Simple("common.items.mineral.ingot.gold"): "voxel.sprite.mineral.ingot.gold", + Simple("common.items.mineral.ingot.orichalcum"): "voxel.sprite.mineral.ingot.orichalcum", + Simple("common.items.mineral.ingot.bloodsteel"): "voxel.sprite.mineral.ingot.bloodsteel", + Simple("common.items.mineral.ingot.bronze"): "voxel.sprite.mineral.ingot.bronze", + Simple("common.items.mineral.ingot.cobalt"): "voxel.sprite.mineral.ingot.cobalt", + Simple("common.items.mineral.ingot.copper"): "voxel.sprite.mineral.ingot.copper", + Simple("common.items.mineral.ingot.iron"): "voxel.sprite.mineral.ingot.iron", + Simple("common.items.mineral.ingot.steel"): "voxel.sprite.mineral.ingot.steel", + Simple("common.items.mineral.ingot.tin"): "voxel.sprite.mineral.ingot.tin", + Simple("common.items.mineral.ore.gold"): "voxel.sprite.mineral.ore.gold", + Simple("common.items.mineral.ore.silver"): "voxel.sprite.mineral.ore.silver", + Simple("common.items.mineral.ore.bloodstone"): "voxel.sprite.mineral.ore.bloodstone", + Simple("common.items.mineral.ore.cobalt"): "voxel.sprite.mineral.ore.cobalt", + Simple("common.items.mineral.ore.copper"): "voxel.sprite.mineral.ore.copper", + Simple("common.items.mineral.ore.iron"): "voxel.sprite.mineral.ore.iron", + Simple("common.items.mineral.ore.tin"): "voxel.sprite.mineral.ore.tin", + Simple("common.items.mineral.stone.coal"): "voxel.sprite.mineral.ore.coal", + Simple("common.items.mineral.ore.coal"): "voxel.sprite.mineral.ore.coal", + Simple("common.items.crafting_ing.honey"): "voxel.object.honey", + Simple("common.items.crafting_tools.mortar_pestle"): "voxel.object.mortar_pestle", + Simple("common.items.crafting_ing.empty_vial"): "voxel.object.potion_empty", + Simple("common.items.crafting_ing.bowl"): "voxel.sprite.crafting_ing.bowl", + Simple("common.items.crafting_ing.oil"): "voxel.sprite.crafting_ing.oil", + Simple("common.items.crafting_ing.animal_misc.viscous_ooze"): "voxel.sprite.crafting_ing.animal_misc.viscous_ooze", + Simple("common.items.crafting_ing.animal_misc.phoenix_feather"): "voxel.sprite.crafting_ing.animal_misc.phoenix_feather", + Simple("common.items.log.bamboo"): "voxel.sprite.wood.item.bamboo", + Simple("common.items.log.eldwood"): "voxel.sprite.wood.item.eldwood", + Simple("common.items.log.frostwood"): "voxel.sprite.wood.item.frostwood", + Simple("common.items.log.hardwood"): "voxel.sprite.wood.item.hardwood", + Simple("common.items.log.ironwood"): "voxel.sprite.wood.item.ironwood", + Simple("common.items.log.wood"): "voxel.sprite.wood.item.wood", // Gliders - Glider("Starter"): "voxel.glider.starter", - Glider("PlainCloth"): "voxel.glider.basic_white", - Glider("RedCloth"): "voxel.glider.basic_red", - Glider("Blue0"): "voxel.glider.blue", - Glider("ButterflyMorpho"): "voxel.glider.butterfly1", - Glider("ButterflyMonarch"): "voxel.glider.butterfly2", - Glider("ButterflyLove"): "voxel.glider.butterfly3", - Glider("MothLuna"): "voxel.glider.moth", - Glider("SandRaptor"): "voxel.glider.sandraptor", - Glider("SnowRaptor"): "voxel.glider.snowraptor", - Glider("WoodRaptor"): "voxel.glider.woodraptor", - Glider("Sunset"): "voxel.glider.sunset", - Glider("Moonrise"): "voxel.glider.moonrise", - Glider("Purple0"): "voxel.glider.cultists", - Glider("Leaves"): "voxel.glider.leaves", + Simple("common.items.glider.cloverleaf"): "voxel.glider.starter", + Simple("common.items.glider.basic_white"): "voxel.glider.basic_white", + Simple("common.items.glider.basic_red"): "voxel.glider.basic_red", + Simple("common.items.glider.blue"): "voxel.glider.blue", + Simple("common.items.glider.morpho"): "voxel.glider.butterfly1", + Simple("common.items.glider.monarch"): "voxel.glider.butterfly2", + Simple("common.items.glider.butterfly3"): "voxel.glider.butterfly3", + Simple("common.items.glider.moth"): "voxel.glider.moth", + Simple("common.items.glider.sandraptor"): "voxel.glider.sandraptor", + Simple("common.items.glider.snowraptor"): "voxel.glider.snowraptor", + Simple("common.items.glider.woodraptor"): "voxel.glider.woodraptor", + Simple("common.items.glider.sunset"): "voxel.glider.sunset", + Simple("common.items.glider.moonrise"): "voxel.glider.moonrise", + Simple("common.items.glider.skullgrin"): "voxel.glider.cultists", + Simple("common.items.glider.leaves"): "voxel.glider.leaves", // Debug Items - Tool("common.items.debug.admin_stick"): "voxel.weapon.tool.broom_belzeshrub_purple", + Simple("common.items.debug.admin_stick"): "voxel.weapon.tool.broom_belzeshrub_purple", // Misc - Tool("common.items.weapons.tool.golf_club"): "voxel.weapon.tool.golf_club", + Simple("common.items.weapons.tool.golf_club"): "voxel.weapon.tool.golf_club", // Gems - Ingredient("Amethyst"): "voxel.sprite.mineral.gem.amethystgem", - Ingredient("Topaz"): "voxel.sprite.mineral.gem.topazgem", - Ingredient("Sapphire"): "voxel.sprite.mineral.gem.sapphiregem", - Ingredient("Emerald"): "voxel.sprite.mineral.gem.emeraldgem", - Ingredient("Ruby"): "voxel.sprite.mineral.gem.rubygem", - Ingredient("Diamond"): "voxel.sprite.mineral.gem.diamondgem", + Simple("common.items.mineral.gem.amethyst"): "voxel.sprite.mineral.gem.amethystgem", + Simple("common.items.mineral.gem.topaz"): "voxel.sprite.mineral.gem.topazgem", + Simple("common.items.mineral.gem.sapphire"): "voxel.sprite.mineral.gem.sapphiregem", + Simple("common.items.mineral.gem.emerald"): "voxel.sprite.mineral.gem.emeraldgem", + Simple("common.items.mineral.gem.ruby"): "voxel.sprite.mineral.gem.rubygem", + Simple("common.items.mineral.gem.diamond"): "voxel.sprite.mineral.gem.diamondgem", Empty: "voxel.armor.empty", // Modular component pieces // Swords @@ -965,9 +960,9 @@ ModularWeaponComponent(("common.items.modular.weapon.primary.sword.sabre", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.sword.sabre.orichalcum", ModularWeaponComponent(("common.items.modular.weapon.primary.sword.sawblade", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.sword.sawblade.orichalcum", ModularWeaponComponent(("common.items.modular.weapon.primary.sword.zweihander", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.sword.zweihander.orichalcum", - Tool("common.items.modular.weapon.secondary.sword.long"): "voxel.weapon.component.sword.hilt.long", - Tool("common.items.modular.weapon.secondary.sword.medium"): "voxel.weapon.component.sword.hilt.medium", - Tool("common.items.modular.weapon.secondary.sword.short"): "voxel.weapon.component.sword.hilt.short", + Simple("common.items.modular.weapon.secondary.sword.long"): "voxel.weapon.component.sword.hilt.long", + Simple("common.items.modular.weapon.secondary.sword.medium"): "voxel.weapon.component.sword.hilt.medium", + Simple("common.items.modular.weapon.secondary.sword.short"): "voxel.weapon.component.sword.hilt.short", // Axes ModularWeaponComponent(("common.items.modular.weapon.primary.axe.axe", "common.items.mineral.ingot.bronze")): "voxel.weapon.component.axe.axe.bronze", ModularWeaponComponent(("common.items.modular.weapon.primary.axe.battleaxe", "common.items.mineral.ingot.bronze")): "voxel.weapon.component.axe.battleaxe.bronze", @@ -1011,9 +1006,9 @@ ModularWeaponComponent(("common.items.modular.weapon.primary.axe.labrys", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.axe.labrys.orichalcum", ModularWeaponComponent(("common.items.modular.weapon.primary.axe.ornate", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.axe.ornate.orichalcum", ModularWeaponComponent(("common.items.modular.weapon.primary.axe.poleaxe", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.axe.poleaxe.orichalcum", - Tool("common.items.modular.weapon.secondary.axe.long"): "voxel.weapon.component.axe.haft.long", - Tool("common.items.modular.weapon.secondary.axe.medium"): "voxel.weapon.component.axe.haft.medium", - Tool("common.items.modular.weapon.secondary.axe.short"): "voxel.weapon.component.axe.haft.short", + Simple("common.items.modular.weapon.secondary.axe.long"): "voxel.weapon.component.axe.haft.long", + Simple("common.items.modular.weapon.secondary.axe.medium"): "voxel.weapon.component.axe.haft.medium", + Simple("common.items.modular.weapon.secondary.axe.short"): "voxel.weapon.component.axe.haft.short", // Hammers ModularWeaponComponent(("common.items.modular.weapon.primary.hammer.greathammer", "common.items.mineral.ingot.bronze")): "voxel.weapon.component.hammer.greathammer.bronze", ModularWeaponComponent(("common.items.modular.weapon.primary.hammer.greatmace", "common.items.mineral.ingot.bronze")): "voxel.weapon.component.hammer.greatmace.bronze", @@ -1057,9 +1052,9 @@ ModularWeaponComponent(("common.items.modular.weapon.primary.hammer.ornate", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.hammer.ornate.orichalcum", ModularWeaponComponent(("common.items.modular.weapon.primary.hammer.spikedmace", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.hammer.spikedmace.orichalcum", ModularWeaponComponent(("common.items.modular.weapon.primary.hammer.warhammer", "common.items.mineral.ingot.orichalcum")): "voxel.weapon.component.hammer.warhammer.orichalcum", - Tool("common.items.modular.weapon.secondary.hammer.long"): "voxel.weapon.component.hammer.shaft.long", - Tool("common.items.modular.weapon.secondary.hammer.medium"): "voxel.weapon.component.hammer.shaft.medium", - Tool("common.items.modular.weapon.secondary.hammer.short"): "voxel.weapon.component.hammer.shaft.short", + Simple("common.items.modular.weapon.secondary.hammer.long"): "voxel.weapon.component.hammer.shaft.long", + Simple("common.items.modular.weapon.secondary.hammer.medium"): "voxel.weapon.component.hammer.shaft.medium", + Simple("common.items.modular.weapon.secondary.hammer.short"): "voxel.weapon.component.hammer.shaft.short", // Bows ModularWeaponComponent(("common.items.modular.weapon.primary.bow.bow", "common.items.log.wood")): "voxel.weapon.component.bow.bow.wood", ModularWeaponComponent(("common.items.modular.weapon.primary.bow.composite", "common.items.log.wood")): "voxel.weapon.component.bow.composite.wood", @@ -1103,9 +1098,9 @@ ModularWeaponComponent(("common.items.modular.weapon.primary.bow.ornate", "common.items.log.eldwood")): "voxel.weapon.component.bow.ornate.eldwood", ModularWeaponComponent(("common.items.modular.weapon.primary.bow.shortbow", "common.items.log.eldwood")): "voxel.weapon.component.bow.shortbow.eldwood", ModularWeaponComponent(("common.items.modular.weapon.primary.bow.warbow", "common.items.log.eldwood")): "voxel.weapon.component.bow.warbow.eldwood", - Tool("common.items.modular.weapon.secondary.bow.long"): "voxel.weapon.component.bow.grip.long", - Tool("common.items.modular.weapon.secondary.bow.medium"): "voxel.weapon.component.bow.grip.medium", - Tool("common.items.modular.weapon.secondary.bow.short"): "voxel.weapon.component.bow.grip.short", + Simple("common.items.modular.weapon.secondary.bow.long"): "voxel.weapon.component.bow.grip.long", + Simple("common.items.modular.weapon.secondary.bow.medium"): "voxel.weapon.component.bow.grip.medium", + Simple("common.items.modular.weapon.secondary.bow.short"): "voxel.weapon.component.bow.grip.short", // Staffs ModularWeaponComponent(("common.items.modular.weapon.primary.staff.brand", "common.items.log.wood")): "voxel.weapon.component.staff.brand.wood", ModularWeaponComponent(("common.items.modular.weapon.primary.staff.grandstaff", "common.items.log.wood")): "voxel.weapon.component.staff.grandstaff.wood", @@ -1149,9 +1144,9 @@ ModularWeaponComponent(("common.items.modular.weapon.primary.staff.pole", "common.items.log.eldwood")): "voxel.weapon.component.staff.pole.eldwood", ModularWeaponComponent(("common.items.modular.weapon.primary.staff.rod", "common.items.log.eldwood")): "voxel.weapon.component.staff.rod.eldwood", ModularWeaponComponent(("common.items.modular.weapon.primary.staff.staff", "common.items.log.eldwood")): "voxel.weapon.component.staff.staff.eldwood", - Tool("common.items.modular.weapon.secondary.staff.heavy"): "voxel.weapon.component.staff.core.heavy", - Tool("common.items.modular.weapon.secondary.staff.medium"): "voxel.weapon.component.staff.core.medium", - Tool("common.items.modular.weapon.secondary.staff.light"): "voxel.weapon.component.staff.core.light", + Simple("common.items.modular.weapon.secondary.staff.heavy"): "voxel.weapon.component.staff.core.heavy", + Simple("common.items.modular.weapon.secondary.staff.medium"): "voxel.weapon.component.staff.core.medium", + Simple("common.items.modular.weapon.secondary.staff.light"): "voxel.weapon.component.staff.core.light", // Sceptres ModularWeaponComponent(("common.items.modular.weapon.primary.sceptre.arbor", "common.items.log.wood")): "voxel.weapon.component.sceptre.arbor.wood", ModularWeaponComponent(("common.items.modular.weapon.primary.sceptre.cane", "common.items.log.wood")): "voxel.weapon.component.sceptre.cane.wood", @@ -1195,7 +1190,7 @@ ModularWeaponComponent(("common.items.modular.weapon.primary.sceptre.grandsceptre", "common.items.log.eldwood")): "voxel.weapon.component.sceptre.grandsceptre.eldwood", ModularWeaponComponent(("common.items.modular.weapon.primary.sceptre.ornate", "common.items.log.eldwood")): "voxel.weapon.component.sceptre.ornate.eldwood", ModularWeaponComponent(("common.items.modular.weapon.primary.sceptre.sceptre", "common.items.log.eldwood")): "voxel.weapon.component.sceptre.sceptre.eldwood", - Tool("common.items.modular.weapon.secondary.sceptre.heavy"): "voxel.weapon.component.sceptre.core.heavy", - Tool("common.items.modular.weapon.secondary.sceptre.medium"): "voxel.weapon.component.sceptre.core.medium", - Tool("common.items.modular.weapon.secondary.sceptre.light"): "voxel.weapon.component.sceptre.core.light", + Simple("common.items.modular.weapon.secondary.sceptre.heavy"): "voxel.weapon.component.sceptre.core.heavy", + Simple("common.items.modular.weapon.secondary.sceptre.medium"): "voxel.weapon.component.sceptre.core.medium", + Simple("common.items.modular.weapon.secondary.sceptre.light"): "voxel.weapon.component.sceptre.core.light", }) From bbe22d68077d952305a2c656f3de2e1b6da2f9e9 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 18 May 2022 16:44:09 -0400 Subject: [PATCH 3/3] Fixed bins (no assets) --- common/src/bin/csv_export/main.rs | 28 ++-------------------------- common/src/bin/csv_import/main.rs | 2 +- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 56c35ee563..edd19ad409 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -14,7 +14,7 @@ use veloren_common::{ item::{ armor::{ArmorKind, Protection}, tool::{Hands, Tool, ToolKind}, - Item, ItemKind, + Item, }, }, generation::{EntityConfig, EntityInfo}, @@ -201,42 +201,18 @@ fn get_armor_kind(kind: &ArmorKind) -> String { } } -fn get_armor_kind_kind(kind: &ArmorKind) -> String { - match kind { - ArmorKind::Shoulder(x) => x.clone(), - ArmorKind::Chest(x) => x.clone(), - ArmorKind::Belt(x) => x.clone(), - ArmorKind::Hand(x) => x.clone(), - ArmorKind::Pants(x) => x.clone(), - ArmorKind::Foot(x) => x.clone(), - ArmorKind::Back(x) => x.clone(), - ArmorKind::Ring(x) => x.clone(), - ArmorKind::Neck(x) => x.clone(), - ArmorKind::Head(x) => x.clone(), - ArmorKind::Tabard(x) => x.clone(), - ArmorKind::Bag(x) => x.clone(), - } -} - fn all_items() -> Result<(), Box> { let mut wtr = csv::Writer::from_path("items.csv")?; - wtr.write_record(&["Path", "Name", "Kind"])?; + wtr.write_record(&["Path", "Name"])?; for item in comp::item::Item::new_from_asset_glob("common.items.*") .expect("Failed to iterate over item folders!") { - let kind = match &*item.kind() { - ItemKind::Armor(armor) => get_armor_kind_kind(&armor.kind), - ItemKind::Lantern(lantern) => lantern.kind.clone(), - _ => "".to_owned(), - }; - wtr.write_record(&[ item.item_definition_id() .itemdef_id() .expect("All items in asset glob should be simple items"), &item.name(), - &kind, ])?; } diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs index 3eda17b68e..65f80d986c 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -173,7 +173,7 @@ fn armor_stats() -> Result<(), Box> { None }; - let kind = armor.kind.clone(); + let kind = armor.kind; let armor_stats = comp::item::armor::Stats::new( protection, poise_resilience,