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

Cleanup 3rd set of outstanding PRs #189

Merged
merged 8 commits into from
May 8, 2024
Merged

Cleanup 3rd set of outstanding PRs #189

merged 8 commits into from
May 8, 2024

Conversation

jt-traub
Copy link
Contributor

@jt-traub jt-traub commented May 7, 2024

  • Too few trade goods causes infinite loop
  • Clean up food item cost display in rules
  • Update rules to explain order of maintenance costs
  • Fix longstanding economy bug
    • Pulled in changes from PR Update economy.cpp #8
    • economic improvement never counted users selling trade goods to a city/town
  • Fix logical bug in world generation code
    • Pulls in changes from PR Fix using assignation instead of compare #53
    • All games except neworigins and standard had this bug - it had been previously fixed (partially) in those 2 codebases, but added parens to make sure comparison was correct.
  • Small code quality cleanups on delete[] vs delete
    • Pulls changes for PR Use of non-array delete #16
    • While these didn't cause any errors/warnings during compile they are technically more correct code.
  • Updated CREDITS file with some names that I was able to find that weren't already recorded.

* This pulls in the work from PR #54 to avoid an infinite loop when we
  have less than 4 trade items.
@jt-traub jt-traub changed the title Jt pr cleanup3 Cleanup 3rd set of outstanding PRs May 7, 2024
* Pull in work from PR #120
  * Remove an extraneous comma
  * Add text saying partial food is lost.
  * Update rules snapshots with changes.
* Pulled in changes from PR #111
  * Added section to rules showing order of maintenance payments.
* Updated snapshots to reflect changes.
* Code pulled in from PR#8
* Trade items in sell markets (where the player sells to the city) were
  never counted toward economic improvement.  They will be now.
@jt-traub jt-traub mentioned this pull request May 8, 2024
* Pulls in changes from PR#53
* All games except neworigins and standard had this bug - it had been
  previously fixed (partially) in those 2 codebases, but added parens
  to make sure comparison was correct.
@jt-traub jt-traub force-pushed the jt-pr-cleanup3 branch 2 times, most recently from 673cd39 to d955009 Compare May 8, 2024 01:48
* Pulls changes for PR #16
* While these didn't cause any errors/warnings during compile they are
  technically more correct code.
@jt-traub jt-traub mentioned this pull request May 8, 2024
@jt-traub jt-traub marked this pull request as ready for review May 8, 2024 02:05
valdisz
valdisz previously approved these changes May 8, 2024
@jt-traub jt-traub merged commit 203615e into master May 8, 2024
10 checks passed
@jt-traub jt-traub deleted the jt-pr-cleanup3 branch May 8, 2024 15:11
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