kuhyx/WUT_Computer_Science
1
0
Fork 0
mirror of https://github.com/kuhyx/WUT_Computer_Science.git synced 2026-07-06 10:03:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'kuchy-formation' into 'Development'

Browse Source 
Kuchy formation

See merge request gskowron/eopsy-lab-567-project!17
This commit is contained in:
Krzysztof Stefan Rudnicki 2022-05-23 17:57:51 +02:00
commit ca123b397c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
theProject/Assets/Scripts/Formation.cs
View File

@ -2,24 +2,24 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class Formation : MonoBehaviour public class Formation : MonoBehaviour
{ {
[SerializeField] Squad squad; [SerializeField] Squad squad;
void Awake() 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(); List<Entity> soldiers = this.squad.GetSoldiers();
Dictionary<Soldier, Vector2Int> soldierNewCoordinate = new Dictionary<Soldier, Vector2Int>(); Dictionary<Entity, Vector2Int> soldierNewCoordinate = new Dictionary<Entity, Vector2Int>();
int soldierNumber = 0; int soldierNumber = 0;
foreach (Soldier soldier in soldiers) foreach (Entity Entity in soldiers)
{ {
soldierNewCoordinate.Add(soldier, calculateSoldierCoordinates(soldierNumber, coordinates)); soldierNewCoordinate.Add(Entity, calculateSoldierCoordinates(soldierNumber, coordinates));
MoveSoldierS(x, y, soldierNewCoordinate.Item1, soldierNewCoordinate.Item2);
} }
return soldierNewCoordinate; return soldierNewCoordinate;
} }
@ -28,8 +28,8 @@ public class Formation : MonoBehaviour
private Vector2Int calculateSoldierCoordinates(in int soldierNumber, in Vector2Int coordinates) private Vector2Int calculateSoldierCoordinates(in int soldierNumber, in Vector2Int coordinates)
{ {
// Horizontal line we change x // Horizontal line we change x
Vector2Int coordinates = new Vector2Int(coordinates.Item1 + soldierNumber, coordinates.Item1); Vector2Int soldierCoordinates = new Vector2Int(coordinates.x + soldierNumber, coordinates.y);
return coordinates; return soldierCoordinates;
} }