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

Final fixes.

Browse Source
This commit is contained in:
Sam 2021-11-11 23:11:17 -05:00
parent f65c89862c
commit 040d70c750
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2517,25 +2517,6 @@ impl<'a> AgentData<'a> {
extract_ability(AbilityInput::Secondary),
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 {
CharacterAbility::BasicBeam { range, .. } => range,
_ => 20.0_f32,

2
voxygen/src/hud/util.rs
View File

@ -374,7 +374,7 @@ pub fn ability_description(ability_id: &str) -> (&str, &str) {
for a short amount of time.",
),
_ => (
"Ability as no title",
"Ability has no title",
"\n\
Ability has no description."
),