More mod compat and bug fixes, add QoL Ui and refactor some command stuff by ZombieFreak115 · Pull Request #2251 · schombert/Project-Alice

ZombieFreak115 · 2026-04-11T11:39:41Z

Increase the max event options and max national mod to be able to cope events and modifiers from GFM and TGC.

_ Change factory bonuses to be an array instead of 3 diffrent fields. Up the max factory bonuses to 6 to add support for more mods' bonuses.

Up the dcon max factory count from 20k to 100k, it is quite easy to reach the 20k cap (GFM reached it in 1898).
Add legacy is_colonial_crisis trigger, which was missing previously.
Move "update_events" call to after "ai_take_decisions" so that events popped as a result of a decision are popped immediately.
Add ai_take_decisions call to "execute_start_game", so that ai make take decisions at game start.
Move many calls which writes to "state.selected_armies" and "state.selected_navies" to execute on UI thread to prevent race conditions with UI reading it while the update thread is writing.
Fix bug in crisis peacedeals in which it would always send a peacedeal with all wargoals checked, even though they weren't checked in the UI.
Fix tax_efficiency national modifier being 100x less effective than it should be, as it used the same function as the "tax_eff" technology modifier.
Add icons for colonization, which were previously missing.
Add guard against invalid sea trade routes which become invalid due to a state being split up and losing its coast.
Refactor some commands such as splitting units to be more uniform and AI being able to use the same functions as the player for checking if they are allowed to do it, but with a diffrent template parameter. Eventually this is the method i will use to try to centralize "can ai do this thing" check in ai code directly, with a vectorized version if needed.

…upport. Add support for clr_country_flag in country history file (also used by GFM).

…ng allowed, up from 3 to support mods with more bonuses. Fix edge case with unit splitting where a unit of 2 or 3 units with all seperate unit types could not be split.

… as GFM. Add ui displaying how many wargoals would be added in add wargoal screen. Do not display more than 10 tooltips for navies/armies to avoid wall of text.

…ng unit types. work in progress

…r. Change the can_change_land_unit_type functions to work on a single item at a time. Make the AI code use these functions directly.

…register immediately. Change all calls to select,deselect and clearing selected armies/navies to be on UI thread to avoid potential UB.

…agnostic handlers

…only the selected ones

Make sure reserves' dig in also get decremented in battles. Fix bug in which the battle finished popop wouldnt pop up because there woundt be a valid lead defender or attacker anymore if all armies on one side were stackwiped.

…t should be

schombert · 2026-04-11T11:42:41Z

 	railroad, fort, naval_base, bank, university, last, factory, province_selector, province_immigrator
 };
 constexpr inline int32_t max_building_types = 5;
+constexpr inline size_t MAX_PRODUCTION_TYPE_BONUSES = 6;


generally, ALL_CAPS names are reserved for defines and macros; I know that I have been letting this slip a bit, but ...

In any case, you should touch base with peter regarding the performance of this change. The issue with increasing the number of bonuses is that the all involve running triggers as part of the econ update, and the econ update is already heavy.

I see, i changed all the ALL_CAPS constants that i remember i added to normal snake_case.

schombert · 2026-04-11T11:44:29Z

