Only shoot at enemies in LOS

zeta-group · Jan 17, 2025 · acff086 · acff086
1 parent fe4108e
commit acff086
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/ZScript.zs b/ZScript.zs
@@ -910,9 +910,7 @@ class ZTBotController : Actor {
             ZetaCape.MakeFor(other);
         }
 
-        if (CVar.FindCVar("deathmatch").GetInt() > 0) {
-            other.bFRIENDLY = false;
-        }
+        other.bFRIENDLY = CVar.FindCVar("deathmatch").GetInt() == 0;
 
         RespawnReset();
     }
@@ -2518,7 +2516,7 @@ class ZTBotController : Actor {
         let dir = AngleToVector(possessed.angle);
         double ddot = (off.x * dir.x) + (off.y * dir.y);
 
-        if (dDot <= 0) {
+        if (!possessed.CheckSight(enemy) || dDot <= 0) {
             possessed.EndShoot();
         }
 
@@ -2708,6 +2706,10 @@ class ZTBotController : Actor {
                 return true;
             }
 
+            if (potentialCommander.cont == null || potentialCommander.cont.commander == null) {
+                return false;
+            }
+
             let nextCommander = ZetaBotPawn(potentialCommander.cont.commander);
 
             if (potentialCommander == nextCommander) {