npc armour

This commit is contained in:
Monty Marz 2020-11-13 00:29:36 +01:00 committed by Joshua Barretto
parent 7359dc6e1f
commit 225756b011
10 changed files with 66 additions and 2 deletions

View File

@ -0,0 +1,12 @@
ItemDef(
name: "Blue Traveler Coat",
description: "",
kind: Armor(
(
kind: Back("LeatherBlue0"),
stats: (
protection: Normal(1.0)),
)
),
quality: Moderate,
)

View File

@ -0,0 +1,12 @@
ItemDef(
name: "Blue Leather Cuirass",
description: "",
kind: Armor(
(
kind: Chest("LeatherBlue0"),
stats: (
protection: Normal(5.0)),
)
),
quality: Moderate,
)

View File

@ -0,0 +1,12 @@
ItemDef(
name: "Blue Leather Guards",
description: "",
kind: Armor(
(
kind: Pants("LeatherBlue0"),
stats: (
protection: Normal(10.0)),
)
),
quality: Low,
)

BIN
assets/voxygen/voxel/armor/back/leather_blue-0.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/chest/leather_blue-0.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/pants/leather_blue-0.vox (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -36,5 +36,9 @@
vox_spec: ("armor.back.velorite_battlemage", (-5.0, -1.0, -14.0)), vox_spec: ("armor.back.velorite_battlemage", (-5.0, -1.0, -14.0)),
color: None color: None
), ),
"LeatherBlue0": (
vox_spec: ("armor.back.leather_blue-0", (-5.0, -1.0, -11.0)),
color: None
),
}, },
)) ))

View File

@ -48,6 +48,10 @@
vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)), vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"LeatherBlue0": (
vox_spec: ("armor.chest.leather_blue-0", (-7.0, -3.5, 2.0)),
color: None
),
"ClothPurple0": ( "ClothPurple0": (
vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)), vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)),
color: None color: None

View File

@ -104,5 +104,9 @@
vox_spec: ("armor.pants.velorite_battlemage", (-6.0, -3.5, -2.0)), vox_spec: ("armor.pants.velorite_battlemage", (-6.0, -3.5, -2.0)),
color: None color: None
), ),
"LeatherBlue0": (
vox_spec: ("armor.pants.leather_blue-0", (-5.0, -3.5, 1.0)),
color: None
),
}, },
)) ))

View File

@ -45,8 +45,8 @@ impl Entity {
]).choose(&mut rng).unwrap()); ]).choose(&mut rng).unwrap());
let back = match rng.gen_range(0, 3) { let back = match rng.gen_range(0, 3) {
0 => Some(comp::Item::new_from_asset_expect("common.items.armor.back.leather_adventurer")), 0 => Some(comp::Item::new_from_asset_expect("common.items.npc_armor.back.leather_blue_0")),
1 => Some(comp::Item::new_from_asset_expect("common.items.armor.back.backpack_0")), 1 => Some(comp::Item::new_from_asset_expect("common.items.npc_armor.back.backpack_0")),
_ => None, _ => None,
}; };
@ -56,9 +56,16 @@ impl Entity {
_ => Some(comp::Item::new_from_asset_expect("common.items.lantern.red_0")), _ => Some(comp::Item::new_from_asset_expect("common.items.lantern.red_0")),
}; };
let chest = Some(comp::Item::new_from_asset_expect("common.items.npc_armor.chest.leather_blue_0"));
let pants = Some(comp::Item::new_from_asset_expect("common.items.npc_armor.pants.leather_blue_0"));
let shoulder = Some(comp::Item::new_from_asset_expect("common.items.armor.shoulder.leather_0"));
LoadoutBuilder::build_loadout(self.get_body(), comp::Alignment::Npc, Some(main_tool), false) LoadoutBuilder::build_loadout(self.get_body(), comp::Alignment::Npc, Some(main_tool), false)
.back(back) .back(back)
.lantern(lantern) .lantern(lantern)
.chest(chest)
.pants(pants)
.shoulder(shoulder)
.build() .build()
} }