From ef38d9778f8b2cf978338b594a5a0348aa6bbf9f Mon Sep 17 00:00:00 2001
From: James Melkonian <jemelkonian@gmail.com>
Date: Mon, 19 Apr 2021 12:13:43 -0700
Subject: [PATCH] Fix bow AI

---
 server/src/sys/agent.rs | 47 ++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs
index dda1368df2..b9f8c98add 100644
--- a/server/src/sys/agent.rs
+++ b/server/src/sys/agent.rs
@@ -14,10 +14,10 @@ use common::{
             Item, ItemDesc, ItemKind,
         },
         skills::{AxeSkill, BowSkill, HammerSkill, Skill, StaffSkill, SwordSkill},
-        Agent, Alignment, BehaviorCapability, BehaviorState, Body, CharacterState, ControlAction,
-        ControlEvent, Controller, Energy, Health, HealthChange, InputKind, Inventory,
-        InventoryAction, LightEmitter, MountState, Ori, PhysicsState, Pos, Scale, SkillSet, Stats,
-        UnresolvedChatMsg, Vel,
+        Agent, Alignment, BehaviorCapability, BehaviorState, Body, CharacterAbility,
+        CharacterState, ControlAction, ControlEvent, Controller, Energy, Health, HealthChange,
+        InputKind, Inventory, InventoryAction, LightEmitter, MountState, Ori, PhysicsState, Pos,
+        Scale, SkillSet, Stats, UnresolvedChatMsg, Vel,
     },
     effect::{BuffEffect, Effect},
     event::{Emitter, EventBus, ServerEvent},
@@ -1805,12 +1805,39 @@ impl<'a> AgentData<'a> {
                 }
             },
             Tactic::Bow => {
-                if self.body.map(|b| b.is_humanoid()).unwrap_or(false)
-                    && dist_sqrd < (2.0 * min_attack_dist).powi(2)
-                {
-                    controller
-                        .actions
-                        .push(ControlAction::basic_input(InputKind::Roll));
+                if dist_sqrd < (2.0 * min_attack_dist).powi(2) {
+                    if self.body.map(|b| b.is_humanoid()).unwrap_or(false)
+                        && self.energy.current()
+                            > CharacterAbility::default_roll().get_energy_cost()
+                    {
+                        controller
+                            .actions
+                            .push(ControlAction::basic_input(InputKind::Roll));
+                    } else {
+                        if let Some((bearing, speed)) = agent.chaser.chase(
+                            &*terrain,
+                            self.pos.0,
+                            self.vel.0,
+                            // Away from the target (ironically)
+                            self.pos.0
+                                + (self.pos.0 - tgt_pos.0)
+                                    .try_normalized()
+                                    .unwrap_or_else(Vec3::unit_y)
+                                    * 50.0,
+                            TraversalConfig {
+                                min_tgt_dist: 1.25,
+                                ..self.traversal_config
+                            },
+                        ) {
+                            controller.inputs.move_dir =
+                                bearing.xy().try_normalized().unwrap_or_else(Vec2::zero) * speed;
+                            self.jump_if(controller, bearing.z > 1.5);
+                            controller.inputs.move_z = bearing.z;
+                        }
+                        controller
+                            .actions
+                            .push(ControlAction::basic_input(InputKind::Primary));
+                    }
                 } else if dist_sqrd < MAX_CHASE_DIST.powi(2) {
                     if let Some((bearing, speed)) = agent.chaser.chase(
                         &*terrain,