Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

draugr assets 1

Browse Source
This commit is contained in:
Monty 2021-05-04 00:58:47 +02:00
parent 587b48871d
commit 18b9bce677
14 changed files with 119 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/npc_names.ron
View File

@ -315,6 +315,10 @@
keyword: "undead",
generic: "Undead"
)
draugr: (
keyword: "draugr",
generic: "Draugr"
)
)
),
quadruped_medium: (

1
assets/voxygen/i18n/en/common.ron
View File

@ -57,6 +57,7 @@ Is the client up to date?"#,
"common.species.elf": "Elf",
"common.species.undead": "Undead",
"common.species.danari": "Danari",
"common.species.draugr": "Draugr",
"common.weapons.axe": "Axe",
"common.weapons.sword": "Sword",

BIN
assets/voxygen/voxel/figure/head/draugr/female_test.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/head/draugr/male.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/head/draugr/male_test.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/head/draugr/male_test_2.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

27
assets/voxygen/voxel/humanoid_color_manifest.ron
View File

@ -140,6 +140,33 @@
(48, 61, 52), // Dark Green
(20, 19, 17), // Black
],
Draugr: [
//(245, 232, 175), // Cream Blonde
(228, 208, 147), // Gold Blonde
//(228, 223, 141), // Platinum Blonde
(176, 106, 41), // Summer Blonde
(107, 76, 51), // Oak
(203, 154, 98), // Light
(64, 32, 18), // Skin7
(86, 72, 71), // Ash
(57, 56, 61), // Raven Black
(101, 83, 95), // Matte Purple
(101, 57, 90), // Witch Purple
(111, 54, 117), // Punky Purple
(135, 38, 39), // Dark Red
(88, 26, 29), // Wine Red
(103, 191, 254), // Ice Blue
(92, 80, 144), // Kingfisher Blue
(146, 198, 238), // Lagoon Blue
(66, 66, 59), // Decayed Grey
//(80, 156, 211), // Candy Pink
(216, 146, 114), // Matte Pink
(0, 131, 122), // Rotten Green
(146, 166, 172), // Matte Green
(84, 139, 107), // Grass Green
(48, 61, 52), // Dark Green
(20, 19, 17), // Black
],
),
eye_colors_light: (
VigorousBlack: (71, 59, 49),

22
assets/voxygen/voxel/humanoid_head_manifest.ron
View File

@ -377,5 +377,25 @@
accessory: [
Some(("figure.accessory.danari.horns-0", (4, 9, 8))),]
),
// More here
(Draugr, Male): (
offset: (-9.0, -4.0, -2.0),
head: ("figure.head.draugr.male", (0, 2, 2)),
eyes: [
Some(("figure.eyes.general.female_default-0", (4, 9, 4))),
],
hair: [None],
beard: [None],
accessory: [None],
),
(Draugr, Female): (
offset: (-9.0, -4.0, -2.0),
head: ("figure.head.draugr.female", (0, 2, 2)),
eyes: [
Some(("figure.eyes.general.female_default-0", (4, 9, 4))),
],
hair: [None],
beard: [None],
accessory: [None],
),
// Add here: Morx, Aunqa
})

1
common/src/comp/agent.rs
View File

@ -173,6 +173,7 @@ impl<'a> From<&'a Body> for Psyche {
humanoid::Species::Human => 0.6,
humanoid::Species::Orc => 0.9,
humanoid::Species::Undead => 0.9,
humanoid::Species::Draugr => 0.9,
},
Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species {
quadruped_small::Species::Pig => 0.5,

4
common/src/comp/body.rs
View File

@ -206,6 +206,8 @@ impl Body {
(humanoid::Species::Undead, humanoid::BodyType::Female) => 50.0,
(humanoid::Species::Danari, humanoid::BodyType::Male) => 80.0,
(humanoid::Species::Danari, humanoid::BodyType::Female) => 60.0,
(humanoid::Species::Draugr, humanoid::BodyType::Male) => 70.0,
(humanoid::Species::Draugr, humanoid::BodyType::Female) => 50.0,
}
},
Body::Object(obj) => obj.mass().0,
@ -301,6 +303,8 @@ impl Body {
(humanoid::Species::Undead, humanoid::BodyType::Female) => 2.1,
(humanoid::Species::Danari, humanoid::BodyType::Male) => 1.5,
(humanoid::Species::Danari, humanoid::BodyType::Female) => 1.4,
(humanoid::Species::Draugr, humanoid::BodyType::Male) => 2.2,
(humanoid::Species::Draugr, humanoid::BodyType::Female) => 2.1,
};
Vec3::new(1.5, 0.5, height)
},

25
common/src/comp/body/humanoid.rs
View File