+		std::copy(initializer.begin(), initializer.end(), data());
+	}
+
+	fixed_size_vector& operator=(fixed_size_vector<data_type, capacity> const& other) noexcept {


you probably need the appropriate move and copy constructors as well

Added appropriate constructors which should work

schombert · 2026-04-11T11:46:24Z

+		}
+	}
+	data_type& back() {
+		return _storage.back();


these will return the end of the storage array, presumably, and not the last "live" element

Yup, i changed it

schombert · 2026-04-11T11:49:43Z

+	auto end() {
+		return iterator(data(), size());
+	}
+	auto rbegin() {


these functions are supposed to return reverse iterators; not only should rbegin return an iterator that points to the last item in the collection, but incrementing it should advance to the previous element, etc. It is perfectly fine to omit these functions if you don't want to implement.

I replaced them with proper reverse iterators from std::array, should work now i think

schombert · 2026-04-11T11:50:56Z

+	}
+	void resize(size_t new_size) {
+		if(new_size < size()) {
+			std::fill_n(_storage[new_size - 1], size() - new_size, data_type{ });


if new_size is 0, this would attempt to fill_n starting from position -1, which is probably not the intended behavior.

Yep, fixed it

schombert · 2026-04-11T12:19:12Z


+	static tagged_vector<fixed_bool_t, dcon::trade_route_id> to_delete;
+	to_delete.resize(state.world.trade_route_size());
+	std::fill(to_delete.begin(), to_delete.end(), false);


While this isn't inefficient, it doesn't feel very efficient either, because in our expected use case here we probably won't be deleting routes very often, but this is going to allocate a vector full of bools, clear then, and then eventually iterate over all the routes to check if one should be deleted. For the expected situation in which deletions are rare, my feeling is that a normal vector holding the ids to delete that you push to, and then sort prior to the deletion loop ( so you can call delete on just the is in the vector ) would be more efficient in the typical cases, since in most cases nothing will ever be added, so it will remain empty with no memory allocated, the sort will exit immediately, and the loop over its contents to do the deletions will exit immediately.

That said, I see that the routes to be deleted are discovered in parallel, which complicates things ...

Perhaps it would be better to delete them in advance outside the parallel work here. Finding the coastal "capitals" will fail for the sea routes in the case that state_is_coastal fails for either of them (that is cheaper than the capital finding function which compares populations). That may be a cheapish loop to run in reverse order on the trade routes. Then they could be deleted as found without having to make a separate storage container for them.

On third thought, maybe your first approach here is as good as it gets, since even doing the above you still end up looping over all the trade routes one additional time (in the pre-delete loop instead of the post delete loop).

... so ignore all my comments here I guess

Peter and i were also discussing an alternative solution which was to basically run a full trade route update on a daily tick if any provinces changed owners in the previous tick (via a flag being set on province ownership changing). I went with this solution instead cause i recall there was a reason to not update it that often (iirc its a very heavy update).

ZombieFreak115 and others added 18 commits April 5, 2026 14:24

Increase max event options and max national modifiers for GFM & TGC s…

2f38130

…upport. Add support for clr_country_flag in country history file (also used by GFM).

Change factory bonuses to be an array with a maximum of 6 bonuses bei…

701b02d

…ng allowed, up from 3 to support mods with more bonuses. Fix edge case with unit splitting where a unit of 2 or 3 units with all seperate unit types could not be split.

Increase max factory count to avoid running out of space on mods such…

b8cb93c

… as GFM. Add ui displaying how many wargoals would be added in add wargoal screen. Do not display more than 10 tooltips for navies/armies to avoid wall of text.

fix off-by-one error in army/navy tooltip

ee33e04

Add legacy is_colonial_crisis trigger, which was missing.

03b944e

Add variable amount of regiments/ships to the command api for switchi…

0fa4ec9

…ng unit types. work in progress

Change selected_regiments and selected_ships to be a fixed size vecto…

2f8f269

…r. Change the can_change_land_unit_type functions to work on a single item at a time. Make the AI code use these functions directly.

fixup some code

11bd836

Move update_events call to be after at_take_decisions so events will …

999bd16

…register immediately. Change all calls to select,deselect and clearing selected armies/navies to be on UI thread to avoid potential UB.

Change more calls to "set_selected_province" to execute on ui thread

f09e4bd

fix msvc build errors

aac8bb8

Refactor command api for splitting. Move more functions to ai-player …

1d671e4

…agnostic handlers

Fix all crisis wargoals always being sent in a peacedeal, instead of …

e810201

…only the selected ones

Implement colonization icons

77a442d

Fix tax efficiency national modifier being 100x less effective than i…

928947b

…t should be

switch selected_regiments and ships to be a vector

9a17c04

Merge branch 'schombert:main' into more-mod-compat-fixes

726bb91

schombert reviewed Apr 11, 2026

View reviewed changes

Fix constant capitalizations and fixed_size_vector problems

4c32081

schombert merged commit de59188 into schombert:main Apr 13, 2026
5 checks passed

ZombieFreak115 deleted the more-mod-compat-fixes branch April 19, 2026 09:57

Conversation

ZombieFreak115 commented Apr 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

schombert Apr 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

schombert Apr 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ZombieFreak115 commented Apr 11, 2026 •

edited

Loading

schombert Apr 11, 2026 •

edited

Loading

schombert Apr 11, 2026 •

edited

Loading