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

Make GliderAux(_) always available

Browse Source
This commit is contained in:
juliancoffee 2024-03-05 17:42:05 +02:00
parent 18a26731d3
commit 1e6c35dab7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/comp/ability.rs
View File

@ -261,10 +261,7 @@ impl ActiveAbilities {
AbilitySource::Weapons => inst_ability(EquipSlot::ActiveOffhand, true),
AbilitySource::Glider => None,
},
Ability::GliderAux(_) => match source {
AbilitySource::Weapons => None,
AbilitySource::Glider => inst_ability(EquipSlot::Glider, false),
},
Ability::GliderAux(_) => inst_ability(EquipSlot::Glider, false),
Ability::Empty => None,
Ability::SpeciesMovement => matches!(body, Some(Body::Humanoid(_)))
.then(|| CharacterAbility::default_roll(char_state))
@ -493,7 +490,7 @@ impl Ability {
Ability::SpeciesMovement => None, // TODO: Make not None
Ability::MainWeaponAux(_) => inst_ability(EquipSlot::ActiveMainhand),
Ability::OffWeaponAux(_) => inst_ability(EquipSlot::ActiveOffhand),
Ability::GliderAux(_) => None,
Ability::GliderAux(_) => inst_ability(EquipSlot::Glider),
Ability::Empty => None,
},
}
@ -591,7 +588,7 @@ impl SpecifiedAbility {
Ability::SpeciesMovement => None, // TODO: Make not None
Ability::MainWeaponAux(_) => inst_ability(EquipSlot::ActiveMainhand),
Ability::OffWeaponAux(_) => inst_ability(EquipSlot::ActiveOffhand),
Ability::GliderAux(_) => None,
Ability::GliderAux(_) => inst_ability(EquipSlot::Glider),
Ability::Empty => None,
},
}