@ -80,6 +80,7 @@ make_case_elim!(
Human = 3,
Orc = 4,
Undead = 5,
Draugr = 6,
}
);
@ -94,6 +95,7 @@ pub struct AllSpecies<SpeciesMeta> {
pub human: SpeciesMeta,
pub orc: SpeciesMeta,
pub undead: SpeciesMeta,
pub draugr: SpeciesMeta,
}
impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@ -108,17 +110,19 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
Species::Human => &self.human,
Species::Orc => &self.orc,
Species::Undead => &self.undead,
Species::Draugr => &self.draugr,
}
}
}
pub const ALL_SPECIES: [Species; 6] = [
pub const ALL_SPECIES: [Species; 7] = [
Species::Danari,
Species::Dwarf,
Species::Elf,
Species::Human,
Species::Orc,
Species::Undead,
Species::Draugr,
];
impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {
@ -189,6 +193,7 @@ pub const HUMAN_SKIN_COLORS: [Skin; 18] = [
];
pub const ORC_SKIN_COLORS: [Skin; 4] = [Skin::OrcOne, Skin::OrcTwo, Skin::OrcThree, Skin::OrcFour];
pub const UNDEAD_SKIN_COLORS: [Skin; 3] = [Skin::UndeadOne, Skin::UndeadTwo, Skin::UndeadThree];
pub const DRAUGR_SKIN_COLORS: [Skin; 3] = [Skin::UndeadOne, Skin::UndeadTwo, Skin::UndeadThree];
// Eye colors
pub const DANARI_EYE_COLORS: [EyeColor; 3] = [
@ -228,6 +233,13 @@ pub const UNDEAD_EYE_COLORS: [EyeColor; 5] = [
EyeColor::MagicPurple,
EyeColor::ToxicGreen,
];
pub const DRAUGR_EYE_COLORS: [EyeColor; 5] = [
EyeColor::ViciousRed,
EyeColor::PumpkinOrange,
EyeColor::GhastlyYellow,
EyeColor::MagicPurple,
EyeColor::ToxicGreen,
];
impl Species {
fn skin_colors(self) -> &'static [Skin] {
@ -238,6 +250,7 @@ impl Species {
Species::Human => &HUMAN_SKIN_COLORS,
Species::Orc => &ORC_SKIN_COLORS,
Species::Undead => &UNDEAD_SKIN_COLORS,
Species::Draugr => &DRAUGR_SKIN_COLORS,
}
}
@ -249,6 +262,7 @@ impl Species {
Species::Human => &HUMAN_EYE_COLORS,
Species::Orc => &ORC_EYE_COLORS,
Species::Undead => &UNDEAD_EYE_COLORS,
Species::Draugr => &DRAUGR_EYE_COLORS,
}
}
@ -265,6 +279,7 @@ impl Species {
Species::Human => 22,
Species::Orc => 11,
Species::Undead => 22,
Species::Draugr => 22,
}
}
@ -300,6 +315,8 @@ impl Species {
(Species::Orc, BodyType::Male) => 8,
(Species::Undead, BodyType::Female) => 6,
(Species::Undead, BodyType::Male) => 5,
(Species::Draugr, BodyType::Female) => 0,
(Species::Draugr, BodyType::Male) => 0,
}
}
@ -317,6 +334,8 @@ impl Species {
(Species::Orc, BodyType::Male) => 6,
(Species::Undead, BodyType::Female) => 2,
(Species::Undead, BodyType::Male) => 2,
(Species::Draugr, BodyType::Female) => 0,
(Species::Draugr, BodyType::Male) => 0,
}
}
@ -336,6 +355,8 @@ impl Species {
(Species::Orc, BodyType::Male) => 2,
(Species::Undead, BodyType::Female) => 3,
(Species::Undead, BodyType::Male) => 4,
(Species::Draugr, BodyType::Female) => 1,
(Species::Draugr, BodyType::Male) => 1,
}
}
@ -353,6 +374,8 @@ impl Species {
(Species::Orc, BodyType::Male) => 3,
(Species::Undead, BodyType::Female) => 1,
(Species::Undead, BodyType::Male) => 1,
(Species::Draugr, BodyType::Female) => 0,
(Species::Draugr, BodyType::Male) => 0,
}
}
}

6
voxygen/anim/src/character/mod.rs
View File

