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

Tacoma - Convert crop overseer field planting to json #56510

Merged
merged 7 commits into from
Apr 9, 2022

Conversation

haveric
Copy link
Contributor

@haveric haveric commented Apr 1, 2022

Summary

Infrastructure "Tacoma - Convert crop overseer field planting to json"

Purpose of change

  • Jsonify purchase and upgrade
  • Move field purchase/upgrade out of the companion missions. Use normal conversation instead.
  • Convert legacy cash to merch
    • Validate liquidate price: int merch_amount = ( number_plants * tmp.price( true ) - number_plots * 2.5 ) / 250;
  • Create a bigger field and path to convert
    • Figure out how to delete the seeds after clearing old plants

Describe the solution

Remove legacy talk functions. Move to json

Describe alternatives you've considered

  • Leave existing small field
  • Create multiple field sizes (that possibly connect)

Testing

Loaded several games before the crop overseer existed as well as after planting the field and building the fence. Tested that everything works in chat.

Additional context

Ported changes from #55690

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON NPC / Factions NPCs, AI, Speech, Factions, Ownership labels Apr 1, 2022
@haveric haveric mentioned this pull request Apr 1, 2022
71 tasks
@github-actions github-actions bot added Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style astyled astyled PR, label is assigned by github actions labels Apr 3, 2022
@haveric haveric marked this pull request as ready for review April 3, 2022 23:50
@github-actions github-actions bot added the Player Faction Base / Camp All about the player faction base/camp/site label Apr 6, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Apr 6, 2022
@kevingranade kevingranade merged commit 3dd42f4 into CleverRaven:master Apr 9, 2022
@haveric haveric deleted the tacoma-crop-overseer branch April 9, 2022 12:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions NPC / Factions NPCs, AI, Speech, Factions, Ownership Player Faction Base / Camp All about the player faction base/camp/site
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants