Merge branch 'main' into fix/cmake-libs-2

dScripts/02_server/Map/AM/AmDrawBridge.cpp

@@ -66,7 +66,7 @@ void AmDrawBridge::OnTimerDone(Entity* self, std::string timerName) {
 			return;
 		}
 
-		simplePhysicsComponent->SetAngularVelocity(NiPoint3::ZERO);
+		simplePhysicsComponent->SetAngularVelocity(NiPoint3Constant::ZERO);
 
 		Game::entityManager->SerializeEntity(bridge);
 	}

dScripts/02_server/Map/AM/AmDropshipComputer.cpp

@@ -12,16 +12,12 @@ void AmDropshipComputer::OnStartup(Entity* self) {
 void AmDropshipComputer::OnUse(Entity* self, Entity* user) {
 	auto* quickBuildComponent = self->GetComponent<QuickBuildComponent>();
 
-	if (quickBuildComponent == nullptr || quickBuildComponent->GetState() != eQuickBuildState::COMPLETED) {
-		return;
-	}
+	if (!quickBuildComponent || quickBuildComponent->GetState() != eQuickBuildState::COMPLETED) return;
 
 	auto* missionComponent = user->GetComponent<MissionComponent>();
 	auto* inventoryComponent = user->GetComponent<InventoryComponent>();
 
-	if (missionComponent == nullptr || inventoryComponent == nullptr) {
-		return;
-	}
+	if (!missionComponent || !inventoryComponent) return;
 
 	if (inventoryComponent->GetLotCount(m_NexusTalonDataCard) != 0 || missionComponent->GetMission(979)->GetMissionState() == eMissionState::COMPLETE) {
 		return;
@@ -33,14 +29,12 @@ void AmDropshipComputer::OnUse(Entity* self, Entity* user) {
 void AmDropshipComputer::OnDie(Entity* self, Entity* killer) {
 	const auto myGroup = GeneralUtils::UTF16ToWTF8(self->GetVar<std::u16string>(u"spawner_name"));
 
-	int32_t pipeNum = 0;
-	if (!GeneralUtils::TryParse<int32_t>(myGroup.substr(10, 1), pipeNum)) {
-		return;
-	}
+	const auto pipeNum = GeneralUtils::TryParse<int32_t>(myGroup.substr(10, 1));
+	if (!pipeNum) return;
 
 	const auto pipeGroup = myGroup.substr(0, 10);
 
-	const auto nextPipeNum = pipeNum + 1;
+	const auto nextPipeNum = pipeNum.value() + 1;
 
 	const auto samePipeSpawners = Game::zoneManager->GetSpawnersByName(myGroup);
 
@@ -70,11 +64,9 @@ void AmDropshipComputer::OnDie(Entity* self, Entity* killer) {
 }
 
 void AmDropshipComputer::OnTimerDone(Entity* self, std::string timerName) {
-	auto* quickBuildComponent = self->GetComponent<QuickBuildComponent>();
+	const auto* const quickBuildComponent = self->GetComponent<QuickBuildComponent>();
 
-	if (quickBuildComponent == nullptr) {
-		return;
-	}
+	if (!quickBuildComponent) return;
 
 	if (timerName == "reset" && quickBuildComponent->GetState() == eQuickBuildState::OPEN) {
 		self->Smash(self->GetObjectID(), eKillType::SILENT);

dScripts/02_server/Map/AM/AmSkullkinTower.cpp

@@ -144,13 +144,10 @@ void AmSkullkinTower::OnChildRemoved(Entity* self, Entity* child) {
 			);
 
 			for (const auto& mission : missions) {
-				int32_t missionID = 0;
+				const auto missionID = GeneralUtils::TryParse<int32_t>(mission);
+				if (!missionID) continue;
 
-				if (!GeneralUtils::TryParse(mission, missionID)) {
-					continue;
-				}
-
-				missionIDs.push_back(missionID);
+				missionIDs.push_back(missionID.value());
 			}
 		}
 

dScripts/02_server/Map/AM/AmTemplateSkillVolume.cpp

@@ -12,12 +12,9 @@ void AmTemplateSkillVolume::OnSkillEventFired(Entity* self, Entity* caster, cons
 	const auto missionIDs = GeneralUtils::SplitString(missionIDsVariable, '_');
 
 	for (const auto& missionIDStr : missionIDs) {
-		int32_t missionID = 0;
+		const auto missionID = GeneralUtils::TryParse<uint32_t>(missionIDStr);
+		if (!missionID) continue;
 
-		if (!GeneralUtils::TryParse(missionIDStr, missionID)) {
-			continue;
-		}
-
-		missionComponent->ForceProgressTaskType(missionID, 1, 1, false);
+		missionComponent->ForceProgressTaskType(missionID.value(), 1, 1, false);
 	}
 }

dScripts/02_server/Map/AM/CMakeLists.txt

@@ -15,7 +15,9 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_AM
 	"AmSkullkinDrillStand.cpp"
 	"AmSkullkinTower.cpp"
 	"AmBlueX.cpp"
-	"AmTeapotServer.cpp")
+	"AmTeapotServer.cpp"
+	"WanderingVendor.cpp"
+	)
 
 add_library(dScriptsServerMapAM OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_AM})
 target_include_directories(dScriptsServerMapAM PUBLIC ".")

dScripts/02_server/Map/AM/WanderingVendor.cpp

@@ -0,0 +1,33 @@
+#include "WanderingVendor.h"
+#include "MovementAIComponent.h"
+#include "ProximityMonitorComponent.h"
+
+void WanderingVendor::OnStartup(Entity* self) {
+	auto movementAIComponent = self->GetComponent<MovementAIComponent>();
+	if (!movementAIComponent) return;
+	// movementAIComponent->Resume();
+	self->SetProximityRadius(10, "playermonitor");
+}
+
+void WanderingVendor::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) {
+	if (status == "ENTER" && entering->IsPlayer()) {
+		auto movementAIComponent = self->GetComponent<MovementAIComponent>();
+		if (!movementAIComponent) return;
+		// movementAIComponent->Pause();
+		self->CancelTimer("startWalking");
+	} else if (status == "LEAVE") {
+		auto* proximityMonitorComponent = self->GetComponent<ProximityMonitorComponent>();
+		if (!proximityMonitorComponent) self->AddComponent<ProximityMonitorComponent>();
+
+		const auto proxObjs = proximityMonitorComponent->GetProximityObjects("playermonitor");
+		if (proxObjs.empty()) self->AddTimer("startWalking", 1.5);
+	}
+}
+
+void WanderingVendor::OnTimerDone(Entity* self, std::string timerName) {
+	if (timerName == "startWalking") {
+		auto movementAIComponent = self->GetComponent<MovementAIComponent>();
+		if (!movementAIComponent) return;
+		// movementAIComponent->Resume();
+	}
+}

dScripts/02_server/Map/AM/WanderingVendor.h

@@ -0,0 +1,13 @@
+#ifndef __WANDERINGVENDOR__H__
+#define __WANDERINGVENDOR__H__
+
+#include "CppScripts.h"
+
+class WanderingVendor : public CppScripts::Script {
+public:
+	void OnStartup(Entity* self) override;
+	void OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) override;
+	void OnTimerDone(Entity* self, std::string timerName) override;
+};
+
+#endif  //!__WANDERINGVENDOR__H__