mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-19 10:15:27 +00:00
fix(missions): accepting a repeat waits whole minutes of cooldown, as the client
The client's cooldown (LWOMissionComponent sub_00cd7770) counts whole minutes since the last completion and has none when Missions.cooldownTime is 0 or below. Accepting used seconds and treated only -1 as no cooldown, so a cooldown of 0 still refused in the second of completion and other negative values refused for a while. CanAccept now uses the same check as the offers (MissionComponent::IsCooldownRunning). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -175,14 +175,11 @@ bool MissionPrerequisites::CanAccept(const uint32_t missionId, const std::unorde
|
|||||||
const auto& info = mission->GetClientInfo();
|
const auto& info = mission->GetClientInfo();
|
||||||
|
|
||||||
if (info.repeatable) {
|
if (info.repeatable) {
|
||||||
const auto prerequisitesMet = CheckPrerequisites(missionId, missions);
|
// The client's cooldown (sub_00cd7770): whole minutes since the last completion, none when <= 0
|
||||||
|
const auto now = static_cast<int64_t>(std::time(nullptr));
|
||||||
|
if (MissionComponent::IsCooldownRunning(mission->GetTimestamp(), info.cooldownTime, now)) return false;
|
||||||
|
|
||||||
// Checked by client
|
return CheckPrerequisites(missionId, missions);
|
||||||
const time_t time = std::time(nullptr);
|
|
||||||
const time_t lock = mission->GetTimestamp() + info.cooldownTime * 60;
|
|
||||||
|
|
||||||
// If there's no time limit, just check the prerequisites, otherwise make sure both conditions are met
|
|
||||||
return (info.cooldownTime == -1 ? prerequisitesMet : (lock - time < 0)) && prerequisitesMet;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mission is already accepted and cannot be repeatedly accepted
|
// Mission is already accepted and cannot be repeatedly accepted
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
#include "tinyxml2.h"
|
#include "tinyxml2.h"
|
||||||
|
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
#include <ctime>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@@ -32,6 +33,8 @@ namespace {
|
|||||||
constexpr uint32_t AFTER_ACTIVE = 992008; // needs NOT_VIEWED:2 (in progress)
|
constexpr uint32_t AFTER_ACTIVE = 992008; // needs NOT_VIEWED:2 (in progress)
|
||||||
constexpr uint32_t GROUPED = 992009; // needs (FINISHED|VIEWED)&(992010|992011)
|
constexpr uint32_t GROUPED = 992009; // needs (FINISHED|VIEWED)&(992010|992011)
|
||||||
constexpr uint32_t ZERO = 992012; // prerequisite "0"
|
constexpr uint32_t ZERO = 992012; // prerequisite "0"
|
||||||
|
constexpr uint32_t HOURLY = 992013; // repeatable, 60 minute cooldown
|
||||||
|
constexpr uint32_t NEGATIVE = 992014; // repeatable, cooldown -5
|
||||||
|
|
||||||
CDMissions Row(const uint32_t id, const bool repeatable = false, const std::string& prereq = "", const int64_t cooldown = -1) {
|
CDMissions Row(const uint32_t id, const bool repeatable = false, const std::string& prereq = "", const int64_t cooldown = -1) {
|
||||||
CDMissions row{};
|
CDMissions row{};
|
||||||
@@ -59,6 +62,8 @@ protected:
|
|||||||
missions.push_back(Row(AFTER_ACTIVE, false, std::to_string(NOT_VIEWED) + ":2"));
|
missions.push_back(Row(AFTER_ACTIVE, false, std::to_string(NOT_VIEWED) + ":2"));
|
||||||
missions.push_back(Row(GROUPED, false, "(992003|992001)&(992010|992011)"));
|
missions.push_back(Row(GROUPED, false, "(992003|992001)&(992010|992011)"));
|
||||||
missions.push_back(Row(ZERO, false, "0"));
|
missions.push_back(Row(ZERO, false, "0"));
|
||||||
|
missions.push_back(Row(HOURLY, true, "", 60));
|
||||||
|
missions.push_back(Row(NEGATIVE, true, "", -5));
|
||||||
}
|
}
|
||||||
|
|
||||||
void TearDown() override {
|
void TearDown() override {
|
||||||
@@ -189,3 +194,23 @@ TEST_F(MissionClientRulesTests, PrerequisitesAsTheClient) {
|
|||||||
EXPECT_FALSE(fresh->CanAccept(AFTER_ACTIVE));
|
EXPECT_FALSE(fresh->CanAccept(AFTER_ACTIVE));
|
||||||
EXPECT_EQ(fresh->GetClientMissionState(AFTER_DAILY), 0);
|
EXPECT_EQ(fresh->GetClientMissionState(AFTER_DAILY), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_F(MissionClientRulesTests, CooldownInWholeMinutesWhenAccepting) {
|
||||||
|
const auto now = static_cast<int64_t>(std::time(nullptr));
|
||||||
|
const auto done = [](const uint32_t id, const int64_t at) {
|
||||||
|
return "<m id=\"" + std::to_string(id) + "\" state=\"8\" cct=\"1\" cts=\"" + std::to_string(at) + "\"/>";
|
||||||
|
};
|
||||||
|
|
||||||
|
Entity player(46, info);
|
||||||
|
auto* const missions = player.AddComponent<MissionComponent>(-1);
|
||||||
|
// Completed this second: a cooldown of 0 or below is none (DLU waited a second for 0 and blocked other negatives)
|
||||||
|
Load(*missions, done(DAILY, now) + done(NEGATIVE, now + 600) + done(HOURLY, now - 59 * 60), "");
|
||||||
|
EXPECT_TRUE(missions->CanAccept(DAILY));
|
||||||
|
EXPECT_TRUE(missions->CanAccept(NEGATIVE));
|
||||||
|
EXPECT_FALSE(missions->CanAccept(HOURLY));
|
||||||
|
|
||||||
|
Entity later(47, info);
|
||||||
|
auto* const again = later.AddComponent<MissionComponent>(-1);
|
||||||
|
Load(*again, done(HOURLY, now - 60 * 60), ""); // 60 whole minutes
|
||||||
|
EXPECT_TRUE(again->CanAccept(HOURLY));
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user