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

clippy, fmt; renaming some enums

Browse Source
This commit is contained in:
horblegorble 2024-06-23 23:57:21 +10:00
parent 74dcd6b41a
commit 75cf72dd4d
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4791,8 +4791,8 @@ impl<'a> AgentData<'a> {
// conditions // conditions
enum ActionStateConditions { enum ActionStateConditions {
FirstVines = 0, HasSummonedFirstVines = 0,
SecondVines, HasSummonedSecondVines,
} }
// timers // timers
@ -4803,6 +4803,7 @@ impl<'a> AgentData<'a> {
} }
// //counters // //counters
#[allow(clippy::enum_variant_names)]
enum ActionStateCounters { enum ActionStateCounters {
CloseMixupCooldown = 0, CloseMixupCooldown = 0,
MidMixupCooldown, MidMixupCooldown,
@ -4864,24 +4865,27 @@ impl<'a> AgentData<'a> {
let health_fraction = self.health.map_or(0.5, |h| h.fraction()); let health_fraction = self.health.map_or(0.5, |h| h.fraction());
// second vine summon // second vine summon
if health_fraction < SECOND_VINE_CREATION_THRESHOLD if health_fraction < SECOND_VINE_CREATION_THRESHOLD
&& !agent.combat_state.conditions[ActionStateConditions::SecondVines as usize] && !agent.combat_state.conditions
[ActionStateConditions::HasSummonedSecondVines as usize]
{ {
controller.push_basic_input(InputKind::Ability(2)); controller.push_basic_input(InputKind::Ability(2));
// wait till recovery before finishing // wait till recovery before finishing
if matches!(self.char_state, CharacterState::SpriteSummon(c) if matches!(c.stage_section, StageSection::Recover)) if matches!(self.char_state, CharacterState::SpriteSummon(c) if matches!(c.stage_section, StageSection::Recover))
{ {
agent.combat_state.conditions[ActionStateConditions::SecondVines as usize] = true; agent.combat_state.conditions
[ActionStateConditions::HasSummonedSecondVines as usize] = true;
} }
} }
// first vine summon // first vine summon
else if health_fraction < FIRST_VINE_CREATION_THRESHOLD else if health_fraction < FIRST_VINE_CREATION_THRESHOLD
&& !agent.combat_state.conditions[ActionStateConditions::FirstVines as usize] && !agent.combat_state.conditions[ActionStateConditions::HasSummonedFirstVines as usize]
{ {
controller.push_basic_input(InputKind::Ability(1)); controller.push_basic_input(InputKind::Ability(1));
// wait till recovery before finishing // wait till recovery before finishing
if matches!(self.char_state, CharacterState::SpriteSummon(c) if matches!(c.stage_section, StageSection::Recover)) if matches!(self.char_state, CharacterState::SpriteSummon(c) if matches!(c.stage_section, StageSection::Recover))
{ {
agent.combat_state.conditions[ActionStateConditions::FirstVines as usize] = true; agent.combat_state.conditions
[ActionStateConditions::HasSummonedFirstVines as usize] = true;
} }
} }
// close range // close range
@ -6101,7 +6105,7 @@ impl<'a> AgentData<'a> {
// conditions // conditions
enum ActionStateConditions { enum ActionStateConditions {
FirstTotem = 0, HasSummonedFirstTotem = 0,
} }
// timers // timers
@ -6136,7 +6140,8 @@ impl<'a> AgentData<'a> {
CharacterState::BasicSummon(s) if s.stage_section == StageSection::Recover => { CharacterState::BasicSummon(s) if s.stage_section == StageSection::Recover => {
// reset when finished summoning // reset when finished summoning
agent.combat_state.timers[ActionStateTimers::SummonTotem as usize] = 0.0; agent.combat_state.timers[ActionStateTimers::SummonTotem as usize] = 0.0;
agent.combat_state.conditions[ActionStateConditions::FirstTotem as usize] = true; agent.combat_state.conditions
[ActionStateConditions::HasSummonedFirstTotem as usize] = true;
}, },
CharacterState::Shockwave(_) | CharacterState::BasicRanged(_) => { CharacterState::Shockwave(_) | CharacterState::BasicRanged(_) => {
// reset heavy attack on either ability // reset heavy attack on either ability
@ -6168,7 +6173,7 @@ impl<'a> AgentData<'a> {
// --- attacks --- // --- attacks ---
// start by summoning green totem // start by summoning green totem
if !agent.combat_state.conditions[ActionStateConditions::FirstTotem as usize] { if !agent.combat_state.conditions[ActionStateConditions::HasSummonedFirstTotem as usize] {
controller.push_basic_input(InputKind::Ability(2)); controller.push_basic_input(InputKind::Ability(2));
} }
// on timer, summon a new totem // on timer, summon a new totem
@ -6214,10 +6219,11 @@ impl<'a> AgentData<'a> {
controller.push_basic_input(InputKind::Ability(0)); controller.push_basic_input(InputKind::Ability(0));
} }
// randomise in shockwave range // randomise in shockwave range
else if attack_data.dist_sqrd < (SHOCKWAVE_RANGE * SHOCKWAVE_RANGE_FACTOR).powi(2) { else if attack_data.dist_sqrd < (SHOCKWAVE_RANGE * SHOCKWAVE_RANGE_FACTOR).powi(2)
{
let randomise: u8 = rng.gen_range(1..=2); let randomise: u8 = rng.gen_range(1..=2);
match randomise { match randomise {
1 => controller.push_basic_input(InputKind::Secondary), // barrage 1 => controller.push_basic_input(InputKind::Secondary), // barrage
_ => controller.push_basic_input(InputKind::Ability(0)), // shockwave _ => controller.push_basic_input(InputKind::Ability(0)), // shockwave
} }
} }