diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-10-20 20:44:51 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-10-20 20:44:51 +0200 |
| commit | 6527f832a5e14a28fc1f5b85628541038eb90141 (patch) | |
| tree | aca829171be7b1144cb3ca29510593fa8a84af24 /src/openvic-simulation/military/UnitType.hpp | |
| parent | 9a84e7af70f2528578b00879e568bca285563e9b (diff) | |
| parent | 5194a3d043db66b81470111a94f3b1cdf8d42176 (diff) | |
Merge pull request #198 from OpenVicProject/resultant-modifier
Calculate country and province modifier sums
Diffstat (limited to 'src/openvic-simulation/military/UnitType.hpp')
| -rw-r--r-- | src/openvic-simulation/military/UnitType.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/openvic-simulation/military/UnitType.hpp b/src/openvic-simulation/military/UnitType.hpp index 3fa9af5..9527041 100644 --- a/src/openvic-simulation/military/UnitType.hpp +++ b/src/openvic-simulation/military/UnitType.hpp @@ -20,7 +20,7 @@ namespace OpenVic { struct UnitType : HasIdentifier { using icon_t = uint32_t; - using terrain_modifiers_t = ordered_map<TerrainType const*, ModifierValue>; + using terrain_modifiers_t = ordered_map<TerrainType const*, Modifier>; enum struct branch_t : uint8_t { INVALID_BRANCH, LAND, NAVAL }; enum struct unit_category_t : uint8_t { @@ -28,6 +28,8 @@ namespace OpenVic { }; struct unit_type_args_t { + using terrain_modifier_values_t = ordered_map<TerrainType const*, ModifierValue>; + icon_t icon = 0; unit_category_t unit_category = unit_category_t::INVALID_UNIT_CATEGORY; // TODO defaults for move_sound and select_sound @@ -38,7 +40,7 @@ namespace OpenVic { supply_consumption = 0; Timespan build_time; GoodDefinition::good_definition_map_t build_cost, supply_cost; - terrain_modifiers_t terrain_modifiers; + terrain_modifier_values_t terrain_modifier_values; unit_type_args_t() = default; unit_type_args_t(unit_type_args_t&&) = default; |