From 5cc54b34bd9814b07d3637a5faa97ec87943e934 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Thu, 23 Sep 2021 22:13:21 -0400 Subject: [PATCH 1/9] headbands --- .../common/items/armor/misc/head/headband.ron | 17 +++++ .../armor/misc/head/headband/danari_f.vox | 3 + .../armor/misc/head/headband/danari_m.vox | 3 + .../armor/misc/head/headband/dwarf_f.vox | 3 + .../armor/misc/head/headband/dwarf_m.vox | 3 + .../voxel/armor/misc/head/headband/elf_f.vox | 3 + .../voxel/armor/misc/head/headband/elf_m.vox | 3 + .../armor/misc/head/headband/human_f.vox | 3 + .../armor/misc/head/headband/human_m.vox | 3 + .../voxel/armor/misc/head/headband/orc_f.vox | 3 + .../voxel/armor/misc/head/headband/orc_m.vox | 3 + .../armor/misc/head/headband/undead_f.vox | 3 + .../armor/misc/head/headband/undead_m.vox | 3 + .../voxel/humanoid_armor_head_manifest.ron | 76 +++++++++++++++---- voxygen/src/scene/figure/load.rs | 9 ++- 15 files changed, 122 insertions(+), 16 deletions(-) create mode 100644 assets/common/items/armor/misc/head/headband.ron create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/danari_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/danari_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/dwarf_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/dwarf_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/elf_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/elf_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/human_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/human_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/orc_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/orc_m.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/undead_f.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/headband/undead_m.vox diff --git a/assets/common/items/armor/misc/head/headband.ron b/assets/common/items/armor/misc/head/headband.ron new file mode 100644 index 0000000000..6024571501 --- /dev/null +++ b/assets/common/items/armor/misc/head/headband.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Headband", + description: "yep.", + kind: Armor(( + kind: Head("Headband"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/voxygen/voxel/armor/misc/head/headband/danari_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/danari_f.vox new file mode 100644 index 0000000000..8a4243321e --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/danari_f.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8527af44385b775f1d236042c254d26e5a48fedebfad530c2e6b3d02b28a80a +size 1192 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/danari_m.vox b/assets/voxygen/voxel/armor/misc/head/headband/danari_m.vox new file mode 100644 index 0000000000..40fd425727 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/danari_m.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a15dfd0933195643d877992aaeac8f042da7f768ecd79e7a17965a8f7ee878b2 +size 1200 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/dwarf_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/dwarf_f.vox new file mode 100644 index 0000000000..a13df50b94 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/dwarf_f.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2898fb4af922a73bc9805ef2915c9008720b738ff60716b43c09d765e5a8382c +size 1208 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/dwarf_m.vox b/assets/voxygen/voxel/armor/misc/head/headband/dwarf_m.vox new file mode 100644 index 0000000000..41df90da9b --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/dwarf_m.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1658344590e243462054a7dbc715d31f056082855536b48ecddd3107f38a47ef +size 1192 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/elf_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/elf_f.vox new file mode 100644 index 0000000000..590a7436a7 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/elf_f.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0de37262525266658af86c4884a2d839c08a231c4c1190fd195f02d1c59be338 +size 1216 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/elf_m.vox b/assets/voxygen/voxel/armor/misc/head/headband/elf_m.vox new file mode 100644 index 0000000000..5353272a2f --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/elf_m.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4a6b1f7ff94a61501a3becd3139f885afef836ea29298f129ab4777641eb1dc +size 1216 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/human_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/human_f.vox new file mode 100644 index 0000000000..9288f3a0fa --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/human_f.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b00cb21a6710984eef2b428907663f4f891b28f7db8638e20e0db39d971e0d7 +size 1216 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/human_m.vox b/assets/voxygen/voxel/armor/misc/head/headband/human_m.vox new file mode 100644 index 0000000000..4efe403e9a --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/human_m.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b38a3b7a50214e3a73e4612cb06b0b9e6049ced9d321a6153f96f596b88027e +size 1216 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/orc_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/orc_f.vox new file mode 100644 index 0000000000..d6872c1ddb --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/orc_f.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4929f209ed364ee79a881befcf194a1931ebd7fd0cf134e9e33c41c784e58dd +size 1208 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/orc_m.vox b/assets/voxygen/voxel/armor/misc/head/headband/orc_m.vox new file mode 100644 index 0000000000..2b29176fae --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/orc_m.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df5d5d9a49d113a0d8c9fb4cde1c48a0f8ec945aedc5877c2b1dbc3a2ffe8338 +size 1208 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/undead_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/undead_f.vox new file mode 100644 index 0000000000..0fdcc3ac48 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/undead_f.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bd70cd7f9caaa2795ae735582c08e1e8576f51cbd967cb14a6719828e2826c9 +size 1204 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/undead_m.vox b/assets/voxygen/voxel/armor/misc/head/headband/undead_m.vox new file mode 100644 index 0000000000..ed82895220 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/headband/undead_m.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4033f2496980288bb0b4a6ca783a7b6de6de8114724a4afe53e90f0f0ff440ff +size 1200 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 1c7d876a40..d92dd8f091 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -4,37 +4,85 @@ color: None ), map: { - (Danari, "Exclamation"): ( + (Danari, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-10.0, -10.0, 20.0)), color: None - ), - (Dwarf, "Exclamation"): ( + ),//fix + (Dwarf, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-13.0, -10.0, 18.0)), color: None - ), - (Human, "Exclamation"): ( + ),//fix + (Human, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-12.0, -11.0, 18.0)), color: None - ), - (Orc, "Exclamation"): ( + ),//fix + (Orc, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -12.0, 18.0)), color: None - ), - (Undead, "Exclamation"): ( + ),//fix + (Undead, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-14.0, -11.0, 18.0)), color: None - ), - (Elf, "Exclamation"): ( + ),//fix + (Elf, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -11.0, 18.0)), color: None - ), - (Human, "Witch"): ( + ),//fix + (Human, Female, "Witch"): ( vox_spec: ("armor.witch.hat", (-4.0, -4.0, 5.0)), color: None ), - (Human, "Pirate"): ( + (Human, Female, "Pirate"): ( vox_spec: ("armor.pirate.hat", (-2.0, -2.0, 5.0)), color: None ), + (Danari, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.danari_m", (4.0, 2.0, 7.0)), + color: None + ), + (Danari, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.danari_f", (4.0, 2.0, 7.0)), + color: None + ), + (Dwarf, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.dwarf_m", (2.0, 3.0, 6.0)), + color: None + ), + (Dwarf, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.dwarf_f", (2.0, 3.0, 5.0)), + color: None + ), + (Human, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.human_m", (2.0, 2.0, 5.0)), + color: None + ), + (Human, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.human_f", (4.0, 2.0, 7.0)), + color: None + ), + (Orc, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.orc_m", (4.0, 3.0, 7.0)), + color: None + ), + (Orc, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.orc_f", (3.0, 1.0, 5.0)), + color: None + ), + (Undead, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.undead_m", (0.0, 2.0, 7.0)), + color: Some((44, 74, 109)) + ), + (Undead, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.undead_f", (0.0, 2.0, 6.0)), + color: None + ), + (Elf, Male, "Headband"): ( + vox_spec: ("armor.misc.head.headband.elf_m", (3.0, 2.0, 5.0)), + color: None + ), + (Elf, Female, "Headband"): ( + vox_spec: ("armor.misc.head.headband.elf_f", (3.0, 2.0, 5.0)), + color: None + ), } )) diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index dda604e939..eefe2780b7 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -359,7 +359,7 @@ struct HumArmorLanternSpec(ArmorVoxSpecMap); #[derive(Deserialize)] struct HumArmorGliderSpec(ArmorVoxSpecMap); #[derive(Deserialize)] -struct HumArmorHeadSpec(ArmorVoxSpecMap<(Species, String), ArmorVoxSpec>); +struct HumArmorHeadSpec(ArmorVoxSpecMap<(Species, BodyType, String), ArmorVoxSpec>); #[derive(Deserialize)] struct HumArmorTabardSpec(ArmorVoxSpecMap); @@ -969,7 +969,11 @@ impl HumArmorLanternSpec { } impl HumArmorHeadSpec { fn load_head(&self, body: &Body, head: Option<&str>) -> Option<(Segment, Vec3)> { - match self.0.map.get(&(body.species, head?.to_string())) { + match self + .0 + .map + .get(&(body.species, body.body_type, head?.to_string())) + { Some(spec) => Some(( graceful_load_segment(&spec.vox_spec.0), Vec3::::from(spec.vox_spec.1).as_(), @@ -981,6 +985,7 @@ impl HumArmorHeadSpec { } } } + impl HumArmorTabardSpec { /// FIXME: Either use this, or remove it. #[allow(dead_code)] From 3915aa7aace77331f6290e23a6c4d6de5eabe9dd Mon Sep 17 00:00:00 2001 From: jshipsey Date: Fri, 24 Sep 2021 00:28:17 -0400 Subject: [PATCH 2/9] support for hollow voxels ty zesterer --- common/src/figure/cell.rs | 23 +++++++++++++++++------ common/src/figure/mod.rs | 20 +++++++++++++++----- voxygen/src/scene/figure/load.rs | 6 +++--- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/common/src/figure/cell.rs b/common/src/figure/cell.rs index 2cb7ad6e4c..63ddb3d81d 100644 --- a/common/src/figure/cell.rs +++ b/common/src/figure/cell.rs @@ -5,24 +5,28 @@ use vek::*; const GLOWY: u8 = 1 << 1; const SHINY: u8 = 1 << 2; +const HOLLOW: u8 = 1 << 3; #[derive(Copy, Clone, Debug, PartialEq, Eq)] pub struct CellData { pub col: Rgb, - pub attr: NonZeroU8, // 1 = glowy, 2 = shiny + pub attr: NonZeroU8, // 1 = glowy, 2 = shiny, 3 = hollow } impl CellData { - pub(super) fn new(col: Rgb, glowy: bool, shiny: bool) -> Self { + pub(super) fn new(col: Rgb, glowy: bool, shiny: bool, hollow: bool) -> Self { CellData { col, - attr: NonZeroU8::new(1 + glowy as u8 * GLOWY + shiny as u8 * SHINY).unwrap(), + attr: NonZeroU8::new( + 1 + glowy as u8 * GLOWY + shiny as u8 * SHINY + hollow as u8 * HOLLOW, + ) + .unwrap(), } } } impl Default for CellData { - fn default() -> Self { Self::new(Rgb::broadcast(255), false, false) } + fn default() -> Self { Self::new(Rgb::broadcast(255), false, false, false) } } /// A type representing a single voxel in a figure. @@ -33,8 +37,8 @@ pub enum Cell { } impl Cell { - pub fn new(col: Rgb, glowy: bool, shiny: bool) -> Self { - Cell::Filled(CellData::new(col, glowy, shiny)) + pub fn new(col: Rgb, glowy: bool, shiny: bool, hollow: bool) -> Self { + Cell::Filled(CellData::new(col, glowy, shiny, hollow)) } pub fn get_color(&self) -> Option> { @@ -57,6 +61,13 @@ impl Cell { Cell::Empty => false, } } + + pub fn is_hollow(&self) -> bool { + match self { + Cell::Filled(data) => data.attr.get() & HOLLOW != 0, + Cell::Empty => false, + } + } } impl Vox for Cell { diff --git a/common/src/figure/mod.rs b/common/src/figure/mod.rs index b16d43730f..c9475b807c 100644 --- a/common/src/figure/mod.rs +++ b/common/src/figure/mod.rs @@ -67,6 +67,7 @@ impl Segment { color, (13..16).contains(&voxel.i), // Glowy (8..13).contains(&voxel.i), // Shiny + voxel.i == 16, // Hollow ), ) .unwrap(); @@ -93,8 +94,14 @@ impl Segment { /// Transform cell colors pub fn map_rgb(self, transform: impl Fn(Rgb) -> Rgb) -> Self { self.map(|cell| { - cell.get_color() - .map(|rgb| Cell::new(transform(rgb), cell.is_glowy(), cell.is_shiny())) + cell.get_color().map(|rgb| { + Cell::new( + transform(rgb), + cell.is_glowy(), + cell.is_shiny(), + cell.is_hollow(), + ) + }) }) } } @@ -119,7 +126,9 @@ impl DynaUnionizer { } } - pub fn unify(self) -> (Dyna, Vec3) { + pub fn unify(self) -> (Dyna, Vec3) { self.unify_with(|v| v) } + + pub fn unify_with(self, mut f: impl FnMut(V) -> V) -> (Dyna, Vec3) { if self.0.is_empty() { return (Dyna::filled(Vec3::zero(), V::empty(), ()), Vec3::zero()); } @@ -140,7 +149,7 @@ impl DynaUnionizer { for (dyna, offset) in self.0 { for (pos, vox) in dyna.full_vol_iter() { if !vox.is_empty() { - combined.set(origin + offset + pos, *vox).unwrap(); + combined.set(origin + offset + pos, f(*vox)).unwrap(); } } } @@ -157,7 +166,7 @@ impl MatSegment { for (pos, vox) in self.full_vol_iter() { let data = match vox { MatCell::None => continue, - MatCell::Mat(mat) => CellData::new(map(*mat), false, false), + MatCell::Mat(mat) => CellData::new(map(*mat), false, false, false), MatCell::Normal(data) => *data, }; vol.set(pos, Cell::Filled(data)).unwrap(); @@ -221,6 +230,7 @@ impl MatSegment { color, (13..16).contains(&index), (8..13).contains(&index), + index == 16, // Hollow )) }, }; diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index eefe2780b7..a249148052 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -22,7 +22,8 @@ use common::{ }, theropod::{self, BodyType as TBodyType, Species as TSpecies}, }, - figure::{DynaUnionizer, MatSegment, Material, Segment}, + figure::{Cell, DynaUnionizer, MatSegment, Material, Segment}, + vol::Vox, }; use hashbrown::HashMap; use serde::Deserialize; @@ -317,8 +318,7 @@ impl HumHeadSpec { .maybe_add(beard) .maybe_add(accessory) .maybe_add(helmet) - .unify(); - + .unify_with(|v| if v.is_hollow() { Cell::empty() } else { v }); ( head, Vec3::from(spec.offset) + origin_offset.map(|e| e as f32 * -1.0), From 97a3c1e713b6cc79e3798c8bb02974fc361f2ef9 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Wed, 29 Sep 2021 12:25:49 -0400 Subject: [PATCH 3/9] simple hats --- .../items/armor/misc/head/bandana/red.ron | 17 + .../items/armor/misc/head/bandana/thief.ron | 17 + .../common/items/armor/misc/head/helmet.ron | 17 + assets/common/items/armor/misc/head/hood.ron | 17 + assets/common/items/armor/misc/head/straw.ron | 17 + assets/voxygen/item_image_manifest.ron | 21 ++ .../voxel/armor/misc/head/bandana/red.vox | 3 + .../voxel/armor/misc/head/bandana/thief.vox | 3 + .../voxygen/voxel/armor/misc/head/helmet.vox | 3 + assets/voxygen/voxel/armor/misc/head/hood.vox | 3 + .../voxygen/voxel/armor/misc/head/straw.vox | 3 + assets/voxygen/voxel/armor/pirate/hat.vox | 4 +- assets/voxygen/voxel/armor/witch/hat.vox | 4 +- .../voxel/humanoid_armor_head_manifest.ron | 309 +++++++++++++++++- 14 files changed, 426 insertions(+), 12 deletions(-) create mode 100644 assets/common/items/armor/misc/head/bandana/red.ron create mode 100644 assets/common/items/armor/misc/head/bandana/thief.ron create mode 100644 assets/common/items/armor/misc/head/helmet.ron create mode 100644 assets/common/items/armor/misc/head/hood.ron create mode 100644 assets/common/items/armor/misc/head/straw.ron create mode 100644 assets/voxygen/voxel/armor/misc/head/bandana/red.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/bandana/thief.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/helmet.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/hood.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/straw.vox diff --git a/assets/common/items/armor/misc/head/bandana/red.ron b/assets/common/items/armor/misc/head/bandana/red.ron new file mode 100644 index 0000000000..2f8db4475a --- /dev/null +++ b/assets/common/items/armor/misc/head/bandana/red.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Red Bandana", + description: "yep.", + kind: Armor(( + kind: Head("Red"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/bandana/thief.ron b/assets/common/items/armor/misc/head/bandana/thief.ron new file mode 100644 index 0000000000..352160a078 --- /dev/null +++ b/assets/common/items/armor/misc/head/bandana/thief.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Thief Bandana", + description: "yep.", + kind: Armor(( + kind: Head("Thief"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/helmet.ron b/assets/common/items/armor/misc/head/helmet.ron new file mode 100644 index 0000000000..79d40e3194 --- /dev/null +++ b/assets/common/items/armor/misc/head/helmet.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Helmet", + description: "yep.", + kind: Armor(( + kind: Head("Helmet"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/hood.ron b/assets/common/items/armor/misc/head/hood.ron new file mode 100644 index 0000000000..5f2d54fc13 --- /dev/null +++ b/assets/common/items/armor/misc/head/hood.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Hood", + description: "yep.", + kind: Armor(( + kind: Head("Hood"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/straw.ron b/assets/common/items/armor/misc/head/straw.ron new file mode 100644 index 0000000000..4b0df4af9e --- /dev/null +++ b/assets/common/items/armor/misc/head/straw.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Straw Hat", + description: "yep.", + kind: Armor(( + kind: Head("Straw"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 9d3d8b2c0f..27a75fc0c5 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -2145,6 +2145,27 @@ "voxel.armor.misc.back.backpack", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), + //Hats + Armor(Head("Witch")): VoxTrans( + "voxel.armor.witch.hat", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Pirate")): VoxTrans( + "voxel.armor.pirate.hat", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Thief")): VoxTrans( + "voxel.armor.misc.head.bandana.thief", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Red")): VoxTrans( + "voxel.armor.misc.head.bandana.red", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Straw")): VoxTrans( + "voxel.armor.misc.head.straw", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), // Rings Armor(Ring("Scratched")): VoxTrans( "voxel.armor.misc.ring.scratched", diff --git a/assets/voxygen/voxel/armor/misc/head/bandana/red.vox b/assets/voxygen/voxel/armor/misc/head/bandana/red.vox new file mode 100644 index 0000000000..1df35cc0cb --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/bandana/red.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68a970bed2c688ca7ffac56b150e4f7b75d624ad377375b4102210c38d8457a6 +size 2784 diff --git a/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox b/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox new file mode 100644 index 0000000000..a2c885315a --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2098f01121367b2061f43ddaf077d56b16ccfebbcf80323ede8ac0d32f655e3d +size 2784 diff --git a/assets/voxygen/voxel/armor/misc/head/helmet.vox b/assets/voxygen/voxel/armor/misc/head/helmet.vox new file mode 100644 index 0000000000..ff85bb2e6f --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/helmet.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0bfb7dc60be7c50b2e8cd33b8e3360f0f17dac2ae89597d33ee2adf9079f1ec +size 12080 diff --git a/assets/voxygen/voxel/armor/misc/head/hood.vox b/assets/voxygen/voxel/armor/misc/head/hood.vox new file mode 100644 index 0000000000..14fbd4ee09 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/hood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5885f8041b1861f56d01b701e4f75c7f6bec65e6622578f8eede84e8959aef15 +size 6792 diff --git a/assets/voxygen/voxel/armor/misc/head/straw.vox b/assets/voxygen/voxel/armor/misc/head/straw.vox new file mode 100644 index 0000000000..c3a9806ed8 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/straw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b907d989fb6b4910ae7c7e77615a360747f4952bb36e7208ccc9e6b3778524d0 +size 9048 diff --git a/assets/voxygen/voxel/armor/pirate/hat.vox b/assets/voxygen/voxel/armor/pirate/hat.vox index 0a71651127..25e9e4122d 100644 --- a/assets/voxygen/voxel/armor/pirate/hat.vox +++ b/assets/voxygen/voxel/armor/pirate/hat.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2f4b946145b706a23494fac26344d789c6bdfa05bd2e411f07bd0a97bc96b46 -size 4048 +oid sha256:cf155f664c119b79cae45b1e46dd5a11afefbbdd84f3cd9addfc6a2e32754145 +size 7248 diff --git a/assets/voxygen/voxel/armor/witch/hat.vox b/assets/voxygen/voxel/armor/witch/hat.vox index 40e5727df7..4d4086c68f 100644 --- a/assets/voxygen/voxel/armor/witch/hat.vox +++ b/assets/voxygen/voxel/armor/witch/hat.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4eb3a03d09c2a420898d5944f7334695175c3f76c6565d7d582258c00d0bfd4d -size 5612 +oid sha256:a3663a0164f2b4fdbedd060ba48dd7e5e940cb37fc877837e4a408a15a999839 +size 21032 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index d92dd8f091..c91adf7379 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -7,19 +7,19 @@ (Danari, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-10.0, -10.0, 20.0)), color: None - ),//fix + ), (Dwarf, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-13.0, -10.0, 18.0)), color: None - ),//fix + ), (Human, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-12.0, -11.0, 18.0)), color: None - ),//fix + ), (Orc, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -12.0, 18.0)), color: None - ),//fix + ), (Undead, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-14.0, -11.0, 18.0)), color: None @@ -27,15 +27,156 @@ (Elf, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -11.0, 18.0)), color: None - ),//fix - (Human, Female, "Witch"): ( - vox_spec: ("armor.witch.hat", (-4.0, -4.0, 5.0)), + ), + // + (Human, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-4.0, -5.0, 5.0)), color: None ), - (Human, Female, "Pirate"): ( + (Human, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-4.0, -5.0, 5.0)), + color: None + ), + (Elf, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-3.0, -5.0, 5.0)), + color: None + ), + (Elf, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-3.0, -6.0, 5.0)), + color: None + ), + (Dwarf, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-5.0, -4.0, 5.0)), + color: None + ), + (Dwarf, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-5.0, -4.0, 5.0)), + color: None + ), + (Danari, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-2.0, -5.0, 7.0)), + color: None + ), + (Danari, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-2.0, -5.0, 7.0)), + color: None + ), + (Undead, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-6.0, -5.0, 7.0)), + color: None + ), + (Undead, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-6.0, -5.0, 6.0)), + color: None + ), + (Orc, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-3.0, -3.0, 8.0)), + color: None + ), + (Orc, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-3.0, -6.0, 5.0)), + color: None + ), + // + (Human, Male, "Pirate"): ( vox_spec: ("armor.pirate.hat", (-2.0, -2.0, 5.0)), color: None ), + (Human, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-2.0, -1.0, 5.0)), + color: None + ), + (Elf, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-1.0, -1.0, 5.0)), + color: None + ), + (Elf, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-1.0, -2.0, 5.0)), + color: None + ), + (Dwarf, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-3.0, -0.0, 5.0)), + color: None + ), + (Dwarf, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-3.0, -0.0, 5.0)), + color: None + ), + (Danari, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-0.0, -2.0, 7.0)), + color: None + ), + (Danari, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-0.0, -2.0, 7.0)), + color: None + ), + (Undead, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-4.0, -2.0, 7.0)), + color: None + ), + (Undead, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-4.0, -2.0, 6.0)), + color: None + ), + (Orc, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-1.0, -1.0, 8.0)), + color: None + ), + (Orc, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-1.0, -2.0, 5.0)), + color: None + ), + // + // + (Human, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 5.0)), + color: None + ), + (Human, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 5.0)), + color: None + ), + (Elf, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-2.0, -3.0, 5.0)), + color: None + ), + (Elf, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-2.0, -4.0, 5.0)), + color: None + ), + (Dwarf, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-4.0, -3.0, 5.0)), + color: None + ), + (Dwarf, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-4.0, -3.0, 5.0)), + color: None + ), + (Danari, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-1.0, -4.0, 7.0)), + color: None + ), + (Danari, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-1.0, -4.0, 7.0)), + color: None + ), + (Undead, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 7.0)), + color: None + ), + (Undead, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-5.0, -3.0, 6.0)), + color: None + ), + (Orc, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-2.0, -2.0, 8.0)), + color: None + ), + (Orc, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 5.0)), + color: None + ), + // (Danari, Male, "Headband"): ( vox_spec: ("armor.misc.head.headband.danari_m", (4.0, 2.0, 7.0)), color: None @@ -84,5 +225,157 @@ vox_spec: ("armor.misc.head.headband.elf_f", (3.0, 2.0, 5.0)), color: None ), + (Human, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + color: None + ), + (Human, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + color: None + ), + (Elf, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + color: None + ), + (Elf, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + color: None + ), + (Orc, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-1.0, -5.0, -1.0)), + color: None + ), + (Orc, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-1.0, -3.0, 2.0)), + color: None + ), + (Dwarf, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), + color: None + ), + (Dwarf, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), + color: None + ), + (Undead, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-4.0, -4.0, -1.0)), + color: None + ), + (Undead, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-4.0, -4.0, 1.0)), + color: None + ), + (Danari, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (0.0, -4.0, 1.0)), + color: None + ), + (Danari, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + color: None + ), + (Danari, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)), + color: None + ), + (Danari, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)), + color: None + ), + (Dwarf, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (1.0, 7.0, -10.0)), + color: None + ), + (Dwarf, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (1.0, 7.0, -10.0)), + color: None + ), + (Human, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (2.0, 6.0, -10.0)), + color: None + ), + (Human, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (2.0, 7.0, -10.0)), + color: None + ), + (Undead, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (0.0, 6.0, -8.0)), + color: None + ), + (Undead, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (0.0, 6.0, -9.0)), + color: None + ), + (Elf, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + color: None + ), + (Elf, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + color: None + ), + (Orc, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (3.0, 8.0, -8.0)), + color: None + ), + (Orc, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + color: None + ), + (Danari, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)), + color: None + ), + (Danari, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)), + color: None + ), + (Dwarf, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (1.0, 7.0, -10.0)), + color: None + ), + (Dwarf, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (1.0, 7.0, -10.0)), + color: None + ), + (Human, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (2.0, 6.0, -10.0)), + color: None + ), + (Human, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (2.0, 7.0, -10.0)), + color: None + ), + (Undead, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (0.0, 6.0, -8.0)), + color: None + ), + (Undead, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (0.0, 6.0, -9.0)), + color: None + ), + (Elf, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + color: None + ), + (Elf, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + color: None + ), + (Orc, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (3.0, 8.0, -8.0)), + color: None + ), + (Orc, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + color: None + ), + (Human, Male, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (1.0, 0.0, -1.0)), + color: None + ), + (Orc, Female, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (2.0, -1.0, -1.0)), + color: None + ), } )) From a05c1ea4c52f06d6543a4aa35697fe62edfb93d3 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Tue, 19 Oct 2021 22:27:22 -0400 Subject: [PATCH 4/9] switch to new matcell variant --- assets/common/entity/spot/pirate.ron | 12 +----- assets/common/entity/spot/witch_dark.ron | 12 +----- .../loadout/spots/dwarf_graverobber.ron | 1 + common/src/figure/cell.rs | 20 +++------- common/src/figure/mat_cell.rs | 1 + common/src/figure/mod.rs | 7 ++-- frame-trace_1634705763589.json | 38 +++++++++++++++++++ voxygen/src/hud/item_imgs.rs | 1 + voxygen/src/scene/figure/load.rs | 2 +- 9 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 frame-trace_1634705763589.json diff --git a/assets/common/entity/spot/pirate.ron b/assets/common/entity/spot/pirate.ron index 381f06c508..5af961727c 100644 --- a/assets/common/entity/spot/pirate.ron +++ b/assets/common/entity/spot/pirate.ron @@ -1,16 +1,6 @@ EntityConfig ( name: Name("Pirate"), - body: Exact(Humanoid(Body( - species: Human, - body_type: Female, - hair_style: 2, - beard: 0, - eyes: 0, - accessory: 0, - hair_color: 12, - skin: 8, - eye_color: 3, - ))), + body: RandomWith("humanoid"), alignment: Alignment(Enemy), loot: LootTable("common.loot_tables.creature.biped_large.saurok"), diff --git a/assets/common/entity/spot/witch_dark.ron b/assets/common/entity/spot/witch_dark.ron index 8b4d39a009..19d3992b32 100644 --- a/assets/common/entity/spot/witch_dark.ron +++ b/assets/common/entity/spot/witch_dark.ron @@ -1,16 +1,6 @@ EntityConfig ( name: Name("Witch"), - body: Exact(Humanoid(Body( - species: Human, - body_type: Female, - hair_style: 15, - beard: 0, - eyes: 0, - accessory: 0, - hair_color: 12, - skin: 0, - eye_color: 1, - ))), + body: RandomWith("humanoid"), alignment: Alignment(Enemy), loot: LootTable("common.loot_tables.spots.witch"), diff --git a/assets/common/loadout/spots/dwarf_graverobber.ron b/assets/common/loadout/spots/dwarf_graverobber.ron index 20fbc4d25d..cd39f533c5 100644 --- a/assets/common/loadout/spots/dwarf_graverobber.ron +++ b/assets/common/loadout/spots/dwarf_graverobber.ron @@ -5,6 +5,7 @@ Armor(Hands): Item("common.items.armor.hide.rawhide.hand"), Armor(Legs): Item("common.items.armor.hide.rawhide.pants"), Armor(Feet): Item("common.items.armor.hide.rawhide.foot"), + Armor(Head): Item("common.items.armor.misc.head.bandana.thief"), Lantern: Choice([ (1.0, Some(Item("common.items.lantern.black_0"))), diff --git a/common/src/figure/cell.rs b/common/src/figure/cell.rs index 63ddb3d81d..378aae4cb2 100644 --- a/common/src/figure/cell.rs +++ b/common/src/figure/cell.rs @@ -5,20 +5,19 @@ use vek::*; const GLOWY: u8 = 1 << 1; const SHINY: u8 = 1 << 2; -const HOLLOW: u8 = 1 << 3; #[derive(Copy, Clone, Debug, PartialEq, Eq)] pub struct CellData { pub col: Rgb, - pub attr: NonZeroU8, // 1 = glowy, 2 = shiny, 3 = hollow + pub attr: NonZeroU8, // 1 = glowy, 2 = shiny } impl CellData { - pub(super) fn new(col: Rgb, glowy: bool, shiny: bool, hollow: bool) -> Self { + pub(super) fn new(col: Rgb, glowy: bool, shiny: bool) -> Self { CellData { col, attr: NonZeroU8::new( - 1 + glowy as u8 * GLOWY + shiny as u8 * SHINY + hollow as u8 * HOLLOW, + 1 + glowy as u8 * GLOWY + shiny as u8 * SHINY, ) .unwrap(), } @@ -26,7 +25,7 @@ impl CellData { } impl Default for CellData { - fn default() -> Self { Self::new(Rgb::broadcast(255), false, false, false) } + fn default() -> Self { Self::new(Rgb::broadcast(255), false, false) } } /// A type representing a single voxel in a figure. @@ -37,8 +36,8 @@ pub enum Cell { } impl Cell { - pub fn new(col: Rgb, glowy: bool, shiny: bool, hollow: bool) -> Self { - Cell::Filled(CellData::new(col, glowy, shiny, hollow)) + pub fn new(col: Rgb, glowy: bool, shiny: bool) -> Self { + Cell::Filled(CellData::new(col, glowy, shiny)) } pub fn get_color(&self) -> Option> { @@ -61,13 +60,6 @@ impl Cell { Cell::Empty => false, } } - - pub fn is_hollow(&self) -> bool { - match self { - Cell::Filled(data) => data.attr.get() & HOLLOW != 0, - Cell::Empty => false, - } - } } impl Vox for Cell { diff --git a/common/src/figure/mat_cell.rs b/common/src/figure/mat_cell.rs index 1b2c8de4ea..8e09bf1a41 100644 --- a/common/src/figure/mat_cell.rs +++ b/common/src/figure/mat_cell.rs @@ -20,6 +20,7 @@ pub enum MatCell { None, Mat(Material), Normal(CellData), + Hollow, } impl Vox for MatCell { diff --git a/common/src/figure/mod.rs b/common/src/figure/mod.rs index c9475b807c..508b842f51 100644 --- a/common/src/figure/mod.rs +++ b/common/src/figure/mod.rs @@ -67,7 +67,6 @@ impl Segment { color, (13..16).contains(&voxel.i), // Glowy (8..13).contains(&voxel.i), // Shiny - voxel.i == 16, // Hollow ), ) .unwrap(); @@ -99,7 +98,6 @@ impl Segment { transform(rgb), cell.is_glowy(), cell.is_shiny(), - cell.is_hollow(), ) }) }) @@ -166,8 +164,9 @@ impl MatSegment { for (pos, vox) in self.full_vol_iter() { let data = match vox { MatCell::None => continue, - MatCell::Mat(mat) => CellData::new(map(*mat), false, false, false), + MatCell::Mat(mat) => CellData::new(map(*mat), false, false), MatCell::Normal(data) => *data, + MatCell::Hollow => continue, }; vol.set(pos, Cell::Filled(data)).unwrap(); } @@ -220,6 +219,7 @@ impl MatSegment { 4 => MatCell::Mat(Material::SkinDark), 5 => MatCell::Mat(Material::SkinLight), 7 => MatCell::Mat(Material::EyeWhite), + 16 => MatCell::Hollow, //6 => MatCell::Mat(Material::Clothing), index => { let color = palette @@ -230,7 +230,6 @@ impl MatSegment { color, (13..16).contains(&index), (8..13).contains(&index), - index == 16, // Hollow )) }, }; diff --git a/frame-trace_1634705763589.json b/frame-trace_1634705763589.json new file mode 100644 index 0000000000..76bd2be55d --- /dev/null +++ b/frame-trace_1634705763589.json @@ -0,0 +1,38 @@ +{ +"traceEvents": [ +{ "pid":1, "tid":1, "ts":1634705763488162, "dur":5681.276321411133, "ph":"X", "name":"frame" }, +{ "pid":1, "tid":1, "ts":1634705763488195, "dur":661.1347198486328, "ph":"X", "name":"shadow_pass" }, +{ "pid":1, "tid":1, "ts":1634705763488195.3, "dur":643.0149078369141, "ph":"X", "name":"direcred_terrain_shadows" }, +{ "pid":1, "tid":1, "ts":1634705763488839.3, "dur":15.497207641601563, "ph":"X", "name":"direcred_figure_shadows" }, +{ "pid":1, "tid":1, "ts":1634705763488858.8, "dur":690.460205078125, "ph":"X", "name":"point shadows" }, +{ "pid":1, "tid":1, "ts":1634705763488867, "dur":43.15376281738281, "ph":"X", "name":"point shadow face-0 pass" }, +{ "pid":1, "tid":1, "ts":1634705763488917.5, "dur":45.7763671875, "ph":"X", "name":"point shadow face-1 pass" }, +{ "pid":1, "tid":1, "ts":1634705763488970.8, "dur":51.25999450683594, "ph":"X", "name":"point shadow face-2 pass" }, +{ "pid":1, "tid":1, "ts":1634705763489028.8, "dur":51.25999450683594, "ph":"X", "name":"point shadow face-3 pass" }, +{ "pid":1, "tid":1, "ts":1634705763489088.5, "dur":42.438507080078125, "ph":"X", "name":"point shadow face-4 pass" }, +{ "pid":1, "tid":1, "ts":1634705763489501.8, "dur":45.06111145019531, "ph":"X", "name":"point shadow face-5 pass" }, +{ "pid":1, "tid":1, "ts":1634705763489573, "dur":3035.5453491210938, "ph":"X", "name":"first_pass" }, +{ "pid":1, "tid":1, "ts":1634705763489573.8, "dur":20.503997802734375, "ph":"X", "name":"figures" }, +{ "pid":1, "tid":1, "ts":1634705763489594.3, "dur":1816.2727355957031, "ph":"X", "name":"terrain" }, +{ "pid":1, "tid":1, "ts":1634705763491410.8, "dur":41.00799560546875, "ph":"X", "name":"figures" }, +{ "pid":1, "tid":1, "ts":1634705763491451.8, "dur":1039.9818420410156, "ph":"X", "name":"lod_terrain" }, +{ "pid":1, "tid":1, "ts":1634705763492492, "dur":3.337860107421875, "ph":"X", "name":"skybox" }, +{ "pid":1, "tid":1, "ts":1634705763492495.8, "dur":96.08268737792969, "ph":"X", "name":"sprites" }, +{ "pid":1, "tid":1, "ts":1634705763492592.3, "dur":0, "ph":"X", "name":"fluid" }, +{ "pid":1, "tid":1, "ts":1634705763492593.5, "dur":13.113021850585938, "ph":"X", "name":"particles" }, +{ "pid":1, "tid":1, "ts":1634705763492606.8, "dur":1.430511474609375, "ph":"X", "name":"debug" }, +{ "pid":1, "tid":1, "ts":1634705763492621, "dur":546.4553833007813, "ph":"X", "name":"second_pass" }, +{ "pid":1, "tid":1, "ts":1634705763493169.8, "dur":466.1083221435547, "ph":"X", "name":"bloom" }, +{ "pid":1, "tid":1, "ts":1634705763493174, "dur":41.00799560546875, "ph":"X", "name":"downsample filtered 1" }, +{ "pid":1, "tid":1, "ts":1634705763493220.5, "dur":12.874603271484375, "ph":"X", "name":"downsample 2" }, +{ "pid":1, "tid":1, "ts":1634705763493237.5, "dur":4.0531158447265625, "ph":"X", "name":"downsample 3" }, +{ "pid":1, "tid":1, "ts":1634705763493247.3, "dur":2.6226043701171875, "ph":"X", "name":"downsample 4" }, +{ "pid":1, "tid":1, "ts":1634705763493255.3, "dur":5.0067901611328125, "ph":"X", "name":"upsample 1" }, +{ "pid":1, "tid":1, "ts":1634705763493438.3, "dur":11.205673217773438, "ph":"X", "name":"upsample 2" }, +{ "pid":1, "tid":1, "ts":1634705763493456.3, "dur":31.948089599609375, "ph":"X", "name":"upsample 3" }, +{ "pid":1, "tid":1, "ts":1634705763493501.8, "dur":131.13021850585938, "ph":"X", "name":"upsample 4" }, +{ "pid":1, "tid":1, "ts":1634705763493646.8, "dur":193.11904907226563, "ph":"X", "name":"third_pass" }, +{ "pid":1, "tid":1, "ts":1634705763493647.3, "dur":181.1981201171875, "ph":"X", "name":"postprocess" }, +{ "pid":1, "tid":1, "ts":1634705763493829.5, "dur":9.5367431640625, "ph":"X", "name":"ui" } +] +} diff --git a/voxygen/src/hud/item_imgs.rs b/voxygen/src/hud/item_imgs.rs index 443cee23c8..67ff971203 100644 --- a/voxygen/src/hud/item_imgs.rs +++ b/voxygen/src/hud/item_imgs.rs @@ -211,6 +211,7 @@ fn graceful_load_segment_no_skin(specifier: &str) -> Arc { let seg = mat_seg .map(|mat_cell| match mat_cell { MatCell::None => None, + MatCell::Hollow => None, MatCell::Mat(_) => Some(MatCell::None), MatCell::Normal(_) => None, }) diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index a249148052..4e03d59bc9 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -318,7 +318,7 @@ impl HumHeadSpec { .maybe_add(beard) .maybe_add(accessory) .maybe_add(helmet) - .unify_with(|v| if v.is_hollow() { Cell::empty() } else { v }); + .unify(); ( head, Vec3::from(spec.offset) + origin_offset.map(|e| e as f32 * -1.0), From c2b7d3bb44159491dbd82747a2c74384008507eb Mon Sep 17 00:00:00 2001 From: jshipsey Date: Mon, 25 Oct 2021 23:29:16 -0400 Subject: [PATCH 5/9] good hat rendering --- common/src/figure/cell.rs | 22 +++++++++++++----- common/src/figure/mat_cell.rs | 1 - common/src/figure/mod.rs | 7 +++--- frame-trace_1635217738690.json | 38 ++++++++++++++++++++++++++++++++ voxygen/src/hud/item_imgs.rs | 3 +-- voxygen/src/scene/figure/load.rs | 2 +- 6 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 frame-trace_1635217738690.json diff --git a/common/src/figure/cell.rs b/common/src/figure/cell.rs index 378aae4cb2..0cc010e25a 100644 --- a/common/src/figure/cell.rs +++ b/common/src/figure/cell.rs @@ -5,27 +5,30 @@ use vek::*; const GLOWY: u8 = 1 << 1; const SHINY: u8 = 1 << 2; +const HOLLOW: u8 = 1 << 3; #[derive(Copy, Clone, Debug, PartialEq, Eq)] pub struct CellData { pub col: Rgb, - pub attr: NonZeroU8, // 1 = glowy, 2 = shiny + pub attr: NonZeroU8, // 1 = glowy, 2 = shiny, 3 = hollow } impl CellData { - pub(super) fn new(col: Rgb, glowy: bool, shiny: bool) -> Self { + pub(super) fn new(col: Rgb, glowy: bool, shiny: bool, hollow: bool) -> Self { CellData { col, attr: NonZeroU8::new( - 1 + glowy as u8 * GLOWY + shiny as u8 * SHINY, + 1 + glowy as u8 * GLOWY + shiny as u8 * SHINY + hollow as u8 * HOLLOW, ) .unwrap(), } } + + pub fn is_hollow(&self) -> bool { self.attr.get() & HOLLOW != 0 } } impl Default for CellData { - fn default() -> Self { Self::new(Rgb::broadcast(255), false, false) } + fn default() -> Self { Self::new(Rgb::broadcast(255), false, false, false) } } /// A type representing a single voxel in a figure. @@ -36,8 +39,8 @@ pub enum Cell { } impl Cell { - pub fn new(col: Rgb, glowy: bool, shiny: bool) -> Self { - Cell::Filled(CellData::new(col, glowy, shiny)) + pub fn new(col: Rgb, glowy: bool, shiny: bool, hollow: bool) -> Self { + Cell::Filled(CellData::new(col, glowy, shiny, hollow)) } pub fn get_color(&self) -> Option> { @@ -60,6 +63,13 @@ impl Cell { Cell::Empty => false, } } + + pub fn is_hollow(&self) -> bool { + match self { + Cell::Filled(data) => data.is_hollow(), + Cell::Empty => false, + } + } } impl Vox for Cell { diff --git a/common/src/figure/mat_cell.rs b/common/src/figure/mat_cell.rs index 8e09bf1a41..1b2c8de4ea 100644 --- a/common/src/figure/mat_cell.rs +++ b/common/src/figure/mat_cell.rs @@ -20,7 +20,6 @@ pub enum MatCell { None, Mat(Material), Normal(CellData), - Hollow, } impl Vox for MatCell { diff --git a/common/src/figure/mod.rs b/common/src/figure/mod.rs index 508b842f51..1a68004d04 100644 --- a/common/src/figure/mod.rs +++ b/common/src/figure/mod.rs @@ -67,6 +67,7 @@ impl Segment { color, (13..16).contains(&voxel.i), // Glowy (8..13).contains(&voxel.i), // Shiny + voxel.i == 16, //Hollow ), ) .unwrap(); @@ -98,6 +99,7 @@ impl Segment { transform(rgb), cell.is_glowy(), cell.is_shiny(), + cell.is_hollow(), ) }) }) @@ -164,9 +166,8 @@ impl MatSegment { for (pos, vox) in self.full_vol_iter() { let data = match vox { MatCell::None => continue, - MatCell::Mat(mat) => CellData::new(map(*mat), false, false), + MatCell::Mat(mat) => CellData::new(map(*mat), false, false, false), MatCell::Normal(data) => *data, - MatCell::Hollow => continue, }; vol.set(pos, Cell::Filled(data)).unwrap(); } @@ -219,7 +220,6 @@ impl MatSegment { 4 => MatCell::Mat(Material::SkinDark), 5 => MatCell::Mat(Material::SkinLight), 7 => MatCell::Mat(Material::EyeWhite), - 16 => MatCell::Hollow, //6 => MatCell::Mat(Material::Clothing), index => { let color = palette @@ -230,6 +230,7 @@ impl MatSegment { color, (13..16).contains(&index), (8..13).contains(&index), + index == 16, // Hollow )) }, }; diff --git a/frame-trace_1635217738690.json b/frame-trace_1635217738690.json new file mode 100644 index 0000000000..7479acb764 --- /dev/null +++ b/frame-trace_1635217738690.json @@ -0,0 +1,38 @@ +{ +"traceEvents": [ +{ "pid":1, "tid":1, "ts":1635217738642844.8, "dur":4531.383514404297, "ph":"X", "name":"frame" }, +{ "pid":1, "tid":1, "ts":1635217738642866, "dur":304.4605255126953, "ph":"X", "name":"shadow_pass" }, +{ "pid":1, "tid":1, "ts":1635217738642866, "dur":297.0695495605469, "ph":"X", "name":"direcred_terrain_shadows" }, +{ "pid":1, "tid":1, "ts":1635217738643163, "dur":5.9604644775390625, "ph":"X", "name":"direcred_figure_shadows" }, +{ "pid":1, "tid":1, "ts":1635217738643172.8, "dur":211.95411682128906, "ph":"X", "name":"point shadows" }, +{ "pid":1, "tid":1, "ts":1635217738643182.3, "dur":21.696090698242188, "ph":"X", "name":"point shadow face-0 pass" }, +{ "pid":1, "tid":1, "ts":1635217738643212, "dur":28.848648071289063, "ph":"X", "name":"point shadow face-1 pass" }, +{ "pid":1, "tid":1, "ts":1635217738643248.3, "dur":28.133392333984375, "ph":"X", "name":"point shadow face-2 pass" }, +{ "pid":1, "tid":1, "ts":1635217738643283.3, "dur":33.14018249511719, "ph":"X", "name":"point shadow face-3 pass" }, +{ "pid":1, "tid":1, "ts":1635217738643322.8, "dur":26.464462280273438, "ph":"X", "name":"point shadow face-4 pass" }, +{ "pid":1, "tid":1, "ts":1635217738643357, "dur":25.033950805664063, "ph":"X", "name":"point shadow face-5 pass" }, +{ "pid":1, "tid":1, "ts":1635217738643402.3, "dur":1906.8717956542969, "ph":"X", "name":"first_pass" }, +{ "pid":1, "tid":1, "ts":1635217738643402.5, "dur":21.696090698242188, "ph":"X", "name":"figures" }, +{ "pid":1, "tid":1, "ts":1635217738643424.8, "dur":672.1019744873047, "ph":"X", "name":"terrain" }, +{ "pid":1, "tid":1, "ts":1635217738644098.3, "dur":18.596649169921875, "ph":"X", "name":"figures" }, +{ "pid":1, "tid":1, "ts":1635217738644117.5, "dur":808.4774017333984, "ph":"X", "name":"lod_terrain" }, +{ "pid":1, "tid":1, "ts":1635217738644926.3, "dur":18.358230590820313, "ph":"X", "name":"skybox" }, +{ "pid":1, "tid":1, "ts":1635217738644944.5, "dur":349.99847412109375, "ph":"X", "name":"sprites" }, +{ "pid":1, "tid":1, "ts":1635217738645295, "dur":0, "ph":"X", "name":"fluid" }, +{ "pid":1, "tid":1, "ts":1635217738645296.3, "dur":10.967254638671875, "ph":"X", "name":"particles" }, +{ "pid":1, "tid":1, "ts":1635217738645308.3, "dur":0.476837158203125, "ph":"X", "name":"debug" }, +{ "pid":1, "tid":1, "ts":1635217738645319.5, "dur":1293.8976287841797, "ph":"X", "name":"second_pass" }, +{ "pid":1, "tid":1, "ts":1635217738646615.5, "dur":278.9497375488281, "ph":"X", "name":"bloom" }, +{ "pid":1, "tid":1, "ts":1635217738646620, "dur":40.76957702636719, "ph":"X", "name":"downsample filtered 1" }, +{ "pid":1, "tid":1, "ts":1635217738646666, "dur":12.159347534179688, "ph":"X", "name":"downsample 2" }, +{ "pid":1, "tid":1, "ts":1635217738646683.3, "dur":4.0531158447265625, "ph":"X", "name":"downsample 3" }, +{ "pid":1, "tid":1, "ts":1635217738646691.8, "dur":3.814697265625, "ph":"X", "name":"downsample 4" }, +{ "pid":1, "tid":1, "ts":1635217738646699.5, "dur":4.5299530029296875, "ph":"X", "name":"upsample 1" }, +{ "pid":1, "tid":1, "ts":1635217738646708, "dur":9.775161743164063, "ph":"X", "name":"upsample 2" }, +{ "pid":1, "tid":1, "ts":1635217738646722, "dur":30.994415283203125, "ph":"X", "name":"upsample 3" }, +{ "pid":1, "tid":1, "ts":1635217738646762.8, "dur":129.46128845214844, "ph":"X", "name":"upsample 4" }, +{ "pid":1, "tid":1, "ts":1635217738646902, "dur":470.87669372558594, "ph":"X", "name":"third_pass" }, +{ "pid":1, "tid":1, "ts":1635217738646902.5, "dur":468.4925079345703, "ph":"X", "name":"postprocess" }, +{ "pid":1, "tid":1, "ts":1635217738647371.5, "dur":0.95367431640625, "ph":"X", "name":"ui" } +] +} diff --git a/voxygen/src/hud/item_imgs.rs b/voxygen/src/hud/item_imgs.rs index 67ff971203..0bb5d4410f 100644 --- a/voxygen/src/hud/item_imgs.rs +++ b/voxygen/src/hud/item_imgs.rs @@ -211,9 +211,8 @@ fn graceful_load_segment_no_skin(specifier: &str) -> Arc { let seg = mat_seg .map(|mat_cell| match mat_cell { MatCell::None => None, - MatCell::Hollow => None, MatCell::Mat(_) => Some(MatCell::None), - MatCell::Normal(_) => None, + MatCell::Normal(data) => data.is_hollow().then(|| MatCell::None), }) .to_segment(|_| Default::default()); Arc::new(seg) diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index 4e03d59bc9..a249148052 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -318,7 +318,7 @@ impl HumHeadSpec { .maybe_add(beard) .maybe_add(accessory) .maybe_add(helmet) - .unify(); + .unify_with(|v| if v.is_hollow() { Cell::empty() } else { v }); ( head, Vec3::from(spec.offset) + origin_offset.map(|e| e as f32 * -1.0), From f69e3c9fbceee10de058ce6a126a7edce72ceefc Mon Sep 17 00:00:00 2001 From: jshipsey Date: Wed, 27 Oct 2021 02:42:12 -0400 Subject: [PATCH 6/9] more hats --- .../common/entity/spot/dwarf_grave_robber.ron | 2 +- assets/common/entity/spot/grim_salvager.ron | 2 +- assets/common/items/armor/cultist/bandana.ron | 19 + .../items/armor/misc/head/bandana/red.ron | 4 +- .../items/armor/misc/head/bandana/thief.ron | 4 +- assets/common/items/armor/misc/head/crown.ron | 17 + assets/common/items/armor/misc/head/hood.ron | 6 +- .../items/armor/misc/head/hood_dark.ron | 17 + assets/common/items/armor/misc/head/mitre.ron | 17 + .../items/armor/misc/head/spikeguard.ron | 17 + assets/common/items/armor/misc/head/straw.ron | 2 +- assets/common/items/armor/pirate/hat.ron | 12 +- assets/common/items/armor/witch/hat.ron | 14 +- .../common/loadout/dungeon/tier-5/cultist.ron | 2 + .../loadout/spots/dwarf_graverobber.ron | 5 +- assets/common/loadout/village/merchant.ron | 1 + assets/common/loadout/village/villager.ron | 12 + .../loot_tables/dungeon/tier-4/chest.ron | 1 + .../loot_tables/dungeon/tier-4/miniboss.ron | 2 + .../loot_tables/dungeon/tier-5/chest.ron | 1 + assets/common/loot_tables/spots/bandit.ron | 18 + assets/common/loot_tables/spots/pirate.ron | 18 + assets/common/loot_tables/spots/witch.ron | 1 + assets/voxygen/item_image_manifest.ron | 24 ++ .../voxygen/voxel/armor/cultist/bandana.vox | 3 + .../voxygen/voxel/armor/misc/head/crown.vox | 3 + .../armor/misc/head/headband/human_f.vox | 2 +- assets/voxygen/voxel/armor/misc/head/hood.vox | 4 +- .../voxel/armor/misc/head/hood_dark.vox | 3 + .../voxygen/voxel/armor/misc/head/mitre.vox | 3 + .../voxel/armor/misc/head/spikeguard.vox | 3 + .../voxygen/voxel/armor/misc/head/straw.vox | 4 +- assets/voxygen/voxel/armor/pirate/hat.vox | 4 +- .../voxel/humanoid_armor_head_manifest.ron | 343 ++++++++++++++++-- frame-trace_1634705763589.json | 38 -- frame-trace_1635217738690.json | 38 -- frame-trace_1635388024283.json | 38 ++ world/src/layer/spot.rs | 6 +- 38 files changed, 572 insertions(+), 138 deletions(-) create mode 100644 assets/common/items/armor/cultist/bandana.ron create mode 100644 assets/common/items/armor/misc/head/crown.ron create mode 100644 assets/common/items/armor/misc/head/hood_dark.ron create mode 100644 assets/common/items/armor/misc/head/mitre.ron create mode 100644 assets/common/items/armor/misc/head/spikeguard.ron create mode 100644 assets/common/loot_tables/spots/bandit.ron create mode 100644 assets/common/loot_tables/spots/pirate.ron create mode 100644 assets/voxygen/voxel/armor/cultist/bandana.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/crown.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/hood_dark.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/mitre.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/spikeguard.vox delete mode 100644 frame-trace_1634705763589.json delete mode 100644 frame-trace_1635217738690.json create mode 100644 frame-trace_1635388024283.json diff --git a/assets/common/entity/spot/dwarf_grave_robber.ron b/assets/common/entity/spot/dwarf_grave_robber.ron index 48c6f06daa..c9cfb694c2 100644 --- a/assets/common/entity/spot/dwarf_grave_robber.ron +++ b/assets/common/entity/spot/dwarf_grave_robber.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("dwarf"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.spots.bandit"), hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-3")), diff --git a/assets/common/entity/spot/grim_salvager.ron b/assets/common/entity/spot/grim_salvager.ron index 4c599aad84..041151b338 100644 --- a/assets/common/entity/spot/grim_salvager.ron +++ b/assets/common/entity/spot/grim_salvager.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("humanoid"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.humanoid"), + loot: LootTable("common.loot_tables.spots.bandit"), hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-0")), diff --git a/assets/common/items/armor/cultist/bandana.ron b/assets/common/items/armor/cultist/bandana.ron new file mode 100644 index 0000000000..111c15d8de --- /dev/null +++ b/assets/common/items/armor/cultist/bandana.ron @@ -0,0 +1,19 @@ +ItemDef( + name: "Cultist Bandana", + description: "Ceremonial attire used by members.", + kind: Armor(( + kind: Head("Cultist"), + stats: ( + protection: Normal(18.0), + poise_resilience: Normal(3.0), + energy_max: 7.0, + energy_reward: 0.1, + crit_power: 0.06, + stealth: 0.0, + ), + )), + quality: Epic, + tags: [ +Cultist + ], +) diff --git a/assets/common/items/armor/misc/head/bandana/red.ron b/assets/common/items/armor/misc/head/bandana/red.ron index 2f8db4475a..63d98343b8 100644 --- a/assets/common/items/armor/misc/head/bandana/red.ron +++ b/assets/common/items/armor/misc/head/bandana/red.ron @@ -1,6 +1,6 @@ ItemDef( name: "Red Bandana", - description: "yep.", + description: "Very sneaky, but also, bright red.", kind: Armor(( kind: Head("Red"), stats: ( @@ -9,7 +9,7 @@ ItemDef( energy_max: 0, energy_reward: 0.0, crit_power: 0.0, - stealth: 0.0, + stealth: 0.15, ), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/bandana/thief.ron b/assets/common/items/armor/misc/head/bandana/thief.ron index 352160a078..0fda84d087 100644 --- a/assets/common/items/armor/misc/head/bandana/thief.ron +++ b/assets/common/items/armor/misc/head/bandana/thief.ron @@ -1,6 +1,6 @@ ItemDef( name: "Thief Bandana", - description: "yep.", + description: "Common bandit's mask.", kind: Armor(( kind: Head("Thief"), stats: ( @@ -9,7 +9,7 @@ ItemDef( energy_max: 0, energy_reward: 0.0, crit_power: 0.0, - stealth: 0.0, + stealth: 0.18, ), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/crown.ron b/assets/common/items/armor/misc/head/crown.ron new file mode 100644 index 0000000000..aec605b2a3 --- /dev/null +++ b/assets/common/items/armor/misc/head/crown.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Crown", + description: "Fit for a king.", + kind: Armor(( + kind: Head("Crown"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(0.0), + energy_max: 9.0, + energy_reward: 0.1, + crit_power: 0.12, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/hood.ron b/assets/common/items/armor/misc/head/hood.ron index 5f2d54fc13..196d3ed807 100644 --- a/assets/common/items/armor/misc/head/hood.ron +++ b/assets/common/items/armor/misc/head/hood.ron @@ -1,15 +1,15 @@ ItemDef( name: "Hood", - description: "yep.", + description: "Become one with the treetops.", kind: Armor(( kind: Head("Hood"), stats: ( - protection: Normal(0.0), + protection: Normal(20.0), poise_resilience: Normal(0.0), energy_max: 0, energy_reward: 0.0, crit_power: 0.0, - stealth: 0.0, + stealth: 0.12, ), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/hood_dark.ron b/assets/common/items/armor/misc/head/hood_dark.ron new file mode 100644 index 0000000000..beb81878c9 --- /dev/null +++ b/assets/common/items/armor/misc/head/hood_dark.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Dark Hood", + description: "yep.", + kind: Armor(( + kind: Head("DarkHood"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/mitre.ron b/assets/common/items/armor/misc/head/mitre.ron new file mode 100644 index 0000000000..7d3c3a7963 --- /dev/null +++ b/assets/common/items/armor/misc/head/mitre.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Mitre", + description: "Calls strength from above.", + kind: Armor(( + kind: Head("Mitre"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 11.0, + energy_reward: 0.12, + crit_power: 0.1, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/spikeguard.ron b/assets/common/items/armor/misc/head/spikeguard.ron new file mode 100644 index 0000000000..329c323a52 --- /dev/null +++ b/assets/common/items/armor/misc/head/spikeguard.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Spiked Faceguard", + description: "Introvert headgear.", + kind: Armor(( + kind: Head("Spikeguard"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(10.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/straw.ron b/assets/common/items/armor/misc/head/straw.ron index 4b0df4af9e..b55de61781 100644 --- a/assets/common/items/armor/misc/head/straw.ron +++ b/assets/common/items/armor/misc/head/straw.ron @@ -1,6 +1,6 @@ ItemDef( name: "Straw Hat", - description: "yep.", + description: "Simple and stylish.", kind: Armor(( kind: Head("Straw"), stats: ( diff --git a/assets/common/items/armor/pirate/hat.ron b/assets/common/items/armor/pirate/hat.ron index 1dafd9addd..58535d64e4 100644 --- a/assets/common/items/armor/pirate/hat.ron +++ b/assets/common/items/armor/pirate/hat.ron @@ -1,14 +1,14 @@ ItemDef( name: "Pirate Hat", - description: "", + description: "It seems like a parrot was perched up here.", kind: Armor(( kind: Head("Pirate"), stats: ( - protection: Normal(32.0), - poise_resilience: Normal(5.0), - energy_max: 9.0, - energy_reward: 0.1, - crit_power: 0.08, + protection: Normal(4.0), + poise_resilience: Normal(1.0), + energy_max: 1.0, + energy_reward: 0.025, + crit_power: 0.02, stealth: 0.0, ), )), diff --git a/assets/common/items/armor/witch/hat.ron b/assets/common/items/armor/witch/hat.ron index 9c07c78e4e..286e2128d4 100644 --- a/assets/common/items/armor/witch/hat.ron +++ b/assets/common/items/armor/witch/hat.ron @@ -1,14 +1,14 @@ ItemDef( - name: "Witch hat", - description: "", + name: "Witch Hat", + description: "Draws strength from dark arts.", kind: Armor(( kind: Head("Witch"), stats: ( - protection: Normal(32.0), - poise_resilience: Normal(5.0), - energy_max: 9.0, - energy_reward: 0.1, - crit_power: 0.08, + protection: Normal(4.0), + poise_resilience: Normal(3.0), + energy_max: 0.0, + energy_reward: 0.08, + crit_power: 0.01, stealth: 0.0, ), )), diff --git a/assets/common/loadout/dungeon/tier-5/cultist.ron b/assets/common/loadout/dungeon/tier-5/cultist.ron index 4634719fee..e96d864080 100644 --- a/assets/common/loadout/dungeon/tier-5/cultist.ron +++ b/assets/common/loadout/dungeon/tier-5/cultist.ron @@ -8,6 +8,8 @@ Armor(Back): Item("common.items.armor.misc.back.dungeon_purple"), + Armor(Head): Item("common.items.armor.cultist.bandana"), + Lantern: Choice([ (1.0, Some(Item("common.items.lantern.black_0"))), (2.0, None), diff --git a/assets/common/loadout/spots/dwarf_graverobber.ron b/assets/common/loadout/spots/dwarf_graverobber.ron index cd39f533c5..aab9b883b7 100644 --- a/assets/common/loadout/spots/dwarf_graverobber.ron +++ b/assets/common/loadout/spots/dwarf_graverobber.ron @@ -5,8 +5,11 @@ Armor(Hands): Item("common.items.armor.hide.rawhide.hand"), Armor(Legs): Item("common.items.armor.hide.rawhide.pants"), Armor(Feet): Item("common.items.armor.hide.rawhide.foot"), - Armor(Head): Item("common.items.armor.misc.head.bandana.thief"), + Armor(Head): Choice([ + (1.0, Some(Item("common.items.armor.misc.head.bandana.thief"))), + (1.0, Some(Item("common.items.armor.misc.head.bandana.red"))), + ]), Lantern: Choice([ (1.0, Some(Item("common.items.lantern.black_0"))), (2.0, None), diff --git a/assets/common/loadout/village/merchant.ron b/assets/common/loadout/village/merchant.ron index 2f8b2e4cd1..a2a97e41e8 100644 --- a/assets/common/loadout/village/merchant.ron +++ b/assets/common/loadout/village/merchant.ron @@ -5,6 +5,7 @@ Armor(Legs): Item("common.items.armor.twigsflowers.pants"), Armor(Feet): Item("common.items.armor.twigsflowers.foot"), Armor(Belt): Item("common.items.armor.twigsflowers.belt"), + Armor(Head): Item("common.items.armor.misc.head.hood"), Lantern: Item("common.items.lantern.black_0"), Armor(Neck): Item("common.items.armor.misc.neck.gem_of_resilience"), diff --git a/assets/common/loadout/village/villager.ron b/assets/common/loadout/village/villager.ron index 72e88f6be4..4a72373387 100644 --- a/assets/common/loadout/village/villager.ron +++ b/assets/common/loadout/village/villager.ron @@ -11,4 +11,16 @@ (1.0, Some(Item("common.items.armor.misc.chest.worker_orange_0"))), (1.0, Some(Item("common.items.armor.misc.chest.worker_orange_1"))), ]), + Armor(Legs): Choice([ + (1.0, Some(Item("common.items.armor.misc.pants.worker_blue"))), + (1.0, Some(Item("common.items.armor.misc.pants.worker_brown"))), + ]), + Armor(Feet): Choice([ + (1.0, Some(Item("common.items.armor.misc.foot.sandals"))), + (1.0, Some(Item("common.items.armor.cloth_blue.foot"))), + ]), + Armor(Head): Choice([ + (1.0, Some(Item("common.items.armor.misc.head.straw"))), + + ]), }) diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron index f3c7ab2047..72cb52c657 100644 --- a/assets/common/loot_tables/dungeon/tier-4/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron @@ -2,6 +2,7 @@ // Gear (1.0, LootTable("common.loot_tables.weapons.tier-4")), (1.0, LootTable("common.loot_tables.armor.tier-4")), + (3.0, ItemQuantity("common.items.armor.misc.head.spikeguard")), // Currency (3.0, ItemQuantity("common.items.utility.coins", 200, 500)), // Materials diff --git a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron index 5bd71fc85f..7b3e66714b 100644 --- a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron +++ b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron @@ -7,4 +7,6 @@ (5.0, LootTable("common.loot_tables.consumable.good")), // lantern (1.0, Item("common.items.lantern.blue_0")), + // gear + (3.0, ItemQuantity("common.items.armor.misc.head.mitre")), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/chest.ron b/assets/common/loot_tables/dungeon/tier-5/chest.ron index 331c50f82f..b3e2e6f89e 100644 --- a/assets/common/loot_tables/dungeon/tier-5/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-5/chest.ron @@ -2,6 +2,7 @@ // Gear (1.0, LootTable("common.loot_tables.weapons.tier-4")), (1.0, LootTable("common.loot_tables.armor.tier-4")), + (0.3, ItemQuantity("common.items.armor.cultist.bandana")), // Currency (3.0, ItemQuantity("common.items.utility.coins", 200, 500)), // Materials diff --git a/assets/common/loot_tables/spots/bandit.ron b/assets/common/loot_tables/spots/bandit.ron new file mode 100644 index 0000000000..4400ec006c --- /dev/null +++ b/assets/common/loot_tables/spots/bandit.ron @@ -0,0 +1,18 @@ +[ + // Crafting Ingredients + (5.0, LootTable("common.loot_tables.materials.common")), + // Consumables + (0.2, Item("common.items.consumable.potion_minor")), + // Ring + (0.02, Item("common.items.armor.misc.ring.gold")), + // Necklace + (0.02, Item("common.items.armor.misc.neck.gold")), + // Utility + (0.05, Item("common.items.utility.collar")), + // Armor + (0.01, Item("common.items.armor.misc.head.bandana.thief")), + (0.01, Item("common.items.armor.misc.head.bandana.red")), + // Food + (1.0, LootTable("common.loot_tables.food.wild_ingredients")), + (0.25, LootTable("common.loot_tables.food.prepared")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/spots/pirate.ron b/assets/common/loot_tables/spots/pirate.ron new file mode 100644 index 0000000000..231345dc3c --- /dev/null +++ b/assets/common/loot_tables/spots/pirate.ron @@ -0,0 +1,18 @@ +[ + // Crafting Ingredients + (3.0, LootTable("common.loot_tables.materials.common")), + // Consumables + (0.2, Item("common.items.consumable.potion_minor")), + // Ring + (0.02, Item("common.items.armor.misc.ring.gold")), + // Necklace + (0.02, Item("common.items.armor.misc.neck.gold")), + // Utility + (0.05, Item("common.items.utility.collar")), + // Armor + (0.007, Item("common.items.armor.pirate.hat")), + (0.005, Item("common.items.armor.misc.head.crown")), + // Food + (1.0, LootTable("common.loot_tables.food.wild_ingredients")), + (0.25, LootTable("common.loot_tables.food.prepared")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/spots/witch.ron b/assets/common/loot_tables/spots/witch.ron index 117c82b8a3..4cacc46022 100644 --- a/assets/common/loot_tables/spots/witch.ron +++ b/assets/common/loot_tables/spots/witch.ron @@ -5,4 +5,5 @@ (1.0, LootTable("common.loot_tables.weapons.tier-3")), (0.1, LootTable("common.loot_tables.weapons.tier-4")), (1.5, LootTable("common.loot_tables.food.prepared")), + (0.01, Item("common.items.armor.witch.hat")), ] \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 27a75fc0c5..a44abbd4ed 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1166,6 +1166,10 @@ "voxel.armor.cultist.shoulder", (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, ), + Armor(Head("Cultist")): VoxTrans( + "voxel.armor.cultist.bandana", + (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, + ), // Villager Clothing Armor(Pants("WorkerBlue")): VoxTrans( "voxel.armor.misc.pants.worker_blue", @@ -2166,6 +2170,26 @@ "voxel.armor.misc.head.straw", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), + Armor(Head("Hood")): VoxTrans( + "voxel.armor.misc.head.hood", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Crown")): VoxTrans( + "voxel.armor.misc.head.crown", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Mitre")): VoxTrans( + "voxel.armor.misc.head.mitre", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Mitre")): VoxTrans( + "voxel.armor.misc.head.mitre", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Spikeguard")): VoxTrans( + "voxel.armor.misc.head.spikeguard", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), // Rings Armor(Ring("Scratched")): VoxTrans( "voxel.armor.misc.ring.scratched", diff --git a/assets/voxygen/voxel/armor/cultist/bandana.vox b/assets/voxygen/voxel/armor/cultist/bandana.vox new file mode 100644 index 0000000000..702885c851 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist/bandana.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d924d8439d4abb0368fec7e7dc425a2a1f3f3baf2c541fcf10727fd80c3185ea +size 2784 diff --git a/assets/voxygen/voxel/armor/misc/head/crown.vox b/assets/voxygen/voxel/armor/misc/head/crown.vox new file mode 100644 index 0000000000..812074ee93 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/crown.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86a6617d7c956b1854796b5a6b9b1a9c74cd50825ea4e8f02e40ce48d4e7c874 +size 8436 diff --git a/assets/voxygen/voxel/armor/misc/head/headband/human_f.vox b/assets/voxygen/voxel/armor/misc/head/headband/human_f.vox index 9288f3a0fa..5e116c34cd 100644 --- a/assets/voxygen/voxel/armor/misc/head/headband/human_f.vox +++ b/assets/voxygen/voxel/armor/misc/head/headband/human_f.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b00cb21a6710984eef2b428907663f4f891b28f7db8638e20e0db39d971e0d7 +oid sha256:8ca1110c81484f648e172e91776a741a67d7ac806483779af5d661e3891573ef size 1216 diff --git a/assets/voxygen/voxel/armor/misc/head/hood.vox b/assets/voxygen/voxel/armor/misc/head/hood.vox index 14fbd4ee09..4bb5405916 100644 --- a/assets/voxygen/voxel/armor/misc/head/hood.vox +++ b/assets/voxygen/voxel/armor/misc/head/hood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5885f8041b1861f56d01b701e4f75c7f6bec65e6622578f8eede84e8959aef15 -size 6792 +oid sha256:3482547792ef1431d303bad19494010d4df89035c35c31e19824d95a4a871843 +size 11408 diff --git a/assets/voxygen/voxel/armor/misc/head/hood_dark.vox b/assets/voxygen/voxel/armor/misc/head/hood_dark.vox new file mode 100644 index 0000000000..ba1bf36a80 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/hood_dark.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58406db4b819d5fba18f2d887e3c19d52440b143aed15075aa656f67d1273690 +size 10120 diff --git a/assets/voxygen/voxel/armor/misc/head/mitre.vox b/assets/voxygen/voxel/armor/misc/head/mitre.vox new file mode 100644 index 0000000000..08325896c5 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/mitre.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3191fd3637655184d88e351af088eebc69f32289f8c40d66539c0a049408595 +size 8224 diff --git a/assets/voxygen/voxel/armor/misc/head/spikeguard.vox b/assets/voxygen/voxel/armor/misc/head/spikeguard.vox new file mode 100644 index 0000000000..161fd594ee --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/spikeguard.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e20a077887132dccb726b6ad23dd31ce8629bbfc884063ff83c4404582c6244 +size 1524 diff --git a/assets/voxygen/voxel/armor/misc/head/straw.vox b/assets/voxygen/voxel/armor/misc/head/straw.vox index c3a9806ed8..4f29f98d23 100644 --- a/assets/voxygen/voxel/armor/misc/head/straw.vox +++ b/assets/voxygen/voxel/armor/misc/head/straw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b907d989fb6b4910ae7c7e77615a360747f4952bb36e7208ccc9e6b3778524d0 -size 9048 +oid sha256:57d4232d5cd96f7d31745555a2c250f917fc2d32796b991e6eb44391b9750d9c +size 18344 diff --git a/assets/voxygen/voxel/armor/pirate/hat.vox b/assets/voxygen/voxel/armor/pirate/hat.vox index 25e9e4122d..8103d3d926 100644 --- a/assets/voxygen/voxel/armor/pirate/hat.vox +++ b/assets/voxygen/voxel/armor/pirate/hat.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf155f664c119b79cae45b1e46dd5a11afefbbdd84f3cd9addfc6a2e32754145 -size 7248 +oid sha256:25209ddc31a240c0f0ad762345c8322e6adf03e62b1a5188ecbccb67212e9ccc +size 12096 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index c91adf7379..54075ac710 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -79,101 +79,198 @@ ), // (Human, Male, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-2.0, -2.0, 5.0)), + vox_spec: ("armor.pirate.hat", (-4.0, -4.0, 5.0)), color: None ), (Human, Female, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-2.0, -1.0, 5.0)), + vox_spec: ("armor.pirate.hat", (-4.0, -4.0, 5.0)), color: None ), (Elf, Male, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-1.0, -1.0, 5.0)), + vox_spec: ("armor.pirate.hat", (-3.0, -4.0, 5.0)), color: None ), (Elf, Female, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-1.0, -2.0, 5.0)), + vox_spec: ("armor.pirate.hat", (-3.0, -5.0, 5.0)), color: None ), (Dwarf, Male, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-3.0, -0.0, 5.0)), + vox_spec: ("armor.pirate.hat", (-5.0, -3.0, 5.0)), color: None ), (Dwarf, Female, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-3.0, -0.0, 5.0)), + vox_spec: ("armor.pirate.hat", (-5.0, -3.0, 5.0)), color: None ), (Danari, Male, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-0.0, -2.0, 7.0)), + vox_spec: ("armor.pirate.hat", (-2.0, -4.0, 7.0)), color: None ), (Danari, Female, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-0.0, -2.0, 7.0)), + vox_spec: ("armor.pirate.hat", (-2.0, -4.0, 7.0)), color: None ), (Undead, Male, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-4.0, -2.0, 7.0)), + vox_spec: ("armor.pirate.hat", (-6.0, -4.0, 7.0)), color: None ), (Undead, Female, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-4.0, -2.0, 6.0)), + vox_spec: ("armor.pirate.hat", (-6.0, -4.0, 6.0)), color: None ), (Orc, Male, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-1.0, -1.0, 8.0)), + vox_spec: ("armor.pirate.hat", (-3.0, -2.0, 8.0)), color: None ), (Orc, Female, "Pirate"): ( - vox_spec: ("armor.pirate.hat", (-1.0, -2.0, 5.0)), + vox_spec: ("armor.pirate.hat", (-3.0, -5.0, 5.0)), color: None ), // - // (Human, Male, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 5.0)), + vox_spec: ("armor.misc.head.straw", (-4.0, -5.0, 5.0)), color: None ), (Human, Female, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 5.0)), + vox_spec: ("armor.misc.head.straw", (-4.0, -5.0, 5.0)), color: None ), (Elf, Male, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-2.0, -3.0, 5.0)), + vox_spec: ("armor.misc.head.straw", (-3.0, -5.0, 5.0)), color: None ), (Elf, Female, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-2.0, -4.0, 5.0)), + vox_spec: ("armor.misc.head.straw", (-3.0, -6.0, 5.0)), color: None ), (Dwarf, Male, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-4.0, -3.0, 5.0)), + vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 5.0)), color: None ), (Dwarf, Female, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-4.0, -3.0, 5.0)), + vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 5.0)), color: None ), (Danari, Male, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-1.0, -4.0, 7.0)), + vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 7.0)), color: None ), (Danari, Female, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-1.0, -4.0, 7.0)), + vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 7.0)), color: None ), (Undead, Male, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 7.0)), + vox_spec: ("armor.misc.head.straw", (-6.0, -5.0, 7.0)), color: None ), (Undead, Female, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-5.0, -3.0, 6.0)), + vox_spec: ("armor.misc.head.straw", (-6.0, -5.0, 6.0)), color: None ), (Orc, Male, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-2.0, -2.0, 8.0)), + vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 8.0)), color: None ), (Orc, Female, "Straw"): ( - vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 5.0)), + vox_spec: ("armor.misc.head.straw", (-3.0, -6.0, 5.0)), + color: None + ), + // + (Human, Male, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-4.0, -5.0, 5.0)), + color: None + ), + (Human, Female, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-4.0, -5.0, 5.0)), + color: None + ), + (Elf, Male, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-3.0, -5.0, 5.0)), + color: None + ), + (Elf, Female, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-3.0, -6.0, 5.0)), + color: None + ), + (Dwarf, Male, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-5.0, -4.0, 5.0)), + color: None + ), + (Dwarf, Female, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-5.0, -4.0, 5.0)), + color: None + ), + (Danari, Male, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-2.0, -5.0, 7.0)), + color: None + ), + (Danari, Female, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-2.0, -5.0, 7.0)), + color: None + ), + (Undead, Male, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-6.0, -5.0, 7.0)), + color: None + ), + (Undead, Female, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-6.0, -5.0, 6.0)), + color: None + ), + (Orc, Male, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-3.0, -3.0, 8.0)), + color: None + ), + (Orc, Female, "Crown"): ( + vox_spec: ("armor.misc.head.crown", (-3.0, -6.0, 5.0)), + color: None + ), + // + (Human, Male, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-4.0, -5.0, 5.0)), + color: None + ), + (Human, Female, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-4.0, -5.0, 5.0)), + color: None + ), + (Elf, Male, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-3.0, -5.0, 5.0)), + color: None + ), + (Elf, Female, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-3.0, -6.0, 5.0)), + color: None + ), + (Dwarf, Male, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-5.0, -4.0, 5.0)), + color: None + ), + (Dwarf, Female, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-5.0, -4.0, 5.0)), + color: None + ), + (Danari, Male, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-2.0, -5.0, 7.0)), + color: None + ), + (Danari, Female, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-2.0, -5.0, 7.0)), + color: None + ), + (Undead, Male, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-6.0, -5.0, 7.0)), + color: None + ), + (Undead, Female, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-6.0, -5.0, 6.0)), + color: None + ), + (Orc, Male, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-3.0, -3.0, 8.0)), + color: None + ), + (Orc, Female, "Mitre"): ( + vox_spec: ("armor.misc.head.mitre", (-3.0, -6.0, 5.0)), color: None ), // @@ -198,7 +295,7 @@ color: None ), (Human, Female, "Headband"): ( - vox_spec: ("armor.misc.head.headband.human_f", (4.0, 2.0, 7.0)), + vox_spec: ("armor.misc.head.headband.human_f", (2.0, 3.0, 5.0)), color: None ), (Orc, Male, "Headband"): ( @@ -273,6 +370,7 @@ vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), color: None ), + // (Danari, Male, "Red"): ( vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)), color: None @@ -321,6 +419,7 @@ vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), color: None ), + // (Danari, Male, "Thief"): ( vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)), color: None @@ -369,12 +468,200 @@ vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), color: None ), +// + (Danari, Male, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (4.0, 6.0, -8.0)), + color: None + ), + (Danari, Female, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (4.0, 6.0, -8.0)), + color: None + ), + (Dwarf, Male, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (1.0, 7.0, -10.0)), + color: None + ), + (Dwarf, Female, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (1.0, 7.0, -10.0)), + color: None + ), + (Human, Male, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (2.0, 6.0, -10.0)), + color: None + ), + (Human, Female, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (2.0, 7.0, -10.0)), + color: None + ), + (Undead, Male, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (0.0, 6.0, -8.0)), + color: None + ), + (Undead, Female, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (0.0, 6.0, -9.0)), + color: None + ), + (Elf, Male, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)), + color: None + ), + (Elf, Female, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)), + color: None + ), + (Orc, Male, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (3.0, 8.0, -8.0)), + color: None + ), + (Orc, Female, "Cultist"): ( + vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)), + color: None + ), + // (Human, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (1.0, 0.0, -1.0)), + vox_spec: ("armor.misc.head.hood", (-4.0, -5.0, -2.0)), + color: None + ), + (Human, Female, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-4.0, -5.0, -2.0)), + color: None + ), + (Elf, Male, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-3.0, -5.0, -2.0)), + color: None + ), + (Elf, Female, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -2.0)), + color: None + ), + (Dwarf, Male, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-5.0, -4.0, -2.0)), + color: None + ), + (Dwarf, Female, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-5.0, -4.0, -2.0)), + color: None + ), + (Danari, Male, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-2.0, -5.0, 0.0)), + color: None + ), + (Danari, Female, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-2.0, -5.0, 0.0)), + color: None + ), + (Undead, Male, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-6.0, -5.0, 0.0)), + color: None + ), + (Undead, Female, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-6.0, -5.0, -1.0)), + color: None + ), + (Orc, Male, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (-3.0, -3.0, 0.0)), color: None ), (Orc, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (2.0, -1.0, -1.0)), + vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -2.0)), + color: None + ), + // + (Human, Male, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-4.0, -5.0, -1.0)), + color: None + ), + (Human, Female, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-4.0, -5.0, -1.0)), + color: None + ), + (Elf, Male, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)), + color: None + ), + (Elf, Female, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -6.0, -1.0)), + color: None + ), + (Dwarf, Male, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-5.0, -4.0, -1.0)), + color: None + ), + (Dwarf, Female, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-5.0, -4.0, -1.0)), + color: None + ), + (Danari, Male, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-2.0, -5.0, 1.0)), + color: None + ), + (Danari, Female, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-2.0, -5.0, 1.0)), + color: None + ), + (Undead, Male, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-6.0, -5.0, 1.0)), + color: None + ), + (Undead, Female, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-6.0, -5.0, -0.0)), + color: None + ), + (Orc, Male, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -3.0, 1.0)), + color: None + ), + (Orc, Female, "DarkHood"): ( + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -6.0, -1.0)), + color: None + ), + // + (Human, Male, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, -2.0)), + color: None + ), + (Human, Female, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, -2.0)), + color: None + ), + (Elf, Male, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), + color: None + ), + (Elf, Female, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -6.0, -2.0)), + color: None + ), + (Dwarf, Male, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-5.0, -4.0, -2.0)), + color: None + ), + (Dwarf, Female, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-5.0, -4.0, -2.0)), + color: None + ), + (Danari, Male, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, -0.0)), + color: None + ), + (Danari, Female, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, -0.0)), + color: None + ), + (Undead, Male, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-6.0, -5.0, -0.0)), + color: None + ), + (Undead, Female, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-6.0, -5.0, -1.0)), + color: None + ), + (Orc, Male, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -3.0, -0.0)), + color: None + ), + (Orc, Female, "Spikeguard"): ( + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -6.0, -2.0)), color: None ), } diff --git a/frame-trace_1634705763589.json b/frame-trace_1634705763589.json deleted file mode 100644 index 76bd2be55d..0000000000 --- a/frame-trace_1634705763589.json +++ /dev/null @@ -1,38 +0,0 @@ -{ -"traceEvents": [ -{ "pid":1, "tid":1, "ts":1634705763488162, "dur":5681.276321411133, "ph":"X", "name":"frame" }, -{ "pid":1, "tid":1, "ts":1634705763488195, "dur":661.1347198486328, "ph":"X", "name":"shadow_pass" }, -{ "pid":1, "tid":1, "ts":1634705763488195.3, "dur":643.0149078369141, "ph":"X", "name":"direcred_terrain_shadows" }, -{ "pid":1, "tid":1, "ts":1634705763488839.3, "dur":15.497207641601563, "ph":"X", "name":"direcred_figure_shadows" }, -{ "pid":1, "tid":1, "ts":1634705763488858.8, "dur":690.460205078125, "ph":"X", "name":"point shadows" }, -{ "pid":1, "tid":1, "ts":1634705763488867, "dur":43.15376281738281, "ph":"X", "name":"point shadow face-0 pass" }, -{ "pid":1, "tid":1, "ts":1634705763488917.5, "dur":45.7763671875, "ph":"X", "name":"point shadow face-1 pass" }, -{ "pid":1, "tid":1, "ts":1634705763488970.8, "dur":51.25999450683594, "ph":"X", "name":"point shadow face-2 pass" }, -{ "pid":1, "tid":1, "ts":1634705763489028.8, "dur":51.25999450683594, "ph":"X", "name":"point shadow face-3 pass" }, -{ "pid":1, "tid":1, "ts":1634705763489088.5, "dur":42.438507080078125, "ph":"X", "name":"point shadow face-4 pass" }, -{ "pid":1, "tid":1, "ts":1634705763489501.8, "dur":45.06111145019531, "ph":"X", "name":"point shadow face-5 pass" }, -{ "pid":1, "tid":1, "ts":1634705763489573, "dur":3035.5453491210938, "ph":"X", "name":"first_pass" }, -{ "pid":1, "tid":1, "ts":1634705763489573.8, "dur":20.503997802734375, "ph":"X", "name":"figures" }, -{ "pid":1, "tid":1, "ts":1634705763489594.3, "dur":1816.2727355957031, "ph":"X", "name":"terrain" }, -{ "pid":1, "tid":1, "ts":1634705763491410.8, "dur":41.00799560546875, "ph":"X", "name":"figures" }, -{ "pid":1, "tid":1, "ts":1634705763491451.8, "dur":1039.9818420410156, "ph":"X", "name":"lod_terrain" }, -{ "pid":1, "tid":1, "ts":1634705763492492, "dur":3.337860107421875, "ph":"X", "name":"skybox" }, -{ "pid":1, "tid":1, "ts":1634705763492495.8, "dur":96.08268737792969, "ph":"X", "name":"sprites" }, -{ "pid":1, "tid":1, "ts":1634705763492592.3, "dur":0, "ph":"X", "name":"fluid" }, -{ "pid":1, "tid":1, "ts":1634705763492593.5, "dur":13.113021850585938, "ph":"X", "name":"particles" }, -{ "pid":1, "tid":1, "ts":1634705763492606.8, "dur":1.430511474609375, "ph":"X", "name":"debug" }, -{ "pid":1, "tid":1, "ts":1634705763492621, "dur":546.4553833007813, "ph":"X", "name":"second_pass" }, -{ "pid":1, "tid":1, "ts":1634705763493169.8, "dur":466.1083221435547, "ph":"X", "name":"bloom" }, -{ "pid":1, "tid":1, "ts":1634705763493174, "dur":41.00799560546875, "ph":"X", "name":"downsample filtered 1" }, -{ "pid":1, "tid":1, "ts":1634705763493220.5, "dur":12.874603271484375, "ph":"X", "name":"downsample 2" }, -{ "pid":1, "tid":1, "ts":1634705763493237.5, "dur":4.0531158447265625, "ph":"X", "name":"downsample 3" }, -{ "pid":1, "tid":1, "ts":1634705763493247.3, "dur":2.6226043701171875, "ph":"X", "name":"downsample 4" }, -{ "pid":1, "tid":1, "ts":1634705763493255.3, "dur":5.0067901611328125, "ph":"X", "name":"upsample 1" }, -{ "pid":1, "tid":1, "ts":1634705763493438.3, "dur":11.205673217773438, "ph":"X", "name":"upsample 2" }, -{ "pid":1, "tid":1, "ts":1634705763493456.3, "dur":31.948089599609375, "ph":"X", "name":"upsample 3" }, -{ "pid":1, "tid":1, "ts":1634705763493501.8, "dur":131.13021850585938, "ph":"X", "name":"upsample 4" }, -{ "pid":1, "tid":1, "ts":1634705763493646.8, "dur":193.11904907226563, "ph":"X", "name":"third_pass" }, -{ "pid":1, "tid":1, "ts":1634705763493647.3, "dur":181.1981201171875, "ph":"X", "name":"postprocess" }, -{ "pid":1, "tid":1, "ts":1634705763493829.5, "dur":9.5367431640625, "ph":"X", "name":"ui" } -] -} diff --git a/frame-trace_1635217738690.json b/frame-trace_1635217738690.json deleted file mode 100644 index 7479acb764..0000000000 --- a/frame-trace_1635217738690.json +++ /dev/null @@ -1,38 +0,0 @@ -{ -"traceEvents": [ -{ "pid":1, "tid":1, "ts":1635217738642844.8, "dur":4531.383514404297, "ph":"X", "name":"frame" }, -{ "pid":1, "tid":1, "ts":1635217738642866, "dur":304.4605255126953, "ph":"X", "name":"shadow_pass" }, -{ "pid":1, "tid":1, "ts":1635217738642866, "dur":297.0695495605469, "ph":"X", "name":"direcred_terrain_shadows" }, -{ "pid":1, "tid":1, "ts":1635217738643163, "dur":5.9604644775390625, "ph":"X", "name":"direcred_figure_shadows" }, -{ "pid":1, "tid":1, "ts":1635217738643172.8, "dur":211.95411682128906, "ph":"X", "name":"point shadows" }, -{ "pid":1, "tid":1, "ts":1635217738643182.3, "dur":21.696090698242188, "ph":"X", "name":"point shadow face-0 pass" }, -{ "pid":1, "tid":1, "ts":1635217738643212, "dur":28.848648071289063, "ph":"X", "name":"point shadow face-1 pass" }, -{ "pid":1, "tid":1, "ts":1635217738643248.3, "dur":28.133392333984375, "ph":"X", "name":"point shadow face-2 pass" }, -{ "pid":1, "tid":1, "ts":1635217738643283.3, "dur":33.14018249511719, "ph":"X", "name":"point shadow face-3 pass" }, -{ "pid":1, "tid":1, "ts":1635217738643322.8, "dur":26.464462280273438, "ph":"X", "name":"point shadow face-4 pass" }, -{ "pid":1, "tid":1, "ts":1635217738643357, "dur":25.033950805664063, "ph":"X", "name":"point shadow face-5 pass" }, -{ "pid":1, "tid":1, "ts":1635217738643402.3, "dur":1906.8717956542969, "ph":"X", "name":"first_pass" }, -{ "pid":1, "tid":1, "ts":1635217738643402.5, "dur":21.696090698242188, "ph":"X", "name":"figures" }, -{ "pid":1, "tid":1, "ts":1635217738643424.8, "dur":672.1019744873047, "ph":"X", "name":"terrain" }, -{ "pid":1, "tid":1, "ts":1635217738644098.3, "dur":18.596649169921875, "ph":"X", "name":"figures" }, -{ "pid":1, "tid":1, "ts":1635217738644117.5, "dur":808.4774017333984, "ph":"X", "name":"lod_terrain" }, -{ "pid":1, "tid":1, "ts":1635217738644926.3, "dur":18.358230590820313, "ph":"X", "name":"skybox" }, -{ "pid":1, "tid":1, "ts":1635217738644944.5, "dur":349.99847412109375, "ph":"X", "name":"sprites" }, -{ "pid":1, "tid":1, "ts":1635217738645295, "dur":0, "ph":"X", "name":"fluid" }, -{ "pid":1, "tid":1, "ts":1635217738645296.3, "dur":10.967254638671875, "ph":"X", "name":"particles" }, -{ "pid":1, "tid":1, "ts":1635217738645308.3, "dur":0.476837158203125, "ph":"X", "name":"debug" }, -{ "pid":1, "tid":1, "ts":1635217738645319.5, "dur":1293.8976287841797, "ph":"X", "name":"second_pass" }, -{ "pid":1, "tid":1, "ts":1635217738646615.5, "dur":278.9497375488281, "ph":"X", "name":"bloom" }, -{ "pid":1, "tid":1, "ts":1635217738646620, "dur":40.76957702636719, "ph":"X", "name":"downsample filtered 1" }, -{ "pid":1, "tid":1, "ts":1635217738646666, "dur":12.159347534179688, "ph":"X", "name":"downsample 2" }, -{ "pid":1, "tid":1, "ts":1635217738646683.3, "dur":4.0531158447265625, "ph":"X", "name":"downsample 3" }, -{ "pid":1, "tid":1, "ts":1635217738646691.8, "dur":3.814697265625, "ph":"X", "name":"downsample 4" }, -{ "pid":1, "tid":1, "ts":1635217738646699.5, "dur":4.5299530029296875, "ph":"X", "name":"upsample 1" }, -{ "pid":1, "tid":1, "ts":1635217738646708, "dur":9.775161743164063, "ph":"X", "name":"upsample 2" }, -{ "pid":1, "tid":1, "ts":1635217738646722, "dur":30.994415283203125, "ph":"X", "name":"upsample 3" }, -{ "pid":1, "tid":1, "ts":1635217738646762.8, "dur":129.46128845214844, "ph":"X", "name":"upsample 4" }, -{ "pid":1, "tid":1, "ts":1635217738646902, "dur":470.87669372558594, "ph":"X", "name":"third_pass" }, -{ "pid":1, "tid":1, "ts":1635217738646902.5, "dur":468.4925079345703, "ph":"X", "name":"postprocess" }, -{ "pid":1, "tid":1, "ts":1635217738647371.5, "dur":0.95367431640625, "ph":"X", "name":"ui" } -] -} diff --git a/frame-trace_1635388024283.json b/frame-trace_1635388024283.json new file mode 100644 index 0000000000..e451e99b7d --- /dev/null +++ b/frame-trace_1635388024283.json @@ -0,0 +1,38 @@ +{ +"traceEvents": [ +{ "pid":1, "tid":1, "ts":1635388024230823, "dur":5888.700485229492, "ph":"X", "name":"frame" }, +{ "pid":1, "tid":1, "ts":1635388024230850, "dur":1027.5840759277344, "ph":"X", "name":"shadow_pass" }, +{ "pid":1, "tid":1, "ts":1635388024230850, "dur":1015.4247283935547, "ph":"X", "name":"direcred_terrain_shadows" }, +{ "pid":1, "tid":1, "ts":1635388024231866.3, "dur":10.251998901367188, "ph":"X", "name":"direcred_figure_shadows" }, +{ "pid":1, "tid":1, "ts":1635388024231880.5, "dur":253.91578674316406, "ph":"X", "name":"point shadows" }, +{ "pid":1, "tid":1, "ts":1635388024231894.8, "dur":25.987625122070313, "ph":"X", "name":"point shadow face-0 pass" }, +{ "pid":1, "tid":1, "ts":1635388024231931.3, "dur":36.95487976074219, "ph":"X", "name":"point shadow face-1 pass" }, +{ "pid":1, "tid":1, "ts":1635388024231977.8, "dur":31.47125244140625, "ph":"X", "name":"point shadow face-2 pass" }, +{ "pid":1, "tid":1, "ts":1635388024232019, "dur":34.57069396972656, "ph":"X", "name":"point shadow face-3 pass" }, +{ "pid":1, "tid":1, "ts":1635388024232062.8, "dur":29.802322387695313, "ph":"X", "name":"point shadow face-4 pass" }, +{ "pid":1, "tid":1, "ts":1635388024232101.5, "dur":30.279159545898438, "ph":"X", "name":"point shadow face-5 pass" }, +{ "pid":1, "tid":1, "ts":1635388024232160.5, "dur":2982.616424560547, "ph":"X", "name":"first_pass" }, +{ "pid":1, "tid":1, "ts":1635388024232161.3, "dur":36.00120544433594, "ph":"X", "name":"figures" }, +{ "pid":1, "tid":1, "ts":1635388024232197.8, "dur":1394.7486877441406, "ph":"X", "name":"terrain" }, +{ "pid":1, "tid":1, "ts":1635388024233593.8, "dur":17.404556274414063, "ph":"X", "name":"figures" }, +{ "pid":1, "tid":1, "ts":1635388024233612.3, "dur":794.4107055664063, "ph":"X", "name":"lod_terrain" }, +{ "pid":1, "tid":1, "ts":1635388024234407.3, "dur":10.728836059570313, "ph":"X", "name":"skybox" }, +{ "pid":1, "tid":1, "ts":1635388024234419.8, "dur":689.9833679199219, "ph":"X", "name":"sprites" }, +{ "pid":1, "tid":1, "ts":1635388024235110, "dur":1.6689300537109375, "ph":"X", "name":"fluid" }, +{ "pid":1, "tid":1, "ts":1635388024235112.3, "dur":30.040740966796875, "ph":"X", "name":"particles" }, +{ "pid":1, "tid":1, "ts":1635388024235143, "dur":0, "ph":"X", "name":"debug" }, +{ "pid":1, "tid":1, "ts":1635388024235156.8, "dur":1069.5457458496094, "ph":"X", "name":"second_pass" }, +{ "pid":1, "tid":1, "ts":1635388024236229, "dur":281.5723419189453, "ph":"X", "name":"bloom" }, +{ "pid":1, "tid":1, "ts":1635388024236234, "dur":42.438507080078125, "ph":"X", "name":"downsample filtered 1" }, +{ "pid":1, "tid":1, "ts":1635388024236281.5, "dur":12.39776611328125, "ph":"X", "name":"downsample 2" }, +{ "pid":1, "tid":1, "ts":1635388024236298, "dur":5.0067901611328125, "ph":"X", "name":"downsample 3" }, +{ "pid":1, "tid":1, "ts":1635388024236307.3, "dur":2.86102294921875, "ph":"X", "name":"downsample 4" }, +{ "pid":1, "tid":1, "ts":1635388024236314.3, "dur":4.291534423828125, "ph":"X", "name":"upsample 1" }, +{ "pid":1, "tid":1, "ts":1635388024236322.8, "dur":10.251998901367188, "ph":"X", "name":"upsample 2" }, +{ "pid":1, "tid":1, "ts":1635388024236337, "dur":30.755996704101563, "ph":"X", "name":"upsample 3" }, +{ "pid":1, "tid":1, "ts":1635388024236379, "dur":129.46128845214844, "ph":"X", "name":"upsample 4" }, +{ "pid":1, "tid":1, "ts":1635388024236518.5, "dur":190.97328186035156, "ph":"X", "name":"third_pass" }, +{ "pid":1, "tid":1, "ts":1635388024236519, "dur":180.0060272216797, "ph":"X", "name":"postprocess" }, +{ "pid":1, "tid":1, "ts":1635388024236699.5, "dur":9.775161743164063, "ph":"X", "name":"ui" } +] +} diff --git a/world/src/layer/spot.rs b/world/src/layer/spot.rs index 6e5276ba2d..46b516d5ba 100644 --- a/world/src/layer/spot.rs +++ b/world/src/layer/spot.rs @@ -101,7 +101,7 @@ impl Spot { Self::generate_spots( Spot::PirateHideout, world, - 2.0, + 1.3, |g, c| { g < 0.25 && !c.near_cliffs() @@ -115,7 +115,7 @@ impl Spot { Self::generate_spots( Spot::DwarvenGrave, world, - 1.0, + 1.3, |g, c| { g < 0.25 && !c.near_cliffs() @@ -284,7 +284,7 @@ impl Spot { Self::generate_spots( Spot::AirshipCrash, world, - 0.5, + 0.7, |g, c| { g < 0.25 && !c.near_cliffs() From beefdfe8401fc2344ba33e77cc2f317ada8a64f0 Mon Sep 17 00:00:00 2001 From: Justin Shipsey Date: Thu, 28 Oct 2021 04:30:41 +0000 Subject: [PATCH 7/9] Delete frame-trace_1635388024283.json --- frame-trace_1635388024283.json | 38 ---------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 frame-trace_1635388024283.json diff --git a/frame-trace_1635388024283.json b/frame-trace_1635388024283.json deleted file mode 100644 index e451e99b7d..0000000000 --- a/frame-trace_1635388024283.json +++ /dev/null @@ -1,38 +0,0 @@ -{ -"traceEvents": [ -{ "pid":1, "tid":1, "ts":1635388024230823, "dur":5888.700485229492, "ph":"X", "name":"frame" }, -{ "pid":1, "tid":1, "ts":1635388024230850, "dur":1027.5840759277344, "ph":"X", "name":"shadow_pass" }, -{ "pid":1, "tid":1, "ts":1635388024230850, "dur":1015.4247283935547, "ph":"X", "name":"direcred_terrain_shadows" }, -{ "pid":1, "tid":1, "ts":1635388024231866.3, "dur":10.251998901367188, "ph":"X", "name":"direcred_figure_shadows" }, -{ "pid":1, "tid":1, "ts":1635388024231880.5, "dur":253.91578674316406, "ph":"X", "name":"point shadows" }, -{ "pid":1, "tid":1, "ts":1635388024231894.8, "dur":25.987625122070313, "ph":"X", "name":"point shadow face-0 pass" }, -{ "pid":1, "tid":1, "ts":1635388024231931.3, "dur":36.95487976074219, "ph":"X", "name":"point shadow face-1 pass" }, -{ "pid":1, "tid":1, "ts":1635388024231977.8, "dur":31.47125244140625, "ph":"X", "name":"point shadow face-2 pass" }, -{ "pid":1, "tid":1, "ts":1635388024232019, "dur":34.57069396972656, "ph":"X", "name":"point shadow face-3 pass" }, -{ "pid":1, "tid":1, "ts":1635388024232062.8, "dur":29.802322387695313, "ph":"X", "name":"point shadow face-4 pass" }, -{ "pid":1, "tid":1, "ts":1635388024232101.5, "dur":30.279159545898438, "ph":"X", "name":"point shadow face-5 pass" }, -{ "pid":1, "tid":1, "ts":1635388024232160.5, "dur":2982.616424560547, "ph":"X", "name":"first_pass" }, -{ "pid":1, "tid":1, "ts":1635388024232161.3, "dur":36.00120544433594, "ph":"X", "name":"figures" }, -{ "pid":1, "tid":1, "ts":1635388024232197.8, "dur":1394.7486877441406, "ph":"X", "name":"terrain" }, -{ "pid":1, "tid":1, "ts":1635388024233593.8, "dur":17.404556274414063, "ph":"X", "name":"figures" }, -{ "pid":1, "tid":1, "ts":1635388024233612.3, "dur":794.4107055664063, "ph":"X", "name":"lod_terrain" }, -{ "pid":1, "tid":1, "ts":1635388024234407.3, "dur":10.728836059570313, "ph":"X", "name":"skybox" }, -{ "pid":1, "tid":1, "ts":1635388024234419.8, "dur":689.9833679199219, "ph":"X", "name":"sprites" }, -{ "pid":1, "tid":1, "ts":1635388024235110, "dur":1.6689300537109375, "ph":"X", "name":"fluid" }, -{ "pid":1, "tid":1, "ts":1635388024235112.3, "dur":30.040740966796875, "ph":"X", "name":"particles" }, -{ "pid":1, "tid":1, "ts":1635388024235143, "dur":0, "ph":"X", "name":"debug" }, -{ "pid":1, "tid":1, "ts":1635388024235156.8, "dur":1069.5457458496094, "ph":"X", "name":"second_pass" }, -{ "pid":1, "tid":1, "ts":1635388024236229, "dur":281.5723419189453, "ph":"X", "name":"bloom" }, -{ "pid":1, "tid":1, "ts":1635388024236234, "dur":42.438507080078125, "ph":"X", "name":"downsample filtered 1" }, -{ "pid":1, "tid":1, "ts":1635388024236281.5, "dur":12.39776611328125, "ph":"X", "name":"downsample 2" }, -{ "pid":1, "tid":1, "ts":1635388024236298, "dur":5.0067901611328125, "ph":"X", "name":"downsample 3" }, -{ "pid":1, "tid":1, "ts":1635388024236307.3, "dur":2.86102294921875, "ph":"X", "name":"downsample 4" }, -{ "pid":1, "tid":1, "ts":1635388024236314.3, "dur":4.291534423828125, "ph":"X", "name":"upsample 1" }, -{ "pid":1, "tid":1, "ts":1635388024236322.8, "dur":10.251998901367188, "ph":"X", "name":"upsample 2" }, -{ "pid":1, "tid":1, "ts":1635388024236337, "dur":30.755996704101563, "ph":"X", "name":"upsample 3" }, -{ "pid":1, "tid":1, "ts":1635388024236379, "dur":129.46128845214844, "ph":"X", "name":"upsample 4" }, -{ "pid":1, "tid":1, "ts":1635388024236518.5, "dur":190.97328186035156, "ph":"X", "name":"third_pass" }, -{ "pid":1, "tid":1, "ts":1635388024236519, "dur":180.0060272216797, "ph":"X", "name":"postprocess" }, -{ "pid":1, "tid":1, "ts":1635388024236699.5, "dur":9.775161743164063, "ph":"X", "name":"ui" } -] -} From b1e9d9664b5805edce634a188c602f9c3e2b2085 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sat, 30 Oct 2021 23:38:06 -0400 Subject: [PATCH 8/9] adjust models, last fixes --- assets/common/entity/spot/pirate.ron | 2 +- assets/common/loadout/village/villager.ron | 2 +- .../loot_tables/dungeon/tier-4/miniboss.ron | 2 +- .../loot_tables/dungeon/tier-5/chest.ron | 2 +- assets/voxygen/item_image_manifest.ron | 22 +-- .../voxygen/voxel/armor/cultist/bandana.vox | 4 +- .../voxel/armor/misc/head/bandana/red.vox | 2 +- .../voxel/armor/misc/head/bandana/thief.vox | 2 +- .../voxygen/voxel/armor/misc/head/crown.vox | 4 +- .../voxygen/voxel/armor/misc/head/helmet.vox | 4 +- assets/voxygen/voxel/armor/misc/head/hood.vox | 4 +- .../voxel/armor/misc/head/hood_dark.vox | 2 +- .../voxygen/voxel/armor/misc/head/mitre.vox | 4 +- .../voxel/armor/misc/head/spikeguard.vox | 4 +- .../voxygen/voxel/armor/misc/head/straw.vox | 4 +- .../voxel/humanoid_armor_head_manifest.ron | 167 +++++++++--------- .../voxygen/voxel/humanoid_head_manifest.ron | 6 +- 17 files changed, 117 insertions(+), 120 deletions(-) diff --git a/assets/common/entity/spot/pirate.ron b/assets/common/entity/spot/pirate.ron index 5af961727c..9e449d2bdb 100644 --- a/assets/common/entity/spot/pirate.ron +++ b/assets/common/entity/spot/pirate.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("humanoid"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.biped_large.saurok"), + loot: LootTable("common.loot_tables.spots.pirate"), hands: Paired(Item("common.items.weapons.sword_1h.iron-2")), diff --git a/assets/common/loadout/village/villager.ron b/assets/common/loadout/village/villager.ron index 4a72373387..2b460e776a 100644 --- a/assets/common/loadout/village/villager.ron +++ b/assets/common/loadout/village/villager.ron @@ -20,7 +20,7 @@ (1.0, Some(Item("common.items.armor.cloth_blue.foot"))), ]), Armor(Head): Choice([ - (1.0, Some(Item("common.items.armor.misc.head.straw"))), + (1.0, Some(Item("common.items.armor.misc.head.spikeguard"))), ]), }) diff --git a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron index 7b3e66714b..e384bcaa07 100644 --- a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron +++ b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron @@ -8,5 +8,5 @@ // lantern (1.0, Item("common.items.lantern.blue_0")), // gear - (3.0, ItemQuantity("common.items.armor.misc.head.mitre")), + (3.0, Item("common.items.armor.misc.head.mitre")), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/chest.ron b/assets/common/loot_tables/dungeon/tier-5/chest.ron index b3e2e6f89e..39bcf4ccf9 100644 --- a/assets/common/loot_tables/dungeon/tier-5/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-5/chest.ron @@ -1,7 +1,7 @@ [ // Gear (1.0, LootTable("common.loot_tables.weapons.tier-4")), - (1.0, LootTable("common.loot_tables.armor.tier-4")), + (1.0, Item("common.loot_tables.armor.tier-4")), (0.3, ItemQuantity("common.items.armor.cultist.bandana")), // Currency (3.0, ItemQuantity("common.items.utility.coins", 200, 500)), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index a44abbd4ed..117d8b69f0 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1168,7 +1168,7 @@ ), Armor(Head("Cultist")): VoxTrans( "voxel.armor.cultist.bandana", - (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, + (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9, ), // Villager Clothing Armor(Pants("WorkerBlue")): VoxTrans( @@ -2143,7 +2143,7 @@ ), Armor(Back("Backpack")): VoxTrans( "voxel.armor.misc.back.backpack", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 0.0, 0.0), (-75.0, 45.0,0.0), 0.9, ), Armor(Back("BackpackBlue")): VoxTrans( "voxel.armor.misc.back.backpack", @@ -2156,15 +2156,15 @@ ), Armor(Head("Pirate")): VoxTrans( "voxel.armor.pirate.hat", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (1.0, 2.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), Armor(Head("Thief")): VoxTrans( "voxel.armor.misc.head.bandana.thief", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9, ), Armor(Head("Red")): VoxTrans( "voxel.armor.misc.head.bandana.red", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9, ), Armor(Head("Straw")): VoxTrans( "voxel.armor.misc.head.straw", @@ -2172,23 +2172,19 @@ ), Armor(Head("Hood")): VoxTrans( "voxel.armor.misc.head.hood", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), Armor(Head("Crown")): VoxTrans( "voxel.armor.misc.head.crown", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), Armor(Head("Mitre")): VoxTrans( "voxel.armor.misc.head.mitre", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, - ), - Armor(Head("Mitre")): VoxTrans( - "voxel.armor.misc.head.mitre", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), Armor(Head("Spikeguard")): VoxTrans( "voxel.armor.misc.head.spikeguard", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), // Rings Armor(Ring("Scratched")): VoxTrans( diff --git a/assets/voxygen/voxel/armor/cultist/bandana.vox b/assets/voxygen/voxel/armor/cultist/bandana.vox index 702885c851..14d45c6c96 100644 --- a/assets/voxygen/voxel/armor/cultist/bandana.vox +++ b/assets/voxygen/voxel/armor/cultist/bandana.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d924d8439d4abb0368fec7e7dc425a2a1f3f3baf2c541fcf10727fd80c3185ea -size 2784 +oid sha256:b5ff49320a6198671531cb0fc3b358366dc75ac388bd2efd06c20fd68f008c46 +size 2792 diff --git a/assets/voxygen/voxel/armor/misc/head/bandana/red.vox b/assets/voxygen/voxel/armor/misc/head/bandana/red.vox index 1df35cc0cb..7f2c6ceedc 100644 --- a/assets/voxygen/voxel/armor/misc/head/bandana/red.vox +++ b/assets/voxygen/voxel/armor/misc/head/bandana/red.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68a970bed2c688ca7ffac56b150e4f7b75d624ad377375b4102210c38d8457a6 +oid sha256:7d2b33ddc912bf8c57f4e0783172385ca87fa2f9b451b5387a7116a66d79ae83 size 2784 diff --git a/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox b/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox index a2c885315a..8ef14d9f9e 100644 --- a/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox +++ b/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2098f01121367b2061f43ddaf077d56b16ccfebbcf80323ede8ac0d32f655e3d +oid sha256:509f11f2b4a062b8e84177721f178710a7aef3406ecc210d409667848506cbcc size 2784 diff --git a/assets/voxygen/voxel/armor/misc/head/crown.vox b/assets/voxygen/voxel/armor/misc/head/crown.vox index 812074ee93..ef7ad72e02 100644 --- a/assets/voxygen/voxel/armor/misc/head/crown.vox +++ b/assets/voxygen/voxel/armor/misc/head/crown.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86a6617d7c956b1854796b5a6b9b1a9c74cd50825ea4e8f02e40ce48d4e7c874 -size 8436 +oid sha256:4642ed18f4e43058dd4d0d0c9aadb40a6376eb332a9a453f2d20c00a6e193f7b +size 8600 diff --git a/assets/voxygen/voxel/armor/misc/head/helmet.vox b/assets/voxygen/voxel/armor/misc/head/helmet.vox index ff85bb2e6f..b79ff87a03 100644 --- a/assets/voxygen/voxel/armor/misc/head/helmet.vox +++ b/assets/voxygen/voxel/armor/misc/head/helmet.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0bfb7dc60be7c50b2e8cd33b8e3360f0f17dac2ae89597d33ee2adf9079f1ec -size 12080 +oid sha256:b985c6a8bfc5a092af1d4165042697de539c05af361da30bac55c47182f183cf +size 14776 diff --git a/assets/voxygen/voxel/armor/misc/head/hood.vox b/assets/voxygen/voxel/armor/misc/head/hood.vox index 4bb5405916..2b1155b982 100644 --- a/assets/voxygen/voxel/armor/misc/head/hood.vox +++ b/assets/voxygen/voxel/armor/misc/head/hood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3482547792ef1431d303bad19494010d4df89035c35c31e19824d95a4a871843 -size 11408 +oid sha256:ee6d90525115d07044671e6aa28b48a56316db1354b95d66ad0874b888864bbc +size 14512 diff --git a/assets/voxygen/voxel/armor/misc/head/hood_dark.vox b/assets/voxygen/voxel/armor/misc/head/hood_dark.vox index ba1bf36a80..76bf3208ea 100644 --- a/assets/voxygen/voxel/armor/misc/head/hood_dark.vox +++ b/assets/voxygen/voxel/armor/misc/head/hood_dark.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58406db4b819d5fba18f2d887e3c19d52440b143aed15075aa656f67d1273690 +oid sha256:5af2854af8ce6227d350df462aca0b5b9eae9b026b7d2f8cf98d5da43a29e777 size 10120 diff --git a/assets/voxygen/voxel/armor/misc/head/mitre.vox b/assets/voxygen/voxel/armor/misc/head/mitre.vox index 08325896c5..c72a94ff2d 100644 --- a/assets/voxygen/voxel/armor/misc/head/mitre.vox +++ b/assets/voxygen/voxel/armor/misc/head/mitre.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3191fd3637655184d88e351af088eebc69f32289f8c40d66539c0a049408595 -size 8224 +oid sha256:62bfaa6c892d20ff11c4c764c99fb344fb80627c20dbb0e924a7a2f69a8fb989 +size 7984 diff --git a/assets/voxygen/voxel/armor/misc/head/spikeguard.vox b/assets/voxygen/voxel/armor/misc/head/spikeguard.vox index 161fd594ee..590e95370e 100644 --- a/assets/voxygen/voxel/armor/misc/head/spikeguard.vox +++ b/assets/voxygen/voxel/armor/misc/head/spikeguard.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e20a077887132dccb726b6ad23dd31ce8629bbfc884063ff83c4404582c6244 -size 1524 +oid sha256:64274e8d679867ec4166997a46da16329dfc7812a4cb20b91d2df35f386dfd11 +size 1536 diff --git a/assets/voxygen/voxel/armor/misc/head/straw.vox b/assets/voxygen/voxel/armor/misc/head/straw.vox index 4f29f98d23..62ff0c9ae6 100644 --- a/assets/voxygen/voxel/armor/misc/head/straw.vox +++ b/assets/voxygen/voxel/armor/misc/head/straw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57d4232d5cd96f7d31745555a2c250f917fc2d32796b991e6eb44391b9750d9c -size 18344 +oid sha256:81946f3fe132ccae48001a6ab311f916bfe84f6fab80e7c840519823616bc529 +size 19124 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 54075ac710..2f8ecce6a3 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -322,32 +322,33 @@ vox_spec: ("armor.misc.head.headband.elf_f", (3.0, 2.0, 5.0)), color: None ), + // (Human, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-4.0, -5.0, -1.0)), color: None ), (Human, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-4.0, -5.0, -1.0)), color: None ), (Elf, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-3.0, -5.0, -1.0)), color: None ), (Elf, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-3.0, -5.0, -1.0)), color: None ), (Orc, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-1.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), color: None ), (Orc, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-1.0, -3.0, 2.0)), + vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, 2.0)), color: None ), (Dwarf, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-5.0, -4.0, -1.0)), color: None ), (Dwarf, Male, "Helmet"): ( @@ -355,313 +356,313 @@ color: None ), (Undead, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-4.0, -4.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-6.0, -5.0, -1.0)), color: None ), (Undead, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-4.0, -4.0, 1.0)), + vox_spec: ("armor.misc.head.helmet", (-6.0, -5.0, 1.0)), color: None ), (Danari, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (0.0, -4.0, 1.0)), + vox_spec: ("armor.misc.head.helmet", (-2.0, -5.0, 1.0)), color: None ), (Danari, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-2.0, -5.0, -1.0)), color: None ), // (Danari, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.red", (-2.0, -2.0, -8.0)), color: None ), (Danari, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)), + 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", (1.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-5.0, -1.0, -10.0)), color: None ), (Dwarf, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (1.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-5.0, -1.0, -10.0)), color: None ), (Human, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (2.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-4.0, -2.0, -10.0)), color: None ), (Human, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (2.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-4.0, -2.0, -10.0)), color: None ), (Undead, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (0.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.red", (-6.0, -2.0, -8.0)), color: None ), (Undead, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (0.0, 6.0, -9.0)), + vox_spec: ("armor.misc.head.bandana.red", (-6.0, -2.0, -9.0)), color: None ), (Elf, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-3.0, -2.0, -10.0)), color: None ), (Elf, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-3.0, -2.0, -10.0)), color: None ), (Orc, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (3.0, 8.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.red", (-3.0, 0.0, -8.0)), color: None ), (Orc, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-3.0, -3.0, -10.0)), color: None ), // (Danari, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-2.0, -2.0, -8.0)), color: None ), (Danari, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)), + 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", (1.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-5.0, -1.0, -10.0)), color: None ), (Dwarf, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (1.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-5.0, -1.0, -10.0)), color: None ), (Human, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (2.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -2.0, -10.0)), color: None ), (Human, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (2.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -2.0, -10.0)), color: None ), (Undead, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (0.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-6.0, -2.0, -8.0)), color: None ), (Undead, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (0.0, 6.0, -9.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-6.0, -2.0, -9.0)), color: None ), (Elf, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-3.0, -2.0, -10.0)), color: None ), (Elf, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-3.0, -2.0, -10.0)), color: None ), (Orc, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (3.0, 8.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-3.0, 0.0, -8.0)), color: None ), (Orc, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-3.0, -3.0, -10.0)), color: None ), // (Danari, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (4.0, 6.0, -8.0)), + vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)), color: None ), (Danari, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (4.0, 6.0, -8.0)), + vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)), color: None ), (Dwarf, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (1.0, 7.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)), color: None ), (Dwarf, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (1.0, 7.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)), color: None ), (Human, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (2.0, 6.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-4.0, -2.0, -11.0)), color: None ), (Human, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (2.0, 7.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-4.0, -2.0, -10.0)), color: None ), (Undead, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (0.0, 6.0, -8.0)), + vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -8.0)), color: None ), (Undead, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (0.0, 6.0, -9.0)), + vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -9.0)), color: None ), (Elf, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)), color: None ), (Elf, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)), color: None ), (Orc, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (3.0, 8.0, -8.0)), + vox_spec: ("armor.cultist.bandana", (-3.0, 0.0, -8.0)), color: None ), (Orc, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-3.0, -3.0, -10.0)), color: None ), // (Human, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-4.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-4.0, -6.0, -4.0)), color: None ), (Human, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-4.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-4.0, -6.0, -4.0)), color: None ), (Elf, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-3.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -4.0)), color: None ), (Elf, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-3.0, -7.0, -4.0)), color: None ), (Dwarf, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-5.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-5.0, -5.0, -4.0)), color: None ), (Dwarf, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-5.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-5.0, -5.0, -4.0)), color: None ), (Danari, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-2.0, -5.0, 0.0)), + vox_spec: ("armor.misc.head.hood", (-2.0, -6.0, -2.0)), color: None ), (Danari, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-2.0, -5.0, 0.0)), + vox_spec: ("armor.misc.head.hood", (-2.0, -6.0, -2.0)), color: None ), (Undead, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-6.0, -5.0, 0.0)), + vox_spec: ("armor.misc.head.hood", (-6.0, -6.0, -2.0)), color: None ), (Undead, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-6.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.hood", (-6.0, -6.0, -3.0)), color: None ), (Orc, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-3.0, -3.0, 0.0)), + vox_spec: ("armor.misc.head.hood", (-3.0, -5.0, -2.0)), color: None ), (Orc, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-3.0, -7.0, -4.0)), color: None ), // (Human, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-4.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-4.0, -4.0, -1.0)), color: None ), (Human, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-4.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-4.0, -4.0, -1.0)), color: None ), (Elf, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -4.0, -1.0)), color: None ), (Elf, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-3.0, -6.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)), color: None ), (Dwarf, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-5.0, -4.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-5.0, -3.0, -1.0)), color: None ), (Dwarf, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-5.0, -4.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-5.0, -3.0, -1.0)), color: None ), (Danari, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-2.0, -5.0, 1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-2.0, -4.0, 1.0)), color: None ), (Danari, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-2.0, -5.0, 1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-2.0, -4.0, 1.0)), color: None ), (Undead, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-6.0, -5.0, 1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-6.0, -4.0, 1.0)), color: None ), (Undead, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-6.0, -5.0, -0.0)), + vox_spec: ("armor.misc.head.hood_dark", (-6.0, -4.0, -0.0)), color: None ), (Orc, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-3.0, -3.0, 1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -2.0, 1.0)), color: None ), (Orc, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-3.0, -6.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)), color: None ), // (Human, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-4.0, -4.0, -2.0)), color: None ), (Human, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-4.0, -4.0, -2.0)), color: None ), (Elf, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -4.0, -2.0)), color: None ), (Elf, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -6.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), color: None ), (Dwarf, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-5.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, -2.0)), color: None ), (Dwarf, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-5.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, -2.0)), color: None ), (Danari, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, -0.0)), color: None ), (Danari, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, -0.0)), color: None ), (Undead, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-6.0, -5.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, -0.0)), color: None ), (Undead, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-6.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, -1.0)), color: None ), (Orc, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -3.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -2.0, -0.0)), color: None ), (Orc, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -6.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), color: None ), } diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index 05956dce02..47c00b6117 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -1,6 +1,6 @@ ({ (Human, Male): ( - offset: (-7.0, -4.0, -2.0), + offset: (-7.0, -2.5, -2.0), head: ("figure.head.human.male", (0, 2, 0)), eyes: [ Some(("figure.eyes.general.male_default-0", (3, 9, 2))), @@ -142,7 +142,7 @@ ], ), (Elf, Male): ( - offset: (-8.0, -4.0, -2.0), + offset: (-8.0, -2.5, -2.0), head: ("figure.head.elf.male", (0, 2, 0)), eyes: [ Some(("figure.eyes.general.male_default-0", (4, 9, 2))), @@ -290,7 +290,7 @@ ] ), (Undead, Male): ( - offset: (-5.0, -4.0, -2.0), + offset: (-5.0, -4.0, -1.5), head: ("figure.head.undead.male", (0, 2, 0)), eyes: [ Some(("figure.eyes.undead.male-0", (2, 8, 4))), From 913a2725e8f0b509d8549f2f4239592ec2c211b3 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sat, 30 Oct 2021 23:45:27 -0400 Subject: [PATCH 9/9] changelog --- CHANGELOG.md | 1 + assets/common/loot_tables/dungeon/tier-4/chest.ron | 2 +- assets/common/loot_tables/dungeon/tier-5/chest.ron | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85bbf6e562..c387001e17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Sneaking with weapons drawn - Stealth stat values on (some) armors - All new dismantling interface found at your nearest dismantling staion +- Wearable headgear, including hood, crown, bandanas ### Changed diff --git a/assets/common/loot_tables/dungeon/tier-4/chest.ron b/assets/common/loot_tables/dungeon/tier-4/chest.ron index 72cb52c657..06b6965324 100644 --- a/assets/common/loot_tables/dungeon/tier-4/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-4/chest.ron @@ -2,7 +2,7 @@ // Gear (1.0, LootTable("common.loot_tables.weapons.tier-4")), (1.0, LootTable("common.loot_tables.armor.tier-4")), - (3.0, ItemQuantity("common.items.armor.misc.head.spikeguard")), + (3.0, Item("common.items.armor.misc.head.spikeguard")), // Currency (3.0, ItemQuantity("common.items.utility.coins", 200, 500)), // Materials diff --git a/assets/common/loot_tables/dungeon/tier-5/chest.ron b/assets/common/loot_tables/dungeon/tier-5/chest.ron index 39bcf4ccf9..457ba90609 100644 --- a/assets/common/loot_tables/dungeon/tier-5/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-5/chest.ron @@ -1,8 +1,8 @@ [ // Gear (1.0, LootTable("common.loot_tables.weapons.tier-4")), - (1.0, Item("common.loot_tables.armor.tier-4")), - (0.3, ItemQuantity("common.items.armor.cultist.bandana")), + (1.0, LootTable("common.loot_tables.armor.tier-4")), + (0.3, Item("common.items.armor.cultist.bandana")), // Currency (3.0, ItemQuantity("common.items.utility.coins", 200, 500)), // Materials