diff options
| author |   BuildTools <unconfigured@null.spigotmc.org> | 2023-11-20 08:23:08 +0100 |
|---|---|---|
| committer |   hop311 <hop3114@gmail.com> | 2023-12-17 20:43:53 +0100 |
| commit | ee9562c767631fbec6b444cf18f2435d24848e93 (patch) | |
| tree | 8c5a770d6cf6d01c6b92247ae89522f9165967ef /src/openvic-simulation/economy | |
| parent | e6b455b8924948761dbd792756303efe18875c6d (diff) | |
Additional adjacency loading
Diffstat (limited to 'src/openvic-simulation/economy')
| -rw-r--r-- | src/openvic-simulation/economy/BuildingType.cpp | 16 | ||||
| -rw-r--r-- | src/openvic-simulation/economy/BuildingType.hpp | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/openvic-simulation/economy/BuildingType.cpp b/src/openvic-simulation/economy/BuildingType.cpp index a5a4fb0..3d44c8c 100644 --- a/src/openvic-simulation/economy/BuildingType.cpp +++ b/src/openvic-simulation/economy/BuildingType.cpp @@ -14,6 +14,8 @@ BuildingType::BuildingType( colonial_range { colonial_range }, infrastructure { infrastructure }, spawn_railway_track { spawn_railway_track }, sail { sail }, steam { steam }, capital { capital }, port { port } {} +BuildingTypeManager::BuildingTypeManager() : port_building_type { nullptr } {} + bool BuildingTypeManager::add_building_type(std::string_view identifier, ARGS) { if (identifier.empty()) { Logger::error("Invalid building identifier - empty!"); @@ -32,7 +34,7 @@ bool BuildingTypeManager::load_buildings_file( GoodManager const& good_manager, ProductionTypeManager const& production_type_manager, ModifierManager& modifier_manager, ast::NodeCPtr root ) { - const bool ret = expect_dictionary_reserve_length( + bool ret = expect_dictionary_reserve_length( building_types, [this, &good_manager, &production_type_manager, &modifier_manager](std::string_view key, ast::NodeCPtr value) -> bool { std::string_view type; @@ -101,6 +103,18 @@ bool BuildingTypeManager::load_buildings_file( modifier_manager.add_modifier_effect( min_modifier_prefix.append(building_type.get_identifier()), false, ModifierEffect::format_t::INT ); + + if (building_type.is_port()) { + if (port_building_type == nullptr) { + port_building_type = &building_type; + } else { + Logger::error( + "Building type ", building_type, " is marked as a port, but we are already using ", port_building_type, + " as the port building type!" + ); + ret = false; + } + } } return ret; diff --git a/src/openvic-simulation/economy/BuildingType.hpp b/src/openvic-simulation/economy/BuildingType.hpp index a8f9d61..27cedfd 100644 --- a/src/openvic-simulation/economy/BuildingType.hpp +++ b/src/openvic-simulation/economy/BuildingType.hpp @@ -61,7 +61,7 @@ namespace OpenVic { bool PROPERTY(sail); // only in clipper shipyard bool PROPERTY(steam); // only in steamer shipyard bool PROPERTY(capital); // only in naval base - bool PROPERTY(port); // only in naval base + bool PROPERTY_CUSTOM_PREFIX(port, is); // only in naval base BuildingType(std::string_view identifier, ARGS); @@ -74,8 +74,11 @@ namespace OpenVic { private: IdentifierRegistry<BuildingType> IDENTIFIER_REGISTRY(building_type); + BuildingType const* PROPERTY(port_building_type); public: + BuildingTypeManager(); + bool add_building_type(std::string_view identifier, ARGS); bool load_buildings_file( |