tmp condition script stuff

OpenVicProject · Jan 6, 2025 · a3bd3eb · a3bd3eb
1 parent 757c0a1
commit a3bd3eb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation
diff --git a/extension/src/openvic-extension/singletons/PopulationMenu.cpp b/extension/src/openvic-extension/singletons/PopulationMenu.cpp
@@ -397,10 +397,10 @@ Error MenuSingleton::_population_menu_update_filtered_pops() {
 
 		population_menu.workforce_distribution[pop->get_type()] += pop_size;
 		population_menu.religion_distribution[&pop->get_religion()] += pop_size;
-		population_menu.ideology_distribution += pop->get_ideology_distribution() * pop_size;
+		population_menu.ideology_distribution += pop->get_ideology_distribution();
 		population_menu.culture_distribution[&pop->get_culture()] += pop_size;
-		population_menu.issue_distribution += pop->get_issue_distribution() * pop_size;
-		population_menu.vote_distribution += pop->get_vote_distribution() * pop_size;
+		population_menu.issue_distribution += pop->get_issue_distribution();
+		population_menu.vote_distribution += pop->get_vote_distribution();
 	}
 
 	normalise_fixed_point_map(population_menu.workforce_distribution);
@@ -453,6 +453,7 @@ MenuSingleton::sort_func_t MenuSingleton::_get_population_menu_sort_func(PopSort
 		return [](Pop const* a, Pop const* b) -> bool {
 			return a->get_consciousness() < b->get_consciousness();
 		};
+	// TODO - scale by pop size when sorting by ideology, issues and votes!!!
 	case SORT_IDEOLOGY:
 		return [](Pop const* a, Pop const* b) -> bool {
 			return sorted_indexed_map_less_than(a->get_ideology_distribution(), b->get_ideology_distribution());

diff --git a/game/src/Game/MusicConductor/MusicConductor.gd b/game/src/Game/MusicConductor/MusicConductor.gd
@@ -67,7 +67,7 @@ func toggle_play_pause() -> void:
 
 func start_current_song() -> void:
 	_audio_stream_player.stream = _available_songs[_selected_track].song_stream
-	_audio_stream_player.play()
+	# _audio_stream_player.play()
 	song_started.emit(_selected_track)
 
 # REQUIREMENTS
+70 −37		src/headless/main.cpp
+3 −8		src/openvic-simulation/InstanceManager.cpp
+31 −11		src/openvic-simulation/country/CountryInstance.cpp
+4 −7		src/openvic-simulation/country/CountryInstance.hpp
+8 −7		src/openvic-simulation/map/MapInstance.cpp
+2 −2		src/openvic-simulation/map/MapInstance.hpp
+10 −5		src/openvic-simulation/map/ProvinceInstance.cpp
+8 −4		src/openvic-simulation/map/ProvinceInstance.hpp
+4 −0		src/openvic-simulation/map/State.hpp
+2 −0		src/openvic-simulation/military/UnitInstance.hpp
+1 −0		src/openvic-simulation/military/UnitInstanceGroup.cpp
+12 −0		src/openvic-simulation/military/UnitInstanceGroup.hpp
+12 −0		src/openvic-simulation/military/UnitType.hpp
+2 −2		src/openvic-simulation/modifier/ModifierManager.cpp
+3 −4		src/openvic-simulation/modifier/ModifierManager.hpp
+18 −2		src/openvic-simulation/pop/Pop.cpp
+2 −1		src/openvic-simulation/pop/Pop.hpp
+4,237 −667		src/openvic-simulation/scripts/Condition.cpp
+212 −185		src/openvic-simulation/scripts/Condition.hpp
+15 −1		src/openvic-simulation/scripts/ConditionScript.cpp
+7 −0		src/openvic-simulation/scripts/ConditionScript.hpp
+47 −0		src/openvic-simulation/scripts/ConditionalWeight.cpp
+7 −0		src/openvic-simulation/scripts/ConditionalWeight.hpp
+15 −15		src/openvic-simulation/utility/BMP.hpp
+7 −7		src/openvic-simulation/utility/Getters.hpp