diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-09-14 21:37:10 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-09-14 21:37:10 +0200 |
| commit | d8c04cbe53188d4717f8c49f918e01657dbf3440 (patch) | |
| tree | 7754de92a23f21e0546dcd09439bf0d3962b096f /src/openvic-simulation/research/Technology.hpp | |
| parent | 7a9206e3869fbb659d296b854c90f5c81755a5ca (diff) | |
| parent | a424969548083a977480a6be0f078760a5789bbf (diff) | |
Merge pull request #197 from OpenVicProject/country-unlock
CountryInstance unlock tech, invention, crime, building, unit, gas etc.
Diffstat (limited to 'src/openvic-simulation/research/Technology.hpp')
| -rw-r--r-- | src/openvic-simulation/research/Technology.hpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/openvic-simulation/research/Technology.hpp b/src/openvic-simulation/research/Technology.hpp index f13cca3..3afeb0b 100644 --- a/src/openvic-simulation/research/Technology.hpp +++ b/src/openvic-simulation/research/Technology.hpp @@ -2,6 +2,7 @@ #include <cstdint> +#include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/economy/BuildingType.hpp" #include "openvic-simulation/military/UnitType.hpp" #include "openvic-simulation/misc/Modifier.hpp" @@ -50,15 +51,16 @@ namespace OpenVic { const Date::year_t PROPERTY(year); const fixed_point_t PROPERTY(cost); const bool PROPERTY(unciv_military); - const uint8_t PROPERTY(unit); - unit_set_t PROPERTY(activated_buildings); - building_set_t PROPERTY(activated_units); + std::optional<CountryInstance::unit_variant_t> PROPERTY(unit_variant); + unit_set_t PROPERTY(activated_units); + building_set_t PROPERTY(activated_buildings); ConditionalWeight PROPERTY(ai_chance); Technology( std::string_view new_identifier, TechnologyArea const& new_area, Date::year_t new_year, fixed_point_t new_cost, - bool new_unciv_military, uint8_t new_unit, unit_set_t&& new_activated_units, - building_set_t&& new_activated_buildings, ModifierValue&& new_values, ConditionalWeight&& new_ai_chance + bool new_unciv_military, std::optional<CountryInstance::unit_variant_t>&& new_unit_variant, + unit_set_t&& new_activated_units, building_set_t&& new_activated_buildings, ModifierValue&& new_values, + ConditionalWeight&& new_ai_chance ); bool parse_scripts(DefinitionManager const& definition_manager); @@ -87,8 +89,9 @@ namespace OpenVic { bool add_technology( std::string_view identifier, TechnologyArea const* area, Date::year_t year, fixed_point_t cost, - bool unciv_military, uint8_t unit, Technology::unit_set_t&& activated_units, - Technology::building_set_t&& activated_buildings, ModifierValue&& values, ConditionalWeight&& ai_chance + bool unciv_military, std::optional<CountryInstance::unit_variant_t>&& unit_variant, + Technology::unit_set_t&& activated_units, Technology::building_set_t&& activated_buildings, + ModifierValue&& values, ConditionalWeight&& ai_chance ); bool add_technology_school(std::string_view identifier, ModifierValue&& values); |