Merge pull request #22 from DrakiaXYZ/3.8.0

3.8.0
DrakiaXYZ · Apr 8, 2024 · ba2ae66 · ba2ae66
2 parents 952972c + e2c03bf
commit ba2ae66
Show file tree

Hide file tree

Showing 32 changed files with 365 additions and 97,395 deletions.
diff --git a/BrainLogic/RoamingLayer.cs b/BrainLogic/RoamingLayer.cs
diff --git a/BrainLogic/RoamingLogic.cs b/BrainLogic/RoamingLogic.cs
diff --git a/Components/BotZoneDebugComponent.cs b/Components/BotZoneDebugComponent.cs
@@ -1,10 +1,14 @@
-using Comfort.Common;
+using Aki.Reflection.Utils;
+using Comfort.Common;
 using DrakiaXYZ.Waypoints.Helpers;
 using EFT;
 using EFT.Game.Spawning;
+using HarmonyLib;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using UnityEngine;
 
 namespace DrakiaXYZ.Waypoints.Components
@@ -58,54 +62,58 @@ private void createSpawnPointObjects()
 
         private void createBotZoneObjects()
         {
-            foreach (BotZone botZone in botZones)
-            {
-                Console.WriteLine($"Drawing BotZone {botZone.NameZone}");
-                Console.WriteLine($"BushPoints (Green): {botZone.BushPoints.Length}");
-                Console.WriteLine($"CoverPoints (Blue): {botZone.CoverPoints.Length}");
-                Console.WriteLine($"AmbushPoints (Red): {botZone.AmbushPoints.Length}");
-                Console.WriteLine($"PatrolWays: {botZone.PatrolWays.Length}");
-                foreach (PatrolWay patrol in botZone.PatrolWays)
-                {
-                    Console.WriteLine($"    {patrol.name}");
-                }
+            var botGame = Singleton<IBotGame>.Instance;
+            var pointsList = botGame.BotsController.CoversData.Points;
 
-                // Bushpoints are green
-                foreach (CustomNavigationPoint bushPoint in botZone.BushPoints)
-                {
-                    gameObjects.Add(GameObjectHelper.drawSphere(bushPoint.Position, 0.5f, Color.green));
-                }
+            var BushCovers = pointsList.Where(x => x.CoverType == CoverType.Foliage);
+            var WallCovers = pointsList.Where(x => x.CoverType == CoverType.Wall);
+            var ShootCovers = WallCovers.Where(x => x.PointWithNeighborType == PointWithNeighborType.cover || x.PointWithNeighborType == PointWithNeighborType.both);
+            var AmbushCovers = WallCovers.Where(x => x.PointWithNeighborType == PointWithNeighborType.ambush);
 
-                // Coverpoints are blue
-                var coverPoints = botZone.CoverPoints;
-                foreach (CustomNavigationPoint coverPoint in coverPoints)
-                {
-                    gameObjects.Add(GameObjectHelper.drawSphere(coverPoint.Position, 0.5f, Color.blue));
-                }
+            Console.WriteLine($"BushCovers (Green): {BushCovers.Count()}");
+            Console.WriteLine($"WallCovers (Blue): {WallCovers.Count()}");
+            Console.WriteLine($"ShootCovers (Cyan): {ShootCovers.Count()}");
+            Console.WriteLine($"AmbushCovers (Red): {AmbushCovers.Count()}");
 
-                // Ambushpoints are red
-                var ambushPoints = botZone.AmbushPoints;
-                foreach (CustomNavigationPoint ambushPoint in ambushPoints)
-                {
-                    gameObjects.Add(GameObjectHelper.drawSphere(ambushPoint.Position, 0.5f, Color.red));
-                }
+            // BushCovers are green
+            foreach (var point in BushCovers)
+            {
+                gameObjects.Add(GameObjectHelper.drawSphere(point.Position, 0.5f, Color.green));
+            }
 
-                // Patrol points are yellow
-                var patrolWays = botZone.PatrolWays;
-                foreach (PatrolWay patrolWay in patrolWays)
-                {
-                    foreach (PatrolPoint patrolPoint in patrolWay.Points)
-                    {
-                        gameObjects.Add(GameObjectHelper.drawSphere(patrolPoint.Position, 0.5f, Color.yellow));
-
-                        //// Sub-points are purple
-                        //foreach (PatrolPoint subPoint in patrolPoint.subPoints)
-                        //{
-                        //    gameObjects.Add(GameObjectHelper.drawSphere(subPoint.Position, 0.25f, Color.magenta));
-                        //}
-                    }
-                }
+            // WallCovers are blue
+            foreach (var point in WallCovers)
+            {
+                gameObjects.Add(GameObjectHelper.drawSphere(point.Position, 0.5f, Color.blue));
+            }
+
+            // ShootCovers are cyan
+            foreach (var point in ShootCovers)
+            {
+                gameObjects.Add(GameObjectHelper.drawSphere(point.Position, 0.5f, Color.cyan));
             }
+
+            // Ambushpoints are red
+            foreach (var point in AmbushCovers)
+            {
+                gameObjects.Add(GameObjectHelper.drawSphere(point.Position, 0.5f, Color.red));
+            }
+
+            //// Patrol points are yellow
+            //var patrolWays = botZone.PatrolWays;
+            //foreach (PatrolWay patrolWay in patrolWays)
+            //{
+            //    foreach (PatrolPoint patrolPoint in patrolWay.Points)
+            //    {
+            //        gameObjects.Add(GameObjectHelper.drawSphere(patrolPoint.Position, 0.5f, Color.yellow));
+
+            //        //// Sub-points are purple
+            //        //foreach (PatrolPoint subPoint in patrolPoint.subPoints)
+            //        //{
+            //        //    gameObjects.Add(GameObjectHelper.drawSphere(subPoint.Position, 0.25f, Color.magenta));
+            //        //}
+            //    }
+            //}
         }
 
         private void CachePoints(bool forced)