Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge for wine addon #1

Merged
merged 12 commits into from
Aug 4, 2024
Merged

Merge for wine addon #1

merged 12 commits into from
Aug 4, 2024

Conversation

Flamefire
Copy link

I prepared this for Return-To-The-Roots#1673

This should make the PR ready for merge. Old replays unfortunately won't work as I identified an async caused by the added jobs which cannot be helped. I added some changes to avoid such issues in the future.
Turns out the recently merged PR to avoid roads at the border is already enough to make old replays go async. Hence no reason to hold that back for that anymore.

I also improved the farmhand handling a bit to make especially the GetPointQuality clearer.

The bulk though is the merge of master and update of replays (you can reduce the diff by merging yourself if you want to have a look at that).
Return-To-The-Roots#1677 does help to be able to load old replays though. I tested that on top of your PR which then showed the async due to the warehouse issue.

Translate comments and improve naming and comments
Only used in one place and includes costly PointQuality calculation
which needs to happen twice due to this.
Easier handling for derived classes that need to check for available
wares.
Translate comments and use `static_vector` instead of array and size
The startDirection was added to a valid direction which may result in an
invalid direction.
Use a random index instead.
Skip loop iteration if there are no people of a job.
This also avoids asyncs when adding/removing jobs and improves speed by
not calling RANDOM_RAND in that case.
This reverts commit b30e4ec.
We only provide backwards compatibility. So we need to reject any newer
version to avoid corrupting memory due to unexpected changes.
@Flamefire Flamefire marked this pull request as ready for review August 1, 2024 18:08
@ottml ottml merged commit bbc6968 into ottml:wine_addon Aug 4, 2024
@Flamefire Flamefire deleted the wineaddon branch August 4, 2024 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants