Enhance hit detection with proximity object checks

Refactor hit handling to include proximity checks for destroyable entities.

dGame/EntityManager.cpp

@@ -87,6 +87,8 @@ void EntityManager::ReloadConfig() {
 	auto hcXpReduction = Game::config->GetValue("hardcore_uscore_reduction");
 	m_HardcoreUscoreReduction = hcXpReduction.empty() ? 1.0f : GeneralUtils::TryParse<float>(hcXpReduction).value_or(1.0f);
 	m_HardcoreMode = GetHardcoreDisabledWorlds().contains(Game::zoneManager->GetZoneID().GetMapID()) ? false : m_HardcoreMode;
+	auto hcCoinKeep = Game::config->GetValue("hardcore_coin_keep");
+	m_HardcoreCoinKeep = hcCoinKeep.empty() ? false : GeneralUtils::TryParse<float>(hcCoinKeep).value_or(0.0f);
 }
 
 void EntityManager::Initialize() {

dGame/EntityManager.h

@@ -81,6 +81,7 @@ public:
 	const std::set<LOT>& GetHardcoreUscoreReducedLots() const { return m_HardcoreUscoreReducedLots; };
 	const std::set<LOT>& GetHardcoreUscoreExcludedEnemies() const { return m_HardcoreUscoreExcludedEnemies; };
 	const std::set<LWOMAPID>& GetHardcoreDisabledWorlds() const { return m_HardcoreDisabledWorlds; };
+	float GetHardcoreCoinKeep() const { return m_HardcoreCoinKeep; }
 
 	// Messaging
 	bool SendMessage(GameMessages::GameMsg& msg) const;
@@ -125,6 +126,7 @@ private:
 	std::set<LOT> m_HardcoreUscoreReducedLots{};
 	std::set<LOT> m_HardcoreUscoreExcludedEnemies{};
 	std::set<LWOMAPID> m_HardcoreDisabledWorlds{};
+	float m_HardcoreCoinKeep{};
 };
 
 #endif // ENTITYMANAGER_H

dGame/dComponents/DestroyableComponent.cpp

@@ -786,7 +786,7 @@ void DestroyableComponent::Smash(const LWOOBJID source, const eKillType killType
 		}
 	} else {
 		//Check if this zone allows coin drops
-		if (Game::zoneManager->GetPlayerLoseCoinOnDeath()) {
+		if (Game::zoneManager->GetPlayerLoseCoinOnDeath() && !Game::entityManager->GetHardcoreMode()) {
 			auto* character = m_Parent->GetCharacter();
 			uint64_t coinsTotal = character->GetCoins();
 			const uint64_t minCoinsToLose = Game::zoneManager->GetWorldConfig().coinsLostOnDeathMin;
@@ -1012,13 +1012,23 @@ void DestroyableComponent::DoHardcoreModeDrops(const LWOOBJID source) {
 		//get character:
 		auto* chars = m_Parent->GetCharacter();
 		if (chars) {
-			auto coins = chars->GetCoins();
+			auto oldCoins = chars->GetCoins();
+			// Floor this so there arent coins generated from rounding
+			auto coins = static_cast<uint64_t>(oldCoins * Game::entityManager->GetHardcoreCoinKeep());
+			auto coinsToDrop = oldCoins - coins;
+			LOG("Player had %llu coins, will lose %i coins to have %i", oldCoins, coinsToDrop, coins);
 
 			//lose all coins:
-			chars->SetCoins(0, eLootSourceType::NONE);
+			chars->SetCoins(coins, eLootSourceType::NONE);
 
 			//drop all coins:
-			GameMessages::SendDropClientLoot(m_Parent, source, LOT_NULL, coins, m_Parent->GetPosition());
+			constexpr auto MAX_TO_DROP_PER_GM = 100'000;
+			while (coinsToDrop > MAX_TO_DROP_PER_GM) {
+				LOG("Dropping 100,000, %llu left", coinsToDrop);
+				GameMessages::SendDropClientLoot(m_Parent, source, LOT_NULL, MAX_TO_DROP_PER_GM, m_Parent->GetPosition());
+				coinsToDrop -= MAX_TO_DROP_PER_GM;
+			}
+			GameMessages::SendDropClientLoot(m_Parent, source, LOT_NULL, coinsToDrop, m_Parent->GetPosition());
 		}
 		return;
 	}

dGame/dInventory/Inventory.cpp

@@ -324,10 +324,14 @@ Inventory::~Inventory() {
 void Inventory::RegenerateItemIDs() {
 	std::map<LWOOBJID, Item*> newItems{};
 	for (auto* const item : items | std::views::values) {
+		if (item->GetParent() != LWOOBJID_EMPTY) continue; // temp items dont need new ids
+		const bool equipped = item->IsEquipped();
+		if (equipped) item->UnEquip();
 		const auto oldID = item->GetId();
 		const auto newID = item->GenerateID();
 		LOG("Updating item ID from %llu to %llu", oldID, newID);
 		newItems.insert_or_assign(newID, item);
+		if (equipped) item->Equip();
 	}
 
 	// We don't want to delete the item pointers, we're just moving from map to map

dScripts/02_server/Map/General/ExplodingAsset.cpp

@@ -49,7 +49,7 @@ void ExplodingAsset::OnHit(Entity* self, Entity* attacker) {
 	if (!self->GetBoolean(u"bIsHit")) {
 		for (const auto objID : proximityComponent->GetProximityObjects("crateHitters")) {
 			auto* const entity = Game::entityManager->GetEntity(objID);
-			if (!entity) continue;
+			if (!entity || entity->GetObjectID() != attacker->GetObjectID()) continue;
 
 			auto* const destroyable = entity->GetComponent<DestroyableComponent>();
 			if (destroyable) destroyable->Smash(attacker->GetObjectID());

migrations/dlu/mysql/24_remove_persistent_bit.sql

@@ -28,10 +28,12 @@ CREATE TABLE `properties_contents_2` (
   `behavior_4` BIGINT DEFAULT 0,
   `behavior_5` BIGINT DEFAULT 0
 );
+SET foreign_key_checks = 0;
 INSERT INTO `ugc_2` SELECT `id`|0x1000000000000000,`account_id`,`character_id`,`is_optimized`,`lxfml`,`bake_ao`,`filename` FROM `ugc`;
 INSERT INTO `properties_contents_2` SELECT `id`,`property_id`,`ugc_id`|0x1000000000000000,`lot`,`x`,`y`,`z`,`rx`,`ry`,`rz`,`rw`,`model_name`,`model_description`,`behavior_1`,`behavior_2`,`behavior_3`,`behavior_4`,`behavior_5` FROM `properties_contents`;
 DROP TABLE `properties_contents`;
 DROP TABLE `ugc`;
 RENAME TABLE `properties_contents_2` TO `properties_contents`;
 RENAME TABLE `ugc_2` TO `ugc`;
+SET foreign_key_checks = 1;
 COMMIT;

resources/worldconfig.ini

@@ -99,3 +99,6 @@ hardcore_uscore_excluded_enemies=
 
 # Disables hardcore mode for specific worlds, if hardcore is enabled
 hardcore_disabled_worlds=
+
+# Keeps this percentage of a players' coins on death in hardcore
+hardcore_coin_keep=