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

Remove the bought shields penalty after conquest #2521

Merged
merged 1 commit into from
Feb 3, 2025

Conversation

lmoureaux
Copy link
Contributor

@lmoureaux lmoureaux commented Jan 31, 2025

Conquest removes all shields from the city production. This means the penalty on bought shields is no longer needed.

Not resetting to zero resulted in negative shields with the following sequence of events:

  1. Player A buys something
  2. Player B conquers the city (the shield stock becomes 0)
  3. Player B changes production
  4. The bought shields penalty is deduced from the empty shield stock
  5. Negative shields!

This is needed in a few more cases such as sabotage. Implement the change in nullify_prechange_production that is already used when changing production.

Noticed by TriClad in Sim06.

Backport recommended.

Conquest removes all shields from the city production. This means the
penalty on bought shields is no longer needed.

Not resetting to zero resulted in negative shields with the following
sequence of events:
1. Player A buys something
2. Player B conquers the city (the shield stock becomes 0)
3. Player B changes production
4. The bought shields penalty is deduced from the shield stock

This is needed in a few more cases such as sabotage. Implement the
change in nullify_prechange_production that is already used when
changing production.

Noticed by TriClad in Sim06.
@lmoureaux lmoureaux added bug Something isn't working server This issue requires changes to the server labels Jan 31, 2025
@lmoureaux lmoureaux requested a review from jwrober January 31, 2025 20:57
@jwrober jwrober added the back-port back-port candidate label Feb 3, 2025
@jwrober
Copy link
Collaborator

jwrober commented Feb 3, 2025

back port approved

@jwrober jwrober merged commit d275a88 into longturn:master Feb 3, 2025
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
back-port back-port candidate bug Something isn't working server This issue requires changes to the server
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants