Skip to content

Commit

Permalink
Update SIM submodule to include resultant modifiers + display them in…
Browse files Browse the repository at this point in the history
… colonial power tooltip for testing
  • Loading branch information
Hop311 committed Oct 20, 2024
1 parent 4d8148a commit 9caa39e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion extension/deps/openvic-simulation
Submodule openvic-simulation updated 62 files
+0 −1 .gitignore
+1 −1 src/openvic-simulation/DefinitionManager.hpp
+28 −2 src/openvic-simulation/InstanceManager.cpp
+183 −47 src/openvic-simulation/country/CountryInstance.cpp
+51 −25 src/openvic-simulation/country/CountryInstance.hpp
+3 −2 src/openvic-simulation/dataloader/Dataloader.cpp
+22 −6 src/openvic-simulation/economy/BuildingType.cpp
+1 −1 src/openvic-simulation/economy/BuildingType.hpp
+67 −29 src/openvic-simulation/economy/GoodDefinition.cpp
+2 −1 src/openvic-simulation/economy/GoodDefinition.hpp
+29 −1 src/openvic-simulation/history/CountryHistory.cpp
+1 −1 src/openvic-simulation/history/CountryHistory.hpp
+1 −1 src/openvic-simulation/history/ProvinceHistory.cpp
+17 −3 src/openvic-simulation/map/Crime.cpp
+2 −2 src/openvic-simulation/map/Crime.hpp
+233 −12 src/openvic-simulation/map/MapDefinition.cpp
+17 −1 src/openvic-simulation/map/MapDefinition.hpp
+6 −0 src/openvic-simulation/map/MapInstance.cpp
+1 −0 src/openvic-simulation/map/MapInstance.hpp
+1 −1 src/openvic-simulation/map/ProvinceDefinition.cpp
+126 −0 src/openvic-simulation/map/ProvinceInstance.cpp
+20 −0 src/openvic-simulation/map/ProvinceInstance.hpp
+10 −2 src/openvic-simulation/map/Region.cpp
+2 −2 src/openvic-simulation/map/Region.hpp
+30 −2 src/openvic-simulation/map/TerrainType.cpp
+1 −1 src/openvic-simulation/map/TerrainType.hpp
+9 −3 src/openvic-simulation/military/LeaderTrait.cpp
+1 −1 src/openvic-simulation/military/LeaderTrait.hpp
+68 −41 src/openvic-simulation/military/UnitType.cpp
+5 −3 src/openvic-simulation/military/UnitType.hpp
+0 −610 src/openvic-simulation/misc/Modifier.cpp
+0 −217 src/openvic-simulation/misc/Modifier.hpp
+49 −0 src/openvic-simulation/modifier/Modifier.cpp
+77 −0 src/openvic-simulation/modifier/Modifier.hpp
+49 −0 src/openvic-simulation/modifier/ModifierEffect.cpp
+63 −0 src/openvic-simulation/modifier/ModifierEffect.hpp
+231 −0 src/openvic-simulation/modifier/ModifierEffectCache.cpp
+307 −0 src/openvic-simulation/modifier/ModifierEffectCache.hpp
+866 −0 src/openvic-simulation/modifier/ModifierManager.cpp
+144 −0 src/openvic-simulation/modifier/ModifierManager.hpp
+123 −0 src/openvic-simulation/modifier/ModifierSum.cpp
+77 −0 src/openvic-simulation/modifier/ModifierSum.hpp
+149 −0 src/openvic-simulation/modifier/ModifierValue.cpp
+50 −0 src/openvic-simulation/modifier/ModifierValue.hpp
+115 −0 src/openvic-simulation/modifier/StaticModifierCache.cpp
+64 −0 src/openvic-simulation/modifier/StaticModifierCache.hpp
+30 −5 src/openvic-simulation/politics/Issue.cpp
+2 −2 src/openvic-simulation/politics/Issue.hpp
+57 −7 src/openvic-simulation/politics/NationalFocus.cpp
+15 −1 src/openvic-simulation/politics/NationalFocus.hpp
+7 −2 src/openvic-simulation/politics/NationalValue.cpp
+1 −1 src/openvic-simulation/politics/NationalValue.hpp
+11 −3 src/openvic-simulation/politics/Rebel.cpp
+2 −1 src/openvic-simulation/politics/Rebel.hpp
+19 −31 src/openvic-simulation/politics/Rule.cpp
+4 −4 src/openvic-simulation/politics/Rule.hpp
+16 −13 src/openvic-simulation/pop/Pop.cpp
+19 −6 src/openvic-simulation/research/Invention.cpp
+1 −1 src/openvic-simulation/research/Invention.hpp
+22 −4 src/openvic-simulation/research/Technology.cpp
+1 −1 src/openvic-simulation/research/Technology.hpp
+4 −0 src/openvic-simulation/utility/NumberUtils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <godot_cpp/variant/utility_functions.hpp>

#include <openvic-simulation/GameManager.hpp>
#include <openvic-simulation/misc/Modifier.hpp>
#include <openvic-simulation/modifier/Modifier.hpp>

#include "openvic-extension/classes/GFXPieChartTexture.hpp"
#include "openvic-extension/classes/GUINode.hpp"
Expand Down

0 comments on commit 9caa39e

Please sign in to comment.