Page MenuHomeWildfire Games

[gameplay] introduce two new stable technologies
ClosedPublic

Authored by Nescio on Jan 10 2021, 6:22 PM.

Details

Summary

As mentioned in D2801, now the stable is available to all civs, it would be nice to have more stable technologies. This patch:

  • introduces a town-phase technology that gives cavalry +10% health;
  • introduces a city-phase technology that gives the stable −0.1 corral batch training time (similar to the one the barracks has);
  • renames the barracks batch training technology to better reflect what it does and improves its text strings;
  • renames the two Persian levy technologies to better reflect what they do and improves their text strings;
  • deletes the two Persian conscription technologies, because there is no longer a need for these now separate batch training technologies exists for the barracks and stable, which are available to all civs and practically identical to the old Persian versions;
  • moves the Nisean horses technology out of the successors/ folder, since it's available to Persians as well (cf. archery tradition, iron working).
  • [EDIT] And the two Persian levy technologies, which used to give −20% training time and −5% health, now simply grant −10% training time instead, per @borg-.
Test Plan

Check for mistakes and have a critical look at the costs, modifications, icons, texts, etc.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Nescio created this revision.Jan 10 2021, 6:22 PM
Owners added a subscriber: Restricted Owners Package.Jan 10 2021, 6:22 PM

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2750/display/redirect for more details.

Nescio requested review of this revision.Jan 10 2021, 6:29 PM
borg- added a comment.Jan 10 2021, 9:02 PM

Necessary techs. Actually I dont like -5% health, I prefer like -10% training time and no penally.

Nescio updated this revision to Diff 15109.Jan 10 2021, 10:31 PM
Nescio edited the summary of this revision. (Show Details)
Nescio removed a subscriber: Restricted Owners Package.
  • change existing Persian levy technologies from −20% time and −5% health into simply −10% time, per @borg-
Owners added a subscriber: Restricted Owners Package.Jan 10 2021, 10:31 PM

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2753/display/redirect for more details.

borg- added a comment.EditedJan 11 2021, 2:50 AM

We have two equal icons (horser_trainer) for two different technologies, in this case I need to stop to read which is which.
You can also use first_spear for levy infantry and first_spear_fire for infantry conscription, maintains the current icon and a standard and horseshoe_silver to levy cavalry and horseshoe_gold to conscription cavalry.

Nescio updated this revision to Diff 15126.Jan 11 2021, 1:15 PM
Nescio updated this revision to Diff 15127.Jan 11 2021, 1:18 PM
  • forgot svn:mime-type and svn:eol-style

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2762/display/redirect for more details.

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2763/display/redirect for more details.

borg- added a comment.Jan 11 2021, 1:36 PM

I would increase the cost of "Horse Breeding" tech to 400 food 200 metal.

Nisean tech should also, but there is another patch for that, so I don’t think it’s necessary.

I would increase the cost of "Horse Breeding" tech to 400 food 200 metal.

Wouldn't that be a bit expensive? It's only 10%. And the city phase batch training cost technologies cost only 500 food.
How about 400 food and 100 metal, or 450 food and 150 metal?

Nisean tech should also, but there is another patch for that, so I don’t think it’s necessary.

Yes, D2856, which is why I didn't change it here.

borg- added a comment.Jan 11 2021, 1:54 PM

How about 400 food and 100 metal, or 450 food and 150 metal?

400 food 150 metal.

400 food 150 metal.

Or wood instead of metal?

borg- added a comment.Jan 11 2021, 2:05 PM

400 food 150 metal.

Or wood instead of metal?

No, metal.

Nescio updated this revision to Diff 15133.Jan 11 2021, 2:08 PM
  • increase cavalry health technology cost to 400 food, 150 metal, per @borg-

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2765/display/redirect for more details.

borg- accepted this revision.Jan 11 2021, 2:16 PM
This revision is now accepted and ready to land.Jan 11 2021, 2:16 PM