diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-09-20 14:18:59 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-09-20 14:18:59 +0200 |
| commit | 85da7fb84197d617d1b3cde6969bf7bcfbb93d1d (patch) | |
| tree | 0f103095b45de46688206d0e33e24f0331afbabd /src/openvic-simulation/military | |
| parent | 7fe8ba2b3bd3bafad374a691280bbf5102b58678 (diff) | |
| parent | 3703851ced696a2d4559c3e3340c537982d5ebc7 (diff) | |
Merge pull request #203 from OpenVicProject/modifier-sum
Add ModifierSum and improve ModifierValue
Diffstat (limited to 'src/openvic-simulation/military')
| -rw-r--r-- | src/openvic-simulation/military/LeaderTrait.hpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/military/UnitType.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/military/LeaderTrait.hpp b/src/openvic-simulation/military/LeaderTrait.hpp index 65f45f8..cbc5b45 100644 --- a/src/openvic-simulation/military/LeaderTrait.hpp +++ b/src/openvic-simulation/military/LeaderTrait.hpp @@ -2,8 +2,8 @@ #include <string_view> -#include "openvic-simulation/misc/Modifier.hpp" #include "openvic-simulation/dataloader/NodeTools.hpp" +#include "openvic-simulation/modifier/Modifier.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" namespace OpenVic { diff --git a/src/openvic-simulation/military/UnitType.hpp b/src/openvic-simulation/military/UnitType.hpp index 6bbaca7..3fa9af5 100644 --- a/src/openvic-simulation/military/UnitType.hpp +++ b/src/openvic-simulation/military/UnitType.hpp @@ -7,7 +7,7 @@ #include "openvic-simulation/dataloader/NodeTools.hpp" #include "openvic-simulation/economy/GoodDefinition.hpp" -#include "openvic-simulation/misc/Modifier.hpp" +#include "openvic-simulation/modifier/Modifier.hpp" #include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" |