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

Slight balance tweaks.

Browse Source
This commit is contained in:
Sam 2020-11-08 19:27:44 -06:00
parent 7aa3de35c9
commit 9b0e1c8dfc
3 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/src/comp/inventory/item/tool.rs
View File

@ -179,27 +179,27 @@ impl Tool {
stage_data: vec![ stage_data: vec![
combo_melee::Stage { combo_melee::Stage {
stage: 1, stage: 1,
base_damage: (80.0 * self.base_power()) as u32, base_damage: (90.0 * self.base_power()) as u32,
max_damage: (120.0 * self.base_power()) as u32, max_damage: (110.0 * self.base_power()) as u32,
damage_increase: (10.0 * self.base_power()) as u32, damage_increase: (10.0 * self.base_power()) as u32,
knockback: 8.0, knockback: 8.0,
range: 3.5, range: 3.5,
angle: 50.0, angle: 50.0,
base_buildup_duration: Duration::from_millis(350), base_buildup_duration: Duration::from_millis(350),
base_swing_duration: Duration::from_millis(75), //75 base_swing_duration: Duration::from_millis(75),
base_recover_duration: Duration::from_millis(400), base_recover_duration: Duration::from_millis(400),
forward_movement: 0.5, forward_movement: 0.5,
}, },
combo_melee::Stage { combo_melee::Stage {
stage: 2, stage: 2,
base_damage: (100.0 * self.base_power()) as u32, base_damage: (130.0 * self.base_power()) as u32,
max_damage: (190.0 * self.base_power()) as u32, max_damage: (160.0 * self.base_power()) as u32,
damage_increase: (15.0 * self.base_power()) as u32, damage_increase: (15.0 * self.base_power()) as u32,
knockback: 12.0, knockback: 12.0,
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
base_buildup_duration: Duration::from_millis(500), base_buildup_duration: Duration::from_millis(500),
base_swing_duration: Duration::from_millis(100), //75 base_swing_duration: Duration::from_millis(100),
base_recover_duration: Duration::from_millis(500), base_recover_duration: Duration::from_millis(500),
forward_movement: 0.25, forward_movement: 0.25,
}, },
@ -209,7 +209,7 @@ impl Tool {
energy_increase: 20, energy_increase: 20,
speed_increase: 0.05, speed_increase: 0.05,
max_speed_increase: 1.6, max_speed_increase: 1.6,
is_interruptible: true, is_interruptible: false,
}, },
SpinMelee { SpinMelee {
buildup_duration: Duration::from_millis(100), buildup_duration: Duration::from_millis(100),
@ -243,8 +243,8 @@ impl Tool {
ComboMelee { ComboMelee {
stage_data: vec![combo_melee::Stage { stage_data: vec![combo_melee::Stage {
stage: 1, stage: 1,
base_damage: (80.0 * self.base_power()) as u32, base_damage: (120.0 * self.base_power()) as u32,
max_damage: (120.0 * self.base_power()) as u32, max_damage: (150.0 * self.base_power()) as u32,
damage_increase: (10.0 * self.base_power()) as u32, damage_increase: (10.0 * self.base_power()) as u32,
knockback: 8.0, knockback: 8.0,
range: 3.5, range: 3.5,
@ -259,7 +259,7 @@ impl Tool {
energy_increase: 20, energy_increase: 20,
speed_increase: 0.05, speed_increase: 0.05,
max_speed_increase: 1.4, max_speed_increase: 1.4,
is_interruptible: true, is_interruptible: false,
}, },
ChargedMelee { ChargedMelee {
energy_cost: 1, energy_cost: 1,
@ -479,7 +479,7 @@ impl Tool {
}), }),
projectile_gravity: Some(Gravity(0.5)), projectile_gravity: Some(Gravity(0.5)),
projectile_speed: 40.0, projectile_speed: 40.0,
can_continue: true, can_continue: false,
}, },
], ],
Staff => vec![ Staff => vec![

3
common/src/states/combo_melee.rs
View File

@ -98,7 +98,8 @@ impl CharacterBehavior for Data {
} }
} }
let speed_modifer = 1.0 + self.static_data.max_speed_increase let speed_modifer = 1.0
+ self.static_data.max_speed_increase
* (1.0 - self.static_data.speed_increase.powi(self.combo as i32)); * (1.0 - self.static_data.speed_increase.powi(self.combo as i32));
match self.stage_section { match self.stage_section {

9
voxygen/src/scene/figure/mod.rs
View File

@ -1134,12 +1134,8 @@ impl FigureMgr {
}, },
CharacterState::ComboMelee(s) => { CharacterState::ComboMelee(s) => {
let stage_index = (s.stage - 1) as usize; let stage_index = (s.stage - 1) as usize;
let stage_progress = match active_tool_kind {
Some(_) => {
let stage_time = s.timer.as_secs_f64(); let stage_time = s.timer.as_secs_f64();
//let stage_progress = match s.stage_section { let stage_progress = match s.stage_section {
match s.stage_section {
StageSection::Buildup => { StageSection::Buildup => {
stage_time stage_time
/ s.static_data.stage_data[stage_index] / s.static_data.stage_data[stage_index]
@ -1159,9 +1155,6 @@ impl FigureMgr {
.as_secs_f64() .as_secs_f64()
}, },
_ => 0.0, _ => 0.0,
}
},
None => state.state_time,
}; };
match s.stage { match s.stage {
1 => anim::character::AlphaAnimation::update_skeleton( 1 => anim::character::AlphaAnimation::update_skeleton(