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

Merge branch 'SpartaqS-SoldierInterruptQueue' into 'Development'

Browse Source 
Added soldier's queue functionality

See merge request gskowron/eopsy-lab-567-project!8
This commit is contained in:
Gabriel Ksawery Skowron-Rodriguez 2022-05-22 21:19:45 +02:00
commit 2c52961575
2 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,8 @@ MonoBehaviour:
rangeAttack: 3 rangeAttack: 3
rangeView: 1 rangeView: 1
damageAttack: 1 damageAttack: 1
speedAttack: 1 speedAttack: 2
lastAttackTick: -1
nameText: {fileID: 6838251604148675782} nameText: {fileID: 6838251604148675782}
healthPointsText: {fileID: 8012357605284019061} healthPointsText: {fileID: 8012357605284019061}
--- !u!1 &2026481257847620386 --- !u!1 &2026481257847620386

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

@ -5,6 +5,33 @@ using UnityEngine;
public class Soldier : MonoBehaviour public class Soldier : MonoBehaviour
{ {
private Queue<Action> actions = new Queue<Action>();
private Queue<Action> interrupts = new Queue<Action>();
#region Action Queue Items
abstract class Action // action "template"
{
public virtual void Execute(Soldier soldier, TickSystem.OnTickEventArgs tickEventArgs) { } // called by Soldier when action is supposed to be done
}
private class Movement : Action
{
public override void Execute(Soldier soldier, TickSystem.OnTickEventArgs tickEventArgs)
{//TO DO: CALL PROPER FUNCTION TO MOVE
Debug.LogWarning($"(tick: {tickEventArgs.tickNumber}) Trying to teleport to {soldier.movementDestination}");
throw new System.NotImplementedException();
//tileMap.Teleport(movementDestination)
}
}
private class TryAttack : Action
{
public override void Execute(Soldier soldier, TickSystem.OnTickEventArgs tickEventArgs)
{
//Debug.LogWarning($"(tick: {tickEventArgs.tickNumber}) Looking for enemy in range");
if(soldier.TryAttackEnemy())
soldier.lastAttackTick = tickEventArgs.tickNumber;
}
}
#endregion
public enum SoldierType public enum SoldierType
{ {
Ally, Ally,
@ -18,11 +45,14 @@ public class Soldier : MonoBehaviour
[SerializeField] private float rangeAttack = 100; [SerializeField] private float rangeAttack = 100;
[SerializeField] private float rangeView = 1; [SerializeField] private float rangeView = 1;
[SerializeField] private float damageAttack = 1; [SerializeField] private float damageAttack = 1;
[SerializeField] private float speedAttack = 1; [SerializeField] private int speedAttack = 1; // ticks between attacks
[SerializeField] private int lastAttackTick = -1;
[SerializeField] private TMP_Text nameText = null; [SerializeField] private TMP_Text nameText = null;
[SerializeField] private TMP_Text healthPointsText = null; [SerializeField] private TMP_Text healthPointsText = null;
private Vector3Int movementDestination = Vector3Int.zero;
public SoldierType TempGetOwnType() public SoldierType TempGetOwnType()
{ {
return ourType; return ourType;
@ -78,11 +108,23 @@ public class Soldier : MonoBehaviour
private void HandleTick(TickSystem.OnTickEventArgs tickEventArgs) private void HandleTick(TickSystem.OnTickEventArgs tickEventArgs)
{ {
UpdateTarget(); ref Queue<Action> queueToHandle = ref interrupts;
// ADD TICK SYSTEM PREFAB ON SCENE if (interrupts.Count < 1) // if no interrupt actions to do, handle regular queue
queueToHandle = actions;
if(queueToHandle.Count > 0)
queueToHandle.Dequeue().Execute(this, tickEventArgs);
else
{
if(lastAttackTick + speedAttack <= tickEventArgs.tickNumber)
{
queueToHandle.Enqueue(new TryAttack());
queueToHandle.Dequeue().Execute(this, tickEventArgs);
}
}
} }
void UpdateTarget () bool TryAttackEnemy () //returns true if an enemy was attacked
{ {
// Enemies are the game objects tagged with the "Enemy" // Enemies are the game objects tagged with the "Enemy"
//GameObject[] enemies = GameObject.FindGameObjectsWithTag(enemyType); //GameObject[] enemies = GameObject.FindGameObjectsWithTag(enemyType);
@ -122,6 +164,8 @@ public class Soldier : MonoBehaviour
if (target != null) if (target != null)
target.ReduceHP(damageAttack); target.ReduceHP(damageAttack);
return target != null;
} }
// Update is called once per frame // Update is called once per frame