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.

Sign up for GitHub

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

Jump to bottom

[1832] updates to code #10103

Merged

michaeljb merged 12 commits into tobymao:master from philcampeau:1832

Jan 25, 2024

Collaborator

philcampeau commented Jan 6, 2024 •

edited

Loading

Before clicking "Create"

Branch is derived from the latest master
Add the pins label if this change will break existing games
Code passes linter with docker compose exec rack rubocop -a
Tests pass cleanly with docker compose exec rack rake

Implementation Notes

Explanation of Change
More updates to code. adds System corporations to game, free terrain cost for home tile, FECR's Key west token, and more.
Screenshots
Any Assumptions / Hacks


          [1832] updates to code

19a3bff

ollybh requested changes

View reviewed changes

lib/engine/game/g_1832/game.rb Outdated Show resolved Hide resolved

lib/engine/game/g_1832/game.rb Outdated Show resolved Hide resolved

lib/engine/game/g_1832/round/merger.rb Outdated Show resolved Hide resolved

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved

philcampeau and others added 3 commits

January 8, 2024 15:02


          Update lib/engine/game/g_1832/round/merger.rb

a51b371

Co-authored-by: Oliver Burnett-Hall <[email protected]>


          tweaks

30f9589


          Merge branch '1832' of http://github.com/philcampeau/18xx into 1832

4f14eb7

ollybh reviewed

View reviewed changes

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved

philcampeau and others added 2 commits

January 9, 2024 11:31


          Update lib/engine/game/g_1832/step/token.rb

7d364c3

Co-authored-by: Oliver Burnett-Hall <[email protected]>


          updates

340ff00

philcampeau requested a review from ollybh

January 12, 2024 15:33

ollybh reviewed

View reviewed changes

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved


          update to can_place_miami_token check

59343f9

Collaborator Author

philcampeau commented Jan 12, 2024

Fixed all the recommendations, and noticed I had defined CORPORATE_BUY_SHARE_ALLOW_BUY_FROM_PRESIDENT twice, so I removed one of the two.

ollybh reviewed

View reviewed changes

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved

ollybh reviewed

View reviewed changes

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved


          more updates

e304701

ollybh reviewed

View reviewed changes

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved

63fba4d

ollybh reviewed

View reviewed changes

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved

ollybh reviewed

View reviewed changes

lib/engine/game/g_1832/step/token.rb Outdated Show resolved Hide resolved

philcampeau and others added 2 commits

January 16, 2024 09:30


          Update lib/engine/game/g_1832/step/token.rb

5f43703

Co-authored-by: Oliver Burnett-Hall <[email protected]>


          Update lib/engine/game/g_1832/step/token.rb

80a7ae3

Co-authored-by: Oliver Burnett-Hall <[email protected]>

ollybh approved these changes

View reviewed changes


          updates to game, meta, track, entities

bc361cd

philcampeau requested a review from ollybh

January 23, 2024 16:49

michaeljb merged commit 2565010 into tobymao:master

1 check passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet