add deep copy of config data

Revert "fix stale reference"

This reverts commit 03b17c0374787bca6dfec2da663da74ac76c26fb.

fix stale reference

Dockerfile

@@ -31,7 +31,7 @@ COPY --from=build /app/build/*Server /app/
 
 # Necessary suplimentary files
 COPY --from=build /app/build/*.ini /app/configs/
-COPY --from=build /app/build/vanity/*.* /app/vanity/
+COPY --from=build /app/build/vanity/*.* /app/vanity/*
 COPY --from=build /app/build/navmeshes /app/navmeshes
 COPY --from=build /app/build/migrations /app/migrations
 COPY --from=build /app/build/*.dcf /app/
@@ -39,7 +39,7 @@ COPY --from=build /app/build/*.dcf /app/
 # backup of config and vanity files to copy to the host incase 
 # of a mount clobbering the copy from above
 COPY --from=build /app/build/*.ini /app/default-configs/ 
-COPY --from=build /app/build/vanity/*.* /app/default-vanity/
+COPY --from=build /app/build/vanity/*.* /app/default-vanity/*
 
 # needed as the container runs with the root user
 # and therefore sudo doesn't exist

dGame/Character.cpp

@@ -239,7 +239,7 @@ void Character::SaveXMLToDatabase() {
 
 		auto zoneInfo = Game::zoneManager->GetZone()->GetZoneID();
 		// lzid garbage, binary concat of zoneID, zoneInstance and zoneClone
-		if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
+		// if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
 			uint64_t lzidConcat = zoneInfo.GetCloneID();
 			lzidConcat = (lzidConcat << 16) | uint16_t(zoneInfo.GetInstanceID());
 			lzidConcat = (lzidConcat << 16) | uint16_t(zoneInfo.GetMapID());
@@ -251,7 +251,7 @@ void Character::SaveXMLToDatabase() {
 
 			// Set the target scene, custom attribute
 			character->SetAttribute("tscene", m_TargetScene.c_str());
-		}
+		// }
 
 		auto emotes = character->FirstChildElement("ue");
 		if (!emotes) emotes = m_Doc.NewElement("ue");

dGame/Entity.cpp

@@ -660,7 +660,7 @@ void Entity::Initialize() {
 	}
 
 	PetComponent* petComponent;
-	if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::ITEM) > 0 && !TryGetComponent(eReplicaComponentType::PET, petComponent) && !HasComponent(eReplicaComponentType::MODEL)) {
+	if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::ITEM) > 0) {
 		AddComponent<ItemComponent>();
 	}
 
@@ -901,6 +901,14 @@ void Entity::WriteBaseReplicaData(RakNet::BitStream& outBitStream, eReplicaPacke
 			for (size_t i = 0; i < name.size(); ++i) {
 				outBitStream.Write<uint16_t>(name[i]);
 			}
+		} else if (HasVar(u"userModelName")) {
+			const auto& name = GetVar<std::string>(u"userModelName");
+			outBitStream.Write<uint8_t>(uint8_t(name.size()));
+
+			for (size_t i = 0; i < name.size(); ++i) {
+				outBitStream.Write<uint16_t>(name[i]);
+			}
+
 		} else {
 			const auto& name = GetVar<std::string>(u"npcName");
 			outBitStream.Write<uint8_t>(uint8_t(name.size()));
@@ -2158,3 +2166,12 @@ void Entity::SetRespawnRot(const NiQuaternion& rotation) {
 	auto* characterComponent = GetComponent<CharacterComponent>();
 	if (characterComponent) characterComponent->SetRespawnRot(rotation);
 }
+
+void Entity::EraseVar(const std::u16string& name) {
+	for (auto it = m_Settings.begin(); it != m_Settings.end(); ++it) {
+		if ((*it)->GetKey() == name) {
+			m_Settings.erase(it);
+			return;
+		}
+	}
+}

dGame/Entity.h

@@ -299,6 +299,7 @@ public:
 	// Scale will only be communicated to the client when the construction packet is sent
 	void SetScale(const float scale) { m_Scale = scale; };
 
+	void EraseVar(const std::u16string& name);
 protected:
 	LWOOBJID m_ObjectID;
 

dGame/dComponents/ControllablePhysicsComponent.cpp

@@ -187,7 +187,7 @@ void ControllablePhysicsComponent::UpdateXml(tinyxml2::XMLDocument& doc) {
 
 	auto zoneInfo = Game::zoneManager->GetZone()->GetZoneID();
 
-	if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
+	// if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
 		character->SetAttribute("lzx", m_Position.x);
 		character->SetAttribute("lzy", m_Position.y);
 		character->SetAttribute("lzz", m_Position.z);
@@ -195,7 +195,7 @@ void ControllablePhysicsComponent::UpdateXml(tinyxml2::XMLDocument& doc) {
 		character->SetAttribute("lzry", m_Rotation.y);
 		character->SetAttribute("lzrz", m_Rotation.z);
 		character->SetAttribute("lzrw", m_Rotation.w);
-	}
+	// }
 }
 
 void ControllablePhysicsComponent::SetPosition(const NiPoint3& pos) {

dGame/dComponents/ItemComponent.cpp

@@ -1,5 +1,29 @@
 #include "ItemComponent.h"
 
-void ItemComponent::Serialize(RakNet::BitStream& outBitStream, bool isConstruction) {
-	outBitStream.Write0();
+ItemComponent::ItemComponent(Entity* entity) : Component(entity) {
+	m_UgcId = m_Parent->GetVarAs<LWOOBJID>(u"userModelID");
+	m_Description = GeneralUtils::ASCIIToUTF16(m_Parent->GetVar<std::string>(u"userModelDesc"));
+	m_Dirty = false;
+	m_ModerationStatus = 2;
+	LOG("%s", m_Parent->GetVarAsString(u"userModelDesc").c_str());
+}
+
+void ItemComponent::Serialize(RakNet::BitStream& outBitStream, bool isConstruction) {
+	outBitStream.Write(m_Dirty || isConstruction);
+	if (m_Dirty || isConstruction) {
+		outBitStream.Write(m_UgcId);
+		outBitStream.Write(m_ModerationStatus);
+		outBitStream.Write(!m_Description.empty());
+		if (!m_Description.empty()) {
+			outBitStream.Write<uint32_t>(m_Description.size());
+			outBitStream.Write(m_Description);
+		}
+		if (!isConstruction) m_Dirty = false;
+	}
+}
+
+void ItemComponent::UpdateDescription(const std::u16string& description) {
+	if (m_Description == description) return;
+	m_Dirty = true;
+	m_Description = description;
 }

dGame/dComponents/ItemComponent.h

@@ -8,9 +8,16 @@ class ItemComponent final : public Component {
 public:
 	static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::ITEM;
 
-	ItemComponent(Entity* entity) : Component(entity) {}
+	ItemComponent(Entity* entity);
 
 	void Serialize(RakNet::BitStream& bitStream, bool isConstruction) override;
+
+	void UpdateDescription(const std::u16string& description);
+private:
+	std::u16string m_Description;
+	bool m_Dirty = false;
+	LWOOBJID m_UgcId = LWOOBJID_EMPTY;
+	uint32_t m_ModerationStatus = 0;
 };
 
 #endif  //!__ITEMCOMPONENT__H__

dGame/dComponents/ModelComponent.cpp

@@ -10,19 +10,9 @@
 ModelComponent::ModelComponent(Entity* parent) : Component(parent) {
 	m_OriginalPosition = m_Parent->GetDefaultPosition();
 	m_OriginalRotation = m_Parent->GetDefaultRotation();
-
-	m_userModelID = m_Parent->GetVarAs<LWOOBJID>(u"userModelID");
 }
 
 void ModelComponent::Serialize(RakNet::BitStream& outBitStream, bool bIsInitialUpdate) {
-	// ItemComponent Serialization.  Pets do not get this serialization.
-	if (!m_Parent->HasComponent(eReplicaComponentType::PET)) {
-		outBitStream.Write1();
-		outBitStream.Write<LWOOBJID>(m_userModelID != LWOOBJID_EMPTY ? m_userModelID : m_Parent->GetObjectID());
-		outBitStream.Write<int>(0);
-		outBitStream.Write0();
-	}
-
 	//actual model component:
 	outBitStream.Write1(); // Yes we are writing model info
 	outBitStream.Write0(); // Is pickable

dGame/dComponents/ModelComponent.h

@@ -126,9 +126,4 @@ private:
 	 * The rotation original of the model
 	 */
 	NiQuaternion m_OriginalRotation;
