Enable webclient cultivate/plant migration #179
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
tile.js and helpdata.js will get broken on webclient from this? |
Freeciv ticket: hrm #872127 Freeciv commit: fc7f19a899cbb92b6566de768db7b5059dcee57b Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Freeciv ticket: hrm #872584 Freeciv commit: 0fd5f1851c28dd1570b5ff3901e5cb6aca7d4467 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
…e time This changes ruleset format. This adds terrain cultivate_time and plant_time to the network protocol. Those should make it easier to migrate webclient to use Cultivate and Plant actions. (one can check "if (tile_terrain(ptile)['cultivate_time'] > 0)" to see if cultivate is enabled for the tile by the ruleset.) As FCW, unlike freeciv.org at the time original patch was made, still supports targetless irrigate/mine, FCW specific changes were needed to tile_activity_time() Freeciv ticket: hrm #872777 Freeciv commit: 4247bee632e4a94064edb72e7c9f4055d6344516 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
cazfi
force-pushed
the
cultivate-migration
branch
from
cd11eda to
ebf1b31
Compare
…time Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
PR has later been updated with commits to handle that. It's still preferable to merge #185 before this one, and check and possibly rebase this one in between. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR backports freeciv.org patch "Separate cultivate/plant time from irrigation/mining time". The two other backports included are there just to reduce textual conflict when the main patch was applied.
The reason for backporting this is that with dedicated cultivate_time and plant_time terrain properties, webclient can e.g. check if the ruleset has cultivate enabled for the terrain by "if (tile_terrain(ptile)['cultivate_time'] > 0)". This is likely needed when migrating webclient to use cultivate/plant actions.
As usual with ruleset format changes, only rulesets supplied by freeciv.org have been updated. FCW's custom rulesets have not been touched.