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

Reorder rocksnapper abilities

Browse Source
This commit is contained in:
James Melkonian 2024-05-12 22:12:03 -07:00
parent 64eac74258
commit dc50f67103
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/common/abilities/ability_set_manifest.ron
View File

@ -536,10 +536,10 @@
abilities: [],
),
Custom("Rocksnapper"): (
primary: Simple(None, "common.abilities.custom.rocksnapper.dash"),
secondary: Simple(None, "common.abilities.custom.rocksnapper.leapshockwave"),
primary: Simple(None, "common.abilities.custom.rocksnapper.triplestrike"),
secondary: Simple(None, "common.abilities.custom.rocksnapper.dash"),
abilities: [
Simple(None, "common.abilities.custom.rocksnapper.triplestrike"),
Simple(None, "common.abilities.custom.rocksnapper.leapshockwave"),
],
),
Custom("Quad Low Beam"): (

15
server/agent/src/attack.rs
View File

@ -4596,7 +4596,6 @@ impl<'a> AgentData<'a> {
TimerRocksnapperDash = 0,
TimerRocksnapperLeap = 1,
}
agent.combat_state.timers[ActionStateTimers::TimerRocksnapperDash as usize] +=
read_data.dt.0;
agent.combat_state.timers[ActionStateTimers::TimerRocksnapperLeap as usize] +=
@ -4604,13 +4603,13 @@ impl<'a> AgentData<'a> {
if matches!(self.char_state, CharacterState::DashMelee(c) if !matches!(c.stage_section, StageSection::Recover))
{
// If already charging, keep charging if not in recover
controller.push_basic_input(InputKind::Primary);
// If already dashing, keep dashing if not in recover stage
controller.push_basic_input(InputKind::Secondary);
} else if agent.combat_state.timers[ActionStateTimers::TimerRocksnapperDash as usize]
> DASH_TIMER
{
// Use dash if timer has gone for long enough
controller.push_basic_input(InputKind::Primary);
controller.push_basic_input(InputKind::Secondary);
if matches!(self.char_state, CharacterState::DashMelee(_)) {
// Resets action counter when using dash
@ -4621,20 +4620,20 @@ impl<'a> AgentData<'a> {
> LEAP_TIMER
{
// Use shockwave if timer has gone for long enough
controller.push_basic_input(InputKind::Secondary);
controller.push_basic_input(InputKind::Ability(0));
if matches!(self.char_state, CharacterState::LeapShockwave(_)) {
// Resets action counter when using leap shockwave
// Resets action timer when using leap shockwave
agent.combat_state.timers[ActionStateTimers::TimerRocksnapperLeap as usize] =
0.0;
}
} else if attack_data.dist_sqrd < MELEE_RANGE.powi(2) {
// Basic attack if in melee range
controller.push_basic_input(InputKind::Ability(0));
controller.push_basic_input(InputKind::Primary);
}
} else if attack_data.dist_sqrd < MELEE_RANGE.powi(2) && attack_data.angle < 135.0 {
// Basic attack if in melee range
controller.push_basic_input(InputKind::Ability(0));
controller.push_basic_input(InputKind::Primary);
}
// Always attempt to path towards target