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

Merge branch 'slipped/movetweak' into 'master'

Browse Source 
strafe side speed tweak

See merge request veloren/veloren!2492
This commit is contained in:
Justin Shipsey
2021-06-23 02:48:38 +00:00
parent 8356e2ffca 81aaf30d00
commit 16633cc3ec
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/states/utils.rs
View File

@ -15,9 +15,11 @@ use crate::{
util::Dir, util::Dir,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::time::Duration; use std::{
ops::{Add, Div},
time::Duration,
};
use vek::*; use vek::*;
pub const MOVEMENT_THRESHOLD_VEL: f32 = 3.0; pub const MOVEMENT_THRESHOLD_VEL: f32 = 3.0;
impl Body { impl Body {
@ -219,7 +221,7 @@ impl Body {
/// Returns how well a body can move backwards while strafing (0.0 = not at /// Returns how well a body can move backwards while strafing (0.0 = not at
/// all, 1.0 = same as forward) /// all, 1.0 = same as forward)
pub fn reverse_move_factor(&self) -> f32 { 0.5 } pub fn reverse_move_factor(&self) -> f32 { 0.45 }
} }
/// Handles updating `Components` to move player based on state of `JoinData` /// Handles updating `Components` to move player based on state of `JoinData`
@ -266,7 +268,14 @@ fn basic_move(data: &JoinData, update: &mut StateUpdate, efficiency: f32) {
Vec2::from(update.ori) Vec2::from(update.ori)
.try_normalized() .try_normalized()
.unwrap_or_else(Vec2::zero) .unwrap_or_else(Vec2::zero)
.dot(data.inputs.move_dir) .dot(
data.inputs
.move_dir
.try_normalized()
.unwrap_or_else(Vec2::zero),
)
.add(1.0)
.div(2.0)
.max(0.0), .max(0.0),
1.0, 1.0,
data.body.reverse_move_factor(), data.body.reverse_move_factor(),