Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green.

include/Game/BallSystem.h

@@ -105,7 +105,7 @@ private:
 	bool m_InkAttached = false;
 	bool m_InkBlockedWaiting = false;
 	bool m_Restarting = false;
-	int m_StickyCounter = 5;
+	int m_StickyCounter = 3;
 
 	bool m_StageBlockedWaiting = false;
 

include/Game/EInkBlaster.h

@@ -16,6 +16,7 @@ namespace Events
 struct InkBlaster : Event
 {
     Components::Transform* Transform;
+	int Shots;
 };
 
 }

include/Game/EStickyPad.h

@@ -16,6 +16,7 @@ namespace Events
 struct StickyPad : Event
 {
     Components::Transform* Transform;
+	int Times;
 };
 
 }

src/game/Game/BallSystem.cpp

@@ -446,7 +446,6 @@ bool dd::Systems::BallSystem::OnMultiBall(const dd::Events::MultiBall &event)
 bool dd::Systems::BallSystem::OnStickyPad(const dd::Events::StickyPad &event) 
 {
 	m_Sticky = true;
-	m_StickyCounter = 5;
 	return true;
 }
 

src/game/Game/LevelSystem.cpp

@@ -337,6 +337,7 @@ void dd::Systems::LevelSystem::BrickHit(EntityID entityHitter, EntityID entityBr
 			if (sticky != nullptr) {
 				Events::StickyPad e;
 				e.Transform = transformComponentBrick;
+				e.Times = 3;
 				EventBroker->Publish(e);
 			}
 			else {
@@ -344,6 +345,7 @@ void dd::Systems::LevelSystem::BrickHit(EntityID entityHitter, EntityID entityBr
 				if (ink != nullptr) {
 					Events::InkBlaster e;
 					e.Transform = transformComponentBrick;
+					e.Shots = 5;
 					EventBroker->Publish(e);
 				}
 				else {

src/game/Game/PadSystem.cpp

@@ -62,9 +62,10 @@ void dd::Systems::PadSystem::Initialize()
 		m_World->SetProperty(ent, "Name", "Stick");
 		std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
 		transform->Position = glm::vec3(30.f, 0.f, -10.f);
-		transform->Scale = glm::vec3(0.1f, 20.f, 0.1f);
+		transform->Scale = glm::vec3(0.1f, 25.f, 0.1f);
 		std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(ent);
-		sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
+		sprite->SpriteFile = "Models/Brick/White.png";
+		sprite->Color = glm::vec4(0.f, 0.5f, 0.f, 0.5f);
 		std::shared_ptr<Components::StickyAim> sticky = m_World->AddComponent<Components::StickyAim>(ent);
 		m_World->CommitEntity(ent);
 

src/game/Game/ProjectileSystem.cpp

@@ -90,7 +90,7 @@ bool dd::Systems::ProjectileSystem::OnContact(const dd::Events::Contact &event)
 bool dd::Systems::ProjectileSystem::OnInkBlaster(const dd::Events::InkBlaster &event)
 {
 	m_InkBlaster = true;
-	m_Shots = 5;
+	m_Shots = event.Shots;
 	return true;
 }