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

Various tweaks.

Browse Source
This commit is contained in:
Sam 2021-05-22 12:41:47 -05:00
parent ca6266e780
commit f993f28eff
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/abilities/bow/shotgun.ron
View File

@ -1,10 +1,10 @@
BasicRanged( BasicRanged(
energy_cost: 350, energy_cost: 450,
buildup_duration: 0.4, buildup_duration: 0.4,
recover_duration: 0.3, recover_duration: 0.3,
projectile_spread: 0.05, projectile_spread: 0.05,
projectile: Arrow( projectile: Arrow(
damage: 50.0, damage: 40.0,
knockback: 5.0, knockback: 5.0,
energy_regen: 0, energy_regen: 0,
), ),

2
assets/common/abilities/hammer/leap.ron
View File

@ -1,5 +1,5 @@
LeapMelee( LeapMelee(
energy_cost: 700, energy_cost: 500,
buildup_duration: 0.1, buildup_duration: 0.1,
movement_duration: 0.8, movement_duration: 0.8,
swing_duration: 0.15, swing_duration: 0.15,

1
common/src/cmd.rs
View File

@ -913,7 +913,6 @@ impl ArgumentSpec {
} }
} }
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

15
server/src/cmd.rs
View File

@ -3058,14 +3058,13 @@ fn handle_skill_preset(
fn clear_skillset(skill_set: &mut comp::SkillSet) { *skill_set = comp::SkillSet::default(); } fn clear_skillset(skill_set: &mut comp::SkillSet) { *skill_set = comp::SkillSet::default(); }
fn set_skills(skill_set: &mut comp::SkillSet, preset: &str) -> CmdResult<()> { fn set_skills(skill_set: &mut comp::SkillSet, preset: &str) -> CmdResult<()> {
let presets = let presets = match common::cmd::SkillPresetManifest::load("server.manifests.presets") {
match common::cmd::SkillPresetManifest::load("server.manifests.presets") { Ok(presets) => presets.read().0.clone(),
Ok(presets) => presets.read().0.clone(), Err(err) => {
Err(err) => { warn!("Error in preset: {}", err);
warn!("Error in preset: {}", err); return Err("Error while loading presets".to_owned());
return Err("Error while loading presets".to_owned()); },
}, };
};
if let Some(preset) = presets.get(preset) { if let Some(preset) = presets.get(preset) {
for (skill, level) in preset { for (skill, level) in preset {
let group = if let Some(group) = skill.skill_group_kind() { let group = if let Some(group) = skill.skill_group_kind() {