Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-12-24 22:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

added bone dragon treasure dig handling

Browse Source
This commit is contained in:
jadebenn 2023-12-13 00:56:41 -06:00
parent 68df8af784
commit fd5ea75ead
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dGame/dComponents/PetComponent.cpp
View File

@ -159,7 +159,6 @@ void PetComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpd
void PetComponent::SetPetAiState(PetAiState newState) { void PetComponent::SetPetAiState(PetAiState newState) {
if (newState == GetPetAiState()) return; if (newState == GetPetAiState()) return;
this->m_State = newState; this->m_State = newState;
LOG_DEBUG("Set pet AI state!");
} }
void PetComponent::OnUse(Entity* originator) { void PetComponent::OnUse(Entity* originator) {
@ -331,13 +330,6 @@ void PetComponent::Update(float deltaTime) {
/*if (m_Owner == LWOOBJID_EMPTY) { /*if (m_Owner == LWOOBJID_EMPTY) {
UpdateUnowned(deltaTime); UpdateUnowned(deltaTime);
return; return;
}
// Determine pet owner
auto* owner = GetOwner();
if (!owner) {
m_Parent->Kill(); // Kill pet if no owner
return;
}*/ }*/
// Update timers // Update timers
@ -373,7 +365,6 @@ void PetComponent::Update(float deltaTime) {
break; break;
case PetAiState::goToObj: case PetAiState::goToObj:
LOG_DEBUG("Going to object!");
if (m_MovementAI->AtFinalWaypoint()) { if (m_MovementAI->AtFinalWaypoint()) {
LOG_DEBUG("Reached object!"); LOG_DEBUG("Reached object!");
m_MovementAI->Stop(); m_MovementAI->Stop();
@ -498,25 +489,6 @@ void PetComponent::UpdateUnowned(float deltaTime) { //TODO: CURRENTLY UNUSED
} }
} }
/*void PetComponent::SetIsReadyToDig(bool isReady) {
if (isReady) {
LOG("Dig state reached!");
//m_Interaction = closestTresure->GetObjectID();
//SetAbility(PetAbilityType::JumpOnObject);
SetStatus(PetStatus::IS_NOT_WAITING); // Treasure dig status
m_ReadyToDig = true;
Game::entityManager->SerializeEntity(m_Parent);
}
else {
LOG("Dig state ended!");
//m_Interaction = LWOOBJID_EMPTY;
//SetAbility(PetAbilityType::Invalid);
SetStatus(0); // TODO: Check status
m_ReadyToDig = false;
Game::entityManager->SerializeEntity(m_Parent);
}
}*/
void PetComponent::TryBuild(uint32_t numBricks, bool clientFailed) { void PetComponent::TryBuild(uint32_t numBricks, bool clientFailed) {
if (m_Tamer == LWOOBJID_EMPTY) return; if (m_Tamer == LWOOBJID_EMPTY) return;
@ -922,7 +894,8 @@ void PetComponent::OnFollow() {
const bool digUnlocked = missionComponent->GetMissionState(842) == eMissionState::COMPLETE; const bool digUnlocked = missionComponent->GetMissionState(842) == eMissionState::COMPLETE;
Entity* closestTreasure = PetDigServer::GetClosestTresure(ownerPos); Entity* closestTreasure = PetDigServer::GetClosestTresure(ownerPos);
if (closestTreasure != nullptr && digUnlocked) { const bool nonDragonForBone = closestTreasure->GetLOT() == 12192 && m_Parent->GetLOT() != 13067;
if (closestTreasure != nullptr && digUnlocked && !nonDragonForBone) {
const NiPoint3 treasurePos = closestTreasure->GetPosition(); const NiPoint3 treasurePos = closestTreasure->GetPosition();
const LWOOBJID treasureID = closestTreasure->GetObjectID(); const LWOOBJID treasureID = closestTreasure->GetObjectID();
const float distance = Vector3::DistanceSquared(ownerPos, treasurePos); const float distance = Vector3::DistanceSquared(ownerPos, treasurePos);
@ -1022,6 +995,7 @@ void PetComponent::SetupInteractTreasureDig() {
SetIsReadyToInteract(true); SetIsReadyToInteract(true);
SetAbility(PetAbilityType::JumpOnObject);
SetStatus(PetStatus::IS_NOT_WAITING); // TODO: Double-check this is the right flag being set SetStatus(PetStatus::IS_NOT_WAITING); // TODO: Double-check this is the right flag being set
Game::entityManager->SerializeEntity(m_Parent); // TODO: Double-check pet packet captures Game::entityManager->SerializeEntity(m_Parent); // TODO: Double-check pet packet captures
m_Timer += 0.5f; m_Timer += 0.5f;
@ -1208,6 +1182,7 @@ void PetComponent::Command(NiPoint3 position, LWOOBJID source, int32_t commandTy
// Emotes // Emotes
GameMessages::SendPlayEmote(m_Parent->GetObjectID(), typeId, owner->GetObjectID(), UNASSIGNED_SYSTEM_ADDRESS); GameMessages::SendPlayEmote(m_Parent->GetObjectID(), typeId, owner->GetObjectID(), UNASSIGNED_SYSTEM_ADDRESS);
} else if (commandType == 3) { } else if (commandType == 3) {
StopInteract(); // TODO: Verify this is necessary
SetPetAiState(PetAiState::follow); SetPetAiState(PetAiState::follow);
} else if (commandType == 6) { } else if (commandType == 6) {
// TODO: Go to player // TODO: Go to player
@ -1220,7 +1195,6 @@ void PetComponent::Command(NiPoint3 position, LWOOBJID source, int32_t commandTy
// Add movement functionality // Add movement functionality
if (position != NiPoint3::ZERO) { if (position != NiPoint3::ZERO) {
m_MovementAI->SetDestination(position); m_MovementAI->SetDestination(position);
//m_Timer = 9; //Is this setting how long until the next update tick?
} }
} }