Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2025-07-25 04:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed aimbot from ChargeMelee and cleaned up variable typing

Browse Source
This commit is contained in:
Knightress Paladin
2021-07-16 13:12:26 -07:00
parent 081c6e5362
commit a97546dbff
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,9 +271,7 @@ impl<'a> System<'a> for Sys {
let event_emitter = event_bus.emitter(); let event_emitter = event_bus.emitter();
if !matches!(char_state, CharacterState::LeapMelee(_)) if !matches!(char_state, CharacterState::LeapMelee(_)) {
| !matches!(char_state, CharacterState::ChargedMelee(_))
{
// Default to looking in orientation direction // Default to looking in orientation direction
// (can be overridden below) // (can be overridden below)
// //
@ -2653,32 +2651,33 @@ impl<'a> AgentData<'a> {
radius: u32, radius: u32,
circle_time: u32, circle_time: u32,
) { ) {
if agent.action_state.timer >= circle_time as f32 { if agent.action_state.counter >= circle_time as f32 {
// if circle charge is in progress and time hasn't expired, continue charging // if circle charge is in progress and time hasn't expired, continue charging
controller controller
.actions .actions
.push(ControlAction::basic_input(InputKind::Secondary)); .push(ControlAction::basic_input(InputKind::Secondary));
} }
if attack_data.in_min_range() { if attack_data.in_min_range() {
// set timer and counter to zero if in minimum range if agent.action_state.counter > 0.0 {
agent.action_state.timer = 0.0; // set timer and rotation counter to zero if in minimum range
agent.action_state.counter = 0.0; agent.action_state.counter = 0.0;
if thread_rng().gen_bool(0.5) { agent.action_state.int_counter = 0;
// choose whether to melee attack } else {
// melee attack
controller controller
.actions .actions
.push(ControlAction::basic_input(InputKind::Primary)); .push(ControlAction::basic_input(InputKind::Primary));
controller.inputs.move_dir = Vec2::zero(); controller.inputs.move_dir = Vec2::zero();
} }
} else if attack_data.dist_sqrd < (radius as f32 * attack_data.min_attack_dist).powi(2) { } else if attack_data.dist_sqrd < (radius as f32 + attack_data.min_attack_dist).powi(2) {
// if in range to charge, circle, then charge // if in range to charge, circle, then charge
if agent.action_state.timer == 0.0 { if agent.action_state.int_counter == 0 {
// if you haven't chosen a direction to go in, choose now // if you haven't chosen a direction to go in, choose now
agent.action_state.counter = 1.0 + thread_rng().gen_bool(0.5) as i32 as f32; agent.action_state.int_counter = 1 + thread_rng().gen_bool(0.5) as u8;
} }
if agent.action_state.timer < circle_time as f32 { if agent.action_state.counter < circle_time as f32 {
// circle if circle timer not ready // circle if circle timer not ready
let move_dir = match agent.action_state.counter as i32 { let move_dir = match agent.action_state.int_counter {
1 => 1 =>
// circle left if counter is 1 // circle left if counter is 1
{ {
@ -2715,10 +2714,11 @@ impl<'a> AgentData<'a> {
.map_or(true, |b| b.is_some()); .map_or(true, |b| b.is_some());
if obstacle { if obstacle {
// if obstacle detected, stop circling // if obstacle detected, stop circling
agent.action_state.timer = circle_time as f32; agent.action_state.counter = circle_time as f32;
} }
controller.inputs.move_dir = move_dir; controller.inputs.move_dir = move_dir;
agent.action_state.timer += read_data.dt.0; // use counter as timer since timer may be modified in other parts of the code
agent.action_state.counter += read_data.dt.0;
} }
// activating charge once circle timer expires is handled above // activating charge once circle timer expires is handled above
} else if attack_data.dist_sqrd < MAX_PATH_DIST.powi(2) { } else if attack_data.dist_sqrd < MAX_PATH_DIST.powi(2) {