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

Added kit for testing tier 4 dungeons.

Browse Source
This commit is contained in:
Sam 2021-04-28 00:32:35 -04:00
parent 164fd0de04
commit 7ac1488181
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
assets/server/manifests/kits.ron
View File

@ -39,5 +39,19 @@
("common.items.consumable.potion_med", 100),
("common.items.consumable.potion_big", 100),
("common.items.food.apple_mushroom_curry", 100),
]
],
"tier-4": [
("common.items.armor.steel.belt", 1),
("common.items.armor.steel.chest", 1),
("common.items.armor.steel.foot", 1),
("common.items.armor.steel.hand", 1),
("common.items.armor.steel.pants", 1),
("common.items.armor.steel.shoulder", 1),
("common.items.weapons.sword.cobalt-0", 1),
("common.items.weapons.axe.cobalt_axe-0", 1),
("common.items.weapons.hammer.cobalt_hammer-0", 1),
("common.items.weapons.bow.frostwood-0", 1),
("common.items.weapons.staff.frostwood_torch", 1),
("common.items.weapons.sceptre.fork0", 1),
],
})

18
common/src/states/charged_melee.rs
View File

@ -204,14 +204,16 @@ impl CharacterBehavior for Data {
.filter(|(_, tool)| tool == &Some(ToolKind::Pick)),
});
// Send local event used for frontend shenanigans
update
.local_events
.push_front(LocalEvent::CreateOutcome(Outcome::Bonk {
pos: data.pos.0
+ *data.ori.look_dir()
* (data.body.radius() + self.static_data.range),
}));
if let Some(FrontendSpecifier::GroundCleave) = self.static_data.specifier {
// Send local event used for frontend shenanigans
update
.local_events
.push_front(LocalEvent::CreateOutcome(Outcome::Bonk {
pos: data.pos.0
+ *data.ori.look_dir()
* (data.body.radius() + self.static_data.range),
}));
}
} else if self.timer < self.static_data.swing_duration {
// Swings
update.character = CharacterState::ChargedMelee(Data {

1
voxygen/src/audio/sfx/event_mapper/combat/tests.rs
View File

@ -79,6 +79,7 @@ fn maps_basic_melee() {
range: 1.0,
max_angle: 1.0,
ability_info: empty_ability_info(),
damage_effect: None,
},
timer: Duration::default(),
stage_section: states::utils::StageSection::Buildup,