From 83d847e9456cba58323f25a90d18238149f5dded Mon Sep 17 00:00:00 2001
From: Robin Ruud Kristensen <robin1998@hotmail.no>
Date: Thu, 27 Oct 2022 22:32:56 +0200
Subject: [PATCH] added more enemies to randomily spawn

---
 MrBigsock/Assets/Code/Map/TilemapGenerator.cs | 14 ++++--
 MrBigsock/Assets/Scenes/GenTilemap.unity      | 49 ++-----------------
 MrBigsock/ProjectSettings/TagManager.asset    |  8 ++-
 3 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/MrBigsock/Assets/Code/Map/TilemapGenerator.cs b/MrBigsock/Assets/Code/Map/TilemapGenerator.cs
index 4e2e4329..52b77a5d 100644
--- a/MrBigsock/Assets/Code/Map/TilemapGenerator.cs
+++ b/MrBigsock/Assets/Code/Map/TilemapGenerator.cs
@@ -217,13 +217,19 @@ namespace Bigsock
 
         public void SpawnEnemies(int[,] map, int enemies, int roomNr)
         {
+            foreach (var item in Enemy)
+            {
+                item.tag = roomNr.ToString();
+            }
+
 
             for (int i = 0; i < enemies; i++)
             {
-                int randomLocation_x =  Random.Range(0,map.GetUpperBound(0));
-                int randomLocation_y = Random.Range(0,map.GetUpperBound(1));
-                Instantiate(Enemy[0],new Vector3Int((int)FloorTilemap[roomNr].transform.position.x + randomLocation_x,
-                    (int)FloorTilemap[roomNr].transform.position.y + randomLocation_y,0),Quaternion.identity);
+                int enemyRandom = Random.Range(0, Enemy.Length);
+                int randomLocation_x = Random.Range(0, map.GetUpperBound(0));
+                int randomLocation_y = Random.Range(0, map.GetUpperBound(1));
+                Instantiate(Enemy[enemyRandom], new Vector3Int((int)FloorTilemap[roomNr].transform.position.x + randomLocation_x,
+                    (int)FloorTilemap[roomNr].transform.position.y + randomLocation_y, 0), Quaternion.identity);
             }
         }
 
diff --git a/MrBigsock/Assets/Scenes/GenTilemap.unity b/MrBigsock/Assets/Scenes/GenTilemap.unity
index a453e342..ab4bf041 100644
--- a/MrBigsock/Assets/Scenes/GenTilemap.unity
+++ b/MrBigsock/Assets/Scenes/GenTilemap.unity
@@ -75855,50 +75855,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
   m_PrefabInstance: {fileID: 2131353724}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &374517730
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 374517732}
-  - component: {fileID: 374517731}
-  m_Layer: 9
-  m_Name: StartPos(Clone)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &374517731
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 374517730}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cb942e88bcce56a43ad5d5eb93684742, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!4 &374517732
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 374517730}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 31.8, y: -40.7, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 14
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1839735485 &383153994 stripped
 Tilemap:
   m_CorrespondingSourceObject: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
@@ -82811,9 +82767,10 @@ MonoBehaviour:
   tileSetSO: {fileID: 11400000, guid: 575173cd6a316be4a841f4318029d01d, type: 2}
   polygonCollider: {fileID: 498579221}
   Door: {fileID: 3927126222752442302, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3}
-  Pad: {fileID: 498579220}
   Enemy:
-  - {fileID: 2996495149472241661, guid: a6d7d2e260da99742bfad3ca548ee10f, type: 3}
+  - {fileID: 2996495149472241661, guid: 92dcf0500ca688742ba5c0f4f51ac314, type: 3}
+  - {fileID: 2996495149472241661, guid: f256acc71054c194a819c82677b399a7, type: 3}
+  - {fileID: 2996495149472241661, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
 --- !u!4 &1223302859
 Transform:
   m_ObjectHideFlags: 0
diff --git a/MrBigsock/ProjectSettings/TagManager.asset b/MrBigsock/ProjectSettings/TagManager.asset
index 0698b4e6..8bf17cd5 100644
--- a/MrBigsock/ProjectSettings/TagManager.asset
+++ b/MrBigsock/ProjectSettings/TagManager.asset
@@ -3,7 +3,13 @@
 --- !u!78 &1
 TagManager:
   serializedVersion: 2
-  tags: []
+  tags:
+  - 0
+  - 1
+  - 2
+  - 3
+  - 4
+  - 5
   layers:
   - Default
   - TransparentFX
-- 
GitLab