Added RealeaseTheKraken sprite

Conflicts:
	src/game/Game/LevelSystem.cpp

include/Game/BallSystem.h

@@ -24,6 +24,7 @@
 #include "Game/EStickyPad.h"
 #include "Game/EInkBlaster.h"
 #include "Game/EInkBlasterOver.h"
+#include "Game/EStageCleared.h"
 #include "Game/EGameOver.h"
 #include "Game/EPause.h"
 #include "Game/EHitPad.h"
@@ -100,6 +101,7 @@ private:
 	bool m_InkBlaster = false;
 	bool m_InkAttached = false;
 	bool m_BlockedWaiting = false;
+	bool m_Restarting = false;
 	int m_StickyCounter = 5;
 
     glm::vec3 m_SavedSpeed;
@@ -120,6 +122,7 @@ private:
     dd::EventRelay<BallSystem, dd::Events::Pause> m_EPause;
     dd::EventRelay<BallSystem, dd::Events::Contact> m_Contact;
     dd::EventRelay<BallSystem, dd::Events::ActionButton> m_EActionButton;
+	dd::EventRelay<BallSystem, dd::Events::StageCleared> m_EStageCleared;
 
     bool Contact(const Events::Contact &event);
     bool OnLifeLost(const dd::Events::LifeLost &event);
@@ -131,6 +134,7 @@ private:
 	bool OnInkBlasterOver(const dd::Events::InkBlasterOver &event);
     bool OnPause(const dd::Events::Pause &event);
     bool OnActionButton(const dd::Events::ActionButton &event);
+	bool OnStageCleared(const dd::Events::StageCleared &event);
 };
 
 }

include/Game/EKrakenAttack.h

@@ -0,0 +1,27 @@
+//
+// Created by Adniklastrator on 2015-10-08.
+//
+
+#ifndef DAYDREAM_EKRAKENATTACK_H
+#define DAYDREAM_EKRAKENATTACK_H
+
+#include "Core/EventBroker.h"
+
+namespace dd
+{
+
+namespace Events
+{
+
+struct KrakenAttack : Event
+{
+	double KrakenStrength;
+	double PlayerStrength;
+	double ChargeUpdate;
+};
+
+}
+
+}
+
+#endif //DAYDREAM_EKRAKENATTACK_H

include/Game/GUI/HUD.h

@@ -9,6 +9,8 @@
 #include "Game/GUI/FPSCounter.h"
 #include "Game/EGameOver.h"
 #include "Game/EClusterClear.h"
