Merge branch 'master' of github.com:teamfisk/AgileBreakOut

include/Game/BallSystem.h

@@ -50,6 +50,7 @@
 #include "Physics/ECreateParticleSequence.h"
 #include "Sound/CCollisionSound.h"
 #include "Sound/EPlaySound.h"
+#include "Rendering/EAnimationComplete.h"
 
 namespace dd
 {
@@ -145,6 +146,7 @@ private:
     dd::EventRelay<BallSystem, dd::Events::ActionButton> m_EActionButton;
 	dd::EventRelay<BallSystem, dd::Events::StageCleared> m_EStageCleared;
 	dd::EventRelay<BallSystem, dd::Events::ArrivedAtNewStage> m_EArrivedAtNewStage;
+	dd::EventRelay<BallSystem, dd::Events::AnimationComplete> m_EAnimationComplete;
 
     bool Contact(const Events::Contact &event);
     bool OnMultiBallLost(const dd::Events::MultiBallLost &event);
@@ -160,6 +162,7 @@ private:
     bool OnActionButton(const dd::Events::ActionButton &event);
 	bool OnStageCleared(const dd::Events::StageCleared &event);
 	bool OnArrivedToNewStage(const dd::Events::ArrivedAtNewStage &event);
+	bool OnAnimationComplete(const dd::Events::AnimationComplete &event);
 };
 
 }

include/Game/CBall.h

@@ -22,6 +22,7 @@ struct Ball : Component
     bool Waiting = true;
 	bool InkBlaster = false;
 	bool Sticky = false;
+	bool Loaded = false;
 	glm::vec3 StickyPlacement = glm::vec3(0, 0, 0);
     glm::vec3 SavedSpeed = glm::vec3(0, 1, 0);
 

include/Game/CKraken.h

@@ -15,7 +15,7 @@ namespace Components
 
 struct Kraken : Component {
 
-    int MaxHealth = 30;
+    int MaxHealth = 18;
 	int Health = MaxHealth;
 	int CurrentAction = 3;
 	float RetreatSpeed = 0.2;

include/Game/EBrickGenerating.h

@@ -20,6 +20,7 @@ struct BrickGenerating : Event
 	int TargetLine;
 	int Set;
 	int SetCluster;
+	int Speed = 6;
 };
 
 }

include/Game/EScreenShake.h

@@ -15,9 +15,9 @@ namespace Events
 
 struct ScreenShake : Event
 {
-    float Time;
-	int Intensity;
-	float TimeTakenToCoolDown;
+    float Time = 1.f;
+	float Intensity = 1.f;
+	float TimeTakenToCoolDown = 1.f;
 };
 
 }

include/Game/KrakenSystem.h

@@ -33,6 +33,7 @@
 #include "Game/CKraken.h"
 #include "Game/CBall.h"
 #include "Game/CProjectile.h"
+#include "Game/EScreenShake.h"
 #include "Sound/CCollisionSound.h"
 #include "Rendering/CAnimation.h"
 #include "Rendering/CSprite.h"
@@ -67,6 +68,7 @@ private:
 	bool m_KrakenBattle = false;
 	bool m_KrakenHasArrived = false;
 	bool m_ReturnToIdle = false;
+	bool m_RandomKraken = false;
 	EntityID m_KrakenTemplate;
 	std::string m_Action = "Idle";
 	int m_NumberOfActions;
@@ -76,6 +78,9 @@ private:
 	float m_KrakenCurrentSecondsToAction = 15;
 	const int Idle = 1;
 
+	int m_Set = 0;
+	int m_SetCluster = 0;
+
 	std::array<int, 42> m_Bricks;
 	std::array<int, 42> m_Colors;
 
@@ -98,6 +103,7 @@ private:
 	bool OnBrickGenerating(const dd::Events::BrickGenerating &event);
 	bool OnArrivedAtNewStage(const dd::Events::ArrivedAtNewStage &event);
 	void GetBrickSet();
+	void CreateBloodEffect(glm::vec3);
 };
 
 }

include/Game/LevelSystem.h

@@ -19,6 +19,7 @@
 #include "Rendering/CSprite.h"
 #include "Rendering/CModel.h"
 #include "Rendering/CPointLight.h"
