Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Pets can no longer dig treasure without completing Bella Pepper's "Lost Tags" mission #1287

Merged
merged 3 commits into from
Nov 13, 2023
Merged

fix: Pets can no longer dig treasure without completing Bella Pepper's "Lost Tags" mission #1287

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53cb9a9
Added mission check to pet digs
jadebenn Nov 13, 2023
997ea88
Little formatting change
jadebenn Nov 13, 2023
c06b5ef
More formatting clean-up
jadebenn Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion dGame/dComponents/PetComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "RenderComponent.h"
#include "eObjectBits.h"
#include "eGameMasterLevel.h"
#include "eMissionState.h"

std::unordered_map<LOT, PetComponent::PetPuzzleData> PetComponent::buildCache{};
std::unordered_map<LWOOBJID, LWOOBJID> PetComponent::currentActivities{};
Expand Down Expand Up @@ -439,9 +440,15 @@ void PetComponent::Update(float deltaTime) {
}
}

auto* missionComponent = owner->GetComponent<MissionComponent>();
if (!missionComponent) return;

// Determine if the "Lost Tags" mission has been completed and digging has been unlocked
const bool digUnlocked = missionComponent->GetMissionState(842) == eMissionState::COMPLETE;

Entity* closestTresure = PetDigServer::GetClosestTresure(position);

if (closestTresure != nullptr) {
if (closestTresure != nullptr && digUnlocked) {
// Skeleton Dragon Pat special case for bone digging
if (closestTresure->GetLOT() == 12192 && m_Parent->GetLOT() != 13067) {
goto skipTresure;
Expand Down
Loading