Correct code, I suppose. It compiles.
This commit is contained in:
parent
965d0c1a35
commit
40f692ea5e
GPG key ID:
E0326CC678A00BDD
2 changed files with 69 additions and 282 deletions
|
|
@ -17,10 +17,16 @@ constexpr std::uint32_t toolsHash = const_hash("tools");
|
|||
namespace character {
|
||||
using characteristic::Characteristic;
|
||||
|
||||
bool BillyObjects::push_object(const billyObject &object, CharacterSheet &sheet) noexcept {
|
||||
|
||||
bool BillyObjects::insert_object(CharacterSheet &sheet, const billyEnums objType) noexcept {
|
||||
if (sheet.objects.size() < 3) {
|
||||
sheet.objects.emplace_back(object);
|
||||
sheet.available_objects.erase(object);
|
||||
sheet.objects.emplace(objType, 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)); },
|
||||
}, objType));
|
||||
const auto &object = sheet.objects[objType];
|
||||
sheet.available_objects.erase(objType);
|
||||
|
||||
auto &local_habilete = static_cast<Characteristic &>(sheet.habilete);
|
||||
auto &local_adresse = static_cast<Characteristic &>(sheet.adresse);
|
||||
|
|
@ -28,42 +34,21 @@ namespace character {
|
|||
auto &local_chance = static_cast<Characteristic &>(sheet.chance);
|
||||
|
||||
std::visit(overloaded{
|
||||
[&](const weapons &arg) {
|
||||
++sheet.nb_weapons;
|
||||
change_carac_weapon(arg, sheet, local_habilete, local_adresse, local_endurance, plus);
|
||||
},
|
||||
[&](const equipments &arg) {
|
||||
++sheet.nb_equipments;
|
||||
change_carac_equipment(arg,
|
||||
sheet,
|
||||
local_habilete,
|
||||
local_adresse,
|
||||
local_endurance,
|
||||
local_chance,
|
||||
plus,
|
||||
minus);
|
||||
},
|
||||
[&](const tools &arg) {
|
||||
++sheet.nb_tools;
|
||||
change_carac_tools(arg,
|
||||
sheet,
|
||||
local_habilete,
|
||||
local_adresse,
|
||||
local_endurance,
|
||||
local_chance,
|
||||
plus);
|
||||
},
|
||||
}, object);
|
||||
[&](const weapons &arg) { ++sheet.nb_weapons; },
|
||||
[&](const equipments &arg) { ++sheet.nb_equipments; },
|
||||
[&](const tools &arg) { ++sheet.nb_tools; },
|
||||
}, objType);
|
||||
change_carac(object, sheet, local_habilete, local_adresse, local_endurance, local_chance, plus);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void BillyObjects::pop_object(CharacterSheet &sheet) noexcept {
|
||||
void BillyObjects::erase_object(CharacterSheet &sheet, const billyEnums objToErase) noexcept {
|
||||
if (!sheet.objects.empty()) {
|
||||
const billyObject obj = sheet.objects.back();
|
||||
sheet.objects.pop_back();
|
||||
sheet.available_objects.insert(obj);
|
||||
const billyObjects obj{ sheet.objects[objToErase].release() };
|
||||
sheet.objects.erase(objToErase);
|
||||
sheet.available_objects.insert(objToErase);
|
||||
|
||||
auto &local_habilete = static_cast<Characteristic &>(sheet.habilete);
|
||||
auto &local_adresse = static_cast<Characteristic &>(sheet.adresse);
|
||||
|
|
@ -71,171 +56,49 @@ namespace character {
|
|||
auto &local_chance = static_cast<Characteristic &>(sheet.chance);
|
||||
|
||||
std::visit(overloaded{
|
||||
[&](const weapons &arg) {
|
||||
--sheet.nb_weapons;
|
||||
change_carac_weapon(arg, sheet, local_habilete, local_adresse, local_endurance, minus);
|
||||
},
|
||||
[&](const equipments &arg) {
|
||||
--sheet.nb_equipments;
|
||||
change_carac_equipment(arg,
|
||||
sheet,
|
||||
local_habilete,
|
||||
local_adresse,
|
||||
local_endurance,
|
||||
local_chance,
|
||||
minus,
|
||||
plus);
|
||||
},
|
||||
[&](const tools &arg) {
|
||||
--sheet.nb_tools;
|
||||
change_carac_tools(arg,
|
||||
sheet,
|
||||
local_habilete,
|
||||
local_adresse,
|
||||
local_endurance,
|
||||
local_chance,
|
||||
minus);
|
||||
}
|
||||
}, obj);
|
||||
[&](const weapons &arg) { --sheet.nb_weapons; },
|
||||
[&](const equipments &arg) { --sheet.nb_equipments; },
|
||||
[&](const tools &arg) { --sheet.nb_tools; }
|
||||
}, objToErase);
|
||||
change_carac(obj, sheet, local_habilete, local_adresse, local_endurance, local_chance, minus);
|
||||
}
|
||||
}
|
||||
|
||||
void BillyObjects::change_carac_tools(const tools &arg,
|
||||
void BillyObjects::change_carac(const billyObjects &arg,
|
||||
CharacterSheet &sheet,
|
||||
Characteristic &localHabilete,
|
||||
Characteristic &localAdresse,
|
||||
Characteristic &localEndurance,
|
||||
Characteristic &localChance,
|
||||
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation) noexcept {
|
||||
switch (arg) {
|
||||
case tools::Fourche:
|
||||
localHabilete.materiel = operation(localHabilete.materiel, 1);
|
||||
localEndurance.materiel = operation(localEndurance.materiel, 3);
|
||||
break;
|
||||
case tools::Dagger:
|
||||
sheet.critique = operation(sheet.critique, 6);
|
||||
break;
|
||||
case tools::RockClimbingKit:
|
||||
localAdresse.materiel = operation(localAdresse.materiel, 1);
|
||||
break;
|
||||
case tools::SackOfGrain:
|
||||
localEndurance.materiel = operation(localEndurance.materiel, 2);
|
||||
localChance.materiel = operation(localChance.materiel, 2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void BillyObjects::change_carac_equipment(const equipments &arg,
|
||||
CharacterSheet &sheet,
|
||||
Characteristic &localHabilete,
|
||||
Characteristic &localAdresse,
|
||||
Characteristic &localEndurance,
|
||||
Characteristic &localChance,
|
||||
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &primary,
|
||||
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &complement) noexcept {
|
||||
switch (arg) {
|
||||
case equipments::Chainmail:
|
||||
localHabilete.materiel = complement(localHabilete.materiel, 1);
|
||||
localAdresse.materiel = complement(localAdresse.materiel, 1);
|
||||
localEndurance.materiel = primary(localEndurance.materiel, 1);
|
||||
sheet.armor = primary(sheet.armor, 2);
|
||||
break;
|
||||
case equipments::CookingPot:
|
||||
localEndurance.materiel = primary(localEndurance.materiel, 2);
|
||||
sheet.armor = primary(sheet.armor, 1);
|
||||
break;
|
||||
case equipments::PamphletTourist:
|
||||
localChance.materiel = primary(localChance.materiel, 4);
|
||||
break;
|
||||
case equipments::MedicKit:
|
||||
localChance.materiel = primary(localChance.materiel, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void BillyObjects::change_carac_weapon(const weapons &arg,
|
||||
CharacterSheet &sheet,
|
||||
Characteristic &localHabilete,
|
||||
Characteristic &localAdresse,
|
||||
Characteristic &localEndurance,
|
||||
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation) noexcept {
|
||||
switch (arg) {
|
||||
case weapons::Sword:
|
||||
localHabilete.materiel = operation(localHabilete.materiel, 4);
|
||||
break;
|
||||
case weapons::Lance:
|
||||
localHabilete.materiel = operation(localHabilete.materiel, 3);
|
||||
localAdresse.materiel = operation(localAdresse.materiel, 1);
|
||||
break;
|
||||
case weapons::Morgenstern:
|
||||
localHabilete.materiel = operation(localHabilete.materiel, 1);
|
||||
localEndurance.materiel = operation(localEndurance.materiel, 1);
|
||||
sheet.damage = operation(sheet.damage, 1);
|
||||
break;
|
||||
case weapons::Bow:
|
||||
localHabilete.materiel = operation(localHabilete.materiel, 3);
|
||||
localAdresse.materiel = operation(localAdresse.materiel, 1);
|
||||
break;
|
||||
}
|
||||
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));
|
||||
localChance.materiel = operation(localChance.materiel, arg->add_materiel(localChance.type));
|
||||
sheet.armor = operation(sheet.armor, arg->add_armor());
|
||||
sheet.damage = operation(sheet.armor, arg->add_damage());
|
||||
sheet.critique = operation(sheet.critique, arg->add_critique());
|
||||
}
|
||||
|
||||
void BillyObjects::check_dagger_conditions(const CharacterSheet &sheet,
|
||||
Characteristic &localHabilete,
|
||||
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation) {
|
||||
int count_weapons = 0;
|
||||
bool is_there_bow = false;
|
||||
std::for_each(sheet.objects.cbegin(), sheet.objects.cend(), [&](const billyObject &object) -> void {
|
||||
if (const weapons *p = std::get_if<weapons>(std::addressof(object)); p != nullptr) {
|
||||
++count_weapons;
|
||||
if (*p == weapons::Bow) {
|
||||
is_there_bow = true;
|
||||
}
|
||||
if (const auto it_dagger = sheet.objects.find(tools::Dagger); it_dagger != sheet.objects.cend()) {
|
||||
const std::size_t count_weapons = std::count_if(sheet.objects.cbegin(),
|
||||
sheet.objects.cend(),
|
||||
[](container::const_reference node) {
|
||||
return std::get_if<weapons>(&node.first) != nullptr;
|
||||
});
|
||||
const bool is_there_bow = sheet.objects.find(weapons::Bow) != sheet.objects.cend();
|
||||
if (count_weapons > 1 || is_there_bow) {
|
||||
localHabilete.materiel = operation(localHabilete.materiel,
|
||||
-it_dagger->second->add_materiel(localHabilete.type));
|
||||
}
|
||||
});
|
||||
if (count_weapons < 2 && !is_there_bow) {
|
||||
localHabilete.materiel = operation(localHabilete.materiel, 1);
|
||||
}
|
||||
}
|
||||
|
||||
std::string_view BillyObjects::billy_object_to_string(const billyObject &object) noexcept {
|
||||
return std::visit(overloaded{
|
||||
[](const weapons &arg) {
|
||||
switch (arg) {
|
||||
case weapons::Sword:
|
||||
return sword;
|
||||
case weapons::Lance:
|
||||
return lance;
|
||||
case weapons::Morgenstern:
|
||||
return morgenstern;
|
||||
case weapons::Bow:
|
||||
return bow;
|
||||
}
|
||||
},
|
||||
[](const equipments &arg) {
|
||||
switch (arg) {
|
||||
case equipments::Chainmail:
|
||||
return chainmail;
|
||||
case equipments::CookingPot:
|
||||
return cooking_pot;
|
||||
case equipments::MedicKit:
|
||||
return medic_kit;
|
||||
case equipments::PamphletTourist:
|
||||
return pamphlet_tourist;
|
||||
}
|
||||
},
|
||||
[](const tools &arg) {
|
||||
switch (arg) {
|
||||
case tools::Fourche:
|
||||
return fourche;
|
||||
case tools::Dagger:
|
||||
return dagger;
|
||||
case tools::RockClimbingKit:
|
||||
return rock_climbing_kit;
|
||||
case tools::SackOfGrain:
|
||||
return sack_of_grain;
|
||||
}
|
||||
}
|
||||
}, object);
|
||||
std::string_view BillyObjects::billy_object_to_string(const billyObjects &object) noexcept {
|
||||
return object->to_string();
|
||||
}
|
||||
|
||||
void BillyObjects::from_json(const json &j, BillyObjects::container &billy) {
|
||||
|
|
@ -244,20 +107,21 @@ namespace character {
|
|||
const std::uint8_t value = element[1].get<std::uint8_t>();
|
||||
switch (key) {
|
||||
case weaponsHash:
|
||||
billy.push_back(static_cast<weapons>(value));
|
||||
billy.emplace(static_cast<weapons>(value), std::make_unique<Weapons>(static_cast<weapons>(value)));
|
||||
break;
|
||||
case equipmentHash:
|
||||
billy.push_back(static_cast<equipments>(value));
|
||||
billy.emplace(static_cast<equipments>(value),
|
||||
std::make_unique<Equipments>(static_cast<equipments>(value)));
|
||||
break;
|
||||
case toolsHash:
|
||||
billy.push_back(static_cast<tools>(value));
|
||||
billy.emplace(static_cast<tools>(value), std::make_unique<Tools>(static_cast<tools>(value)));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void BillyObjects::to_json(json &j, const BillyObjects::container &billy) {
|
||||
for (const auto &object: billy) {
|
||||
for (const auto &[object_type, _]: billy) {
|
||||
std::visit(overloaded{
|
||||
[&j](const weapons weapon) {
|
||||
j.emplace_back(std::pair{ weaponsHash, static_cast<std::uint8_t>(weapon) });
|
||||
|
|
@ -268,27 +132,7 @@ namespace character {
|
|||
[&j](const tools tool) {
|
||||
j.emplace_back(std::pair{ toolsHash, static_cast<std::uint8_t>(tool) });
|
||||
}
|
||||
}, object);
|
||||
}, object_type);
|
||||
}
|
||||
}
|
||||
|
||||
ankerl::svector<bool, 3> BillyObjects::check_conformity(const CharacterSheet &sheet) noexcept {
|
||||
ankerl::svector<bool, 3> output;
|
||||
std::transform(sheet.get_objects().cbegin(),
|
||||
sheet.get_objects().cend(), std::back_inserter(output),
|
||||
[&sheet](const billyObject &object) -> bool {
|
||||
return std::visit(overloaded{
|
||||
[](const weapons weapon) { return false; },
|
||||
[](const equipments equipment) { return false; },
|
||||
[](const tools tool) { return false; },
|
||||
}, object);
|
||||
});
|
||||
const int total = std::accumulate(sheet.get_objects().cbegin(),
|
||||
sheet.get_objects().cend(),
|
||||
0,
|
||||
[](const int a, const billyObject &object) -> int {
|
||||
return 0;
|
||||
});
|
||||
return output;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue