mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2025-08-06 10:44:08 +00:00
format codebase
This commit is contained in:
@@ -14,8 +14,7 @@
|
||||
#include "MissionComponent.h"
|
||||
|
||||
|
||||
MissionTask::MissionTask(Mission* mission, CDMissionTasks* info, uint32_t mask)
|
||||
{
|
||||
MissionTask::MissionTask(Mission* mission, CDMissionTasks* info, uint32_t mask) {
|
||||
this->info = info;
|
||||
this->mission = mission;
|
||||
this->mask = mask;
|
||||
@@ -43,36 +42,30 @@ MissionTask::MissionTask(Mission* mission, CDMissionTasks* info, uint32_t mask)
|
||||
}
|
||||
|
||||
|
||||
MissionTaskType MissionTask::GetType() const
|
||||
{
|
||||
MissionTaskType MissionTask::GetType() const {
|
||||
return static_cast<MissionTaskType>(info->taskType);
|
||||
}
|
||||
|
||||
|
||||
uint32_t MissionTask::GetProgress() const
|
||||
{
|
||||
uint32_t MissionTask::GetProgress() const {
|
||||
return progress;
|
||||
}
|
||||
|
||||
|
||||
void MissionTask::SetProgress(const uint32_t value, const bool echo)
|
||||
{
|
||||
if (progress == value)
|
||||
{
|
||||
void MissionTask::SetProgress(const uint32_t value, const bool echo) {
|
||||
if (progress == value) {
|
||||
return;
|
||||
}
|
||||
|
||||
progress = value;
|
||||
|
||||
if (!echo)
|
||||
{
|
||||
if (!echo) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto* entity = mission->GetAssociate();
|
||||
|
||||
if (entity == nullptr)
|
||||
{
|
||||
if (entity == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -82,23 +75,19 @@ void MissionTask::SetProgress(const uint32_t value, const bool echo)
|
||||
}
|
||||
|
||||
|
||||
void MissionTask::SetUnique(const std::vector<uint32_t>& value)
|
||||
{
|
||||
void MissionTask::SetUnique(const std::vector<uint32_t>& value) {
|
||||
unique = value;
|
||||
}
|
||||
|
||||
|
||||
void MissionTask::AddProgress(int32_t value)
|
||||
{
|
||||
void MissionTask::AddProgress(int32_t value) {
|
||||
value += progress;
|
||||
|
||||
if (value > info->targetValue)
|
||||
{
|
||||
if (value > info->targetValue) {
|
||||
value = info->targetValue;
|
||||
}
|
||||
|
||||
if (value < 0)
|
||||
{
|
||||
if (value < 0) {
|
||||
value = 0;
|
||||
}
|
||||
|
||||
@@ -106,50 +95,42 @@ void MissionTask::AddProgress(int32_t value)
|
||||
}
|
||||
|
||||
|
||||
Mission* MissionTask::GetMission() const
|
||||
{
|
||||
Mission* MissionTask::GetMission() const {
|
||||
return mission;
|
||||
}
|
||||
|
||||
|
||||
uint32_t MissionTask::GetTarget() const
|
||||
{
|
||||
uint32_t MissionTask::GetTarget() const {
|
||||
return info->target;
|
||||
}
|
||||
|
||||
|
||||
const CDMissionTasks& MissionTask::GetClientInfo() const
|
||||
{
|
||||
const CDMissionTasks& MissionTask::GetClientInfo() const {
|
||||
return *info;
|
||||
}
|
||||
|
||||
|
||||
uint32_t MissionTask::GetMask() const
|
||||
{
|
||||
uint32_t MissionTask::GetMask() const {
|
||||
return mask;
|
||||
}
|
||||
|
||||
|
||||
const std::vector<uint32_t>& MissionTask::GetUnique() const
|
||||
{
|
||||
const std::vector<uint32_t>& MissionTask::GetUnique() const {
|
||||
return unique;
|
||||
}
|
||||
|
||||
|
||||
const std::vector<uint32_t>& MissionTask::GetTargets() const
|
||||
{
|
||||
const std::vector<uint32_t>& MissionTask::GetTargets() const {
|
||||
return targets;
|
||||
}
|
||||
|
||||
|
||||
const std::vector<uint32_t>& MissionTask::GetParameters() const
|
||||
{
|
||||
const std::vector<uint32_t>& MissionTask::GetParameters() const {
|
||||
return parameters;
|
||||
}
|
||||
|
||||
|
||||
std::vector<uint32_t> MissionTask::GetAllTargets() const
|
||||
{
|
||||
std::vector<uint32_t> MissionTask::GetAllTargets() const {
|
||||
auto targets = GetTargets();
|
||||
|
||||
targets.push_back(GetTarget());
|
||||
@@ -158,83 +139,68 @@ std::vector<uint32_t> MissionTask::GetAllTargets() const
|
||||
}
|
||||
|
||||
|
||||
bool MissionTask::InTargets(const uint32_t value) const
|
||||
{
|
||||
bool MissionTask::InTargets(const uint32_t value) const {
|
||||
auto targets = GetTargets();
|
||||
|
||||
return std::find(targets.begin(), targets.end(), value) != targets.end();
|
||||
}
|
||||
|
||||
|
||||
bool MissionTask::InAllTargets(const uint32_t value) const
|
||||
{
|
||||
bool MissionTask::InAllTargets(const uint32_t value) const {
|
||||
auto targets = GetAllTargets();
|
||||
|
||||
return std::find(targets.begin(), targets.end(), value) != targets.end();
|
||||
}
|
||||
|
||||
bool MissionTask::InParameters(const uint32_t value) const
|
||||
{
|
||||
bool MissionTask::InParameters(const uint32_t value) const {
|
||||
auto parameters = GetParameters();
|
||||
|
||||
return std::find(parameters.begin(), parameters.end(), value) != parameters.end();
|
||||
}
|
||||
|
||||
|
||||
bool MissionTask::IsComplete() const
|
||||
{
|
||||
bool MissionTask::IsComplete() const {
|
||||
// Mission 668 has task uid 984 which is a bit mask. Its completion value is 3.
|
||||
if (info->uid == 984) {
|
||||
return progress >= 3;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return progress >= info->targetValue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void MissionTask::Complete()
|
||||
{
|
||||
void MissionTask::Complete() {
|
||||
SetProgress(info->targetValue);
|
||||
}
|
||||
|
||||
|
||||
void MissionTask::CheckCompletion() const
|
||||
{
|
||||
if (IsComplete())
|
||||
{
|
||||
void MissionTask::CheckCompletion() const {
|
||||
if (IsComplete()) {
|
||||
mission->CheckCompletion();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string& targets, int32_t count)
|
||||
{
|
||||
void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string& targets, int32_t count) {
|
||||
if (IsComplete() && count > 0) return;
|
||||
|
||||
const auto type = GetType();
|
||||
|
||||
if (count < 0)
|
||||
{
|
||||
if (mission->IsMission() && type == MissionTaskType::MISSION_TASK_TYPE_ITEM_COLLECTION && InAllTargets(value))
|
||||
{
|
||||
if (parameters.size() > 0 && (parameters[0] & 1) != 0)
|
||||
{
|
||||
if (count < 0) {
|
||||
if (mission->IsMission() && type == MissionTaskType::MISSION_TASK_TYPE_ITEM_COLLECTION && InAllTargets(value)) {
|
||||
if (parameters.size() > 0 && (parameters[0] & 1) != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto* inventoryComponent = mission->GetAssociate()->GetComponent<InventoryComponent>();
|
||||
|
||||
if (inventoryComponent != nullptr)
|
||||
{
|
||||
if (inventoryComponent != nullptr) {
|
||||
int32_t itemCount = inventoryComponent->GetLotCountNonTransfer(value);
|
||||
|
||||
if (itemCount < info->targetValue)
|
||||
{
|
||||
if (itemCount < info->targetValue) {
|
||||
SetProgress(itemCount);
|
||||
|
||||
if (mission->IsReadyToComplete())
|
||||
{
|
||||
if (mission->IsReadyToComplete()) {
|
||||
mission->MakeActive();
|
||||
}
|
||||
}
|
||||
@@ -271,8 +237,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
|
||||
}
|
||||
|
||||
activity = static_cast<ScriptedActivityComponent*>(entity->GetComponent(COMPONENT_TYPE_REBUILD));
|
||||
if (activity == nullptr)
|
||||
{
|
||||
if (activity == nullptr) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -280,8 +245,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
|
||||
|
||||
const auto activityIdOverride = entity->GetVar<int32_t>(u"activityID");
|
||||
|
||||
if (activityIdOverride != 0)
|
||||
{
|
||||
if (activityIdOverride != 0) {
|
||||
activityId = activityIdOverride;
|
||||
}
|
||||
|
||||
@@ -308,8 +272,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
|
||||
|
||||
entity = EntityManager::Instance()->GetEntity(associate);
|
||||
|
||||
if (entity == nullptr)
|
||||
{
|
||||
if (entity == nullptr) {
|
||||
Game::logger->Log("MissionTask", "Failed to find associated entity (%llu)!", associate);
|
||||
|
||||
break;
|
||||
@@ -335,11 +298,11 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
|
||||
break;
|
||||
}
|
||||
|
||||
case MissionTaskType::MISSION_TASK_TYPE_MINIGAME:
|
||||
case MissionTaskType::MISSION_TASK_TYPE_MINIGAME:
|
||||
{
|
||||
auto* minigameManager = EntityManager::Instance()->GetEntity(associate);
|
||||
if (minigameManager == nullptr)
|
||||
break;
|
||||
break;
|
||||
|
||||
int32_t gameID = minigameManager->GetLOT();
|
||||
|
||||
@@ -353,11 +316,11 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
|
||||
}
|
||||
// This special case is for shooting gallery missions that want their
|
||||
// progress value set to 1 instead of being set to the target value.
|
||||
if(info->targetGroup == targets && value >= info->targetValue && GetMission()->IsMission() && info->target == 1864 && info->targetGroup == "performact_score") {
|
||||
if (info->targetGroup == targets && value >= info->targetValue && GetMission()->IsMission() && info->target == 1864 && info->targetGroup == "performact_score") {
|
||||
SetProgress(1);
|
||||
break;
|
||||
}
|
||||
if(info->targetGroup == targets && value >= info->targetValue) {
|
||||
if (info->targetGroup == targets && value >= info->targetValue) {
|
||||
SetProgress(info->targetValue);
|
||||
break;
|
||||
}
|
||||
@@ -383,8 +346,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
|
||||
|
||||
entity = EntityManager::Instance()->GetEntity(associate);
|
||||
|
||||
if (entity == nullptr)
|
||||
{
|
||||
if (entity == nullptr) {
|
||||
Game::logger->Log("MissionTask", "Failed to find associated entity (%llu)!", associate);
|
||||
|
||||
break;
|
||||
@@ -431,8 +393,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
|
||||
|
||||
if (parameters[0] != associate) break;
|
||||
|
||||
if (associate == 1 || associate == 2 || associate == 3)
|
||||
{
|
||||
if (associate == 1 || associate == 2 || associate == 3) {
|
||||
if (value > info->targetValue) break;
|
||||
|
||||
AddProgress(info->targetValue);
|
||||
@@ -447,26 +408,18 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
|
||||
// If we won at Gnarled Forest, set bit 1
|
||||
else if (value == 1303) SetProgress(tempProgress |= 1 << 1);
|
||||
// If both bits are set, then the client sees the mission as complete.
|
||||
}
|
||||
else if (associate == 10)
|
||||
{
|
||||
} else if (associate == 10) {
|
||||
// If the player did not crash during the race, progress this task by count.
|
||||
if (value != 0) break;
|
||||
|
||||
AddProgress(count);
|
||||
}
|
||||
else if (associate == 4 || associate == 5 || associate == 14)
|
||||
{
|
||||
} else if (associate == 4 || associate == 5 || associate == 14) {
|
||||
if (!InAllTargets(value)) break;
|
||||
AddProgress(count);
|
||||
}
|
||||
else if (associate == 17)
|
||||
{
|
||||
} else if (associate == 17) {
|
||||
if (!InAllTargets(value)) break;
|
||||
AddProgress(count);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
AddProgress(count);
|
||||
}
|
||||
|
||||
@@ -503,8 +456,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
|
||||
}
|
||||
|
||||
|
||||
MissionTask::~MissionTask()
|
||||
{
|
||||
MissionTask::~MissionTask() {
|
||||
targets.clear();
|
||||
|
||||
parameters.clear();
|
||||
|
Reference in New Issue
Block a user