Make better

And fail switch if we don't have enough imagination

dGame/dBehaviors/Behavior.cpp

@@ -61,7 +61,6 @@
 #include "SpeedBehavior.h"
 #include "DamageReductionBehavior.h"
 #include "JetPackBehavior.h"
-#include "FallSpeedBehavior.h"
 #include "ChangeIdleFlagsBehavior.h"
 #include "DarkInspirationBehavior.h"
 
@@ -165,9 +164,7 @@ Behavior* Behavior::CreateBehavior(const uint32_t behaviorId) {
 	case BehaviorTemplates::BEHAVIOR_CAR_BOOST:
 		behavior = new CarBoostBehavior(behaviorId);
 		break;
-	case BehaviorTemplates::BEHAVIOR_FALL_SPEED:
-		behavior = new FallSpeedBehavior(behaviorId);
-		break;
+	case BehaviorTemplates::BEHAVIOR_FALL_SPEED: break;
 	case BehaviorTemplates::BEHAVIOR_SHIELD: break;
 	case BehaviorTemplates::BEHAVIOR_REPAIR_ARMOR:
 		behavior = new RepairBehavior(behaviorId);

dGame/dBehaviors/CMakeLists.txt

@@ -22,7 +22,6 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"DurationBehavior.cpp"
 	"EmptyBehavior.cpp"
 	"EndBehavior.cpp"
-	"FallSpeedBehavior.cpp"
 	"ForceMovementBehavior.cpp"
 	"HealBehavior.cpp"
 	"ImaginationBehavior.cpp"

dGame/dBehaviors/FallSpeedBehavior.cpp

@@ -1,50 +0,0 @@
-#include "FallSpeedBehavior.h"
-
-#include "ControllablePhysicsComponent.h"
-#include "BehaviorContext.h"
-#include "BehaviorBranchContext.h"
-
-
-void FallSpeedBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	// make sure required parameter has non-default value
-	if (m_PercentSlowed == 0.0f) return;
-	auto* target = EntityManager::Instance()->GetEntity(branch.target);
-	if (!target) return;
-
-	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
-	if (!controllablePhysicsComponent) return;
-	controllablePhysicsComponent->SetGravityScale(m_PercentSlowed);
-	EntityManager::Instance()->SerializeEntity(target);
-
-	if (branch.duration > 0.0f) {
-		context->RegisterTimerBehavior(this, branch);
-	} else if (branch.start > 0) {
-		context->RegisterEndBehavior(this, branch);
-	}
-}
-
-void FallSpeedBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	Handle(context, bitStream, branch);
-}
-
-void FallSpeedBehavior::Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
-	End(context, branch, second);
-}
-
-void FallSpeedBehavior::UnCast(BehaviorContext* context, BehaviorBranchContext branch) {
-	End(context, branch, LWOOBJID_EMPTY);
-}
-
-void FallSpeedBehavior::End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
-	auto* target = EntityManager::Instance()->GetEntity(branch.target);
-	if (!target) return;
-
-	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
-	if (!controllablePhysicsComponent) return;
-	controllablePhysicsComponent->SetGravityScale(1);
-	EntityManager::Instance()->SerializeEntity(target);
-}
-
-void FallSpeedBehavior::Load(){
-	m_PercentSlowed = GetFloat("percent_slowed");
-}

dGame/dBehaviors/FallSpeedBehavior.h

@@ -1,18 +0,0 @@
-#pragma once
-#include "Behavior.h"
-
-class FallSpeedBehavior final : public Behavior
-{
-public:
-	explicit FallSpeedBehavior(const uint32_t behaviorId) : Behavior(behaviorId) {}
-
-	void Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-	void Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-	void Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
-	void End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
-	void UnCast(BehaviorContext* context, BehaviorBranchContext branch) override;
-	void Load() override;
-
-private:
-	float m_PercentSlowed;
-};

dGame/dBehaviors/SwitchBehavior.cpp

@@ -30,7 +30,7 @@ void SwitchBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStre
 
 	Game::logger->LogDebug("SwitchBehavior", "[%i] State: (%d), imagination: (%i) / (%f)", entity->GetLOT(), state, destroyableComponent->GetImagination(), destroyableComponent->GetMaxImagination());
 
