Pcornat/BillySheet
1
0
Fork 0
Code Issues Pull requests Releases Activity

Reformat

Browse source
This commit is contained in:
Pcornat 2026-01-22 20:20:21 +01:00
commit b050a7634d
Signed by: Pcornat
GPG key ID: E0326CC678A00BDD
8 changed files with 113 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Unit testing/billy_objects_tests.cpp
View file

@ -23,9 +23,15 @@ namespace character::test {
static std::unique_ptr<GenericObject> get_obj(const billyEnums &object) noexcept {
return std::visit(overloaded{
[](const weapons &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Weapons>(arg)); },
[](const equipments &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Equipments>(arg)); },
[](const tools &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Tools>(arg)); },
[](const weapons &arg) {
return std::unique_ptr<GenericObject>(std::make_unique<Weapons>(arg));
},
[](const equipments &arg) {
return std::unique_ptr<GenericObject>(std::make_unique<Equipments>(arg));
},
[](const tools &arg) {
return std::unique_ptr<GenericObject>(std::make_unique<Tools>(arg));
},
},
object);
}

16
Unit testing/characteristics_tests.cpp
View file

@ -16,9 +16,7 @@ TEST_CASE("[A] Serialize adresse", "[serialize][0]") {
REQUIRE_NOTHROW(tester.at("base") == 1);
REQUIRE_NOTHROW(tester.at("carac") == 0);
REQUIRE_NOTHROW(tester.at("materiel") == 0);
REQUIRE_NOTHROW(tester.at("additional") == 0);
{
REQUIRE_NOTHROW(tester.at("additional") == 0); {
std::ofstream file{ "adresse.json" };
file << serializer << std::flush;
}
@ -35,9 +33,7 @@ TEST_CASE("[A] Serialize chance", "[serialize][1]") {
REQUIRE_NOTHROW(tester.at("base") == 3);
REQUIRE_NOTHROW(tester.at("carac") == 0);
REQUIRE_NOTHROW(tester.at("materiel") == 0);
REQUIRE_NOTHROW(tester.at("additional") == 0);
{
REQUIRE_NOTHROW(tester.at("additional") == 0); {
std::ofstream file{ "chance.json" };
file << serializer << std::flush;
}
@ -54,9 +50,7 @@ TEST_CASE("[A] Serialize endurance", "[serialize][2]") {
REQUIRE_NOTHROW(tester.at("base") == 2);
REQUIRE_NOTHROW(tester.at("carac") == 0);
REQUIRE_NOTHROW(tester.at("materiel") == 0);
REQUIRE_NOTHROW(tester.at("additional") == 0);
{
REQUIRE_NOTHROW(tester.at("additional") == 0); {
std::ofstream file{ "endurance.json" };
file << serializer << std::flush;
}
@ -73,9 +67,7 @@ TEST_CASE("[A] Serialize habilete", "[serialize][3]") {
REQUIRE_NOTHROW(tester.at("base") == 2);
REQUIRE_NOTHROW(tester.at("carac") == 0);
REQUIRE_NOTHROW(tester.at("materiel") == 0);
REQUIRE_NOTHROW(tester.at("additional") == 0);
{
REQUIRE_NOTHROW(tester.at("additional") == 0); {
std::ofstream file{ "habilete.json" };
file << serializer << std::flush;
}

2
include/character_sheet.hpp
View file

@ -15,7 +15,6 @@ namespace character {
class CharacterSheet final {
private:
friend BillyObjects;
std::string caractere{};
@ -54,6 +53,7 @@ namespace character {
std::uint32_t nb_equipments{ 0 };
std::uint32_t nb_tools{ 0 };
public:
CharacterSheet() = default;

5
include/characteristic.hpp
View file

@ -1,6 +1,7 @@
#ifndef BILLYSHEET_CHARACTERISTIC_HPP
#define BILLYSHEET_CHARACTERISTIC_HPP
#include <algorithm>
#include <cstdint>
#include <nlohmann/json.hpp>
@ -82,9 +83,7 @@ namespace character::characteristic {
[[nodiscard]] std::size_t get_total() const noexcept {
if (total == defaultValue::max()) {
total = static_cast<std::int32_t>(base + carac + materiel + additional);
if (total < 0) {
total = 0;
}
total = std::max(total, 0);
}
return total;
}

6
include/generic_object.hpp
View file

@ -12,7 +12,10 @@
// helper type for the visitor
template<typename... Ts>
struct overloaded : Ts ... { using Ts::operator()...; };
struct overloaded : Ts... {
using Ts::operator()...;
};
template<typename... Ts>
overloaded(Ts...) -> overloaded<Ts...>;
@ -139,7 +142,6 @@ namespace character {
[[nodiscard]] billyEnums get_type() const noexcept final { return type; }
};
} // character
#endif //BILLYSHEET_GENERIC_OBJECT_HPP

18
src/billy_objects.cpp
View file

@ -1,6 +1,7 @@
#include "billy_objects.hpp"
#include "characteristic.hpp"
#include "character_sheet.hpp"
#include <nlohmann/json.hpp>
constexpr std::uint32_t const_hash(const char *input) {
@ -20,12 +21,20 @@ namespace character {
sheet.objects.emplace(objType,
std::visit(overloaded{
[](const weapons &arg) {
return std::unique_ptr<GenericObject>(std::make_unique<Weapons>(arg));
return std::unique_ptr<GenericObject>(
std::make_unique<Weapons>(arg)
);
},
[](const equipments &arg) {
return std::unique_ptr<GenericObject>(std::make_unique<Equipments>(arg));
return std::unique_ptr<GenericObject>(
std::make_unique<Equipments>(arg)
);
},
[](const tools &arg) {
return std::unique_ptr<GenericObject>(
std::make_unique<Tools>(arg)
);
},
[](const tools &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Tools>(arg)); },
},
objType));
const auto &object = sheet.objects[objType];
@ -75,7 +84,8 @@ namespace character {
Characteristic &localAdresse,
Characteristic &localEndurance,
Characteristic &localChance,
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation) noexcept {
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation)
noexcept {
localHabilete.materiel = operation(localHabilete.materiel, arg->add_materiel(localHabilete.type));
localAdresse.materiel = operation(localAdresse.materiel, arg->add_materiel(localAdresse.type));
localEndurance.materiel = operation(localEndurance.materiel, arg->add_materiel(localEndurance.type));