Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-10 02:08:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

backup commit with comments

Browse Source
This commit is contained in:
EmosewaMC 2022-02-10 01:03:51 -08:00
parent 6c5c6b7b8e
commit 9021c5209f
2 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
dGame/dComponents/InventoryComponent.cpp
View File

@ -911,8 +911,8 @@ void InventoryComponent::EquipItem(Item* item, const bool skipChecks)
const auto type = static_cast<eItemType>(item->GetInfo().itemType);
if (item->GetLot() == 8092 && m_Parent->GetGMLevel() >= GAME_MASTER_LEVEL_OPERATOR && hasCarEquipped == false)
{
auto startPosition = m_Parent->GetPosition() + NiPoint3::UNIT_Y + 10;
{ // Spawn above current position so we dont fall through floor?
auto startPosition = m_Parent->GetPosition() + NiPoint3::UNIT_Y + 2;
auto startRotation = NiQuaternion::LookAt(startPosition, startPosition + NiPoint3::UNIT_X);
auto angles = startRotation.GetEulerAngles();
@ -930,19 +930,19 @@ void InventoryComponent::EquipItem(Item* item, const bool skipChecks)
auto* carEntity = EntityManager::Instance()->CreateEntity(info, nullptr, m_Parent);
m_Parent->AddChild(carEntity);
// auto *destroyableComponent = carEntity->GetComponent<DestroyableComponent>();
// // Setup the vehicle stats.
// if (destroyableComponent != nullptr) {
// destroyableComponent->SetMaxImagination(60);
// destroyableComponent->SetImagination(0);
// destroyableComponent->SetIsImmune(true);
// }
auto *destroyableComponent = carEntity->GetComponent<DestroyableComponent>();
// Setup the vehicle stats.
if (destroyableComponent != nullptr) {
destroyableComponent->SetIsSmashable(false);
destroyableComponent->SetIsImmune(true);
}
// #108
auto* possessableComponent = carEntity->GetComponent<PossessableComponent>();
if (possessableComponent != nullptr)
{
previousPossessableID = possessableComponent->GetPossessor();
possessableComponent->SetPossessor(m_Parent->GetObjectID());
}
@ -961,11 +961,12 @@ void InventoryComponent::EquipItem(Item* item, const bool skipChecks)
}
}
}
// #107
auto* possessorComponent = m_Parent->GetComponent<PossessorComponent>();
if (possessorComponent != nullptr)
{
previousPossessorID = possessorComponent->GetPossessable();
possessorComponent->SetPossessable(carEntity->GetObjectID());
}
@ -982,8 +983,7 @@ void InventoryComponent::EquipItem(Item* item, const bool skipChecks)
GameMessages::SendSetJetPackMode(m_Parent, false);
GameMessages::SendNotifyVehicleOfRacingObject(carEntity->GetObjectID(), m_Parent->GetObjectID(), UNASSIGNED_SYSTEM_ADDRESS);
GameMessages::SendRacingPlayerLoaded(m_Parent->GetObjectID(), m_Parent->GetObjectID(), carEntity->GetObjectID(), UNASSIGNED_SYSTEM_ADDRESS);
GameMessages::SendRacingPlayerLoaded(m_Parent->GetObjectID(), m_Parent->GetObjectID(), carEntity->GetObjectID(), UNASSIGNED_SYSTEM_ADDRESS);
GameMessages::SendRacingPlayerLoaded(LWOOBJID_EMPTY, m_Parent->GetObjectID(), carEntity->GetObjectID(), UNASSIGNED_SYSTEM_ADDRESS);
GameMessages::SendVehicleUnlockInput(carEntity->GetObjectID(), false, UNASSIGNED_SYSTEM_ADDRESS);
GameMessages::SendTeleport(m_Parent->GetObjectID(), startPosition, startRotation, m_Parent->GetSystemAddress(), true, true);
GameMessages::SendTeleport(carEntity->GetObjectID(), startPosition, startRotation, m_Parent->GetSystemAddress(), true, true);
@ -1002,10 +1002,43 @@ void InventoryComponent::EquipItem(Item* item, const bool skipChecks)
return;
} else if (item->GetLot() == 8092 && m_Parent->GetGMLevel() >= GAME_MASTER_LEVEL_OPERATOR && hasCarEquipped == true)
{
// auto *playerInstance = dynamic_cast<Player *>(m_Parent);
// playerInstance->SendToZone(1200);
//GameMessages::SendTeleport(m_Parent->GetObjectID(), m_Parent->GetPosition(), m_Parent->GetRotation(), m_Parent->GetSystemAddress(), true, true);
// reset character component back to what it was
// auto* characterComponent = m_Parent->GetComponent<CharacterComponent>();
// equippedCarEntity->Kill();
// if (characterComponent != nullptr)
// {
// characterComponent->SetIsRacing(false);
// characterComponent->SetVehicleObjectID(LWOOBJID_EMPTY);
// }
// auto* possessableComponent = equippedCarEntity->GetComponent<PossessableComponent>();
// if (possessableComponent != nullptr)
// {
// possessableComponent->SetPossessor(previousPossessableID);
// previousPossessableID = LWOOBJID_EMPTY;
// }
// // #107
// auto* possessorComponent = m_Parent->GetComponent<PossessorComponent>();
// if (possessorComponent != nullptr)
// {
// possessorComponent->SetPossessable(previousPossessorID);
// previousPossessorID = LWOOBJID_EMPTY;
// }
GameMessages::SendNotifyRacingClient(LWOOBJID_EMPTY, 3, 0, LWOOBJID_EMPTY, u"", m_Parent->GetObjectID(), UNASSIGNED_SYSTEM_ADDRESS);
// GameMessages::SendNotifyVehicleOfRacingObject(equippedCarEntity->GetObjectID(), LWOOBJID_EMPTY, UNASSIGNED_SYSTEM_ADDRESS);
// GameMessages::SendRacingPlayerLoaded(LWOOBJID_EMPTY, m_Parent->GetObjectID(), LWOOBJID_EMPTY, UNASSIGNED_SYSTEM_ADDRESS);
//GameMessages::SendTeleport(m_Parent->GetObjectID(), equippedCarEntity->GetPosition(), equippedCarEntity->GetRotation(), m_Parent->GetSystemAddress(), true, true);
// EntityManager::Instance()->SerializeEntity(m_Parent);
auto player = dynamic_cast<Player*>(m_Parent);
player->SendToZone(player->GetCharacter()->GetZoneID());
equippedCarEntity->Kill();
hasCarEquipped = false;
equippedCarEntity = nullptr;
return;
}
if (!building)

2
dGame/dComponents/InventoryComponent.h
View File

@ -390,6 +390,8 @@ private:
*/
bool hasCarEquipped = false;
Entity* equippedCarEntity = nullptr;
LWOOBJID previousPossessableID = LWOOBJID_EMPTY;
LWOOBJID previousPossessorID = LWOOBJID_EMPTY;
/**
* Creates all the proxy items (subitems) for a parent item
* @param parent the parent item to generate all the subitems for