BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Kraken battle. I think. Made it so you do not shoot projectiles or squids when struggling with Kraken.

Browse Source
This commit is contained in:
PlatinumSkink
2015-10-21 15:12:50 +02:00
parent 2954e2cbb3
commit f0b36c6f12
10 changed files with 126 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/BallSystem.h
+8
View File
@@ -30,6 +30,8 @@
#include "Game/EStickyAttachedToPad.h"
#include "Game/EInkBlaster.h"
#include "Game/EInkBlasterOver.h"
#include "Game/EKrakenAttack.h"
#include "Game/EKrakenAttackEnd.h"
#include "Game/EStageCleared.h"
#include "Game/EArrivedAtNewStage.h"
#include "Game/EGameOver.h"
@@ -109,6 +111,8 @@ private:
bool m_InkBlaster = false;
bool m_InkAttached = false;
bool m_InkBlockedWaiting = false;
bool m_KrakenAttack = false;
double m_KrakenCharge = 0;
bool m_Restarting = false;
int m_StickyCounter = 3;
bool m_GodMode = false;
@@ -130,6 +134,8 @@ private:
dd::EventRelay<BallSystem, dd::Events::StickyPad> m_EStickyPad;
dd::EventRelay<BallSystem, dd::Events::InkBlaster> m_EInkBlaster;
dd::EventRelay<BallSystem, dd::Events::InkBlasterOver> m_EInkBlasterOver;
dd::EventRelay<BallSystem, dd::Events::KrakenAttack> m_EKrakenAttack;
dd::EventRelay<BallSystem, dd::Events::KrakenAttackEnd> m_EKrakenAttackEnd;
dd::EventRelay<BallSystem, dd::Events::Pause> m_EPause;
dd::EventRelay<BallSystem, dd::Events::Resume> m_EResume;
dd::EventRelay<BallSystem, dd::Events::Contact> m_Contact;
@@ -145,6 +151,8 @@ private:
bool OnStickyPad(const dd::Events::StickyPad &event);
bool OnInkBlaster(const dd::Events::InkBlaster &event);
bool OnInkBlasterOver(const dd::Events::InkBlasterOver &event);
bool OnKrakenAttack(const dd::Events::KrakenAttack &event);
bool OnKrakenAttackEnd(const dd::Events::KrakenAttackEnd &event);
bool OnPause(const dd::Events::Pause &event);
bool OnResume(const dd::Events::Resume &event);
bool OnActionButton(const dd::Events::ActionButton &event);