diff --git a/include/Game/BallSystem.h b/include/Game/BallSystem.h index 35fd924..1f9aa30 100644 --- a/include/Game/BallSystem.h +++ b/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; diff --git a/include/Game/EInkBlaster.h b/include/Game/EInkBlaster.h index 1128c5e..03058ca 100644 --- a/include/Game/EInkBlaster.h +++ b/include/Game/EInkBlaster.h @@ -16,6 +16,7 @@ namespace Events struct InkBlaster : Event { Components::Transform* Transform; + int Shots; }; } diff --git a/include/Game/EStickyPad.h b/include/Game/EStickyPad.h index bdaa47e..3b7e2eb 100644 --- a/include/Game/EStickyPad.h +++ b/include/Game/EStickyPad.h @@ -16,6 +16,7 @@ namespace Events struct StickyPad : Event { Components::Transform* Transform; + int Times; }; } diff --git a/src/game/Game/BallSystem.cpp b/src/game/Game/BallSystem.cpp index 205dcd6..e67cafb 100644 --- a/src/game/Game/BallSystem.cpp +++ b/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; } diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp index 8abc8cb..a71cdc1 100755 --- a/src/game/Game/LevelSystem.cpp +++ b/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 { diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp index 6e96fdc..323fea7 100755 --- a/src/game/Game/PadSystem.cpp +++ b/src/game/Game/PadSystem.cpp @@ -62,9 +62,10 @@ void dd::Systems::PadSystem::Initialize() m_World->SetProperty(ent, "Name", "Stick"); std::shared_ptr transform = m_World->AddComponent(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 sprite = m_World->AddComponent(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 sticky = m_World->AddComponent(ent); m_World->CommitEntity(ent); diff --git a/src/game/Game/ProjectileSystem.cpp b/src/game/Game/ProjectileSystem.cpp index 224d86b..566a009 100644 --- a/src/game/Game/ProjectileSystem.cpp +++ b/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; }