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.

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

feat(skymp5-server): Recipe checks #1979

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
35 changes: 32 additions & 3 deletions skymp5-server/cpp/server_guest_lib/ActionListener.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "ActionListener.h"
#include "AnimationSystem.h"
#include "Condition.h"
#include "ConsoleCommands.h"
#include "CropRegeneration.h"
#include "DummyMessageOutput.h"
Expand All @@ -11,15 +12,14 @@
#include "MovementValidation.h"
#include "MpObjectReference.h"
#include "MsgType.h"
#include "UpdateEquipmentMessage.h"
#include "UserMessageOutput.h"
#include "WorldState.h"
#include "script_objects/EspmGameObject.h"
#include <fmt/format.h>
#include <spdlog/spdlog.h>
#include <unordered_set>

#include "UpdateEquipmentMessage.h"

namespace {
void SendHostStop(PartOne& partOne, Networking::UserId badHosterUserId,
MpObjectReference& remote)
Expand Down Expand Up @@ -456,8 +456,37 @@ void UseCraftRecipe(MpActor* me, const espm::COBJ* recipeUsed,
spdlog::info("Using craft recipe with EDID {} from espm file with index {}",
recipeUsed->GetEditorId(cache), espmIdx);

std::vector<Condition*> conditions;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

raw pointer detected 🤖

please use std::unique_ptr/std::shared_ptr instead

This is how we usually do it + I see incorrect delete logic which is much easier to replace than fix, re-review, etc


for (auto& condition : recipeData.conditions) {
// impl race, item, perk? checks
if (condition.IsGetItemCount()) {
conditions.push_back(new ItemCountCondition(
condition.GetDefaultData().firstParameter, condition.comparisonValue,
condition.GetOperator(), condition.GetFlags()));
} else if (condition.IsGetIsRace()) {
conditions.push_back(new RaceCondition(
condition.GetDefaultData().firstParameter, condition.comparisonValue,
condition.GetOperator(), condition.GetFlags()));
}
}

bool requireAnd = false;
for (auto& cond : conditions) {
if (!cond->Evaluate(me)) {
if (cond->GetFlags() != espm::CTDA::Flags::OR || requireAnd) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want checking if the flag is set, we have to use & instead of != no matter how:

static_cast<uint32_t>(cond->GetFlags()) & static_cast<uint32_t>(espm::CTDA::Flags::OR)

== and & is not the same. the first one will check that ALL flags are in the same state

spdlog::trace("UseCraftRecipe - blocked by condition: {}",
cond->GetDescription());
delete cond;
return;
}
} else {
requireAnd = false;
}

if (cond->GetFlags() == espm::CTDA::Flags::ANDORDEFAULT) {
requireAnd = true;
}
delete cond;
}

std::vector<Inventory::Entry> entries;
Expand Down
90 changes: 90 additions & 0 deletions skymp5-server/cpp/server_guest_lib/Condition.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
#include "Condition.h"

bool CalculateOperationResult(int firstArgument, int secondArgument,
espm::CTDA::Operator conditionOperator)
{
switch (conditionOperator) {
case espm::CTDA::Operator::EqualTo:
return firstArgument == secondArgument;
case espm::CTDA::Operator::NotEqualTo:
return firstArgument != secondArgument;
case espm::CTDA::Operator::GreaterThen:
return firstArgument > secondArgument;
case espm::CTDA::Operator::GreaterThenOrEqualTo:
return firstArgument >= secondArgument;
case espm::CTDA::Operator::LessThen:
return firstArgument < secondArgument;
case espm::CTDA::Operator::LessThenOrEqualTo:
return firstArgument <= secondArgument;
default:
return false;
}
}

Condition::Condition(espm::CTDA::Operator conditionOperator,
espm::CTDA::Flags flags)
: conditionOperator(conditionOperator)
, flags(flags)
{
}

espm::CTDA::Flags Condition::GetFlags() const
{
return flags;
}

ItemCountCondition::ItemCountCondition(int itemId, int comparisonValue,
espm::CTDA::Operator conditionOperator,
espm::CTDA::Flags flags)
: Condition(conditionOperator, flags)
, itemId(itemId)
, comparisonValue(comparisonValue)
{
}

bool ItemCountCondition::Evaluate(MpActor* actor) const
{
int itemCount = actor->GetInventory().GetItemCount(itemId);
bool result =
CalculateOperationResult(itemCount, comparisonValue, conditionOperator);
spdlog::info("ItemCountCondition: itemId = {}, itemCount = {}, "
"comparisonValue = {}, operator = {}, result = {}",
itemId, itemCount, comparisonValue,
static_cast<int>(conditionOperator), result);
return result;
}

std::string ItemCountCondition::GetDescription() const
{
return "ItemCountCondition: itemId = " + std::to_string(itemId) +
", comparisonValue = " + std::to_string(comparisonValue) +
", operator = " + std::to_string(static_cast<int>(conditionOperator));
}

RaceCondition::RaceCondition(int raceId, int comparisonValue,
espm::CTDA::Operator conditionOperator,
espm::CTDA::Flags flags)
: Condition(conditionOperator, flags)
, raceId(raceId)
, comparisonValue(comparisonValue)
{
}

bool RaceCondition::Evaluate(MpActor* actor) const
{
int raceEquals = actor->GetRaceId() == raceId ? 1 : 0;
bool result =
CalculateOperationResult(raceEquals, comparisonValue, conditionOperator);
spdlog::info("RaceCondition: raceId = {}, raceEquals = {}, "
"comparisonValue = {}, operator = {}, result = {}",
raceId, raceEquals, comparisonValue,
static_cast<int>(conditionOperator), result);
return result;
}

std::string RaceCondition::GetDescription() const
{
return "RaceCondition: raceId = " + std::to_string(raceId) +
", comparisonValue = " + std::to_string(comparisonValue) +
", operator = " + std::to_string(static_cast<int>(conditionOperator));
}
47 changes: 47 additions & 0 deletions skymp5-server/cpp/server_guest_lib/Condition.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#pragma once
#include "MpActor.h"
#include <spdlog/spdlog.h>

class Condition
{
protected:
espm::CTDA::Operator conditionOperator;
espm::CTDA::Flags flags;

public:
Condition(espm::CTDA::Operator conditionOperator, espm::CTDA::Flags flags);
virtual bool Evaluate(MpActor* actor) const = 0;
virtual std::string GetDescription() const = 0;
espm::CTDA::Flags GetFlags() const;
virtual ~Condition() = default;
};

class ItemCountCondition : public Condition
{
int itemId = 0;
int comparisonValue = 0;

public:
ItemCountCondition(int itemId, int comparisonValue,
espm::CTDA::Operator conditionOperator,
espm::CTDA::Flags flags);

bool Evaluate(MpActor* actor) const override;

std::string GetDescription() const override;
};

class RaceCondition : public Condition
{
int raceId = 0;
int comparisonValue = 0;

public:
RaceCondition(int raceId, int comparisonValue,
espm::CTDA::Operator conditionOperator,
espm::CTDA::Flags flags);

bool Evaluate(MpActor* actor) const override;

std::string GetDescription() const override;
};
39 changes: 39 additions & 0 deletions unit/ConditionTest.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#include "Condition.h"
#include "TestUtils.hpp"
#include <catch2/catch_all.hpp>

TEST_CASE("ItemCountCondition evaluates correctly", "[ItemCountCondition]")
{
MpActor actor(LocationalData(), FormCallbacks::DoNothing());

ItemCountCondition condition(0x1, 5, espm::CTDA::Operator::EqualTo,
espm::CTDA::Flags::ANDORDEFAULT);

REQUIRE(condition.Evaluate(&actor) == false);

actor.AddItem(0x1, 4);

REQUIRE(condition.Evaluate(&actor) == false);

actor.AddItem(0x1, 1);

REQUIRE(condition.Evaluate(&actor) == true);
}

TEST_CASE("RaceCondition evaluates correctly", "[RaceCondition]")
{
MpActor actor(LocationalData(), FormCallbacks::DoNothing());
Appearance appearance;
appearance.raceId = 0x123;
actor.SetAppearance(&appearance);

RaceCondition condition(0x21, 1, espm::CTDA::Operator::EqualTo,
espm::CTDA::Flags::ANDORDEFAULT);

REQUIRE(condition.Evaluate(&actor) == false);

condition = RaceCondition(0x123, 1, espm::CTDA::Operator::EqualTo,
espm::CTDA::Flags::ANDORDEFAULT);

REQUIRE(condition.Evaluate(&actor) == true);
}
Loading