Terrain cultivate_time is linked to irrigation_result

[jwrober]

Describe the bug In evaluating another issue's PR, it was discovered that cultivate_time is linked to the irrigation_result Terrain ruleset spec entry.

To Reproduce Steps to reproduce the behavior:

1. Open the Civ2Civ3 ruleset's terrain.ruleset file
2. Look at the [terrain_jungle] section
3. Notice that cultivate_time has a numeric value and irrigation_result = "Swamp"
4. Look at the [terrain_grassland] section
5. Notice that cultivate_time = 0 and irrigation_result = "yes"

Expected behavior It does not really make sense that a value other than yes for irrigation_result would generate the result of a cultivate operation. Would expect to have a cultivate_result entry instead.

Platform and version (please complete the following information):

• OS: All
• Freeciv21 version: 3.0-alpha9
• Ruleset/Longturn game (if applicable): Seems like all of the rulesets are impacted here.

Additional context None

[psampathkumar]

I'm not really sure this needs to be fixed. Since they both use the same key, and cultivate terrain by design doesnt allow irrigation.

Unless we have a separate activity for cultivation, this creates unnecessary confusion imo. From a ruleset level the entry seems simple, what happens when the irrigation key is pressed. We could maybe change the "yes" to "Irrigation_Extra" or just "Irrigation" to make it more transparent.

[lmoureaux]

Cultivate and Irrigation are separate activities with separate shortcuts (Shift+I and I, respectively).

[psampathkumar]

Cultivate and Irrigation are separate activities with separate shortcuts (Shift+I and I, respectively).

Gah! Sorry! You are right, it was the same in 2.6!