Merge branch 'Main-Scene_impr' into 'Development'

fix: concept file

See merge request gskowron/eopsy-lab-567-project!7

theProject/Assets/Prefabs/Soldier.prefab

@@ -46,7 +46,7 @@ BoxCollider:
   m_GameObject: {fileID: 403095692180922766}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 0
+  m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}

theProject/Assets/Scenes/Main.unity

@@ -296,6 +296,109 @@ 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
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 905024698}
+  - component: {fileID: 905024697}
+  m_Layer: 0
+  m_Name: Player
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &905024697
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 905024696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6be2da178228f6e4790d99beae504bba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tilemapManager: {fileID: 0}
+--- !u!4 &905024698
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 905024696}
+  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: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1067482839
 GameObject:
   m_ObjectHideFlags: 0
@@ -341,6 +444,104 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1129778410
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1129778411}
+  - component: {fileID: 1129778414}
+  - component: {fileID: 1129778413}
+  - component: {fileID: 1129778412}
+  m_Layer: 0
+  m_Name: Plane
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1129778411
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1129778410}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.99, y: -0.3, z: 5.01}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1853262996}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!64 &1129778412
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1129778410}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1129778413
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1129778410}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1129778414
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1129778410}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1242078932
 GameObject:
   m_ObjectHideFlags: 0
@@ -696,6 +897,7 @@ GameObject:
   - component: {fileID: 1853262996}
   - component: {fileID: 1853262998}
   - component: {fileID: 1853262997}
+  - component: {fileID: 1853262999}
   m_Layer: 0
   m_Name: Soldier Map
   m_TagString: Untagged
@@ -714,7 +916,8 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1129778411}
   m_Father: {fileID: 1067482841}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1829,3 +2032,17 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
+--- !u!64 &1853262999
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1853262995}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 0}

theProject/Assets/Scenes/SpartaqS.unity

@@ -315,8 +315,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   mapSize: {x: 10, y: 5}
   WORLD_SPACE_OFFSET: {x: 0.5, y: 1, z: 0.5}
-  soldierStartingPosition: {x: 0, y: 0}
+  soldierStartingPositions: []
-  enemyStartingPosition: {x: 1, y: 0}
+  enemyStartingPositions: []
   tilemap: {fileID: 2046204565}
   soldierPrefab: {fileID: 403095692180922766, guid: a87b1aa46b0ed3e0fba621e11dd4f1e2,
     type: 3}
@@ -482,6 +482,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6be2da178228f6e4790d99beae504bba, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  tilemapManager: {fileID: 0}
 --- !u!4 &816363138
 Transform:
   m_ObjectHideFlags: 0
@@ -756,7 +757,6 @@ GameObject:
   - component: {fileID: 2046204563}
   - component: {fileID: 2046204565}
   - component: {fileID: 2046204564}
-  - component: {fileID: 2046204566}
   m_Layer: 0
   m_Name: Soldier Map
   m_TagString: Untagged
@@ -866,22 +866,6 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
---- !u!19719996 &2046204566
-TilemapCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2046204562}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_MaximumTileChangeCount: 1000
-  m_ExtrusionFactor: 0.00001
 --- !u!1 &2114096516
 GameObject:
   m_ObjectHideFlags: 0

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<Squad>();
+	}
+	// Update is called once per frame
+	void Update()
+    {
+		Debug.Log("Added initial soldeirs to squad");
+		// add all ally soldiers to squad
+		var soldiers = FindObjectsOfType<Soldier>();
+		foreach(var soldier in soldiers)
+		{
+			if(soldier.TempGetOwnType() == Soldier.SoldierType.Ally)
+			{
+				playerSquad.TempAddSoldierToSquad(soldier);
+			}
+		}
+
+        enabled = false;
+    }
+}

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: 

theProject/Assets/Scripts/Player/PlayerClickSystem.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 public class PlayerClickSystem : MonoBehaviour
 {
-    TilemapManager tilemapManager;
+    [SerializeField] TilemapManager tilemapManager;
 	private void Awake()
 	{
         tilemapManager = FindObjectOfType<TilemapManager>();
@@ -16,8 +16,9 @@ public class PlayerClickSystem : MonoBehaviour
 	// Update is called once per frame
 	void Update()
     {
-        if(Input.GetMouseButton(0))
+        if(Input.GetMouseButton(0)) // Change to new input system
 		{
+            //Debug.Log("CLICK");
             Camera camera = Camera.main;
             RaycastHit hit;
             Ray ray = camera.ScreenPointToRay(Input.mousePosition);

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

theProject/Assets/Scripts/Squad.cs

@@ -26,6 +26,11 @@ public class Squad : MonoBehaviour
 	[SerializeField] private List<Soldier> soldiers = new List<Soldier>(); // soldiers belonging to the squad
     private Queue<Order> orders = new Queue<Order>(); // orders given to the squad
 
+	public void TempAddSoldierToSquad(Soldier soldier)
+	{
+		soldiers.Add(soldier);
+	}
+
 	private void Awake()
 	{
 		TickSystem.OnTick += HandleTick;