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

Mindflayer summons husks instead of dogs now

Browse Source
This commit is contained in:
Sam 2021-03-24 12:18:49 -04:00
parent 71b847cabb
commit 50e832b6d0
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/common/abilities/unique/mindflayer/summonminions.ron
View File

@ -4,13 +4,13 @@ BasicSummon(
recover_duration: 0.5,
summon_amount: 2,
summon_info: (
body: QuadrupedMedium((
species: Darkhound,
body: BipedSmall((
species: Husk,
body_type: Male,
)),
scale: Some((2.0)),
scale: None,
health_scaling: 30,
loadout_config: None,
loadout_config: Some(Husk),
skillset_config: None,
),
)

2
assets/voxygen/voxel/biped_weapon_manifest.ron
View File

@ -969,7 +969,7 @@
vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)),
color: None
),
"common.items.npc_weapons.empty.empty": (
"common.items.npc_weapons.unique.quadmedbasic": (
vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)),
color: None
),

5
common/src/comp/inventory/loadout_builder.rs
View File

@ -309,6 +309,11 @@ impl LoadoutBuilder {
"common.items.npc_weapons.biped_small.adlet.gnoll_staff",
));
},
(biped_small::Species::Husk, _) => {
main_tool = Some(Item::new_from_asset_expect(
"common.items.npc_weapons.unique.quadmedbasic",
));
},
_ => {
main_tool = Some(Item::new_from_asset_expect(
"common.items.npc_weapons.biped_small.adlet.wooden_spear",

12
common/src/states/basic_summon.rs
View File

@ -78,12 +78,6 @@ impl CharacterBehavior for Data {
{
let body = self.static_data.summon_info.body;
let mut stats = comp::Stats::new("Summon".to_string());
stats.skill_set = SkillSetBuilder::build_skillset(
&None,
self.static_data.summon_info.skillset_config,
)
.build();
let loadout = LoadoutBuilder::build_loadout(
body,
None,
@ -91,6 +85,12 @@ impl CharacterBehavior for Data {
None,
)
.build();
let mut stats = comp::Stats::new("Summon".to_string());
stats.skill_set = SkillSetBuilder::build_skillset(
&None,
self.static_data.summon_info.skillset_config,
)
.build();
update.server_events.push_front(ServerEvent::CreateNpc {
pos: *data.pos,