From 5b10f583bbb213b99f5dbb39923272c64fd439b9 Mon Sep 17 00:00:00 2001
From: ChocoTaco <boldfilter@zoho.com>
Date: Tue, 22 Jan 2019 14:41:49 -0500
Subject: [PATCH] Improved Flag waypoints

---
 Classic/scripts/LakRabbitGame.cs | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Classic/scripts/LakRabbitGame.cs b/Classic/scripts/LakRabbitGame.cs
index de08c8d..161671e 100644
--- a/Classic/scripts/LakRabbitGame.cs
+++ b/Classic/scripts/LakRabbitGame.cs
@@ -19,6 +19,7 @@
 // v3.33 January 2019
 // Took out slap headshot.
 // Added footnotes for voting references with evo admin mod.
+// An improved Flag-Waypoint
 //
 // v3.32 December 2018
 // Fixed an issue with lak vote items in the Evo Admin Votemenu
@@ -158,14 +159,17 @@ function Flag::objectiveInit(%data, %flag)
    }
    
    // create a waypoint to the flag's starting place
-   %flagWaypoint = new WayPoint()
+   if( $Host::ShowFlagIcon == 0 )
    {
-      position = %flag.position;
-      rotation = "1 0 0 0";
-      name = "Flag Home";
-      dataBlock = "WayPointMarker";
-      team = $NonRabbitTeam;
-   };
+		%flagWaypoint = new WayPoint()
+		{
+			position = %flag.position;
+			rotation = "1 0 0 0";
+			name = "Flag Home";
+			dataBlock = "WayPointMarker";
+			team = $NonRabbitTeam;
+		};
+   }
 
    $AIRabbitFlag = %flag;
 
@@ -1528,7 +1532,7 @@ function LakRabbitGame::playerDroppedFlag(%game, %player)
    // ilys -- remove flag icon from player
    if($Host::ShowFlagIcon == 1 || $Host::ShowFlagIcon == 2)
    {
-      setTargetSensorGroup(%flag.getTarget(), $NonRabbitTeam);
+      setTargetSensorGroup(%flag.getTarget(), $Observer);
       %player.scopeWhenSensorVisible(false);
       %target = %player.getTarget();
       setTargetRenderMask(%target, getTargetRenderMask(%target) & ~0x2);
@@ -1690,11 +1694,11 @@ function LakRabbitGame::playerTouchFlag(%game, %player, %flag)
       // ilys -- add flag icon to player
       if($Host::ShowFlagIcon == 1 || $Host::ShowFlagIcon == 2)
       {
-         setTargetSensorGroup(%flag.getTarget(), $RabbitTeam);
-         %player.scopeWhenSensorVisible(true);
-         %target = %player.getTarget();
-         setTargetRenderMask(%target, getTargetRenderMask(%target) | 0x2);
-         setTargetAlwaysVisMask(%target, 0x7);
+         //setTargetSensorGroup(%flag.getTarget(), $RabbitTeam);
+         //%player.scopeWhenSensorVisible(true);
+         //%target = %player.getTarget();
+         //setTargetRenderMask(%target, getTargetRenderMask(%target) | 0x2);
+         //setTargetAlwaysVisMask(%target, 0x7);
       }
       %flag.isHome = false;
       $flagStatus = %client.name;