From 1970c7d2987bca8291f60c64dfddc903047f9327 Mon Sep 17 00:00:00 2001
From: ineedbots <ineedbots@outlook.com>
Date: Sat, 29 May 2021 12:18:28 -0600
Subject: [PATCH] jug radar

---
 maps/mp/bots/_bot.gsc |  31 +++++++++
 scripts/bots_test.gsc | 153 ------------------------------------------
 2 files changed, 31 insertions(+), 153 deletions(-)

diff --git a/maps/mp/bots/_bot.gsc b/maps/mp/bots/_bot.gsc
index 5be289b..d80a2a1 100644
--- a/maps/mp/bots/_bot.gsc
+++ b/maps/mp/bots/_bot.gsc
@@ -389,6 +389,37 @@ watchRadar_loop()
 			player.bot_isInRadar = true;
 		}
 	}
+
+	for ( i = level.players.size - 1; i >= 0; i-- )
+	{
+		if ( !isDefined( level.players[i].personalRadar ) )
+			continue;
+
+		if (!isReallyAlive(level.players[i]))
+			continue;
+
+		for ( h = level.players.size - 1; h >= 0; h-- )
+		{
+			player = level.players[h];
+
+			if (!isReallyAlive(player))
+				continue;
+
+			if (level.players[i] == player)
+				continue;
+
+			if(level.teamBased && level.players[i].team == player.team)
+				continue;
+
+			if (player _hasPerk("specialty_coldblooded"))
+				continue;
+
+			if (DistanceSquared(player.origin, level.players[i].origin) > 256*256)
+				continue;
+
+			player.bot_isInRadar = true;
+		}
+	}
 }
 
 /*
diff --git a/scripts/bots_test.gsc b/scripts/bots_test.gsc
index 555deec..845c3ed 100644
--- a/scripts/bots_test.gsc
+++ b/scripts/bots_test.gsc
@@ -5,8 +5,6 @@
 
 init()
 {
-	thread tester();
-
 	setDvarIfUninitialized( "bots_test", true );
 
 	if (!getDvarInt("bots_test"))
@@ -15,157 +13,6 @@ init()
 	level thread onConnected();
 }
 
-tester()
-{
-	wait 0.5;
-
-	// regression
-	a = 801;
-	if (a <= -800)
-		a = 800;
-
-	print(a); // 801
-
-	// regression
-	dir = "yo";
-	r = 3;
-
-	j = 0;
-	while (j < 24)
-	{
-		a = 9;
-		j++;
-	}
-
-	b = 2;
-
-	print(dir); // yo
-	print(r); // 3
-
-
-
-	// test arg passing
-	e = spawnStruct();
-	e.a = 4;
-	f = ::test_func;
-
-	[[f]](e, 4); // test_func 4 4
-	print(e.a); // 5
-
-	test_func2(::test_func3, "hi"); // hi
-
-	e.b = ::test_func3;
-	[[e.b]]("ahaha"); // ahaha
-
-
-
-
-
-	callbacksort = undefined;
-	y = 0;
-
-	switch ("kek")
-	{
-		case "lol":
-				print("FUCKKKKKKKK");
-			break;
-		case "kek":
-			print("HAHAHAHAHAAH");
-			break;
-	}
-	
-	switch(randomInt(3))
-	{
-		case 0:
-			callbacksort = ::test_func;
-			y = 1;
-		break;
-		case 1:
-			callbacksort = ::test_func2;
-			y = 1;
-		break;
-		case 2:
-			callbacksort = ::test_func3;
-			y = 1;
-		break;
-	}
-	
-	print(isDefined(callbacksort) + " " + y); // 1 1
-
-
-	// test heap sorting
-	sort = NewHeap(::ReverseHeap);
-	sort HeapInsert(3);
-	sort HeapInsert(4);
-	sort HeapInsert(1);
-	sort HeapInsert(3);
-	sort HeapInsert(87);
-	sort HeapInsert(-123);
-	sort HeapInsert(0);
-
-	str = "";
-
-	while (sort.data.size)
-	{
-		str += sort.data[0] + ", ";
-		sort HeapRemove();
-	}
-
-	print(str); // -123, 0, 1, 3, 3, 4, 87, 
-
-
-	thread await();
-	level waittill("aaaa", aa, bb, cc, dd);
-	print(aa + " " + bb + " " + cc + " " + dd); // 1 2 3 4
-
-
-	new_arr[0] = true;
-	print(new_arr[0]); // 1
-
-
-
-	level tet(); // OK
-
-
-	level tet2(); // 0
-}
-
-tet2(a)
-{
-	print(isDefined(a));
-}
-
-tet()
-{
-	arr = [];
-
-	arr[0] = self;
-
-	print("OK");
-}
-
-await()
-{
-	wait 0.5;
-	level notify("aaaa", 1, 2, 3, "4");
-}
-
-test_func(a, b)
-{
-	print("test_func " + b + " " + a.a);
-	a.a += 1;
-}
-
-test_func2(a, b)
-{
-	[[a]](b);
-}
-
-test_func3(a)
-{
-	print(a);
-}
-
 onConnected()
 {
 	for (;;)