Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 15:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crashes related to hardcore mode

Browse Source
This commit is contained in:
wincent 2023-01-11 21:50:21 +01:00
parent 5557a98129
commit 7aacfc1bf0
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dGame/dComponents/DestroyableComponent.cpp
View File

@ -666,46 +666,46 @@ void DestroyableComponent::Damage(uint32_t damage, const LWOOBJID source, uint32
return; return;
} }
Smash(source, eKillType::VIOLENT, u"", skillID);
//check if hardcore mode is enabled //check if hardcore mode is enabled
if (Game::config->GetValue("hardcore_mode") == "1") { if (Game::config->GetValue("hardcore_mode") == "1") {
//check if this is a player: //check if this is a player:
if (m_Parent->GetLOT() == 1) { if (m_Parent->GetLOT() == 1) {
//get hardcore_lose_uscore_on_death_percent from dconfig: //get hardcore_lose_uscore_on_death_percent from dconfig:
auto hardcore_lose_uscore_on_death_percent = std::stoi(Game::config->GetValue("hardcore_lose_uscore_on_death_percent")); auto hardcoreLoseUscoreOnDeathPercent = std::stoi(Game::config->GetValue("hardcore_lose_uscore_on_death_percent"));
//remove hardcore_lose_uscore_on_death_percent from the player's uscore: //remove hardcore_lose_uscore_on_death_percent from the player's uscore:
auto* character = m_Parent->GetComponent<CharacterComponent>(); auto* character = m_Parent->GetComponent<CharacterComponent>();
auto uscore = character->GetUScore(); auto uscore = character->GetUScore();
auto uscore_to_lose = uscore * hardcore_lose_uscore_on_death_percent / 100; auto uscoreToLose = uscore * hardcoreLoseUscoreOnDeathPercent / 100;
character->SetUScore(uscore - uscore_to_lose); character->SetUScore(uscore - uscoreToLose);
//get hardcore_dropinventory on death from dconfig: GameMessages::SendModifyLEGOScore(m_Parent, m_Parent->GetSystemAddress(), -uscoreToLose, eLootSourceType::LOOT_SOURCE_MISSION);
auto hardcore_dropinventory_on_death = (bool)std::stoi(Game::config->GetValue("hardcore_dropinventory_on_death"));
if (hardcore_dropinventory_on_death == false) return; // Reload the player
EntityManager::Instance()->DestructEntity(m_Parent);
EntityManager::Instance()->ConstructEntity(m_Parent);
auto hardcoreDropinventoryOnDeath = (bool)std::stoi(Game::config->GetValue("hardcore_dropinventory_on_death"));
if (hardcoreDropinventoryOnDeath == false) return;
//drop all items from inventory: //drop all items from inventory:
auto* inventory = m_Parent->GetComponent<InventoryComponent>(); auto* inventory = m_Parent->GetComponent<InventoryComponent>();
//get the items inventory: //get the items inventory:
auto items = inventory->GetInventory(eInventoryType::ITEMS); auto items = inventory->GetInventory(eInventoryType::ITEMS);
for (auto item : items->GetItems()) { auto itemMap = items->GetItems();
//check if this is an equipped item: for (const auto& item : itemMap) {
if (item.second->IsEquipped()) {
//unequip the item:
inventory->UnEquipItem(item.second);
}
//drop the item: //drop the item:
GameMessages::SendDropClientLoot(m_Parent, source, item.second->GetLot(), 0, m_Parent->GetPosition(), item.second->GetCount()); GameMessages::SendDropClientLoot(m_Parent, source, item.second->GetLot(), 0, m_Parent->GetPosition(), item.second->GetCount());
//remove from inventory: item.second->SetCount(0, false, false);
inventory->RemoveItem(item.second->GetLot(), item.second->GetCount());
} }
EntityManager::Instance()->SerializeEntity(m_Parent);
//get character: //get character:
auto* chars = m_Parent->GetCharacter(); auto* chars = m_Parent->GetCharacter();
if (chars) { if (chars) {
@ -727,15 +727,19 @@ void DestroyableComponent::Damage(uint32_t damage, const LWOOBJID source, uint32
auto maxHealth = GetMaxHealth(); auto maxHealth = GetMaxHealth();
//get the u-score to award from dconfig: //get the u-score to award from dconfig:
auto hardcore_uscore_enemies_multiplier = std::stoi(Game::config->GetValue("hardcore_uscore_enemies_multiplier")); auto hardcoreUscoreEnemiesMultiplier = std::stoi(Game::config->GetValue("hardcore_uscore_enemies_multiplier"));
int uscore = maxHealth * hardcore_uscore_enemies_multiplier; int uscore = maxHealth * hardcoreUscoreEnemiesMultiplier;
playerStats->SetUScore(playerStats->GetUScore() + uscore); playerStats->SetUScore(playerStats->GetUScore() + uscore);
GameMessages::SendModifyLEGOScore(player, player->GetSystemAddress(), uscore, eLootSourceType::LOOT_SOURCE_NONE); GameMessages::SendModifyLEGOScore(player, player->GetSystemAddress(), uscore, eLootSourceType::LOOT_SOURCE_MISSION);
EntityManager::Instance()->SerializeEntity(m_Parent);
} }
} }
} }
} }
Smash(source, eKillType::VIOLENT, u"", skillID);
} }
void DestroyableComponent::Subscribe(LWOOBJID scriptObjId, CppScripts::Script* scriptToAdd) { void DestroyableComponent::Subscribe(LWOOBJID scriptObjId, CppScripts::Script* scriptToAdd) {

13
dGame/dUtilities/SlashCommandHandler.cpp
View File

@ -1312,7 +1312,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
} }
} }
if ((chatCommand == "giveuscore") && args.size() == 1 && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) { if ((chatCommand == "giveuscore") && args.size() >= 1 && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) {
int32_t uscore; int32_t uscore;
if (!GeneralUtils::TryParse(args[0], uscore)) { if (!GeneralUtils::TryParse(args[0], uscore)) {
@ -1323,7 +1323,16 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
CharacterComponent* character = entity->GetComponent<CharacterComponent>(); CharacterComponent* character = entity->GetComponent<CharacterComponent>();
if (character) character->SetUScore(character->GetUScore() + uscore); if (character) character->SetUScore(character->GetUScore() + uscore);
// LOOT_SOURCE_MODERATION should work but it doesn't. Relog to see uscore changes // LOOT_SOURCE_MODERATION should work but it doesn't. Relog to see uscore changes
GameMessages::SendModifyLEGOScore(entity, entity->GetSystemAddress(), uscore, eLootSourceType::LOOT_SOURCE_MODERATION);
eLootSourceType lootType = eLootSourceType::LOOT_SOURCE_MODERATION;
int32_t type;
if (args.size() >= 2 && GeneralUtils::TryParse(args[1], type))
{
lootType = (eLootSourceType) type;
}
GameMessages::SendModifyLEGOScore(entity, entity->GetSystemAddress(), uscore, lootType);
} }
if ((chatCommand == "setlevel") && args.size() >= 1 && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) { if ((chatCommand == "setlevel") && args.size() >= 1 && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) {