From e9f69fbd8828f48675d6dc798b4e98f7f2d17cde Mon Sep 17 00:00:00 2001 From: Gabriel Ksawery Skowron-Rodriguez Date: Fri, 20 May 2022 11:51:59 +0200 Subject: [PATCH] added temp code for squad WIP for showcase proabbly need to refactor stuff that starts with "Temp" and was added in this commit --- theProject/Assets/Scenes/Main.unity | 58 +++++++++++++++++++ .../Scripts/Managers/TempSquadManager.cs | 29 ++++++++++ .../Scripts/Managers/TempSquadManager.cs.meta | 11 ++++ theProject/Assets/Scripts/Soldier.cs | 6 ++ theProject/Assets/Scripts/Squad.cs | 5 ++ 5 files changed, 109 insertions(+) create mode 100644 theProject/Assets/Scripts/Managers/TempSquadManager.cs create mode 100644 theProject/Assets/Scripts/Managers/TempSquadManager.cs.meta diff --git a/theProject/Assets/Scenes/Main.unity b/theProject/Assets/Scenes/Main.unity index cbffc4b1..914f5eab 100644 --- a/theProject/Assets/Scenes/Main.unity +++ b/theProject/Assets/Scenes/Main.unity @@ -296,6 +296,64 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!1 &484241835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 484241837} + - component: {fileID: 484241836} + - component: {fileID: 484241838} + m_Layer: 0 + m_Name: TempSquad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &484241836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484241835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eeef7310a48872043b4089979ec88b42, type: 3} + m_Name: + m_EditorClassIdentifier: + soldiers: [] +--- !u!4 &484241837 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484241835} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.4048395, y: -4.749419, z: 13.353434} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &484241838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484241835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a470f948c2458f4994fe0cf5f226c52, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &905024696 GameObject: m_ObjectHideFlags: 0 diff --git a/theProject/Assets/Scripts/Managers/TempSquadManager.cs b/theProject/Assets/Scripts/Managers/TempSquadManager.cs new file mode 100644 index 00000000..03644cb7 --- /dev/null +++ b/theProject/Assets/Scripts/Managers/TempSquadManager.cs @@ -0,0 +1,29 @@ +// TEMP CODE JUST FOR SHOWCASE PURPOSES +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TempSquadManager : MonoBehaviour +{ + Squad playerSquad; + private void Awake() + { + playerSquad = FindObjectOfType(); + } + // Update is called once per frame + void Update() + { + Debug.Log("Added initial soldeirs to squad"); + // add all ally soldiers to squad + var soldiers = FindObjectsOfType(); + foreach(var soldier in soldiers) + { + if(soldier.TempGetOwnType() == Soldier.SoldierType.Ally) + { + playerSquad.TempAddSoldierToSquad(soldier); + } + } + + enabled = false; + } +} diff --git a/theProject/Assets/Scripts/Managers/TempSquadManager.cs.meta b/theProject/Assets/Scripts/Managers/TempSquadManager.cs.meta new file mode 100644 index 00000000..710513f1 --- /dev/null +++ b/theProject/Assets/Scripts/Managers/TempSquadManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3a470f948c2458f4994fe0cf5f226c52 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/theProject/Assets/Scripts/Soldier.cs b/theProject/Assets/Scripts/Soldier.cs index 306a7e16..3ba20c48 100644 --- a/theProject/Assets/Scripts/Soldier.cs +++ b/theProject/Assets/Scripts/Soldier.cs @@ -22,6 +22,12 @@ public class Soldier : MonoBehaviour [SerializeField] private TMP_Text nameText = null; [SerializeField] private TMP_Text healthPointsText = null; + + public SoldierType TempGetOwnType() + { + return ourType; + } + // Start is called before the first frame update void Start(){ healthPoints = maxHealthPoints; // initialize health diff --git a/theProject/Assets/Scripts/Squad.cs b/theProject/Assets/Scripts/Squad.cs index 6989bcee..5ca2ba8a 100644 --- a/theProject/Assets/Scripts/Squad.cs +++ b/theProject/Assets/Scripts/Squad.cs @@ -26,6 +26,11 @@ public class Squad : MonoBehaviour [SerializeField] private List soldiers = new List(); // soldiers belonging to the squad private Queue orders = new Queue(); // orders given to the squad + public void TempAddSoldierToSquad(Soldier soldier) + { + soldiers.Add(soldier); + } + private void Awake() { TickSystem.OnTick += HandleTick;