Merge pull request #132 from Nine-Byte-Warriors/Corn-Boss

Added Boss to the Game
Nine-Byte-Warriors · Feb 10, 2023 · 7db2d69 · 7db2d69
2 parents e5a7906 + 4edc903
commit 7db2d69
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 0 deletions.
diff --git a/Roche-Engine/Events/Event.h b/Roche-Engine/Events/Event.h
@@ -42,6 +42,7 @@ enum class EVENTID
 	GameEndLevelEvent,
 	ChangePhase,
 	NextDay,
+	FinalNight,
 	CurrentState,
 	CurrentPhase,
 	GetPhase,

diff --git a/Roche-Engine/Levels/GameManager.cpp b/Roche-Engine/Levels/GameManager.cpp
@@ -40,6 +40,9 @@ void GameManager::SetPhase()
 
 	EventSystem::Instance()->AddEvent(EVENTID::CurrentPhase, &m_currentPhase);
 
+	if (m_currentPhase == Phase::NightPhase && m_currentDay == 5)
+		EventSystem::Instance()->AddEvent(EVENTID::FinalNight);
+
 	if (m_currentState == GameState::Unpaused) 
 		EventSystem::Instance()->AddEvent(EVENTID::HUDSwap);
 

diff --git a/Roche-Engine/Levels/Level.cpp b/Roche-Engine/Levels/Level.cpp
@@ -229,6 +229,21 @@ void Level::RenderFrameTileMap()
     }
 }
 
+void Level::SpawnFinalBoss()
+{
+    int entitynum = m_entityController.GetEntityEnemyNumFromName("Corn");
+    std::string texture = m_entityController.GetTexture(entitynum);
+
+    Vector2f spawnpos = Vector2f(500, 500);
+    m_entitySpawner.AddEntityToSpawn(entitynum, 0, spawnpos);
+
+    m_entitySpawner.SpawnEntity(0);
+
+    m_entityController.AddEntityData(m_entitySpawner.GetEntityData()[0]);
+
+    m_entitySpawner.EntitiesAdded();
+}
+
 void Level::EndFrame_Start()
 {
     // Render ui
@@ -751,12 +766,14 @@ void Level::AddToEvent() noexcept
 {
     EventSystem::Instance()->AddClient(EVENTID::GamePauseEvent, this);
     EventSystem::Instance()->AddClient(EVENTID::GameUnpauseEvent, this);
+    EventSystem::Instance()->AddClient(EVENTID::FinalNight, this);
 }
 
 void Level::RemoveFromEvent() noexcept
 {
     EventSystem::Instance()->RemoveClient(EVENTID::GamePauseEvent, this);
     EventSystem::Instance()->RemoveClient(EVENTID::GameUnpauseEvent, this);
+    EventSystem::Instance()->RemoveClient(EVENTID::FinalNight, this);
 }
 
 void Level::HandleEvent(Event* event)
@@ -773,6 +790,11 @@ void Level::HandleEvent(Event* event)
     {
         m_bIsGamePaused = false;
     }
+    case EVENTID::FinalNight:
+    {
+        SpawnFinalBoss();
+        break;
+    }
     break;
     }
 }
diff --git a/Roche-Engine/Levels/Level.h b/Roche-Engine/Levels/Level.h
@@ -88,6 +88,8 @@ class Level : public LevelContainer, public Listener
 	void UpdateTileMapEmpty(const float dt);
 	void RenderFrameTileMap();
 
+	void SpawnFinalBoss();
+
 	// Objects
 	Camera m_camera;
 	UIEditor m_uiEditor;

diff --git a/Roche-Engine/Resources/Entity/Entity_Game.json b/Roche-Engine/Resources/Entity/Entity_Game.json
@@ -661,5 +661,56 @@
         "speed": 10.0,
         "texture": "Resources\\Textures\\Entity\\Potato\\Potato.png",
         "type": "Enemy"
+    },
+    {
+        "AI": true,
+        "animation": true,
+        "animationPath": "Resources\\Textures\\Entity\\Corn\\Corn.json",
+        "animationType": "Walk",
+        "audio": false,
+        "bColliderEnabled": true,
+        "bColliderInteractDecoration": false,
+        "bColliderInteractEnemy": false,
+        "bColliderInteractEnemyProjectile": false,
+        "bColliderInteractPlayer": true,
+        "bColliderInteractPlayerProjectile": true,
+        "bColliderStatic": false,
+        "bColliderTrigger": true,
+        "bProjectileBullet": true,
+        "bProjectilePattern": true,
+        "behaviour": "None",
+        "collider": true,
+        "colliderRadius": [
+            400.0,
+            500.0
+        ],
+        "colliderShape": "Box",
+        "columns": 4,
+        "health": 5.0,
+        "identifier": 13,
+        "mass": 1.0,
+        "maxFrame": [
+            1,
+            1
+        ],
+        "name": "Corn",
+        "position": [
+            418.0,
+            500.0
+        ],
+        "projectileBullet": "None",
+        "projectilePattern": "None",
+        "projectileSystem": true,
+        "rotation": 0.0,
+        "rows": 2,
+        "sColliderLayer": "Enemy",
+        "scale": [
+            400.0,
+            500.0
+        ],
+        "soundBankName": "",
+        "speed": 10.0,
+        "texture": "Resources\\Textures\\Entity\\Corn\\Corn Boss.png",
+        "type": "Enemy"
     }
 ]
diff --git a/Roche-Engine/Resources/Textures/Entity/Corn/Corn Boss-20230126-012119.piskel b/Roche-Engine/Resources/Textures/Entity/Corn/Corn Boss-20230126-012119.piskel
diff --git a/Roche-Engine/Resources/Textures/Entity/Corn/Corn Boss.gif b/Roche-Engine/Resources/Textures/Entity/Corn/Corn Boss.gif
diff --git a/Roche-Engine/Resources/Textures/Entity/Corn/Corn Boss.png b/Roche-Engine/Resources/Textures/Entity/Corn/Corn Boss.png
diff --git a/Roche-Engine/Resources/Textures/Entity/Corn/Corn.json b/Roche-Engine/Resources/Textures/Entity/Corn/Corn.json
@@ -0,0 +1,19 @@
+{
+  "frameCount": [
+      4,
+      1
+  ],
+  "name": "Corn",
+  "type": [
+      {
+          "alias": "Corn Running",          
+          "frameTiming": 0.5,
+          "name": "Walk"
+      },
+      {
+          "alias": " Corn getting hit",
+          "frameTiming": 1.0,
+          "name": "Hit"
+      }
+  ]
+}