+#include "Rendering/CCamera.h"
 
 #include "Transform/EMove.h"
 
@@ -59,6 +60,7 @@
 #include "Game/EKrakenAppear.h"
 #include "Game/EKrakenDefeated.h"
 #include "Game/EBrickGenerating.h"
+#include "Game/EBreakAllBricks.h"
 
 #include "Physics/CPhysics.h"
 #include "Physics/CCircleShape.h"
@@ -101,7 +103,7 @@ public:
     void CreateBasicLevel(int, int, glm::vec2, float);
     void CreateLevel(int);
     EntityID CreateBrick(int, int, glm::vec2, float, int, int, int, glm::vec4);
-	void BrickHit(EntityID, EntityID, int);
+	void BrickHit(EntityID, EntityID, int, bool);
 
     void OnEntityRemoved(EntityID entity);
 
@@ -180,6 +182,7 @@ private:
 	bool m_BrickGenerating = false;
 	dd::Events::BrickGenerating m_BrickGeneratingEvent;
 
+	bool m_KrakenBattle = false;
 	bool m_BreakAllBricks = false;
 
     dd::EventRelay<LevelSystem, dd::Events::Contact> m_EContact;
@@ -194,6 +197,7 @@ private:
 	dd::EventRelay<LevelSystem, dd::Events::Resume> m_EResume;
     dd::EventRelay<LevelSystem, dd::Events::HitPad> m_EHitPad;
 	dd::EventRelay<LevelSystem, dd::Events::BrickGenerating> m_EBrickGenerating;
+	dd::EventRelay<LevelSystem, dd::Events::BreakAllBricks> m_EBreakAllBricks;
 	dd::EventRelay<LevelSystem, dd::Events::KrakenDefeated> m_EKrakenDefeated;
 
     bool OnContact(const dd::Events::Contact &event);
@@ -209,6 +213,7 @@ private:
     bool OnHitPad(const dd::Events::HitPad &event);
 	bool OnBrickGenerating(const dd::Events::BrickGenerating &event);
 	bool BrickGenerating(const dd::Events::BrickGenerating &event);
+	bool OnBreakAllBricks(const dd::Events::BreakAllBricks &event);
 	void GetBrickSet(int Set, int SetCluster);
 	bool OnKrakenDefeated(const dd::Events::KrakenDefeated &event);
 

include/Game/LifebuoySystem.h

@@ -47,6 +47,10 @@ public:
 private:
 	bool m_Pause = false;
 	EntityID m_Template;
+	Events::Lifebuoy m_SavedEvent;
+	bool m_Lifebuoy = false;
+	float m_Timer;
+	float m_WaitingTime = 0.4;
 
 	dd::EventRelay<LifebuoySystem, dd::Events::Contact> m_EContact;
 	dd::EventRelay<LifebuoySystem, dd::Events::Pause> m_EPause;
@@ -58,6 +62,7 @@ private:
 	bool OnPause(const dd::Events::Pause &event);
 	bool OnResume(const dd::Events::Resume &event);
 	bool OnLifebuoy(const dd::Events::Lifebuoy &event);
+	bool Lifebuoy(const dd::Events::Lifebuoy &event);
 	bool OnLifebuoyHit(const dd::Events::LifebuoyHit &event);
 
 	struct LifebuoyInfo

include/Game/PadSystem.h

@@ -54,6 +54,7 @@
 #include "Rendering/CAnimation.h"
 
 #include "Game/EBrickGenerating.h"
+#include "Game/EBreakAllBricks.h"
 
 
 namespace dd

include/Game/ProjectileSystem.h

@@ -30,6 +30,7 @@
 #include "Game/CProjectile.h"
 #include "Game/CBall.h"
 #include "Rendering/CSprite.h"
+#include "Rendering/CAnimation.h"
 
 namespace dd
 {
@@ -60,7 +61,7 @@ private:
 	int m_Shots = 0;
 	float m_InkBlasterSpeed = 5;
 	EntityID m_InkBlastTemplate;
-	EntityID m_AttachedSquid;
+	EntityID m_AttachedSquid = 0;
 
 	dd::EventRelay<ProjectileSystem, dd::Events::Contact> m_EContact;
 	dd::EventRelay<ProjectileSystem, dd::Events::Pause> m_EPause;