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

More weapon and hit box tweaks

Browse Source
This commit is contained in:
Silentium2318 2020-07-02 23:12:42 -04:00 committed by Sam
parent 1de40154c7
commit 1c40218de9
5 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ impl Tool {
recover_duration: Duration::from_millis(300),
base_healthchange: (-120.0 * self.base_power()) as i32,
range: 3.5,
max_angle: 60.0,
max_angle: 20.0,
},
LeapMelee {
energy_cost: 800,
@ -157,8 +157,8 @@ impl Tool {
buildup_duration: Duration::from_millis(700),
recover_duration: Duration::from_millis(150),
base_healthchange: (-50.0 * self.base_power()) as i32,
range: 3.0,
max_angle: 15.0,
range: 3.5,
max_angle: 20.0,
}],
Bow(_) => vec![
BasicRanged {
@ -202,7 +202,7 @@ impl Tool {
recover_duration: Duration::from_millis(400),
base_healthchange: (-50.0 * self.base_power()) as i32,
range: 3.5,
max_angle: 60.0,
max_angle: 20.0,
},
DashMelee {
energy_cost: 700,
@ -219,8 +219,8 @@ impl Tool {
buildup_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(300),
base_healthchange: (-10.0 * self.base_power()) as i32,
range: 10.0,
max_angle: 45.0,
range: 5.0,
max_angle: 20.0,
},
BasicMelee {
energy_cost: 350,
@ -238,8 +238,8 @@ impl Tool {
buildup_duration: Duration::from_millis(100),
recover_duration: Duration::from_millis(300),
base_healthchange: (-40.0 * self.base_power()) as i32,
range: 10.0,
max_angle: 45.0,
range: 3.5,
max_angle: 20.0,
},
BasicRanged {
energy_cost: 0,
@ -348,8 +348,8 @@ impl Tool {
buildup_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(1000),
base_healthchange: -20,
range: 5.0,
max_angle: 60.0,
range: 3.5,
max_angle: 15.0,
}],
}
}

2
common/src/loadout_builder.rs
View File

@ -73,7 +73,7 @@ impl LoadoutBuilder {
recover_duration: Duration::from_millis(100),
base_healthchange: -(body.base_dmg() as i32),
range: body.base_range(),
max_angle: 80.0,
max_angle: 20.0,
}),
ability2: None,
ability3: None,

2
common/src/states/dash_melee.rs
View File

@ -57,7 +57,7 @@ impl CharacterBehavior for Data {
data.updater.insert(data.entity, Attacking {
base_healthchange: -(self.base_damage as i32),
range: 3.5,
max_angle: 180_f32.to_radians(),
max_angle: 45_f32.to_radians(),
applied: false,
hit_count: 0,
knockback: 0.0,

10
common/src/states/triple_strike.rs
View File

@ -121,11 +121,7 @@ impl CharacterBehavior for Data {
// Move player forward while in first third of each stage
if update.vel.0.magnitude_squared() < BASE_SPEED.powf(2.0) {
update.vel.0 += data.dt.0
* (if data.physics.on_ground {
Vec3::new(0.0, 0.0, 500.0) // Jump upwards if on ground
} else {
Vec3::one()
} + adjusted_accel * Vec3::from(data.ori.0.xy()));
* ( adjusted_accel * Vec3::from(data.ori.0.xy()));
let mag2 = update.vel.0.magnitude_squared();
if mag2 > BASE_SPEED.powf(2.0) {
update.vel.0 = update.vel.0.normalized() * BASE_SPEED;
@ -149,10 +145,10 @@ impl CharacterBehavior for Data {
data.updater.insert(data.entity, Attacking {
base_healthchange: -(dmg as i32),
range: 3.5,
max_angle: 180_f32.to_radians(),
max_angle: 45_f32.to_radians(),
applied: false,
hit_count: 0,
knockback: 16.0,
knockback: 10.0,
});
CharacterState::TripleStrike(Data {

6
server/src/sys/terrain.rs
View File

@ -137,9 +137,9 @@ impl<'a> System<'a> for Sys {
energy_cost: 0,
buildup_duration: Duration::from_millis(0),
recover_duration: Duration::from_millis(400),
base_healthchange: -60,
range: 5.0,
max_angle: 80.0,
base_healthchange: -40,
range: 3.5,
max_angle: 15.0,
}),
ability2: None,
ability3: None,