diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-11-22 23:11:42 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-11-22 23:11:42 +0100 |
| commit | a54898b7770e0d66b729216173960686c67e58bb (patch) | |
| tree | af8ed836a4789ef94c5bfed27abb713922f45af3 /src/openvic-simulation/military/LeaderTrait.hpp | |
| parent | e76336cd92639f4ec71088fc4c80aea4c25528cd (diff) | |
| parent | 738a203e0d8b4df87c42888043b99c13d5d97511 (diff) | |
Merge pull request #78 from OpenVicProject/property-macro
Refactoring (*mostly* related to the property macro)
Diffstat (limited to 'src/openvic-simulation/military/LeaderTrait.hpp')
| -rw-r--r-- | src/openvic-simulation/military/LeaderTrait.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/openvic-simulation/military/LeaderTrait.hpp b/src/openvic-simulation/military/LeaderTrait.hpp index 34de44d..4ec3b63 100644 --- a/src/openvic-simulation/military/LeaderTrait.hpp +++ b/src/openvic-simulation/military/LeaderTrait.hpp @@ -17,7 +17,7 @@ namespace OpenVic { enum class trait_type_t { PERSONALITY, BACKGROUND }; private: - const trait_type_t type; + const trait_type_t PROPERTY(trait_type); /* * Allowed modifiers for leaders: * attack - integer @@ -30,17 +30,15 @@ namespace OpenVic { * experience - % * reliability - decimal, mil gain or loss for associated POPs */ - const ModifierValue modifiers; + const ModifierValue PROPERTY(modifiers); LeaderTrait(std::string_view new_identifier, trait_type_t new_type, ModifierValue&& new_modifiers); public: LeaderTrait(LeaderTrait&&) = default; - trait_type_t get_trait_type() const; bool is_personality_trait() const; bool is_background_trait() const; - ModifierValue const& get_modifiers() const; }; struct LeaderTraitManager { |