From 6fa16f12ac61a3e86c03deff5d3cb0ab2a8d9cb9 Mon Sep 17 00:00:00 2001
From: Krzysztof Rudnicki <krzysztofrudnicki0@gmail.com>
Date: Mon, 23 May 2022 17:55:37 +0200
Subject: [PATCH] fix: fix formation

---
 theProject/Assets/Scripts/Formation.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/theProject/Assets/Scripts/Formation.cs b/theProject/Assets/Scripts/Formation.cs
index 269b7a7e..3d08ee73 100644
--- a/theProject/Assets/Scripts/Formation.cs
+++ b/theProject/Assets/Scripts/Formation.cs
@@ -2,24 +2,24 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
+
 public class Formation : MonoBehaviour
 {
     [SerializeField] Squad squad;
 
     void Awake()
     {
-        this.squad = squad.GetComponent(typeof(Squad));
+        this.squad = squad.GetComponent<Squad>();
     }
 
-    public Dictionary<Soldier, Vector2Int> calculatePositions(Vector2int coordinates)
+    public Dictionary<Entity, Vector2Int> calculatePositions(Vector2Int coordinates)
     {
-        List<Soldier> soldiers = this.squad.getSoldiers();
-        Dictionary<Soldier, Vector2Int> soldierNewCoordinate = new Dictionary<Soldier, Vector2Int>();
+        List<Entity> soldiers = this.squad.GetSoldiers();
+        Dictionary<Entity, Vector2Int> soldierNewCoordinate = new Dictionary<Entity, Vector2Int>();
         int soldierNumber = 0;
-        foreach (Soldier soldier in soldiers)
+        foreach (Entity Entity in soldiers)
         {
-            soldierNewCoordinate.Add(soldier, calculateSoldierCoordinates(soldierNumber, coordinates));
-            MoveSoldierS(x, y, soldierNewCoordinate.Item1, soldierNewCoordinate.Item2);
+            soldierNewCoordinate.Add(Entity, calculateSoldierCoordinates(soldierNumber, coordinates));
         }
         return soldierNewCoordinate;
     }
@@ -28,8 +28,8 @@ public class Formation : MonoBehaviour
     private Vector2Int calculateSoldierCoordinates(in int soldierNumber, in Vector2Int coordinates)
     {
         // Horizontal line we change x
-        Vector2Int coordinates = new Vector2Int(coordinates.Item1 + soldierNumber,  coordinates.Item1);
-        return coordinates;
+        Vector2Int soldierCoordinates = new Vector2Int(coordinates.x + soldierNumber,  coordinates.y);
+        return soldierCoordinates;
     }