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

WIP, before tilemap manager changes

Browse Source
This commit is contained in:
Gabriel Ksawery Skowron-Rodriguez 2022-05-23 12:57:50 +02:00
parent 40dfa80f14
commit 65899a25e5
4 changed files with 1599 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1959
theProject/Assets/Scenes/SpartaqS.unity
View File

File diff suppressed because it is too large Load Diff

2
theProject/Assets/Scenes/SpartaqS.unity.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 049060bf353f41b4fb0d3675a00a1832 guid: ab3f3b9b28d59aa48a9da7d926f1e0cd
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

6
theProject/Assets/Scripts/Managers/SquadManager.cs
View File

@ -12,20 +12,22 @@ public class SquadManager : MonoBehaviour
{ {
playerSquad = Instantiate(squadPrefab).GetComponent<Squad>(); playerSquad = Instantiate(squadPrefab).GetComponent<Squad>();
playerSquad.gameObject.name = "Player Squad"; playerSquad.gameObject.name = "Player Squad";
playerSquad.transform.SetParent(transform);
enemySquad = Instantiate(squadPrefab).GetComponent<Squad>(); enemySquad = Instantiate(squadPrefab).GetComponent<Squad>();
enemySquad.gameObject.name = "Enemy Squad"; enemySquad.gameObject.name = "Enemy Squad";
enemySquad.transform.SetParent(transform);
} }
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
Debug.Log("Added initial soldeirs to squad"); Debug.Log("Added initial soldiers to squad");
// add all ally soldiers to squad // add all ally soldiers to squad
var soldiers = FindObjectsOfType<Soldier>(); var soldiers = FindObjectsOfType<Soldier>();
foreach(var soldier in soldiers) foreach(var soldier in soldiers)
{ {
if(soldier.TempGetOwnType() == Soldier.SoldierType.Ally) if(soldier.GetOwnType() == Soldier.SoldierType.Ally)
{ {
playerSquad.TempAddSoldierToSquad(soldier); playerSquad.TempAddSoldierToSquad(soldier);
} }

2
theProject/Assets/Scripts/Soldier.cs
View File

@ -60,7 +60,7 @@ public class Soldier : MonoBehaviour
[SerializeField] private Vector2Int movementDestination = Vector2Int.zero; [SerializeField] private Vector2Int movementDestination = Vector2Int.zero;
public SoldierType TempGetOwnType() public SoldierType GetOwnType()
{ {
return ourType; return ourType;
} }