From 67cbd14630c4344902d3fa1ddca178809da4293b Mon Sep 17 00:00:00 2001 From: hop311 Date: Sun, 21 Jul 2024 14:09:25 +0100 Subject: Fleshing out Country, State and Province instances + history --- src/openvic-simulation/country/CountryInstance.hpp | 167 ++++++++++++++++----- 1 file changed, 133 insertions(+), 34 deletions(-) (limited to 'src/openvic-simulation/country/CountryInstance.hpp') diff --git a/src/openvic-simulation/country/CountryInstance.hpp b/src/openvic-simulation/country/CountryInstance.hpp index 1eaf398..5b26f7f 100644 --- a/src/openvic-simulation/country/CountryInstance.hpp +++ b/src/openvic-simulation/country/CountryInstance.hpp @@ -6,8 +6,7 @@ #include "openvic-simulation/military/Leader.hpp" #include "openvic-simulation/military/UnitInstanceGroup.hpp" -#include "openvic-simulation/research/Invention.hpp" -#include "openvic-simulation/research/Technology.hpp" +#include "openvic-simulation/pop/Pop.hpp" #include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" #include "openvic-simulation/types/IndexedMap.hpp" @@ -15,61 +14,140 @@ namespace OpenVic { struct CountryDefinition; - struct Culture; - struct Religion; + struct ProvinceInstance; + struct State; + struct Technology; + struct Invention; + struct TechnologySchool; + struct NationalValue; + struct GovernmentType; struct CountryParty; struct Ideology; - struct ProvinceDefinition; - struct GovernmentType; - struct NationalValue; struct Reform; + struct Culture; + struct Religion; struct CountryHistoryEntry; + struct MapInstance; - /* Representation of an existing country that is currently in-game. */ + /* Representation of a country's mutable attributes, with a CountryDefinition that is unique at any single time + * but can be swapped with other CountryInstance's CountryDefinition when switching tags. */ struct CountryInstance { friend struct CountryInstanceManager; private: - CountryDefinition const* PROPERTY_RW(country_definition); - Culture const* PROPERTY_RW(primary_culture); - std::vector PROPERTY(accepted_cultures); - Religion const* PROPERTY_RW(religion); - CountryParty const* PROPERTY_RW(ruling_party); - Date PROPERTY_RW(last_election); - IndexedMap PROPERTY(upper_house); - // TODO - should this be ProvinceInstance and/or non-const pointer? - // Currently ProvinceDefinition as that's what CountryHistoryEntry has (loaded prior to ProvinceInstance generation) - ProvinceDefinition const* PROPERTY_RW(capital); - GovernmentType const* PROPERTY_RW(government_type); - fixed_point_t PROPERTY_RW(plurality); - NationalValue const* PROPERTY_RW(national_value); - bool PROPERTY_RW(civilised); - fixed_point_t PROPERTY_RW(prestige); - std::vector PROPERTY(reforms); // TODO: should be map of reform groups to active reforms: must set defaults & validate applied history - + /* Main attributes */ + // We can always assume country_definition is not null, as it is initialised from a reference and only ever changed + // by swapping with another CountryInstance's country_definition. + CountryDefinition const* PROPERTY(country_definition); + colour_t PROPERTY(colour); // Cached to avoid searching government overrides for every province + ProvinceInstance const* PROPERTY(capital); + string_set_t PROPERTY(country_flags); + + bool PROPERTY(civilised); + bool PROPERTY_CUSTOM_PREFIX(releasable_vassal, is); + + ordered_set PROPERTY(owned_provinces); + ordered_set PROPERTY(controlled_provinces); + ordered_set PROPERTY(core_provinces); + ordered_set PROPERTY(states); + + /* Production */ + // TODO - total amount of each good produced + + /* Budget */ + fixed_point_t PROPERTY(cash_stockpile); + // TODO - cash stockpile change over last 30 days + + /* Technology */ IndexedMap PROPERTY(technologies); IndexedMap PROPERTY(inventions); - - // TODO: Military units + OOBs; will probably need an extensible deployment class - + Technology const* PROPERTY(current_research); + fixed_point_t PROPERTY(invested_research_points); + Date PROPERTY(expected_completion_date); + fixed_point_t PROPERTY(research_point_stockpile); + fixed_point_t PROPERTY(daily_research_points); // TODO - breakdown by source + fixed_point_t PROPERTY(national_literacy); + TechnologySchool const* PROPERTY(tech_school); + // TODO - cached possible inventions with %age chance + + /* Politics */ + NationalValue const* PROPERTY(national_value); + GovernmentType const* PROPERTY(government_type); + Date PROPERTY(last_election); + CountryParty const* PROPERTY(ruling_party); + IndexedMap PROPERTY(upper_house); + std::vector PROPERTY(reforms); // TODO: should be map of reform groups to active reforms: must set defaults & validate applied history + // TODO - national issue support distribution (for just voters and for everyone) + fixed_point_t PROPERTY(suppression_points); + fixed_point_t PROPERTY(infamy); + fixed_point_t PROPERTY(plurality); + fixed_point_t PROPERTY(revanchism); + // TODO - rebel movements + + /* Population */ + Culture const* PROPERTY(primary_culture); + ordered_set PROPERTY(accepted_cultures); + Religion const* PROPERTY(religion); + Pop::pop_size_t PROPERTY(total_population); + // TODO - population change over last 30 days + fixed_point_t PROPERTY(national_consciousness); + fixed_point_t PROPERTY(national_militancy); + IndexedMap PROPERTY(pop_type_distribution); + size_t PROPERTY(national_focus_capacity) + // TODO - national foci + + /* Trade */ + // TODO - total amount of each good exported and imported + + /* Diplomacy */ + size_t PROPERTY(total_rank); + fixed_point_t PROPERTY(prestige); + size_t PROPERTY(prestige_rank); + fixed_point_t PROPERTY(industrial_power); + size_t PROPERTY(industrial_rank); + fixed_point_t PROPERTY(military_power); + size_t PROPERTY(military_rank); + fixed_point_t PROPERTY(diplomatic_points); + // TODO - colonial power, current wars + + /* Military */ plf::colony PROPERTY(generals); plf::colony PROPERTY(admirals); ordered_set PROPERTY(armies); ordered_set PROPERTY(navies); + size_t PROPERTY(regiment_count); + size_t PROPERTY(mobilisation_regiment_potential); + size_t PROPERTY(ship_count); + fixed_point_t PROPERTY(total_consumed_ship_supply); + fixed_point_t PROPERTY(max_ship_supply); + fixed_point_t PROPERTY(leadership_points); + fixed_point_t PROPERTY(war_exhaustion); UNIT_BRANCHED_GETTER(get_unit_instance_groups, armies, navies); UNIT_BRANCHED_GETTER(get_leaders, generals, admirals); CountryInstance( CountryDefinition const* new_country_definition, decltype(technologies)::keys_t const& technology_keys, - decltype(inventions)::keys_t const& invention_keys, decltype(upper_house)::keys_t const& ideology_keys + decltype(inventions)::keys_t const& invention_keys, decltype(upper_house)::keys_t const& ideology_keys, + decltype(pop_type_distribution)::keys_t const& pop_type_keys ); public: std::string_view get_identifier() const; - bool add_accepted_culture(Culture const* new_accepted_culture); - bool remove_accepted_culture(Culture const* culture_to_remove); + bool set_country_flag(std::string_view flag, bool warn); + bool clear_country_flag(std::string_view flag, bool warn); + bool add_owned_province(ProvinceInstance& new_province); + bool remove_owned_province(ProvinceInstance& province_to_remove); + bool add_controlled_province(ProvinceInstance& new_province); + bool remove_controlled_province(ProvinceInstance& province_to_remove); + bool add_core_province(ProvinceInstance& new_core); + bool remove_core_province(ProvinceInstance& core_to_remove); + bool add_state(State& new_state); + bool remove_state(State& state_to_remove); + + bool add_accepted_culture(Culture const& new_accepted_culture); + bool remove_accepted_culture(Culture const& culture_to_remove); /* Set a party's popularity in the upper house. */ bool set_upper_house(Ideology const* ideology, fixed_point_t popularity); bool add_reform(Reform const* new_reform); @@ -85,29 +163,50 @@ namespace OpenVic { template bool remove_leader(LeaderBranched const* leader); - bool apply_history_to_country(CountryHistoryEntry const* entry); + bool apply_history_to_country(CountryHistoryEntry const* entry, MapInstance& map_instance); + + private: + void _update_production(); + void _update_budget(); + void _update_technology(); + void _update_politics(); + void _update_population(); + void _update_trade(); + void _update_diplomacy(); + void _update_military(); + + public: + + void update_gamestate(); + void tick(); }; struct CountryDefinitionManager; struct CountryHistoryManager; struct UnitInstanceManager; - struct MapInstance; struct CountryInstanceManager { private: IdentifierRegistry IDENTIFIER_REGISTRY(country_instance); public: + CountryInstance& get_country_instance_from_definition(CountryDefinition const& country); + CountryInstance const& get_country_instance_from_definition(CountryDefinition const& country) const; + bool generate_country_instances( CountryDefinitionManager const& country_definition_manager, decltype(CountryInstance::technologies)::keys_t const& technology_keys, decltype(CountryInstance::inventions)::keys_t const& invention_keys, - decltype(CountryInstance::upper_house)::keys_t const& ideology_keys + decltype(CountryInstance::upper_house)::keys_t const& ideology_keys, + decltype(CountryInstance::pop_type_distribution)::keys_t const& pop_type_keys ); bool apply_history_to_countries( CountryHistoryManager const& history_manager, Date date, UnitInstanceManager& unit_instance_manager, MapInstance& map_instance ); + + void update_gamestate(); + void tick(); }; } -- cgit v1.2.3-56-ga3b1