+#include "Game/EKrakenAttack.h"
+#include "GUI/Slider.h"
 
 namespace dd
 {
@@ -24,30 +26,42 @@ public:
 		Width = parent->Width;
 		Height = parent->Height;
 
-		m_LevelIndicator = new GUI::TextureFrame(this, "HUDLevelIndicator");
+		//m_LevelIndicator = new GUI::TextureFrame(this, "HUDLevelIndicator");
-		m_LevelIndicator->SetTexture("Textures/GUI/HUD/LevelIndicatorBG.png");
+		//m_LevelIndicator->SetTexture("Textures/GUI/HUD/LevelIndicatorBG.png");
 
-		m_AreaNumberFrame = new GUI::NumberFrame(m_LevelIndicator, "HUDScoreNumberFrameawdawdwa");
+		//m_AreaNumberFrame = new GUI::NumberFrame(m_LevelIndicator, "HUDScoreNumberFrameawdawdwa");
-		m_AreaNumberFrame->X = 132;
+		//m_AreaNumberFrame->X = 132;
-		m_AreaNumberFrame->Y = 19;
+		//m_AreaNumberFrame->Y = 19;
-		m_AreaNumberFrame->SetNumber(6);
+		//m_AreaNumberFrame->SetNumber(6);
-		m_StageNumberFrame = new GUI::NumberFrame(m_LevelIndicator, "HUDScoreNumberFrameawdawdwa");
+		//m_StageNumberFrame = new GUI::NumberFrame(m_LevelIndicator, "HUDScoreNumberFrameawdawdwa");
-		m_StageNumberFrame->X = 165;
+		//m_StageNumberFrame->X = 165;
-		m_StageNumberFrame->Y = 19;
+		//m_StageNumberFrame->Y = 19;
-		m_StageNumberFrame->SetNumber(5);
+		//m_StageNumberFrame->SetNumber(5);
 
-		m_ScoreIndicator = new GUI::TextureFrame(this, "HUDScoreIndicator");
+		//m_ScoreIndicator = new GUI::TextureFrame(this, "HUDScoreIndicator");
-		m_ScoreIndicator->SetTexture("Textures/GUI/HUD/ScoreIndicatorBG.png");
+		//m_ScoreIndicator->SetTexture("Textures/GUI/HUD/ScoreIndicatorBG.png");
-		m_ScoreIndicator->SetRight(Right());
+		m_ScoreNumberFrame = new GUI::NumberFrame(this, "HUDScoreNumberFrame");
-		m_ScoreNumberFrame = new GUI::NumberFrame(m_ScoreIndicator, "HUDScoreNumberFrame");
+		//m_ScoreNumberFrame->X = 15;
-		m_ScoreNumberFrame->X = 15;
+		m_ScoreNumberFrame->Y = 18;
-		m_ScoreNumberFrame->Y = 21;
 
 		m_FPSCounter = new GUI::FPSCounter(this, "FPSCounter");
 
+		m_KrakenAttackSlider = new Slider(this, "KrakenSlider");
+		m_KrakenAttackSlider->SetTexture("Textures/GUI/Menu/SliderBackground.png");
+		m_KrakenAttackSlider->SetTextureReleased("Textures/GUI/Menu/SliderHandle.png");
+		m_KrakenAttackSlider->SetLeft(Width / 2 - m_KrakenAttackSlider->Width / 2);
+		m_KrakenAttackSlider->Y = 800;
+		m_KrakenAttackSlider->Hide();
+
 		EVENT_SUBSCRIBE_MEMBER(m_EScore, &HUD::OnScore);
 		EVENT_SUBSCRIBE_MEMBER(m_EGameOver, &HUD::OnGameOver);
 		EVENT_SUBSCRIBE_MEMBER(m_ClusterClear, &HUD::OnClusterClear);
+		EVENT_SUBSCRIBE_MEMBER(m_KrakenAttack, &HUD::OnKrakenAttack);
+	}
+
+	void Update(double dt) override
+	{
+		m_ScoreNumberFrame->SetLeft(Width / 2.f - m_ScoreNumberFrame->Width / 2.f);
 	}
 
 private:
@@ -59,10 +73,12 @@ private:
 	FPSCounter* m_FPSCounter = nullptr;
 	TextureFrame* m_GameOverFrame = nullptr;
 	TextureFrame* m_ClusterClearFrame = nullptr;
+	Slider* m_KrakenAttackSlider = nullptr;
 
 	EventRelay<Frame, Events::ScoreEvent> m_EScore;
 	EventRelay<Frame, Events::GameOver> m_EGameOver;
 	EventRelay<Frame, Events::ClusterClear> m_ClusterClear;
+	EventRelay<Frame, Events::KrakenAttack> m_KrakenAttack;
 
 	bool OnScore(const Events::ScoreEvent& event)
 	{
@@ -83,6 +99,19 @@ private:
 		m_ClusterClearFrame->SetTexture("Textures/GUI/HUD/WinScreen.png");
 		return true;
 	}
+
+	bool OnKrakenAttack(const Events::KrakenAttack& event)
+	{
+		
+		if (event.ChargeUpdate >= 1.f) {
+			m_KrakenAttackSlider->Hide();
+		} else {
+			m_KrakenAttackSlider->Show();
+			m_KrakenAttackSlider->SetPercentage(event.ChargeUpdate);
+		}
+		
+		return true;
+	}
 };
 
 }

include/Game/GUI/Story1.h

