mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Final fixes.
This commit is contained in:
parent
f65c89862c
commit
040d70c750
@ -2517,25 +2517,6 @@ impl<'a> AgentData<'a> {
|
|||||||
extract_ability(AbilityInput::Secondary),
|
extract_ability(AbilityInput::Secondary),
|
||||||
extract_ability(AbilityInput::Auxiliary(0)),
|
extract_ability(AbilityInput::Auxiliary(0)),
|
||||||
);
|
);
|
||||||
// self
|
|
||||||
// .inventory
|
|
||||||
// .equipped(EquipSlot::ActiveMainhand)
|
|
||||||
// .map(|i| &i.item_config_expect().abilities)
|
|
||||||
// .map(|a| {
|
|
||||||
// (
|
|
||||||
// Some(a.secondary.clone()),
|
|
||||||
// a.abilities.get(0).map(|(_, s)| s),
|
|
||||||
// )
|
|
||||||
// })
|
|
||||||
// .map_or(
|
|
||||||
// (CharacterAbility::default(), CharacterAbility::default()),
|
|
||||||
// |(s, a)| {
|
|
||||||
// (
|
|
||||||
// extract_ability(&s.unwrap_or_default()),
|
|
||||||
// extract_ability(a.unwrap_or(&CharacterAbility::default())),
|
|
||||||
// )
|
|
||||||
// },
|
|
||||||
// );
|
|
||||||
let flamethrower_range = match flamethrower {
|
let flamethrower_range = match flamethrower {
|
||||||
CharacterAbility::BasicBeam { range, .. } => range,
|
CharacterAbility::BasicBeam { range, .. } => range,
|
||||||
_ => 20.0_f32,
|
_ => 20.0_f32,
|
||||||
|
@ -374,7 +374,7 @@ pub fn ability_description(ability_id: &str) -> (&str, &str) {
|
|||||||
for a short amount of time.",
|
for a short amount of time.",
|
||||||
),
|
),
|
||||||
_ => (
|
_ => (
|
||||||
"Ability as no title",
|
"Ability has no title",
|
||||||
"\n\
|
"\n\
|
||||||
Ability has no description."
|
Ability has no description."
|
||||||
),
|
),
|
||||||
|
Loading…
Reference in New Issue
Block a user