diff options
author | zaaarf <me@zaaarf.foo> | 2023-12-09 15:18:43 +0100 |
---|---|---|
committer | zaaarf <me@zaaarf.foo> | 2023-12-09 15:18:43 +0100 |
commit | 5688655934d8851a09ebfbc1149fadf3a5bafdd0 (patch) | |
tree | 74ea31d31c9ea76f536a295ab5a899d5dc107963 /src/openvic-simulation/history/CountryHistory.hpp | |
parent | abb0804b015d8444542af7a6c5db728c0fde4cfb (diff) |
feat: loading techs, inventions and foreign investments in country history
Diffstat (limited to 'src/openvic-simulation/history/CountryHistory.hpp')
-rw-r--r-- | src/openvic-simulation/history/CountryHistory.hpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/openvic-simulation/history/CountryHistory.hpp b/src/openvic-simulation/history/CountryHistory.hpp index ed200bf..0ffab23 100644 --- a/src/openvic-simulation/history/CountryHistory.hpp +++ b/src/openvic-simulation/history/CountryHistory.hpp @@ -1,6 +1,7 @@ #pragma once #include <map> +#include <unordered_map> #include <vector> #include "openvic-simulation/country/Country.hpp" @@ -16,6 +17,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; @@ -40,8 +43,10 @@ namespace OpenVic { 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); CountryHistoryEntry(Country const& new_country, Date new_date); }; |