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

Compare commits

base: Pcornat:c6c3d941ead197f9dcf4641086285163be6faebd
Branches Tags
Pcornat:main
...
compare: Pcornat:d610ba376206577135c9f3a3e6cd7965ea97055a
Branches Tags
Pcornat:main

3 commits
c6c3d941ea ... d610ba3762

Author SHA1 Message Date
Pcornat
d610ba3762
 		Adding nodiscard for erase 2026-02-06 13:34:35 +01:00
Pcornat
f245f84601
 		Adding the max number of objects allowed 2026-02-06 13:34:27 +01:00
Pcornat
e575a51284
 		Simplify code 2026-02-06 13:34:10 +01:00
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/billy_objects.hpp
View file

@ -45,6 +45,8 @@ namespace character {
static constexpr std::string_view json_key{ "billy_objects" };
static constexpr std::uint32_t max_obj{ 3 };
static std::string_view billy_object_to_string(const billyObjects &object) noexcept;
static void to_json(json &j, const container &billy);
@ -53,7 +55,7 @@ namespace character {
[[nodiscard]] bool insert_object(CharacterSheet &sheet, const billyEnums objType) noexcept;
bool erase_object(CharacterSheet &sheet, const billyEnums objToErase) noexcept;
[[nodiscard]] bool erase_object(CharacterSheet &sheet, const billyEnums objToErase) noexcept;
[[nodiscard]] const std::plus<std::uint32_t> &get_plus_operation() const { return plus; }

10
src/billy_objects.cpp
View file

@ -17,7 +17,7 @@ namespace character {
bool BillyObjects::insert_object(CharacterSheet &sheet, const billyEnums objType) noexcept {
if (sheet.objects.size() < 3) {
if (sheet.objects.size() < max_obj) {
sheet.objects.emplace(objType,
std::visit(overloaded{
[](const weapons &arg) {
@ -99,13 +99,7 @@ namespace character {
void BillyObjects::check_dagger_conditions(CharacterSheet &sheet) {
if (const auto it_dagger = sheet.get_objects().find(tools::Dagger); it_dagger != sheet.get_objects().cend()) {
const std::size_t count_weapons = std::ranges::count_if(sheet.get_objects(),
[](container::const_reference node) {
return std::get_if<weapons>(&node.first) !=
nullptr;
}
);
if (count_weapons > 1 || sheet.get_objects().contains(weapons::Bow)) {
if (sheet.get_nb_weapons() > 1 || sheet.get_objects().contains(weapons::Bow)) {
sheet.habilete.materiel -= it_dagger->second->add_materiel(sheet.get_habilete().type);
}
}