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

ori fixes

Browse Source
This commit is contained in:
jshipsey 2021-04-24 15:20:26 -04:00
parent 991ccf0033
commit c01fd86f44
13 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/states/basic_aura.rs
View File

@ -49,6 +49,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, 0.8); handle_move(data, &mut update, 0.8);
handle_jump(data, &mut update, 1.0); handle_jump(data, &mut update, 1.0);

1
common/src/states/basic_beam.rs
View File

@ -68,6 +68,7 @@ impl CharacterBehavior for Data {
}, },
} }
handle_orientation(data, &mut update, 0.3);
handle_move(data, &mut update, 0.4); handle_move(data, &mut update, 0.4);
handle_jump(data, &mut update, 1.0); handle_jump(data, &mut update, 1.0);

1
common/src/states/basic_ranged.rs
View File

@ -42,6 +42,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, 0.3); handle_move(data, &mut update, 0.3);
handle_jump(data, &mut update, 1.0); handle_jump(data, &mut update, 1.0);

1
common/src/states/charged_melee.rs
View File

@ -66,6 +66,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, 0.7); handle_move(data, &mut update, 0.7);
handle_jump(data, &mut update, 1.0); handle_jump(data, &mut update, 1.0);

1
common/src/states/charged_ranged.rs
View File

@ -65,6 +65,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, self.static_data.move_speed); handle_move(data, &mut update, self.static_data.move_speed);
handle_jump(data, &mut update, 1.0); handle_jump(data, &mut update, 1.0);

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

@ -119,8 +119,8 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 0.65);
handle_move(data, &mut update, 0.6); handle_move(data, &mut update, 0.6);
handle_orientation(data, &mut update, 0.2);
let stage_index = (self.stage - 1) as usize; let stage_index = (self.stage - 1) as usize;

1
common/src/states/equipping.rs
View File

@ -26,6 +26,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, 1.0); handle_move(data, &mut update, 1.0);
handle_jump(data, &mut update, 1.0); handle_jump(data, &mut update, 1.0);

1
common/src/states/idle.rs
View File

@ -10,6 +10,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, 1.0); handle_move(data, &mut update, 1.0);
handle_jump(data, &mut update, 1.0); handle_jump(data, &mut update, 1.0);
handle_wield(data, &mut update); handle_wield(data, &mut update);

1
common/src/states/shockwave.rs
View File

@ -59,6 +59,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, self.static_data.move_efficiency); handle_move(data, &mut update, self.static_data.move_efficiency);
match self.stage_section { match self.stage_section {

1
common/src/states/sneak.rs
View File

@ -10,6 +10,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, 0.4); handle_move(data, &mut update, 0.4);
handle_jump(data, &mut update, 1.0); handle_jump(data, &mut update, 1.0);
handle_wield(data, &mut update); handle_wield(data, &mut update);

1
common/src/states/stunned.rs
View File

@ -36,6 +36,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, self.static_data.movement_speed); handle_move(data, &mut update, self.static_data.movement_speed);
match self.stage_section { match self.stage_section {

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

@ -245,7 +245,6 @@ pub fn handle_move(data: &JoinData, update: &mut StateUpdate, efficiency: f32) {
/// Updates components to move player as if theyre on ground or in air /// Updates components to move player as if theyre on ground or in air
#[allow(clippy::assign_op_pattern)] // TODO: Pending review in #587 #[allow(clippy::assign_op_pattern)] // TODO: Pending review in #587
fn basic_move(data: &JoinData, update: &mut StateUpdate, efficiency: f32) { fn basic_move(data: &JoinData, update: &mut StateUpdate, efficiency: f32) {
handle_orientation(data, update, 1.0);
let accel = if data.physics.on_ground { let accel = if data.physics.on_ground {
data.body.base_accel() data.body.base_accel()

1
common/src/states/wielding.rs
View File

@ -13,6 +13,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate { fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data); let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(&data, &mut update, 1.0); handle_move(&data, &mut update, 1.0);
handle_climb(&data, &mut update); handle_climb(&data, &mut update);
attempt_input(&data, &mut update); attempt_input(&data, &mut update);