@@ -216,7 +216,7 @@ private:
 	bool OnKeyDown(const Events::KeyDown& event)
 	{
 		if (Hidden()) {
-			return;
+			return false;
 		}
 
 		if (event.KeyCode == GLFW_KEY_SPACE) {

include/Game/LevelSystem.h

@@ -26,6 +26,7 @@
 #include "Game/ELifebuoy.h"
 #include "Game/EStickyPad.h"
 #include "Game/EInkBlaster.h"
+#include "Game/EKrakenAttack.h"
 #include "Game/EMultiBall.h"
 #include "Game/EMultiBallLost.h"
 #include "Game/EPause.h"
@@ -133,6 +134,7 @@ private:
 	const int LifebuoyBrick = 3;
 	const int StickyBrick = 4;
 	const int InkBlasterBrick = 5;
+	const int KrakenAttackBrick = 6;
 
     EntityID m_BrickTemplate;
 

include/Game/PadSystem.h

@@ -26,6 +26,7 @@
 #include "Game/CPowerUp.h"
 #include "Game/EResetBall.h"
 #include "Game/EMultiBall.h"
+#include "Game/EKrakenAttack.h"
 #include "Game/EPowerUpTaken.h"
 #include "Game/EStageCleared.h"
 #include "Game/EPause.h"
@@ -76,6 +77,10 @@ private:
     bool m_Right = false;
     bool m_ReplaceBall = false;
     bool m_MultiBall = false;
+	bool m_KrakenAttack = false;
+	double m_KrakenCharge = 0;
+	double m_KrakenStrength = 0;
+	double m_PlayerStrength = 0;
     float m_Edge = 2.8f;
     Components::Transform* m_Transform = nullptr;
     Components::Pad* m_Pad = nullptr;
@@ -88,6 +93,8 @@ private:
     dd::EventRelay<PadSystem, dd::Events::Contact> m_EContactPowerUp;
     dd::EventRelay<PadSystem, dd::Events::StageCleared> m_EStageCleared;
     dd::EventRelay<PadSystem, dd::Events::Pause> m_EPause;
+	dd::EventRelay<PadSystem, dd::Events::KrakenAttack> m_EKrakenAttack;
+	dd::EventRelay<PadSystem, dd::Events::ActionButton> m_EActionButton;
 
     bool OnKeyDown(const dd::Events::KeyDown &event);
     bool OnKeyUp(const dd::Events::KeyUp &event);
@@ -95,6 +102,8 @@ private:
     bool OnContactPowerUp(const dd::Events::Contact &event);
     bool OnStageCleared(const dd::Events::StageCleared &event);
     bool OnPause(const dd::Events::Pause &event);
+	bool OnKrakenAttack(const dd::Events::KrakenAttack &event);
+	bool OnActionButton(const dd::Events::ActionButton &event);
 
     class PadSteeringInputController;
     std::array<std::shared_ptr<PadSteeringInputController>, 4> m_PadInputControllers;

src/game/Game/BallSystem.cpp

@@ -23,12 +23,13 @@ void dd::Systems::BallSystem::Initialize()
 	EVENT_SUBSCRIBE_MEMBER(m_EInkBlasterOver, &BallSystem::OnInkBlasterOver);
     EVENT_SUBSCRIBE_MEMBER(m_EPause, &BallSystem::OnPause);
     EVENT_SUBSCRIBE_MEMBER(m_EActionButton, &BallSystem::OnActionButton);
+	EVENT_SUBSCRIBE_MEMBER(m_EStageCleared, &BallSystem::OnStageCleared);
 
     //OctoBall
     {
         auto ent = m_World->CreateEntity();
         std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
-        transform->Position = glm::vec3(-0.f, 50.26f, -10.f);
+        transform->Position = glm::vec3(0.f, 0.26f, -10.f);
         transform->Scale = glm::vec3(0.3f, 0.3f, 0.3f);
         transform->Velocity = glm::vec3(0.f, 0.f, 0.f);
         auto model = m_World->AddComponent<Components::Model>(ent);
@@ -117,6 +118,7 @@ void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID
 
         if (ballComponent->Waiting) {
             if (!m_Waiting) {
+				m_Restarting = false;
                 ballComponent->Waiting = false;
 				auto transform = m_World->GetComponent<Components::Transform>(entity);
                 transform->Velocity = glm::normalize(glm::vec3(0.5f, 1, 0.f)) * ballComponent->Speed;
@@ -129,6 +131,7 @@ void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID
             }
         }
 		if (ballComponent->Sticky) {
+			//TODO - Ball can stick to same pad just after detaching.
 			if (!m_Waiting)
 			{
 				auto transform = m_World->GetComponent<Components::Transform>(entity);
@@ -154,7 +157,7 @@ void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID
                 m_World->RemoveEntity(entity);
                 Events::MultiBallLost e;
                 EventBroker->Publish(e);
-            } else if (Lives() == PastLives()) {
+            } else if (Lives() == PastLives() && !m_Restarting) {
                 Events::ResetBall be;
                 EventBroker->Publish(be);
                 Events::LifeLost e;
@@ -470,3 +473,9 @@ bool dd::Systems::BallSystem::OnActionButton(const dd::Events::ActionButton &eve
     return true;
 }
 
+bool dd::Systems::BallSystem::OnStageCleared(const dd::Events::StageCleared &event)
+{
+	m_Restarting = true;
+	return true;
+}
+

src/game/Game/LevelSystem.cpp

@@ -93,6 +93,12 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
 			} else if (brick->Type == InkBlasterBrick) {
 				Events::InkBlaster e;
 				EventBroker->Publish(e);
+			} else if(brick->Type == KrakenAttackBrick) {
+				Events::KrakenAttack e;
+				e.ChargeUpdate = 0;
+				e.KrakenStrength = 0.1;
+				e.PlayerStrength = 0.05;
+				EventBroker->Publish(e);
 			}
             m_LooseBricks--;
             m_World->RemoveEntity(entity);
@@ -207,6 +213,9 @@ void dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spacesBe
 	} else if (typeInt == InkBlasterBrick) {
 		cBrick->Type = InkBlasterBrick;
 		model->Color = glm::vec4(0.1f, 0.1f, 0.1f, 1.0f);
+	} else if (typeInt == KrakenAttackBrick) {
+		cBrick->Type = KrakenAttackBrick;
+		model->Color = glm::vec4(0.f, 0.5f, 1.0f, .0f);
 	}
 
 	
@@ -467,6 +476,7 @@ void dd::Systems::LevelSystem::GetNextLevel()
 	// 3 is lifebuoy brick.
 	// 4 is sticky brick.
 	// 5 is ink blaster brick.
+	// 6 is kraken attack brick.
 
 	// wolor array determines the color of standard bricks.
 	// w is white.
@@ -647,14 +657,14 @@ void dd::Systems::LevelSystem::GetNextLevel()
                      1, 4, 1, 1, 1, 3, 1,
                      0, 1, 0, 1, 0, 1, 0,
                      0, 1, 0, 1, 0, 1, 0,
-                     1, 5, 1, 1, 1, 2, 1,
+                     1, 5, 1, 6, 1, 2, 1,
                      0, 1, 0, 0, 0, 1, 0};
 			color = 
 					{w, p3, w, w, w, r, w,
 					 p2, w, p1, g, w, w, w,
 					 w, p4, w, g, w, r, w,
 					 w, br, w, g, w, lb1, w,
-					 y, w, y, g, b, w, b,
+					 y, w, y, d, b, w, b,
 					 w, br, w, w, w, lb1, w};
         }
     } else if (m_CurrentCluster == 3) {

src/game/Game/PadSystem.cpp

@@ -28,6 +28,8 @@ void dd::Systems::PadSystem::Initialize()
     EVENT_SUBSCRIBE_MEMBER(m_EContactPowerUp, &PadSystem::OnContactPowerUp);
     EVENT_SUBSCRIBE_MEMBER(m_EStageCleared, &PadSystem::OnStageCleared);
     EVENT_SUBSCRIBE_MEMBER(m_EPause, &PadSystem::OnPause);
+	EVENT_SUBSCRIBE_MEMBER(m_EKrakenAttack, &PadSystem::OnKrakenAttack);
+	EVENT_SUBSCRIBE_MEMBER(m_EActionButton, &PadSystem::OnActionButton);
     //EVENT_SUBSCRIBE_MEMBER(m_EBindKey, &PadSystem::OnBindKey);
 
     {
@@ -84,9 +86,21 @@ void dd::Systems::PadSystem::Update(double dt)
         }
     }
 