@ -228,6 +228,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Undead, Female) => 0.72,
(Danari, Male) => 0.56,
(Danari, Female) => 0.56,
(Draugr, Male) => 0.56,
(Draugr, Female) => 0.56,
},
head_scale: match (body.species, body.body_type) {
(Orc, Male) => 0.9,
@ -242,6 +244,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Undead, Female) => 0.9,
(Danari, Male) => 1.15,
(Danari, Female) => 1.15,
(Draugr, Male) => 0.56,
(Draugr, Female) => 0.56,
},
head: match (body.species, body.body_type) {
(Orc, Male) => (-2.0, 9.0),
@ -256,6 +260,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Undead, Female) => (-1.5, 9.5),
(Danari, Male) => (-1.5, 7.0),
(Danari, Female) => (-1.5, 7.0),
(Draugr, Male) => (-1.5, 7.0),
(Draugr, Female) => (-1.5, 7.0),
},
chest: match (body.species, body.body_type) {
_ => (0.0, 8.0),

9
voxygen/src/menu/char_selection/ui/mod.rs
View File

@ -103,6 +103,8 @@ image_ids_ice! {
elf_f: "voxygen.element.ui.char_select.portraits.elf_f",
danari_m: "voxygen.element.ui.char_select.portraits.danari_m",
danari_f: "voxygen.element.ui.char_select.portraits.danari_f",
draugr_m: "voxygen.element.ui.char_select.portraits.ud_m",
draugr_f: "voxygen.element.ui.char_select.portraits.ud_f",
// Icon Borders
icon_border: "voxygen.element.ui.generic.buttons.border",
icon_border_mo: "voxygen.element.ui.generic.buttons.border_mo",
@ -752,6 +754,7 @@ impl Controls {
humanoid::Species::Elf => (imgs.elf_m, imgs.elf_f),
humanoid::Species::Undead => (imgs.undead_m, imgs.undead_f),
humanoid::Species::Danari => (imgs.danari_m, imgs.danari_f),
humanoid::Species::Draugr => (imgs.undead_m, imgs.undead_f),
};
let [ref mut body_m_button, ref mut body_f_button] = body_type_buttons;
@ -836,10 +839,10 @@ impl Controls {
.into(),
icon_button_tooltip(
undead_button,
matches!(body.species, humanoid::Species::Undead),
Message::Species(humanoid::Species::Undead),
matches!(body.species, humanoid::Species::Draugr),
Message::Species(humanoid::Species::Draugr),
undead_icon,
"common.species.undead",
"common.species.draugr",
)
.into(),
icon_button_tooltip(

26
world/src/layer/wildlife.rs
View File

@ -41,7 +41,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
}
let scatter: &[Entry<R>] = &[
// Tundra snow pack ennemies
// Tundra snow pack enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -72,7 +72,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
* 1.0
},
},
// Tundra solitary ennemies
// Tundra solitary enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -101,7 +101,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
close(c.temp, CONFIG.snow_temp, 0.3) * col.tree_density * BASE_DENSITY * 1.4
},
},
// Tundra rare solitary ennemies
// Tundra rare solitary enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -115,7 +115,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
day_period: vec![Night, Morning, Noon, Evening],
get_density: |c, _col| close(c.temp, CONFIG.snow_temp, 0.15) * BASE_DENSITY * 0.5,
},
// Tundra rarer solitary ennemies
// Tundra rarer solitary enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -129,7 +129,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
day_period: vec![Night, Morning, Noon, Evening],
get_density: |c, _col| close(c.temp, CONFIG.snow_temp, 0.15) * BASE_DENSITY * 0.1,
},
// Tundra rock solitary ennemies
// Tundra rock solitary enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -146,7 +146,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
close(c.temp, CONFIG.snow_temp, 0.15) * BASE_DENSITY * col.rock * 1.0
},
},
// Taiga rare solitary ennemies
// Taiga rare solitary enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -168,7 +168,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
close(c.temp, CONFIG.snow_temp + 0.2, 0.2) * col.tree_density * BASE_DENSITY * 0.4
},
},
// Taiga pack ennemies
// Taiga pack enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -252,7 +252,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
day_period: vec![Night, Morning, Noon, Evening],
get_density: |c, _col| close(c.temp, CONFIG.snow_temp + 0.2, 0.6) * BASE_DENSITY * 5.0,
},
// Temperate solitary ennemies
// Temperate solitary enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -505,7 +505,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
}
},
},
// Temperate rare river ennemies
// Temperate rare river enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -530,7 +530,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
}
},
},
// Temperate river ennemies
// Temperate river enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -552,7 +552,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
}
},
},
// Tropical rock solitary ennemies
// Tropical rock solitary enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -572,7 +572,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
close(c.temp, CONFIG.tropical_temp + 0.1, 0.5) * col.rock * BASE_DENSITY * 5.0
},
},
// Jungle solitary ennemies
// Jungle solitary enemies
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -601,7 +601,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
* 2.8
},
},
// Jungle solitary ennemies day
// Jungle solitary enemies day
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)