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

Allowed staff AI to queue shockwave if occupied by animation

Browse Source
This commit is contained in:
Knightress Paladin 2021-07-21 17:56:51 -07:00
parent 38432cc880
commit e87bfae5cd
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/src/sys/agent.rs
View File

@ -2445,14 +2445,30 @@ impl<'a> AgentData<'a> {
) { ) {
//TODO: minimum energy values for skills and rolls are hard coded from //TODO: minimum energy values for skills and rolls are hard coded from
// approximate guesses // approximate guesses
let mut flamethrower_range = 20.0_f32;
if let Ok(Some(level)) = self.skill_set.skill_level(Skill::Staff(StaffSkill::FRange)) {
flamethrower_range *= 1.25_f32.powi(level.into());
}
let mut shockwave_cost = 600.0_f32;
if let Ok(Some(level)) = self.skill_set.skill_level(Skill::Staff(StaffSkill::SCost)) {
shockwave_cost *= 0.8_f32.powi(level.into());
}
if self.body.map(|b| b.is_humanoid()).unwrap_or(false) if self.body.map(|b| b.is_humanoid()).unwrap_or(false)
&& attack_data.in_min_range() && attack_data.in_min_range()
&& self.energy.current() > 100 && self.energy.current() > 100
&& !matches!(self.char_state, CharacterState::Shockwave(_))
{ {
// if a humanoid, have enough stamina, and in melee range, emergency roll // if a humanoid, have enough stamina, and in melee range, emergency roll
controller controller
.actions .actions
.push(ControlAction::basic_input(InputKind::Roll)); .push(ControlAction::basic_input(InputKind::Roll));
} else if agent.action_state.condition
&& matches!(self.char_state, CharacterState::Wielding)
{
controller
.actions
.push(ControlAction::basic_input(InputKind::Ability(0)));
agent.action_state.condition = false;
} else if !matches!(self.char_state, CharacterState::Shockwave(c) if !matches!(c.stage_section, StageSection::Recover)) } else if !matches!(self.char_state, CharacterState::Shockwave(c) if !matches!(c.stage_section, StageSection::Recover))
{ {
// only try to use another ability if not already in recover and not casting // only try to use another ability if not already in recover and not casting
@ -2470,10 +2486,16 @@ impl<'a> AgentData<'a> {
&& self.energy.current() > 200 && self.energy.current() > 200
{ {
// if enemy is closing distance quickly, use shockwave to knock back // if enemy is closing distance quickly, use shockwave to knock back
if matches!(self.char_state, CharacterState::Wielding) {
controller controller
.actions .actions
.push(ControlAction::basic_input(InputKind::Ability(0))); .push(ControlAction::basic_input(InputKind::Ability(0)));
} else if self.energy.current() > 100 && attack_data.dist_sqrd < 280.0 { } else {
agent.action_state.condition = true;
}
} else if self.energy.current() as f32 > shockwave_cost + 100.0
&& attack_data.dist_sqrd < flamethrower_range.powi(2)
{
controller controller
.actions .actions
.push(ControlAction::basic_input(InputKind::Secondary)); .push(ControlAction::basic_input(InputKind::Secondary));