diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index dfb76abe25..5032e520a2 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -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), + ], }) diff --git a/common/src/states/charged_melee.rs b/common/src/states/charged_melee.rs index 6dab18b9d4..718220b91b 100644 --- a/common/src/states/charged_melee.rs +++ b/common/src/states/charged_melee.rs @@ -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 { diff --git a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs index 0247bf85c3..35cb0f7c24 100644 --- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs +++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs @@ -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,