aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/openvic-simulation/GameManager.cpp1
-rw-r--r--src/openvic-simulation/map/Map.hpp5
-rw-r--r--src/openvic-simulation/map/Province.cpp2
-rw-r--r--src/openvic-simulation/map/Province.hpp4
-rw-r--r--src/openvic-simulation/map/State.cpp79
-rw-r--r--src/openvic-simulation/map/State.hpp51
6 files changed, 140 insertions, 2 deletions
diff --git a/src/openvic-simulation/GameManager.cpp b/src/openvic-simulation/GameManager.cpp
index 397b729..0ea073e 100644
--- a/src/openvic-simulation/GameManager.cpp
+++ b/src/openvic-simulation/GameManager.cpp
@@ -59,6 +59,7 @@ bool GameManager::load_bookmark(Bookmark const* new_bookmark) {
}
today = bookmark->get_date();
ret &= map.apply_history_to_provinces(history_manager.get_province_manager(), today);
+ map.get_state_manager().generate_states(map);
// TODO - apply country history
// TODO - apply pop history
return ret;
diff --git a/src/openvic-simulation/map/Map.hpp b/src/openvic-simulation/map/Map.hpp
index 4f87237..cef0962 100644
--- a/src/openvic-simulation/map/Map.hpp
+++ b/src/openvic-simulation/map/Map.hpp
@@ -7,6 +7,7 @@
#include "openvic-simulation/map/Region.hpp"
#include "openvic-simulation/map/TerrainType.hpp"
+#include "openvic-simulation/map/State.hpp"
namespace OpenVic {
namespace fs = std::filesystem;
@@ -69,6 +70,8 @@ namespace OpenVic {
Province::index_t get_index_from_colour(colour_t colour) const;
bool _generate_province_adjacencies();
+ StateManager state_manager;
+
public:
Map();
@@ -102,6 +105,8 @@ namespace OpenVic {
IDENTIFIER_REGISTRY_ACCESSORS(mapmode)
Mapmode const* get_mapmode_by_index(size_t index) const;
+ REF_GETTERS(state_manager);
+
/* The mapmode colour image contains of a list of base colours and stripe colours. Each colour is four bytes
* in RGBA format, with the alpha value being used to interpolate with the terrain colour, so A = 0 is fully terrain
* and A = 255 is fully the RGB colour packaged with A. The base and stripe colours for each province are packed
diff --git a/src/openvic-simulation/map/Province.cpp b/src/openvic-simulation/map/Province.cpp
index c2d2da0..7277a54 100644
--- a/src/openvic-simulation/map/Province.cpp
+++ b/src/openvic-simulation/map/Province.cpp
@@ -31,7 +31,7 @@ bool Province::load_positions(BuildingManager const& building_manager, ast::Node
"factory", ZERO_OR_ONE, expect_fvec2(assign_variable_callback(positions.factory)),
"building_construction", ZERO_OR_ONE, expect_fvec2(assign_variable_callback(positions.building_construction)),
"military_construction", ZERO_OR_ONE, expect_fvec2(assign_variable_callback(positions.military_construction)),
- "building_position", ZERO_OR_ONE, expect_dictionary_keys(
+ "building_position", ZERO_OR_ONE, expect_dictionary_keys( // TODO: for TGC etc are building positions available for modded-in buildings? needs testing
"fort", ZERO_OR_ONE, expect_fvec2(assign_variable_callback(positions.fort)),
"railroad", ZERO_OR_ONE, expect_fvec2(assign_variable_callback(positions.railroad)),
"naval_base", ZERO_OR_ONE, expect_fvec2(assign_variable_callback(positions.navalbase))
diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp
index af0bed4..02bc8cf 100644
--- a/src/openvic-simulation/map/Province.hpp
+++ b/src/openvic-simulation/map/Province.hpp
@@ -10,6 +10,7 @@
namespace OpenVic {
struct Map;
struct Region;
+ struct State;
struct Good;
struct TerrainType;
struct TerrainTypeMapping;
@@ -27,7 +28,7 @@ namespace OpenVic {
using distance_t = uint16_t;
using flags_t = uint16_t;
- enum struct colony_status_t : int8_t { STATE, PROTECTORATE, COLONY };
+ enum struct colony_status_t : uint8_t { STATE, PROTECTORATE, COLONY };
struct adjacency_t {
friend struct Province;
@@ -62,6 +63,7 @@ namespace OpenVic {
private:
const index_t PROPERTY(index);
Region* PROPERTY(region);
+ State const* PROPERTY_RW(state);
bool PROPERTY(on_map);
bool PROPERTY(has_region);
bool PROPERTY(water);
diff --git a/src/openvic-simulation/map/State.cpp b/src/openvic-simulation/map/State.cpp
new file mode 100644
index 0000000..1a7f10d
--- /dev/null
+++ b/src/openvic-simulation/map/State.cpp
@@ -0,0 +1,79 @@
+#include "State.hpp"
+
+#include "Map.hpp"
+
+using namespace OpenVic;
+
+State::State(Country const* owner, Province const* capital, Region::provinces_t&& provinces, Province::colony_status_t colony_status)
+ : owner { owner }, capital { capital }, provinces { std::move(provinces) }, colony_status { colony_status } {}
+
+StateSet::StateSet(Region const* new_region) {
+ if (region->get_meta()) {
+ Logger::error("Cannot use meta region as state template!");
+ }
+ region = new_region;
+
+ std::vector<Region::provinces_t> temp_provinces;
+ bool in_state = false;
+
+ for (const auto province : region->get_provinces()) {
+ // add to existing state if shared owner & status...
+ for (auto& provinces : temp_provinces) {
+ if (provinces[0] == province) {
+ provinces.push_back(province);
+ in_state = true;
+ break;
+ }
+ }
+ if (in_state) {
+ in_state = false;
+ } else {
+ // ...otherwise start a new state
+ temp_provinces.push_back({ province });
+ }
+ }
+
+ for (auto& provinces : temp_provinces) {
+ states.push_back({ /* TODO: capital province logic */ provinces[0]->get_owner(), provinces[0], std::move(provinces), provinces[0]->get_colony_status() });
+ }
+
+ // Go back and assign each new state to its provinces.
+ for (const auto& state : states) {
+ for (auto province : state.get_provinces()) {
+ province->set_state(&state);
+ }
+ }
+}
+
+bool StateSet::add_state(State&& state) {
+ const auto existing = std::find(states.begin(), states.end(), state);
+ if (existing != states.end()) {
+ Logger::error("Attempted to add existing state!");
+ return false;
+ }
+ states.push_back(std::move(state));
+ return true;
+}
+
+bool StateSet::remove_state(State const* state) {
+ const auto existing = std::find(states.begin(), states.end(), *state);
+ if (existing == states.end()) {
+ Logger::error("Attempted to remove non-existant state!");
+ return false;
+ }
+ states.erase(existing);
+ return true;
+}
+
+StateSet::states_t& StateSet::get_states() {
+ return states;
+}
+
+void StateManager::generate_states(Map const& map) {
+ regions.clear();
+ regions.reserve(map.get_region_count());
+ for(const auto& region : map.get_regions()) {
+ regions.push_back(StateSet(&region));
+ }
+ Logger::info("Generated states.");
+} \ No newline at end of file
diff --git a/src/openvic-simulation/map/State.hpp b/src/openvic-simulation/map/State.hpp
new file mode 100644
index 0000000..e9f41c4
--- /dev/null
+++ b/src/openvic-simulation/map/State.hpp
@@ -0,0 +1,51 @@
+#pragma once
+
+#include "openvic-simulation/map/Province.hpp"
+#include "openvic-simulation/map/Region.hpp"
+#include "openvic-simulation/country/Country.hpp"
+
+#include <deque>
+
+namespace OpenVic {
+ struct State {
+ private:
+ Country const* PROPERTY_RW(owner);
+ Province const* PROPERTY_RW(capital);
+ Region::provinces_t PROPERTY(provinces);
+ Province::colony_status_t PROPERTY_RW(colony_status);
+
+ public:
+ State(Country const* owner, Province const* capital, Region::provinces_t&& provinces, Province::colony_status_t colony_status);
+ };
+
+ inline bool operator==(const State& lhs, const State& rhs) {
+ return (lhs.get_owner() == rhs.get_owner() && lhs.get_colony_status() == rhs.get_colony_status());
+ }
+
+ struct StateSet {
+ using states_t = std::deque<State>;
+
+ private:
+ Region const* PROPERTY(region);
+ states_t states;
+
+ public:
+ StateSet(Region const* new_region);
+
+ bool add_state(State&& state);
+ bool remove_state(State const* state);
+ states_t& get_states();
+ };
+
+ /* Contains all current states.*/
+ struct StateManager {
+ private:
+ std::vector<StateSet> PROPERTY(regions);
+
+ public:
+ /* Creates states from current province gamestate & regions, sets province state value.
+ After this function, the `regions` property is unmanaged and must be carefully updated and
+ validated by functions that modify it. */
+ void generate_states(Map const& map);
+ };
+} // namespace OpenVic
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100