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

Create 'push_cancel_input' function

Browse Source
This commit is contained in:
Dr. Dystopia 2022-01-26 20:15:40 +01:00
parent b2b208687c
commit a1a9c0f4f2
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/lib.rs
View File

@ -1290,7 +1290,7 @@ impl Client {
select_pos,
});
} else {
self.control_action(ControlAction::CancelInput(input));
self.push_cancel_input(input);
}
}

4
common/src/comp/controller.rs
View File

@ -285,6 +285,10 @@ impl Controller {
pub fn push_basic_input(&mut self, input: InputKind) {
self.push_action(ControlAction::basic_input(input));
}
pub fn push_cancel_input(&mut self, input: InputKind) {
self.push_action(ControlAction::CancelInput(input));
}
}
impl Component for Controller {

4
server/src/sys/agent.rs
View File

@ -739,7 +739,7 @@ impl<'a> AgentData<'a> {
{
controller.push_basic_input(InputKind::Fly);
} else {
controller.push_action(ControlAction::CancelInput(InputKind::Fly))
controller.push_cancel_input(InputKind::Fly)
}
if let Some((bearing, speed)) = agent.chaser.chase(
@ -2276,7 +2276,7 @@ impl<'a> AgentData<'a> {
if condition {
controller.push_basic_input(InputKind::Jump);
} else {
controller.push_action(ControlAction::CancelInput(InputKind::Jump))
controller.push_cancel_input(InputKind::Jump)
}
}

8
server/src/sys/agent/attack.rs
View File

@ -64,7 +64,7 @@ impl<'a> AgentData<'a> {
if attack_data.in_min_range() && attack_data.angle < 45.0 {
controller.inputs.move_dir = Vec2::zero();
if agent.action_state.timer > 5.0 {
controller.push_action(ControlAction::CancelInput(InputKind::Secondary));
controller.push_cancel_input(InputKind::Secondary);
agent.action_state.timer = 0.0;
} else if agent.action_state.timer > 2.5 && has_energy(10.0) {
controller.push_basic_input(InputKind::Secondary);
@ -124,7 +124,7 @@ impl<'a> AgentData<'a> {
if attack_data.in_min_range() && attack_data.angle < 45.0 {
controller.inputs.move_dir = Vec2::zero();
if agent.action_state.timer > 4.0 {
controller.push_action(ControlAction::CancelInput(InputKind::Secondary));
controller.push_cancel_input(InputKind::Secondary);
agent.action_state.timer = 0.0;
} else if agent.action_state.timer > 3.0 {
controller.push_basic_input(InputKind::Secondary);
@ -830,7 +830,7 @@ impl<'a> AgentData<'a> {
&& attack_data.dist_sqrd < (1.5 * attack_data.min_attack_dist).powi(2)
{
if agent.action_state.timer > 4.0 {
controller.push_action(ControlAction::CancelInput(InputKind::Primary));
controller.push_cancel_input(InputKind::Primary);
agent.action_state.timer = 0.0;
} else if agent.action_state.timer > 1.0 {
controller.push_basic_input(InputKind::Primary);
@ -1335,7 +1335,7 @@ impl<'a> AgentData<'a> {
rng: &mut impl Rng,
) {
// Set fly to false
controller.push_action(ControlAction::CancelInput(InputKind::Fly));
controller.push_cancel_input(InputKind::Fly);
if attack_data.dist_sqrd > 30.0_f32.powi(2) {
if rng.gen_bool(0.05)
&& can_see_tgt(