Cleaner includes
This commit is contained in:
parent
1f18499228
commit
e2d598d5d0
@ -11,13 +11,14 @@
|
||||
#include <variant>
|
||||
#include <string_view>
|
||||
#include <unordered_map>
|
||||
#include <ankerl/svector.h>
|
||||
#include "characteristic/characteristic.hpp"
|
||||
#include "generic_object.hpp"
|
||||
|
||||
|
||||
namespace character {
|
||||
class CharacterSheet;
|
||||
namespace characteristic{
|
||||
class Characteristic;
|
||||
}
|
||||
|
||||
class BillyObjects final {
|
||||
public:
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef BILLYSHEET_CHARACTER_SHEET_HPP
|
||||
#define BILLYSHEET_CHARACTER_SHEET_HPP
|
||||
|
||||
#include "characteristic/characteristic.hpp"
|
||||
#include "characteristic.hpp"
|
||||
#include "billy_objects.hpp"
|
||||
#include <unordered_set>
|
||||
|
||||
|
@ -9,7 +9,6 @@
|
||||
#include <variant>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include "characteristic/characteristic.hpp"
|
||||
|
||||
// helper type for the visitor
|
||||
template<typename... Ts>
|
||||
@ -18,6 +17,10 @@ template<typename... Ts>
|
||||
overloaded(Ts...) -> overloaded<Ts...>;
|
||||
|
||||
namespace character {
|
||||
namespace characteristic {
|
||||
enum class characType : std::uint8_t;
|
||||
}
|
||||
|
||||
using namespace std::string_literals;
|
||||
|
||||
enum class weapons : std::uint8_t {
|
||||
@ -59,7 +62,7 @@ namespace character {
|
||||
|
||||
[[nodiscard]] virtual std::uint32_t add_damage() const noexcept = 0;
|
||||
|
||||
[[nodiscard]] virtual std::int32_t add_materiel(const characteristic::characType inType) const noexcept = 0;
|
||||
[[nodiscard]] virtual std::int32_t add_materiel(const characteristic::characType &inType) const noexcept = 0;
|
||||
|
||||
[[nodiscard]] virtual std::string_view to_string() const noexcept = 0;
|
||||
|
||||
@ -84,7 +87,7 @@ namespace character {
|
||||
|
||||
[[nodiscard]] std::uint32_t add_damage() const noexcept final;
|
||||
|
||||
[[nodiscard]] std::int32_t add_materiel(const characteristic::characType inType) const noexcept final;
|
||||
[[nodiscard]] std::int32_t add_materiel(const characteristic::characType &inType) const noexcept final;
|
||||
|
||||
[[nodiscard]] std::string_view to_string() const noexcept final;
|
||||
|
||||
@ -107,7 +110,7 @@ namespace character {
|
||||
|
||||
[[nodiscard]] std::uint32_t add_damage() const noexcept final;
|
||||
|
||||
[[nodiscard]] std::int32_t add_materiel(const characteristic::characType inType) const noexcept final;
|
||||
[[nodiscard]] std::int32_t add_materiel(const characteristic::characType &inType) const noexcept final;
|
||||
|
||||
[[nodiscard]] std::string_view to_string() const noexcept final;
|
||||
|
||||
@ -130,7 +133,7 @@ namespace character {
|
||||
|
||||
[[nodiscard]] std::uint32_t add_damage() const noexcept final;
|
||||
|
||||
[[nodiscard]] std::int32_t add_materiel(const characteristic::characType inType) const noexcept final;
|
||||
[[nodiscard]] std::int32_t add_materiel(const characteristic::characType &inType) const noexcept final;
|
||||
|
||||
[[nodiscard]] std::string_view to_string() const noexcept final;
|
||||
|
||||
|
@ -1,9 +1,5 @@
|
||||
//
|
||||
// Created by postaron on 23/02/24.
|
||||
//
|
||||
#include "billy_objects.hpp"
|
||||
#include <spdlog/spdlog.h>
|
||||
#include "characteristic/characteristic.hpp"
|
||||
#include "characteristic.hpp"
|
||||
#include "character_sheet.hpp"
|
||||
|
||||
std::uint32_t constexpr const_hash(const char *input) {
|
||||
|
@ -1 +0,0 @@
|
||||
#include "character_sheet.hpp"
|
@ -3,6 +3,7 @@
|
||||
//
|
||||
|
||||
#include "generic_object.hpp"
|
||||
#include "characteristic.hpp"
|
||||
|
||||
namespace character {
|
||||
using characteristic::characType;
|
||||
@ -30,7 +31,7 @@ namespace character {
|
||||
|
||||
std::uint32_t Weapons::add_damage() const noexcept { return type == weapons::Morgenstern ? 1 : 0; }
|
||||
|
||||
std::int32_t Weapons::add_materiel(const characteristic::characType inType) const noexcept {
|
||||
std::int32_t Weapons::add_materiel(const characteristic::characType &inType) const noexcept {
|
||||
switch (type) {
|
||||
case weapons::Sword:
|
||||
if (inType == characType::Habilete) {
|
||||
@ -93,7 +94,7 @@ namespace character {
|
||||
|
||||
std::uint32_t Equipments::add_damage() const noexcept { return 0; }
|
||||
|
||||
std::int32_t Equipments::add_materiel(const characteristic::characType inType) const noexcept {
|
||||
std::int32_t Equipments::add_materiel(const characteristic::characType &inType) const noexcept {
|
||||
switch (type) {
|
||||
case equipments::Chainmail:
|
||||
if (inType == characType::Habilete ||
|
||||
@ -129,7 +130,7 @@ namespace character {
|
||||
|
||||
std::uint32_t Tools::add_damage() const noexcept { return 0; }
|
||||
|
||||
std::int32_t Tools::add_materiel(const characteristic::characType inType) const noexcept {
|
||||
std::int32_t Tools::add_materiel(const characteristic::characType &inType) const noexcept {
|
||||
switch (type) {
|
||||
case tools::Fourche:
|
||||
switch (inType) {
|
||||
|
Loading…
Reference in New Issue
Block a user