Range ruler activation polishing

Author: Sandrem

Assets/Scripts/Model/Actions/Actions.cs

@@ -26,8 +26,6 @@ public static bool AssignTargetLockToPair(Ship.GenericShip thisShip, Ship.Generi
 
         if (Letters.Count == 0) InitializeTargetLockLetters();
 
-        MovementTemplates.ShowRange(thisShip, targetShip);
-
         if (GetRange(thisShip, targetShip) < 4)
         {
             Tokens.GenericToken existingBlueToken = thisShip.GetToken(typeof(Tokens.BlueTargetLockToken), '*');
@@ -124,7 +122,7 @@ public static bool InArcCheck(Ship.GenericShip thisShip, Ship.GenericShip anothe
                 Vector3 vectorToTarget = objAnother.Value - objThis.Value;
                 float angle = Vector3.Angle(vectorToTarget, vectorFacing);
                 //Debug.Log ("Angle between " + objThis.Key + " and " + objAnother.Key + " is: " + angle.ToString ());
-                MovementTemplates.ShowFiringArcRange(thisShip, anotherShip);
+
                 if (angle <= 40)
                 {
                     inArc = true;
@@ -221,7 +219,7 @@ public static void DeclareTarget()
         //check is target available for attack
 
         bool inArc = InArcCheck(Selection.ThisShip, Selection.AnotherShip);
-        int distance = GetFiringRangeAndShow(Selection.ThisShip, Selection.AnotherShip);
+        int distance = GetFiringRange(Selection.ThisShip, Selection.AnotherShip);
         int attackTypesAreAvailable = Selection.ThisShip.GetAttackTypes(distance, inArc);
 
         if (attackTypesAreAvailable > 1)
@@ -243,10 +241,12 @@ public static void DeclareTarget()
     public static void TryPerformAttack()
     {
         Game.UI.HideContextMenu();
+        MovementTemplates.ReturnRangeRuler();
+
         //TODO: CheckShot is needed before
         if (TargetIsLegal())
         {
-            Board.ShowFiringLine(Selection.ThisShip, Selection.AnotherShip);
+            Board.LaunchObstacleChecker(Selection.ThisShip, Selection.AnotherShip);
             //Call later "Combat.PerformAttack(Selection.ThisShip, Selection.AnotherShip);"
         }
         else

Assets/Scripts/Model/Phases/SubPhases/CombatSubPhase.cs

@@ -132,6 +132,7 @@ public override bool AnotherShipCanBeSelected(Ship.GenericShip targetShip)
             {
                 if (targetShip.Owner.PlayerNo != Phases.CurrentSubPhase.RequiredPlayer)
                 {
+                    MovementTemplates.ShowFiringArcRange(Selection.ThisShip, targetShip);
                     result = true;
                 }
                 else

Assets/Scripts/Model/Phases/SubPhases/Temporary/SelectTargetSubPhase.cs

@@ -36,12 +36,14 @@ public override bool AnotherShipCanBeSelected(Ship.GenericShip anotherShip)
 
             if (anotherShip.Owner.PlayerNo != Phases.CurrentSubPhase.RequiredPlayer)
             {
+                MovementTemplates.ShowRange(Selection.ThisShip, anotherShip);
                 if (!Actions.AssignTargetLockToPair(Selection.ThisShip, anotherShip))
                 {
                     Selection.ThisShip.RemoveAlreadyExecutedAction(typeof(ActionsList.TargetLockAction));
                     Phases.CurrentSubPhase = PreviousSubPhase;
                     Roster.AllShipsHighlightOff();
                     UpdateHelpInfo();
+
                     Actions.ShowActionsPanel();
                     return false;
                 }

Assets/Scripts/View/Board/Board.cs

@@ -108,7 +108,7 @@ public static Vector3 GetShotVectorToTarget(Ship.GenericShip thisShip, Ship.Gene
         return vectorToTarget;
     }
 
-    public static void ShowFiringLine(Ship.GenericShip thisShip, Ship.GenericShip anotherShip)
+    public static void LaunchObstacleChecker(Ship.GenericShip thisShip, Ship.GenericShip anotherShip)
     {
         FiringLineCollisions = new List<Collider>();
 

Assets/Scripts/View/Board/MovementTemplates.cs

@@ -17,7 +17,6 @@ public static class MovementTemplates {
     static MovementTemplates()
     {
         Game = GameObject.Find("GameManager").GetComponent<GameManagerScript>();
-        Actions.OnCheckTargetIsLegal += CallShowRange;
         Templates = Game.PrefabsList.RulersHolderTransform;
     }
 
@@ -95,11 +94,6 @@ public static void HideLastMovementRuler(){
 		CurrentTemplate.eulerAngles = savedRulerRotation;
 	}
 
-    public static void CallShowRange(ref bool result, Ship.GenericShip thisShip, Ship.GenericShip anotherShip)
-    {
-        ShowRange(thisShip, anotherShip);
-    }
-
     public static void ShowRange(Ship.GenericShip thisShip, Ship.GenericShip anotherShip)
     {
         Vector3 vectorToTarget = thisShip.GetClosestEdgesTo(anotherShip)["another"] - thisShip.GetClosestEdgesTo(anotherShip)["this"];
@@ -112,6 +106,7 @@ public static void ShowFiringArcRange(Ship.GenericShip thisShip, Ship.GenericShi
         Vector3 closestEdge = thisShip.GetClosestFiringEdgesTo(anotherShip)["this"];
         Vector3 vectorToTarget = Board.GetShotVectorToTarget(thisShip, anotherShip);
         ShowRangeRuler(closestEdge, vectorToTarget);
+        if (!Actions.InArcCheck(thisShip, anotherShip)) Messages.ShowError("Out of arc");
     }
 
     public static void ShowRangeRuler(Vector3 position, Vector3 direction)