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

Addressed round 3 of feedback (no assets).

Browse Source
This commit is contained in:
Sam 2022-05-09 08:49:15 -04:00
parent 13ea6dee93
commit 5d0ba6e2b8
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1004,7 +1004,7 @@ impl CharacterAbility {
}| {
// Do we want to make buff_strength affect this instead of power?
// Look into during modular weapon transition
*strength *= stats.buff_strength;
*strength *= stats.buff_strength * stats.power;
},
);
*range *= stats.range;
@ -1046,7 +1046,7 @@ impl CharacterAbility {
} => {
// Do we want to make buff_strength affect this instead of power?
// Look into during modular weapon transition
*buff_strength *= stats.buff_strength;
*buff_strength *= stats.buff_strength * stats.power;
*buildup_duration /= stats.speed;
*cast_duration /= stats.speed;
*recover_duration /= stats.speed;

35
common/src/comp/inventory/item/item_key.rs
View File

@ -37,29 +37,18 @@ impl<T: ItemDesc> From<&T> for ItemKey {
},
ItemDefinitionId::Compound { .. } => ItemKey::Empty,
},
ItemKind::ModularComponent(mod_comp) => {
use modular::ModularComponent;
match mod_comp {
ModularComponent::ToolPrimaryComponent { .. } => {
if let ItemDefinitionId::Simple(id) = item_definition_id {
match modular::weapon_component_to_key(id, item_desc.components()) {
Ok(key) => ItemKey::ModularWeaponComponent(key),
// TODO: Maybe use a different ItemKey?
Err(_) => ItemKey::Tool(id.to_owned()),
}
} else {
ItemKey::Empty
}
},
ModularComponent::ToolSecondaryComponent { .. } => {
if let ItemDefinitionId::Simple(id) = item_definition_id {
// TODO: Maybe use a different ItemKey?
ItemKey::Tool(id.to_owned())
} else {
ItemKey::Empty
}
},
}
ItemKind::ModularComponent(_) => match item_definition_id {
ItemDefinitionId::Simple(id) => ItemKey::Tool(id.to_owned()),
ItemDefinitionId::Compound { simple_base, .. } => {
if let Ok(key) =
modular::weapon_component_to_key(simple_base, item_desc.components())
{
ItemKey::ModularWeaponComponent(key)
} else {
ItemKey::Tool(simple_base.to_owned())
}
},
ItemDefinitionId::Modular { .. } => ItemKey::Empty,
},
ItemKind::Lantern(Lantern { kind, .. }) => ItemKey::Lantern(kind.clone()),
ItemKind::Glider(Glider { kind, .. }) => ItemKey::Glider(kind.clone()),