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

merloj: Fixed bug with empty squad

Browse Source
This commit is contained in:
Maciekxdabu 2022-06-10 10:59:49 +02:00
parent 150f828c22
commit 06c13568c1
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
theProject/Assets/Prefabs/Soldier.prefab
View File

@ -78,7 +78,7 @@ MonoBehaviour:
MySquad: {fileID: 0} MySquad: {fileID: 0}
rangeAttack: 3 rangeAttack: 3
rangeView: 1 rangeView: 1
damageAttack: 1 damageAttack: 10
speedAttack: 2 speedAttack: 2
lastAttackTick: -1 lastAttackTick: -1
target: {fileID: 0} target: {fileID: 0}

13
theProject/Assets/Scripts/Squad.cs
View File

@ -63,6 +63,19 @@ public class Squad : MonoBehaviour
soldiers.RemoveFromList(soldier); soldiers.RemoveFromList(soldier);
((Soldier)soldier).MySquad = null; ((Soldier)soldier).MySquad = null;
soldier.OnDeath.RemoveListener(RemoveSoldierFromSquad); soldier.OnDeath.RemoveListener(RemoveSoldierFromSquad);
if (soldiers.GetCount() == 0)
{
Soldier[] objs = FindObjectsOfType<Soldier>();
foreach (Soldier obj in objs)
{
if (obj != soldier && obj.GetOwnTeam() == ownTeam)
{
AddSoldierToSquad(obj);
}
}
}
} }
public void AddSpottedEnemy(Entity enemy) public void AddSpottedEnemy(Entity enemy)

5
theProject/Assets/Scripts/TickSystem/TTLList.cs
View File

@ -63,6 +63,11 @@ public class TTLList<T> where T : UnityEngine.Object
return new List<T>(dict.Keys); return new List<T>(dict.Keys);
} }
public int GetCount()
{
return dict.Count;
}
// ---------- private methods // ---------- private methods
// DEBUG - Changes a view list to see soldiers active in squad in inspector // DEBUG - Changes a view list to see soldiers active in squad in inspector