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

Entities will now attempt to orient towards the sprite they are interacting with.

Browse Source
This commit is contained in:
Sam 2021-08-29 19:23:34 -04:00
parent 42a0dd785b
commit 9e5744f3ee
24 changed files with 59 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -67,7 +67,7 @@ impl CharacterBehavior for Data {
let ori_rate = self.static_data.ori_rate;
handle_orientation(data, &mut update, ori_rate);
handle_orientation(data, &mut update, ori_rate, None);
handle_move(data, &mut update, 0.4);
handle_jump(data, &mut update, 1.0);

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

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

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

@ -56,10 +56,9 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_orientation(data, &mut update, 1.0, None);
handle_move(data, &mut update, 0.7);
handle_jump(data, &mut update, 1.0);
handle_orientation(data, &mut update, 0.35);
match self.stage_section {
StageSection::Buildup => {

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

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

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

@ -37,7 +37,7 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_orientation(data, &mut update, 1.0, None);
match self.stage_section {
StageSection::Buildup => {

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

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

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

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

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

@ -175,7 +175,12 @@ impl CharacterBehavior for Data {
match self.stage_section {
StageSection::Buildup => {
if self.timer < self.static_data.stage_data[stage_index].base_buildup_duration {
handle_orientation(data, &mut update, 0.4 * self.static_data.ori_modifier);
handle_orientation(
data,
&mut update,
0.4 * self.static_data.ori_modifier,
None,
);
// Build up
update.character = CharacterState::ComboMelee(Data {
@ -289,7 +294,12 @@ impl CharacterBehavior for Data {
});
} else if self.timer < self.static_data.stage_data[stage_index].base_swing_duration
{
handle_orientation(data, &mut update, 0.4 * self.static_data.ori_modifier);
handle_orientation(
data,
&mut update,
0.4 * self.static_data.ori_modifier,
None,
);
// Forward movement
handle_forced_movement(data, &mut update, ForcedMovement::Forward {
@ -314,7 +324,12 @@ impl CharacterBehavior for Data {
},
StageSection::Recover => {
if self.timer < self.static_data.stage_data[stage_index].base_recover_duration {
handle_orientation(data, &mut update, 0.8 * self.static_data.ori_modifier);
handle_orientation(
data,
&mut update,
0.8 * self.static_data.ori_modifier,
None,
);
// Recovers
update.character = CharacterState::ComboMelee(Data {
static_data: self.static_data.clone(),

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

@ -82,7 +82,7 @@ impl CharacterBehavior for Data {
match self.stage_section {
StageSection::Buildup => {
if self.timer < self.static_data.buildup_duration {
handle_orientation(data, &mut update, 1.0);
handle_orientation(data, &mut update, 1.0, None);
// Build up
update.character = CharacterState::DashMelee(Data {
timer: tick_attack_or_default(data, self.timer, None),
@ -109,7 +109,7 @@ impl CharacterBehavior for Data {
/ self.static_data.charge_duration.as_secs_f32())
.min(1.0);
handle_orientation(data, &mut update, self.static_data.ori_modifier);
handle_orientation(data, &mut update, self.static_data.ori_modifier, None);
handle_forced_movement(data, &mut update, ForcedMovement::Forward {
strength: self.static_data.forward_speed * charge_frac.sqrt(),
});

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

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

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

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

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

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

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

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

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

@ -54,7 +54,7 @@ pub struct Data {
impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_orientation(data, &mut update, 1.0, None);
handle_move(data, &mut update, 0.3);
match self.stage_section {

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

@ -54,7 +54,7 @@ impl CharacterBehavior for Data {
update.should_strafe = false;
// Smooth orientation
handle_orientation(data, &mut update, 2.5);
handle_orientation(data, &mut update, 2.5, None);
match self.stage_section {
StageSection::Buildup => {

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

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

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

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

6
common/src/states/sprite_interact.rs
View File

@ -4,6 +4,7 @@ use crate::{
event::ServerEvent,
states::behavior::{CharacterBehavior, JoinData},
terrain::SpriteKind,
util::Dir,
};
use serde::{Deserialize, Serialize};
use std::time::Duration;
@ -43,7 +44,10 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 0.0);
let ori_dir = Dir::from_unnormalized(Vec3::from(
(self.static_data.sprite_pos.map(|x| x as f32) - data.pos.0).xy(),
));
handle_orientation(data, &mut update, 1.0, ori_dir);
handle_move(data, &mut update, 0.0);
match self.stage_section {

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

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

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

@ -15,7 +15,7 @@ impl CharacterBehavior for Data {
let mut update = StateUpdate::from(data);
handle_wield(data, &mut update);
handle_orientation(data, &mut update, TURN_RATE);
handle_orientation(data, &mut update, TURN_RATE, None);
update
}

4
common/src/states/use_item.rs
View File

@ -52,11 +52,11 @@ impl CharacterBehavior for Data {
match self.static_data.item_kind {
ItemUseKind::Consumable(ConsumableKind::Drink) => {
handle_orientation(data, &mut update, 1.0);
handle_orientation(data, &mut update, 1.0, None);
handle_move(data, &mut update, 1.0);
},
ItemUseKind::Consumable(ConsumableKind::Food | ConsumableKind::ComplexFood) => {
handle_orientation(data, &mut update, 0.0);
handle_orientation(data, &mut update, 0.0, None);
handle_move(data, &mut update, 0.0);
},
}

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

@ -349,11 +349,18 @@ pub fn handle_forced_movement(
}
}
pub fn handle_orientation(data: &JoinData<'_>, update: &mut StateUpdate, efficiency: f32) {
let dir = (is_strafing(data, update) || update.character.is_attack())
.then(|| data.inputs.look_dir.to_horizontal().unwrap_or_default())
.or_else(|| Dir::from_unnormalized(data.inputs.move_dir.into()))
.unwrap_or_else(|| data.ori.to_horizontal().look_dir());
pub fn handle_orientation(
data: &JoinData<'_>,
update: &mut StateUpdate,
efficiency: f32,
dir_override: Option<Dir>,
) {
let dir = dir_override.unwrap_or_else(||
(is_strafing(data, update) || update.character.is_attack())
.then(|| data.inputs.look_dir.to_horizontal().unwrap_or_default())
.or_else(|| Dir::from_unnormalized(data.inputs.move_dir.into()))
.unwrap_or_else(|| data.ori.to_horizontal().look_dir()),
);
let rate = {
let angle = update.ori.look_dir().angle_between(*dir);
data.body.base_ori_rate() * efficiency * std::f32::consts::PI / angle
@ -422,7 +429,7 @@ pub fn fly_move(data: &JoinData<'_>, update: &mut StateUpdate, efficiency: f32)
let thrust = efficiency * force;
let accel = thrust / data.mass.0;
handle_orientation(data, update, efficiency);
handle_orientation(data, update, efficiency, None);
// Elevation control
match data.body {

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

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