-	if (state || (entity->GetLOT() == 8092 && destroyableComponent->GetImagination() >= m_imagination)) {
+	if (state) {
 		this->m_actionTrue->Handle(context, bitStream, branch);
 	} else {
 		this->m_actionFalse->Handle(context, bitStream, branch);

dGame/dComponents/ControllablePhysicsComponent.cpp

@@ -320,7 +320,7 @@ void ControllablePhysicsComponent::RemoveSpeedboost(float value) {
 
 	// Recalculate speedboost since we removed one
 	m_SpeedBoost = 0.0f;
-	if (m_ActiveSpeedBoosts.empty()) { // no active speed boosts left, so return to base speed
+	if (m_ActiveSpeedBoosts.size() == 0) { // no active speed boosts left, so return to base speed
 		auto* levelProgressionComponent = m_Parent->GetComponent<LevelProgressionComponent>();
 		if (levelProgressionComponent) m_SpeedBoost = levelProgressionComponent->GetSpeedBase();
 	} else { // Used the last applied speedboost

dGame/dComponents/ControllablePhysicsComponent.h

@@ -276,7 +276,7 @@ public:
 	 * The speed boosts of this component.
 	 * @return All active Speed boosts for this component.
 	 */
-	std::vector<float> GetActiveSpeedboosts() { return m_ActiveSpeedBoosts; };
+	std::vector<float> GetActiveSpeedboosts() { return m_ActivePickupRadiusScales; };
 
 	/**
 	* Activates the Bubble Buff

dGame/dComponents/RacingControlComponent.cpp

@@ -404,7 +404,7 @@ void RacingControlComponent::HandleMessageBoxResponse(Entity* player, int32_t bu
 				missionComponent->Progress(eMissionTaskType::RACING, dZoneManager::Instance()->GetZone()->GetWorldID(), (LWOOBJID)eRacingTaskParam::LAST_PLACE_FINISH); // Finished first place in specific world.
 			}
 		}
-	} else if ((id == "ACT_RACE_EXIT_THE_RACE?" || id == "Exit") && button == m_ActivityExitConfirm) {
+	} else if (id == "ACT_RACE_EXIT_THE_RACE?" && button == m_ActivityExitConfirm) {
 		auto* vehicle = EntityManager::Instance()->GetEntity(data->vehicleID);
 
 		if (vehicle == nullptr) {

dGame/dComponents/RebuildComponent.cpp

@@ -196,18 +196,18 @@ void RebuildComponent::Update(float deltaTime) {
 			DestroyableComponent* destComp = builder->GetComponent<DestroyableComponent>();
 			if (!destComp) break;
 
-			int newImagination = destComp->GetImagination() - 1;
+			int newImagination = destComp->GetImagination();
+			if (newImagination <= 0) {
+				CancelRebuild(builder, eQuickBuildFailReason::OUT_OF_IMAGINATION, true);
+				break;
+			}
 
+			++m_DrainedImagination;
+			--newImagination;
 			destComp->SetImagination(newImagination);
 			EntityManager::Instance()->SerializeEntity(builder);
 
-			++m_DrainedImagination;
 
-			if (newImagination == 0 && m_DrainedImagination < m_TakeImagination) {
-				CancelRebuild(builder, eQuickBuildFailReason::OUT_OF_IMAGINATION, true);
-
-				break;
-			}
 		}
 
 		if (m_Timer >= m_CompleteTime && m_DrainedImagination >= m_TakeImagination) {

dGame/dComponents/TriggerComponent.cpp

@@ -235,8 +235,6 @@ void TriggerComponent::HandleRotateObject(Entity* targetEntity, std::vector<std:
 }
 
 void TriggerComponent::HandlePushObject(Entity* targetEntity, std::vector<std::string> argArray){
-	if (argArray.size() < 3) return;
-
 	auto* phantomPhysicsComponent = m_Parent->GetComponent<PhantomPhysicsComponent>();
 	if (!phantomPhysicsComponent) {
 		Game::logger->LogDebug("TriggerComponent::HandlePushObject", "Phantom Physics component not found!");