-    auto transform = Transform();
+	if (m_KrakenAttack) {
-    auto pad = Pad();
+		m_KrakenCharge -= m_KrakenStrength * dt;
-    auto acceleration = Acceleration();
+		if (m_KrakenCharge < 0) {
+			m_KrakenCharge = 0;
+		}
+		Events::KrakenAttack e;
+		e.ChargeUpdate = m_KrakenCharge;
+		EventBroker->Publish(e);
+		//std::cout << "Charge: " << m_KrakenCharge << std::endl;
+		return;
+	}
+
+	auto transform = Transform();
+	auto pad = Pad();
+	auto acceleration = Acceleration();
 
     if (transform->Velocity.x < -pad->MaxSpeed) {
         transform->Velocity.x = -pad->MaxSpeed;
@@ -167,7 +181,14 @@ bool dd::Systems::PadSystem::OnKeyDown(const dd::Events::KeyDown &event) {
     } else if (val == GLFW_KEY_S) {
 		Events::StageCleared e;
 		EventBroker->Publish(e);
-	} else if (val == GLFW_KEY_SPACE) {
+	} else if (val == GLFW_KEY_K) {
+		Events::KrakenAttack e;
+		e.ChargeUpdate = 0;
+		e.KrakenStrength = 0.1;
+		e.PlayerStrength = 0.05;
+		EventBroker->Publish(e);
+	}
+	else if (val == GLFW_KEY_SPACE) {
         Events::ActionButton e;
 		e.Position = Transform()->Position;
         EventBroker->Publish(e);
@@ -288,6 +309,44 @@ bool dd::Systems::PadSystem::OnStageCleared(const dd::Events::StageCleared &even
     return true;
 }
 
+bool dd::Systems::PadSystem::OnKrakenAttack(const dd::Events::KrakenAttack &event)
+{
+	if (!m_KrakenAttack) {
+		m_KrakenStrength = event.KrakenStrength;
+		m_PlayerStrength = event.PlayerStrength;
+		m_KrakenCharge = event.ChargeUpdate;
+		m_KrakenAttack = true;
+		auto transform = Transform();
+		auto acceleration = Acceleration();
+
+		transform->Velocity = glm::vec3(0, 0, 0);
+		acceleration = glm::vec3(0, 0, 0);
+
+		SetTransform(transform);
+		SetAcceleration(acceleration);
+	} else if (m_KrakenCharge >= 1) {
+		m_KrakenAttack = false;
+		m_KrakenCharge = 0;
+		m_KrakenStrength = 0;
+		m_PlayerStrength = 0;
+	}
+	return true;
+}
+
+bool dd::Systems::PadSystem::OnActionButton(const dd::Events::ActionButton &event)
+{
+	if (m_KrakenAttack) {
+		m_KrakenCharge += m_PlayerStrength;
+
+		Events::KrakenAttack e;
+		e.ChargeUpdate = m_KrakenCharge;
+		e.KrakenStrength = 0;
+		e.PlayerStrength = 0;
+		EventBroker->Publish(e);
+	}
+	return true;
+}
+
 bool dd::Systems::PadSystem::PadSteeringInputController::OnCommand(const Events::InputCommand &event)
 {
     std::string command = event.Command;