diff options
Diffstat (limited to 'src/openvic-simulation/history/CountryHistory.hpp')
| -rw-r--r-- | src/openvic-simulation/history/CountryHistory.hpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/openvic-simulation/history/CountryHistory.hpp b/src/openvic-simulation/history/CountryHistory.hpp index ed200bf..af7d502 100644 --- a/src/openvic-simulation/history/CountryHistory.hpp +++ b/src/openvic-simulation/history/CountryHistory.hpp @@ -1,7 +1,7 @@ #pragma once #include <map> -#include <vector> +#include <optional> #include "openvic-simulation/country/Country.hpp" #include "openvic-simulation/history/Bookmark.hpp" @@ -16,6 +16,8 @@ #include "openvic-simulation/pop/Religion.hpp" #include "openvic-simulation/types/Colour.hpp" #include "openvic-simulation/types/Date.hpp" +#include "openvic-simulation/research/Invention.hpp" +#include "openvic-simulation/research/Technology.hpp" namespace OpenVic { struct CountryHistoryMap; @@ -36,12 +38,25 @@ namespace OpenVic { std::optional<GovernmentType const*> PROPERTY(government_type); std::optional<fixed_point_t> PROPERTY(plurality); std::optional<NationalValue const*> PROPERTY(national_value); - std::optional<bool> PROPERTY(civilised); + std::optional<bool> PROPERTY_CUSTOM_PREFIX(civilised, is); std::optional<fixed_point_t> PROPERTY(prestige); std::vector<Reform const*> PROPERTY(reforms); std::optional<Deployment const*> PROPERTY(inital_oob); - // TODO: technologies, tech schools, and inventions when PR#51 merged - // TODO: starting foreign investment + std::optional<TechnologySchool const*> PROPERTY(tech_school); + std::map<Technology const*, bool> PROPERTY(technologies); + std::map<Invention const*, bool> PROPERTY(inventions); + fixed_point_map_t<Country const*> PROPERTY(foreign_investment); + std::optional<fixed_point_t> PROPERTY(consciousness); + std::optional<fixed_point_t> PROPERTY(nonstate_consciousness); + std::optional<fixed_point_t> PROPERTY(literacy); + std::optional<fixed_point_t> PROPERTY(nonstate_culture_literacy); + std::optional<bool> PROPERTY_CUSTOM_PREFIX(releasable_vassal, is); + std::optional<fixed_point_t> PROPERTY(colonial_points); + string_set_t PROPERTY(country_flags); + string_set_t PROPERTY(global_flags); + std::map<GovernmentType const*, std::string> PROPERTY(government_flags); + + //TODO: decisions CountryHistoryEntry(Country const& new_country, Date new_date); }; |