-
-	/**
-	 * The ID of the user that made the model
-	 */
-	LWOOBJID m_userModelID;
 };

dGame/dComponents/PropertyManagementComponent.cpp

@@ -21,7 +21,9 @@
 #include "eObjectBits.h"
 #include "CharacterComponent.h"
 #include "PlayerManager.h"
+#include "ItemComponent.h"
 
+#include <ranges>
 #include <vector>
 #include "CppScripts.h"
 
@@ -152,21 +154,49 @@ void PropertyManagementComponent::SetPrivacyOption(PropertyPrivacyOption value)
 	Database::Get()->UpdatePropertyModerationInfo(info);
 }
 
-void PropertyManagementComponent::UpdatePropertyDetails(std::string name, std::string description) {
+void PropertyManagementComponent::UpdatePropertyDetails(UpdatePropertyWithFilterCheck& update) {
 	if (owner == LWOOBJID_EMPTY) return;
 
-	propertyName = name;
+	if (update.isProperty) {
+		propertyName = update.name;
 
-	propertyDescription = description;
+		propertyDescription = update.description;
 
-	IProperty::Info info;
-	info.id = propertyId;
-	info.name = propertyName;
-	info.description = propertyDescription;
+		IProperty::Info info;
+		info.id = propertyId;
+		info.name = propertyName;
+		info.description = propertyDescription;
 
-	Database::Get()->UpdatePropertyDetails(info);
+		Database::Get()->UpdatePropertyDetails(info);
 
-	OnQueryPropertyData(GetOwner(), UNASSIGNED_SYSTEM_ADDRESS);
+		OnQueryPropertyData(GetOwner(), UNASSIGNED_SYSTEM_ADDRESS);
+	} else {
+		auto* entity = Game::entityManager->GetEntity(update.worldId);
+		if (!entity) return;
+
+		if (update.name.empty()) {
+			entity->EraseVar(u"userModelName");
+		} else {
+			entity->SetVar<std::string>(u"userModelName", update.name);
+		}
+
+		if (update.description.empty()) {
+			entity->EraseVar(u"userModelDesc");
+		} else {
+			entity->SetVar<std::string>(u"userModelDesc", update.description);
+		}
+
+		auto* owner = GetOwner();
+		if (!owner) return;
+
+		GameMessages::SendSetName(update.worldId, GeneralUtils::ASCIIToUTF16(update.name), owner->GetSystemAddress());
+		auto* itemComponent = entity->GetComponent<ItemComponent>();
+		if (itemComponent) {
+			itemComponent->UpdateDescription(GeneralUtils::ASCIIToUTF16(update.description));
+		}
+
+		Game::entityManager->SerializeEntity(entity);
+	}
 }
 
 bool PropertyManagementComponent::Claim(const LWOOBJID playerId) {
@@ -195,7 +225,7 @@ bool PropertyManagementComponent::Claim(const LWOOBJID playerId) {
 
 	auto prop_path = zone->GetPath(m_Parent->GetVarAsString(u"propertyName"));
 
-	if (prop_path){
+	if (prop_path) {
 		if (!prop_path->property.displayName.empty()) name = prop_path->property.displayName;
 		description = prop_path->property.displayDesc;
 	}
@@ -325,12 +355,15 @@ void PropertyManagementComponent::UpdateModelPosition(const LWOOBJID id, const N
 		return;
 	}
 
-	item->SetCount(item->GetCount() - 1);
-
 	auto* node = new SpawnerNode();
 
 	node->position = position;
 	node->rotation = rotation;
+	for (const auto config : item->GetConfig()) {
+		node->config.push_back(config->Copy());
+	}
+
+	item->SetCount(item->GetCount() - 1);
 
 	ObjectIDManager::RequestPersistentID([this, node, modelLOT, entity, position, rotation, originalRotation](uint32_t persistentId) {
 		SpawnerInfo info{};
@@ -352,11 +385,27 @@ void PropertyManagementComponent::UpdateModelPosition(const LWOOBJID id, const N
 
 		auto* spawner = Game::zoneManager->GetSpawner(spawnerId);
 
-		info.nodes[0]->config.push_back(new LDFData<LWOOBJID>(u"modelBehaviors", 0));
-		info.nodes[0]->config.push_back(new LDFData<LWOOBJID>(u"userModelID", info.spawnerID));
-		info.nodes[0]->config.push_back(new LDFData<int>(u"modelType", 2));
-		info.nodes[0]->config.push_back(new LDFData<bool>(u"propertyObjectID", true));
-		info.nodes[0]->config.push_back(new LDFData<int>(u"componentWhitelist", 1));
+		// If empty, insert the default config data since it doesn't exist yet
+
+		if (!node->HasVar(u"modelBehaviors")) {
+			node->config.push_back(new LDFData<LWOOBJID>(u"modelBehaviors", 0));
+		}
+
+		if (!node->HasVar(u"userModelID")) {
+			node->config.push_back(new LDFData<LWOOBJID>(u"userModelID", info.spawnerID));
+		}
+
+		if (!node->HasVar(u"modelType")) {
+			node->config.push_back(new LDFData<int>(u"modelType", 2));
+		}
+
+		if (!node->HasVar(u"propertyObjectID")) {
+			node->config.push_back(new LDFData<bool>(u"propertyObjectID", true));
+		}
+
+		if (!node->HasVar(u"componentWhitelist")) {
+			node->config.push_back(new LDFData<int>(u"componentWhitelist", 1));
+		}
 
 		auto* model = spawner->Spawn();
 
@@ -436,7 +485,7 @@ void PropertyManagementComponent::DeleteModel(const LWOOBJID id, const int delet
 		std::vector<LDFBaseData*> settings;
 
 		//fill our settings with BBB gurbage
-		LDFBaseData* ldfBlueprintID = new LDFData<LWOOBJID>(u"blueprintid", model->GetVar<LWOOBJID>(u"blueprintid"));
+		LDFBaseData* ldfBlueprintID = new LDFData<LWOOBJID>(u"blueprintID", model->GetVar<LWOOBJID>(u"blueprintID"));
 		LDFBaseData* userModelDesc = new LDFData<std::u16string>(u"userModelDesc", u"A cool model you made!");
 		LDFBaseData* userModelHasBhvr = new LDFData<bool>(u"userModelHasBhvr", false);
 		LDFBaseData* userModelID = new LDFData<LWOOBJID>(u"userModelID", model->GetVar<LWOOBJID>(u"userModelID"));
@@ -484,8 +533,9 @@ void PropertyManagementComponent::DeleteModel(const LWOOBJID id, const int delet
 		return;
 	}
 
-	inventoryComponent->AddItem(model->GetLOT(), 1, eLootSourceType::DELETION, INVALID, {}, LWOOBJID_EMPTY, false);
+	inventoryComponent->AddItem(model->GetLOT(), 1, eLootSourceType::DELETION, INVALID, model->GetSettings(), LWOOBJID_EMPTY, false);
 
+	// figure out how to get the actual item we picked up instead of just the first lot we find
 	auto* item = inventoryComponent->FindItemByLot(model->GetLOT());
 
 	if (item == nullptr) {
@@ -572,28 +622,21 @@ void PropertyManagementComponent::Load() {
 
 		info.spawnerID = databaseModel.id;
 
-		std::vector<LDFBaseData*> settings;
-
 		//BBB property models need to have extra stuff set for them:
 		if (databaseModel.lot == 14) {
 			LWOOBJID blueprintID = databaseModel.ugcId;
 			GeneralUtils::SetBit(blueprintID, eObjectBits::CHARACTER);
 			GeneralUtils::SetBit(blueprintID, eObjectBits::PERSISTENT);
 
-			settings.push_back(new LDFData<LWOOBJID>(u"blueprintid", blueprintID));
-			settings.push_back(new LDFData<int>(u"componentWhitelist", 1));
-			settings.push_back(new LDFData<int>(u"modelType", 2));
-			settings.push_back(new LDFData<bool>(u"propertyObjectID", true));
-			settings.push_back(new LDFData<LWOOBJID>(u"userModelID", databaseModel.id));
+			if (!node->HasVar(u"blueprintID")) node->config.push_back(new LDFData<LWOOBJID>(u"blueprintID", blueprintID));
 		} else {
-			settings.push_back(new LDFData<int>(u"modelType", 2));
-			settings.push_back(new LDFData<LWOOBJID>(u"userModelID", databaseModel.id));
-			settings.push_back(new LDFData<LWOOBJID>(u"modelBehaviors", 0));
-			settings.push_back(new LDFData<bool>(u"propertyObjectID", true));
-			settings.push_back(new LDFData<int>(u"componentWhitelist", 1));
+			if (!node->HasVar(u"modelBehaviors")) node->config.push_back(new LDFData<LWOOBJID>(u"modelBehaviors", 0));
 		}
 
-		node->config = settings;
+		if (!node->HasVar(u"modelType")) node->config.push_back(new LDFData<int>(u"modelType", 2));
+		if (!node->HasVar(u"componentWhitelist")) node->config.push_back(new LDFData<int>(u"componentWhitelist", 1));
+		if (!node->HasVar(u"propertyObjectID")) node->config.push_back(new LDFData<bool>(u"propertyObjectID", true));
+		if (!node->HasVar(u"userModelID")) node->config.push_back(new LDFData<LWOOBJID>(u"userModelID", databaseModel.id));
 
 		const auto spawnerId = Game::zoneManager->MakeSpawner(info);
 

dGame/dComponents/PropertyManagementComponent.h

@@ -17,12 +17,12 @@ enum class PropertyPrivacyOption {
 	/**
 	 * Your friends can visit your property
 	 */
-	 Friends = 1,
+	Friends = 1,
 
-	 /**
-	  * Requires Mythran approval, everyone can visit your property
-	  */
-	  Public = 2
+	/**
+	 * Requires Mythran approval, everyone can visit your property
+	 */
+	Public = 2
 };
 
 /**
@@ -30,6 +30,13 @@ enum class PropertyPrivacyOption {
  */
 class PropertyManagementComponent final : public Component {
 public:
+	struct UpdatePropertyWithFilterCheck {
+		LWOOBJID objectId;
+		LWOOBJID worldId;
+		bool isProperty;
+		std::string name;
+		std::string description;
+	};
 	static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::PROPERTY_MANAGEMENT;
 	PropertyManagementComponent(Entity* parent);
 	static PropertyManagementComponent* Instance();
@@ -95,7 +102,7 @@ public:
 	 * @param name the name to set for the property
 	 * @param description the description to set for the property
 	 */
-	void UpdatePropertyDetails(std::string name, std::string description);
+	void UpdatePropertyDetails(UpdatePropertyWithFilterCheck& update);
 
 	/**
 	 * Makes this property owned by the passed player ID, storing it in the database

dGame/dComponents/RacingControlComponent.cpp

@@ -25,7 +25,6 @@
 #include "LeaderboardManager.h"
 #include "dZoneManager.h"
 #include "CDActivitiesTable.h"
-#include "eStateChangeType.h"
 #include <ctime>
 
 #ifndef M_PI
@@ -78,9 +77,6 @@ void RacingControlComponent::OnPlayerLoaded(Entity* player) {
 
 	m_LoadedPlayers++;
 
-	// not live accurate to stun the player but prevents them from using skills during the race that are not meant to be used.
-	GameMessages::SendSetStunned(player->GetObjectID(), eStateChangeType::PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY, true, true, true, true, true, true, true, true, true);
-
 	LOG("Loading player %i",
 		m_LoadedPlayers);
 	m_LobbyPlayers.push_back(player->GetObjectID());

dGame/dComponents/VendorComponent.cpp

@@ -76,8 +76,8 @@ void VendorComponent::RefreshInventory(bool isCreation) {
 				if (vendorItems.empty()) break;
 				auto randomItemIndex = GeneralUtils::GenerateRandomNumber<int32_t>(0, vendorItems.size() - 1);
 				const auto& randomItem = vendorItems.at(randomItemIndex);
-				if (SetupItem(randomItem.itemid)) m_Inventory.push_back(SoldItem(randomItem.itemid, randomItem.sortPriority));
 				vendorItems.erase(vendorItems.begin() + randomItemIndex);
+				if (SetupItem(randomItem.itemid)) m_Inventory.push_back(SoldItem(randomItem.itemid, randomItem.sortPriority));
 			}
 		}
 	}

dGame/dGameMessages/GameMessages.cpp

@@ -102,7 +102,6 @@
 
 #include "CDComponentsRegistryTable.h"
 #include "CDObjectsTable.h"
-#include "eItemType.h"
 
 void GameMessages::SendFireEventClientSide(const LWOOBJID& objectID, const SystemAddress& sysAddr, std::u16string args, const LWOOBJID& object, int64_t param1, int param2, const LWOOBJID& sender) {
 	CBITSTREAM;
@@ -2208,19 +2207,17 @@ void GameMessages::HandleUnUseModel(RakNet::BitStream& inStream, Entity* entity,
 }
 
 void GameMessages::HandleUpdatePropertyOrModelForFilterCheck(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr) {
-	bool isProperty{};
-	LWOOBJID objectId{};
+	PropertyManagementComponent::UpdatePropertyWithFilterCheck filterCheck{};
 	LWOOBJID playerId{};
-	LWOOBJID worldId{};
 	uint32_t nameLength{};
 	std::u16string name{};
 	uint32_t descriptionLength{};
 	std::u16string description{};
 
-	inStream.Read(isProperty);
-	inStream.Read(objectId);
+	inStream.Read(filterCheck.isProperty);
+	inStream.Read(filterCheck.objectId);
 	inStream.Read(playerId);
-	inStream.Read(worldId);
+	inStream.Read(filterCheck.worldId);
 
 	inStream.Read(descriptionLength);
 	for (uint32_t i = 0; i < descriptionLength; ++i) {
@@ -2228,6 +2225,7 @@ void GameMessages::HandleUpdatePropertyOrModelForFilterCheck(RakNet::BitStream&
 		inStream.Read(character);
 		description.push_back(character);
 	}
+	filterCheck.description = GeneralUtils::UTF16ToWTF8(description);
 
 	inStream.Read(nameLength);
 	for (uint32_t i = 0; i < nameLength; ++i) {
@@ -2235,8 +2233,10 @@ void GameMessages::HandleUpdatePropertyOrModelForFilterCheck(RakNet::BitStream&
 		inStream.Read(character);
 		name.push_back(character);
 	}
+	filterCheck.name = GeneralUtils::UTF16ToWTF8(name);
+	LOG("names %s desc %s", filterCheck.name.c_str(), filterCheck.description.c_str());
 
-	PropertyManagementComponent::Instance()->UpdatePropertyDetails(GeneralUtils::UTF16ToWTF8(name), GeneralUtils::UTF16ToWTF8(description));
+	PropertyManagementComponent::Instance()->UpdatePropertyDetails(filterCheck);
 }
 
 void GameMessages::HandleQueryPropertyData(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr) {
@@ -2665,7 +2665,7 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream& inStream, Entity* ent
 		info.spawnerID = entity->GetObjectID();
 		info.spawnerNodeID = 0;
 
-		info.settings.push_back(new LDFData<LWOOBJID>(u"blueprintid", blueprintID));
+		info.settings.push_back(new LDFData<LWOOBJID>(u"blueprintID", blueprintID));
 		info.settings.push_back(new LDFData<int>(u"componentWhitelist", 1));
 		info.settings.push_back(new LDFData<int>(u"modelType", 2));
 		info.settings.push_back(new LDFData<bool>(u"propertyObjectID", true));
@@ -5353,8 +5353,7 @@ void GameMessages::HandleRemoveItemFromInventory(RakNet::BitStream& inStream, En
 	iStackCount = std::min<uint32_t>(item->GetCount(), iStackCount);
 
 	if (bConfirmed) {
-		const auto itemType = static_cast<eItemType>(item->GetInfo().itemType);
-		if (itemType == eItemType::MODEL || itemType == eItemType::LOOT_MODEL) {
+		if (eInvType == eInventoryType::MODELS) {
 			item->DisassembleModel(iStackCount);
 		}
 		auto lot = item->GetLot();

dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.cpp

@@ -15,7 +15,6 @@
 #include "SkillComponent.h"
 #include "eReplicaComponentType.h"
 #include "RenderComponent.h"
-#include "PlayerManager.h"
 
 #include <vector>
 
@@ -54,13 +53,11 @@ void BossSpiderQueenEnemyServer::OnStartup(Entity* self) {
 
 void BossSpiderQueenEnemyServer::OnDie(Entity* self, Entity* killer) {
 	if (Game::zoneManager->GetZoneID().GetMapID() == instanceZoneID && killer) {
-		for (const auto& player : PlayerManager::GetAllPlayers()) {
-			auto* missionComponent = player->GetComponent<MissionComponent>();
-			if (missionComponent == nullptr)
-				return;
+		auto* missionComponent = killer->GetComponent<MissionComponent>();
+		if (missionComponent == nullptr)
+			return;
 
-			missionComponent->CompleteMission(instanceMissionID);
-		}
+		missionComponent->CompleteMission(instanceMissionID);
 	}
 
 	// There is suppose to be a 0.1 second delay here but that may be admitted?

dScripts/CppScripts.cpp

@@ -14,7 +14,6 @@
 #include "AgShipPlayerDeathTrigger.h"
 #include "AgShipPlayerShockServer.h"
 #include "AgSpaceStuff.h"
-#include "AgShipShake.h"
 #include "AgImagSmashable.h"
 #include "NpcNpSpacemanBob.h"
 #include "StoryBoxInteractServer.h"
@@ -342,7 +341,6 @@ namespace {
 		{ "scripts\\ai\\AG\\L_AG_SHIP_PLAYER_DEATH_TRIGGER.lua", []() { return new AgShipPlayerDeathTrigger(); } },
 		{"scripts\\ai\\NP\\L_NPC_NP_SPACEMAN_BOB.lua", []() { return new NpcNpSpacemanBob(); } },
 		{"scripts\\ai\\AG\\L_AG_SPACE_STUFF.lua", []() { return new AgSpaceStuff();} },
-		{"scripts\\ai\\AG\\L_AG_SHIP_SHAKE.lua", []() { return new AgShipShake();}},
 		{"scripts\\ai\\AG\\L_AG_SHIP_PLAYER_SHOCK_SERVER.lua", []() { return new AgShipPlayerShockServer();} },
 		{"scripts\\ai\\AG\\L_AG_IMAG_SMASHABLE.lua", []() { return new AgImagSmashable();} },
 		{"scripts\\02_server\\Map\\General\\L_STORY_BOX_INTERACT_SERVER.lua", []() { return new StoryBoxInteractServer();} },
@@ -582,7 +580,6 @@ namespace {
 		{"scripts\\02_server\\Map\\AM\\L_SKULLKIN_DRILL_STAND.lua", []() {return new AmSkullkinDrillStand();}},
 		{"scripts\\02_server\\Map\\AM\\L_SKULLKIN_TOWER.lua", []() {return new AmSkullkinTower();}},
 		{"scripts\\02_server\\Enemy\\AM\\L_AM_NAMED_DARKLING_DRAGON.lua", []() {return new AmDarklingDragon();}},
-		{"scripts\\02_server\\Enemy\\AM\\L_AM_DARKLING_DRAGON.lua", []() {return new AmDarklingDragon();}},
 		{"scripts\\02_server\\Enemy\\AM\\L_AM_DARKLING_APE.lua", []() {return new BaseEnemyApe();}},
 		{"scripts\\02_server\\Map\\AM\\L_BLUE_X.lua", []() {return new AmBlueX();}},
 		{"scripts\\02_server\\Map\\AM\\L_TEAPOT_SERVER.lua", []() {return new AmTeapotServer();}},
@@ -657,7 +654,6 @@ namespace {
 
 		//Pickups
 		{"scripts\\ai\\SPEC\\L_SPECIAL_1_BRONZE-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(1);}},
-		{"scripts\\ai\\SPEC\\L_SPECIAL_1_GOLD-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(10000);}},
 		{"scripts\\ai\\SPEC\\L_SPECIAL_1_SILVER-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(100);}},
 		{"scripts\\ai\\SPEC\\L_SPECIAL_10_BRONZE-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(10);}},
 		{"scripts\\ai\\SPEC\\L_SPECIAL_10_GOLD-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(100000);}},
@@ -704,8 +700,7 @@ CppScripts::Script* const CppScripts::GetScript(Entity* parent, const std::strin
 			(scriptName == "scripts\\02_server\\Enemy\\General\\L_BASE_ENEMY_SPIDERLING.lua") ||
 			(scriptName == "scripts\\ai\\FV\\L_ACT_NINJA_STUDENT.lua") ||
 			(scriptName == "scripts\\ai\\WILD\\L_WILD_GF_FROG.lua") ||
-			(scriptName == "scripts\\empty.lua") ||
-			(scriptName == "scripts\\ai\\AG\\L_AG_SENTINEL_GUARD.lua")
+			(scriptName == "scripts\\empty.lua")
 			)) LOG_DEBUG("LOT %i attempted to load CppScript for '%s', but returned InvalidScript.", parent->GetLOT(), scriptName.c_str());
 	}
 

dScripts/ai/AG/AgShipShake.cpp

@@ -1,81 +0,0 @@
-#include "AgShipShake.h"
-#include "EntityInfo.h"
-#include "GeneralUtils.h"
-#include "GameMessages.h"
-#include "EntityManager.h"
-#include "RenderComponent.h"
-#include "Entity.h"
-
-void AgShipShake::OnStartup(Entity* self) {
-	EntityInfo info{};
-
-	info.pos = { -418, 585, -30 };
-	info.lot = 33;
-	info.spawnerID = self->GetObjectID();
-
-	auto* ref = Game::entityManager->CreateEntity(info);
-
-	Game::entityManager->ConstructEntity(ref);
-
-	self->SetVar(u"ShakeObject", ref->GetObjectID());
-
-	self->AddTimer("ShipShakeIdle", 2.0f);
-	self->SetVar(u"RandomTime", 10);
-}
-
-void AgShipShake::OnTimerDone(Entity* self, std::string timerName) {
-	auto* shipFxObject = GetEntityInGroup(ShipFX);
-	auto* shipFxObject2 = GetEntityInGroup(ShipFX2);
-	auto* debrisObject = GetEntityInGroup(DebrisFX);
-	if (timerName == "ShipShakeIdle") {
-		auto* ref = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"ShakeObject"));
-
-		const auto randomTime = self->GetVar<int>(u"RandomTime");
-		auto time = GeneralUtils::GenerateRandomNumber<int>(0, randomTime + 1);
-
-		if (time < randomTime / 2) {
-			time += randomTime / 2;
-		}
-
-		self->AddTimer("ShipShakeIdle", static_cast<float>(time));
-
-		if (ref)
-			GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(ref, FXName, ref->GetObjectID(), 500.0f);
-
-
-		if (debrisObject)
-			GameMessages::SendPlayFXEffect(debrisObject, -1, u"DebrisFall", "Debris", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
-
-		const auto randomFx = GeneralUtils::GenerateRandomNumber<int>(0, 3);
-
-		if (shipFxObject) {
-			std::string effectType = "shipboom" + std::to_string(randomFx);
-			GameMessages::SendPlayFXEffect(shipFxObject, 559, GeneralUtils::ASCIIToUTF16(effectType), "FX", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
-		}
-
-		self->AddTimer("ShipShakeExplode", 5.0f);
-
-		if (shipFxObject2)
-			RenderComponent::PlayAnimation(shipFxObject2, u"explosion");
-	} else if (timerName == "ShipShakeExplode") {
-		if (shipFxObject)
-			RenderComponent::PlayAnimation(shipFxObject, u"idle");
-		if (shipFxObject2)
-			RenderComponent::PlayAnimation(shipFxObject2, u"idle");
-	}
-}
-
-Entity* AgShipShake::GetEntityInGroup(const std::string& group) {
-	auto entities = Game::entityManager->GetEntitiesInGroup(group);
-	Entity* en = nullptr;
-
-	for (auto entity : entities) {
-		if (entity) {
-			en = entity;
-			break;
-		}
-	}
-
-	return en;
-}
-

dScripts/ai/AG/AgShipShake.h

@@ -1,16 +0,0 @@
-#pragma once
-#include "CppScripts.h"
-
-class AgShipShake : public CppScripts::Script {
-public:
-	void OnStartup(Entity* self) override;
-	void OnTimerDone(Entity* self, std::string timerName) override;
-
-	std::string DebrisFX = "DebrisFX";
-	std::string ShipFX = "ShipFX";
-	std::string ShipFX2 = "ShipFX2";
-	std::u16string FXName = u"camshake-bridge";
-
-private:
-	Entity* GetEntityInGroup(const std::string& group);
-};

dScripts/ai/AG/AgSpaceStuff.cpp

@@ -8,6 +8,21 @@
 
 void AgSpaceStuff::OnStartup(Entity* self) {
 	self->AddTimer("FloaterScale", 5.0f);
+
+	EntityInfo info{};
+
+	info.pos = { -418, 585, -30 };
+	info.lot = 33;
+	info.spawnerID = self->GetObjectID();
+
+	auto* ref = Game::entityManager->CreateEntity(info);
+
+	Game::entityManager->ConstructEntity(ref);
+
+	self->SetVar(u"ShakeObject", ref->GetObjectID());
+
+	self->AddTimer("ShipShakeIdle", 2.0f);
+	self->SetVar(u"RandomTime", 10);
 }
 
 void AgSpaceStuff::OnTimerDone(Entity* self, std::string timerName) {
@@ -22,5 +37,70 @@ void AgSpaceStuff::OnTimerDone(Entity* self, std::string timerName) {
 
 		RenderComponent::PlayAnimation(self, u"path_0" + (GeneralUtils::to_u16string(pathType)));
 		self->AddTimer("FloaterScale", randTime);
+	} else if (timerName == "ShipShakeExplode") {
+		DoShake(self, true);
+	} else if (timerName == "ShipShakeIdle") {
+		DoShake(self, false);
 	}
 }
+
+void AgSpaceStuff::DoShake(Entity* self, bool explodeIdle) {
+
+	if (!explodeIdle) {
+		auto* ref = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"ShakeObject"));
+
+		const auto randomTime = self->GetVar<int>(u"RandomTime");
+		auto time = GeneralUtils::GenerateRandomNumber<int>(0, randomTime + 1);
+
+		if (time < randomTime / 2) {
+			time += randomTime / 2;
+		}
+
+		self->AddTimer("ShipShakeIdle", static_cast<float>(time));
+
+		if (ref)
+			GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(ref, FXName, ref->GetObjectID(), 500.0f);
+
+		auto* debrisObject = GetEntityInGroup(DebrisFX);
+
+		if (debrisObject)
+			GameMessages::SendPlayFXEffect(debrisObject, -1, u"DebrisFall", "Debris", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
+
+		const auto randomFx = GeneralUtils::GenerateRandomNumber<int>(0, 3);
+
+		auto* shipFxObject = GetEntityInGroup(ShipFX);
+		if (shipFxObject) {
+			std::string effectType = "shipboom" + std::to_string(randomFx);
+			GameMessages::SendPlayFXEffect(shipFxObject, 559, GeneralUtils::ASCIIToUTF16(effectType), "FX", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
+		}
+
+		self->AddTimer("ShipShakeExplode", 5.0f);
+
+		auto* shipFxObject2 = GetEntityInGroup(ShipFX2);
+		if (shipFxObject2)
+			RenderComponent::PlayAnimation(shipFxObject2, u"explosion");
+	} else {
+		auto* shipFxObject = GetEntityInGroup(ShipFX);
+		auto* shipFxObject2 = GetEntityInGroup(ShipFX2);
+
+		if (shipFxObject)
+			RenderComponent::PlayAnimation(shipFxObject, u"idle");
+
+		if (shipFxObject2)
+			RenderComponent::PlayAnimation(shipFxObject2, u"idle");
+	}
+}
+
+Entity* AgSpaceStuff::GetEntityInGroup(const std::string& group) {
+	auto entities = Game::entityManager->GetEntitiesInGroup(group);
+	Entity* en = nullptr;
+
+	for (auto entity : entities) {
+		if (entity) {
+			en = entity;
+			break;
+		}
+	}
+
+	return en;
+}

dScripts/ai/AG/AgSpaceStuff.h

@@ -5,5 +5,14 @@ class AgSpaceStuff : public CppScripts::Script {
 public:
 	void OnStartup(Entity* self);
 	void OnTimerDone(Entity* self, std::string timerName);
+	void DoShake(Entity* self, bool explodeIdle);
+
+	std::string DebrisFX = "DebrisFX";
+	std::string ShipFX = "ShipFX";
+	std::string ShipFX2 = "ShipFX2";
+	std::u16string FXName = u"camshake-bridge";
+
+private:
+	Entity* GetEntityInGroup(const std::string& group);
 };
 

dScripts/ai/AG/CMakeLists.txt

@@ -1,7 +1,6 @@
 set(DSCRIPTS_SOURCES_AI_AG 
 	"AgShipPlayerDeathTrigger.cpp"
 	"AgSpaceStuff.cpp"
-    "AgShipShake.cpp"
 	"AgShipPlayerShockServer.cpp"
 	"AgImagSmashable.cpp"
 	"ActSharkPlayerDeathTrigger.cpp"

dZoneManager/Spawner.cpp

@@ -7,6 +7,15 @@
 #include "GeneralUtils.h"
 #include "dZoneManager.h"
 
+bool SpawnerNode::HasVar(const std::u16string_view view) {
+	for (const auto* data : config) {
+		if (data->GetKey() == view) {
+			return true;
+		}
+	}
+	return false;
+}
+
 Spawner::Spawner(const SpawnerInfo info) {
 	m_Info = info;
 	m_Active = m_Info.activeOnLoad && info.spawnActivator;

dZoneManager/Spawner.h

@@ -10,6 +10,7 @@
 #include <functional>
 #include "LDFFormat.h"
 #include "EntityInfo.h"
+#include <string_view>
 
 struct SpawnerNode {
 	NiPoint3 position = NiPoint3Constant::ZERO;
@@ -18,6 +19,8 @@ struct SpawnerNode {
 	uint32_t nodeMax = 1;
 	std::vector<LWOOBJID> entities;
 	std::vector<LDFBaseData*> config;
+
+	bool HasVar(const std::u16string_view view);
 };
 
 struct SpawnerInfo {