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

Remove the dependency of the new mindflayer AI on action_state.timer.

Browse Source
This commit is contained in:
Avi Weinstock 2021-05-09 21:16:57 -04:00
parent 1ae105125d
commit abcb6f34a3
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/abilities/custom/mindflayer/necroticsphere.ron
View File

@ -7,10 +7,6 @@ BasicRanged(
radius: 5.0, radius: 5.0,
), ),
projectile_body: Object(FireworkPurple), projectile_body: Object(FireworkPurple),
/*projectile_light: Some(LightEmitter {
col: (1.0, 0.75, 0.11).into(),
..Default::default()
}),*/
projectile_speed: 100.0, projectile_speed: 100.0,
) )

4
assets/common/abilities/staff/firebomb.ron
View File

@ -8,9 +8,5 @@ BasicRanged(
energy_regen: 50, energy_regen: 50,
), ),
projectile_body: Object(BoltFire), projectile_body: Object(BoltFire),
/*projectile_light: Some(LightEmitter {
col: (1.0, 0.75, 0.11).into(),
..Default::default()
}),*/
projectile_speed: 60.0, projectile_speed: 60.0,
) )

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

@ -3003,10 +3003,6 @@ impl<'a> AgentData<'a> {
agent.action_state.counter = 1.0 - MINION_SUMMON_THRESHOLD; agent.action_state.counter = 1.0 - MINION_SUMMON_THRESHOLD;
agent.action_state.condition = true; agent.action_state.condition = true;
} }
agent.action_state.timer = (agent.action_state.timer - read_data.dt.0 as f32).max(0.0);
if agent.action_state.timer > 0.0 {
return;
}
let mindflayer_is_far = attack_data.dist_sqrd > MINDFLAYER_ATTACK_DIST.powi(2); let mindflayer_is_far = attack_data.dist_sqrd > MINDFLAYER_ATTACK_DIST.powi(2);
if agent.action_state.counter > health_fraction { if agent.action_state.counter > health_fraction {
// Summon minions at particular thresholds of health // Summon minions at particular thresholds of health
@ -3018,18 +3014,11 @@ impl<'a> AgentData<'a> {
{ {
agent.action_state.counter -= MINION_SUMMON_THRESHOLD; agent.action_state.counter -= MINION_SUMMON_THRESHOLD;
} }
} else if matches!(
self.char_state,
CharacterState::BasicSummon(_) | CharacterState::Blink(_)
) {
// Deliberately do nothing here to prevent overwriting summon/blink
// state with another input
} else if mindflayer_is_far { } else if mindflayer_is_far {
// If too far from target, throw a random number of necrotic spheres at them and // If too far from target, throw a random number of necrotic spheres at them and
// then blink to them. // then blink to them.
let num_fireballs = &mut agent.action_state.int_counter; let num_fireballs = &mut agent.action_state.int_counter;
if *num_fireballs == 0 { if *num_fireballs == 0 {
*num_fireballs = rand::random::<u8>() % 4;
controller.actions.push(ControlAction::StartInput { controller.actions.push(ControlAction::StartInput {
input: InputKind::Ability(0), input: InputKind::Ability(0),
target_entity: agent target_entity: agent
@ -3039,7 +3028,10 @@ impl<'a> AgentData<'a> {
.copied(), .copied(),
select_pos: None, select_pos: None,
}); });
} else { if matches!(self.char_state, CharacterState::Blink(_)) {
*num_fireballs = rand::random::<u8>() % 4;
}
} else if matches!(self.char_state, CharacterState::Wielding) {
*num_fireballs -= 1; *num_fireballs -= 1;
controller.actions.push(ControlAction::StartInput { controller.actions.push(ControlAction::StartInput {
input: InputKind::Ability(1), input: InputKind::Ability(1),
@ -3051,7 +3043,6 @@ impl<'a> AgentData<'a> {
select_pos: None, select_pos: None,
}); });
} }
agent.action_state.timer = 0.1;
} else { } else {
// If close to target, use either primary or secondary ability // If close to target, use either primary or secondary ability
if matches!(self.char_state, CharacterState::BasicBeam(c) if c.timer < Duration::from_secs(10) && !matches!(c.stage_section, StageSection::Recover)) if matches!(self.char_state, CharacterState::BasicBeam(c) if c.timer < Duration::from_secs(10) && !matches!(c.stage_section, StageSection::Recover))