Page MenuHomeWildfire Games

Display gather rates per subtype
ClosedPublic

Authored by Silier on Jan 9 2021, 4:27 PM.
Tags
None
Subscribers
Restricted Owners Package
Restricted Owners Package
Tokens
"Love" token, awarded by asterix."Love" token, awarded by borg-.

Details

Reviewers
wraitii
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP24549: Display gather rates per subtype
Summary

Currently gather rates per subtype of resource are averaged , which hides important information for players. Therefore they do not realise some units may be better collecting grain or fruit.

Also removing todo from the code.

Thank @Stan for fruit and grain icons without cursor and new fish.

Test Plan

Check gather rates per subtype are displayed everywhere.

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

Silier created this revision.Jan 9 2021, 4:27 PM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Jan 9 2021, 4:27 PM
Silier published this revision for review.Jan 9 2021, 4:27 PM
Vulcan added a comment.Jan 9 2021, 4:47 PM

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgraphics_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libatlas_dbg.a(precompiled.o) has no symbols
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/F

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

Nescio added a subscriber: Nescio.Jan 9 2021, 5:09 PM

Thank you, this is a great improvement and long overdue!
Is just displaying an icon without any explanatory text clear enough, though?
Just so you know, arc patch D3310 has trouble properly adding the new images.

Maybe we would need nicer fish icon.

And maybe we need a better food icon, one that's more representative.

binaries/data/mods/public/gui/common/setup_resources.xml
9 ↗(On Diff #15078)

Actually we could consider naming them simply after their subtype, e.g. grain.png. There is no larger version and e.g. stone.grain doesn't exist.

21 ↗(On Diff #15078)

Please rename to food_meat_small.png for consistency.

borg- awarded a token.Jan 9 2021, 6:24 PM
Silier planned changes to this revision.Jan 9 2021, 6:28 PM

And maybe we need a better food icon, one that's more representative.

Agree.

Actually we could consider naming them simply after their subtype, e.g. grain.png. There is no larger version and e.g. stone.grain doesn't exist.

yes, nice point

Please rename to food_meat_small.png for consistency.

guess could be done with new food icon so there are not 2 same

Is just displaying an icon without any explanatory text clear enough, though?

we have different action cursors for them (and i plan to replace them with subtypes in another places as well), I think it is ok.

Just so you know, arc patch D3310 has trouble properly adding the new images.

yes, sadly arcanist does not like binary files

Silier updated this revision to Diff 15080.Jan 9 2021, 6:53 PM

try for food icon

Vulcan added a comment.Jan 9 2021, 6:59 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/2735/display/redirect for more details.

Silier updated this revision to Diff 15081.Jan 9 2021, 7:16 PM
Silier edited the summary of this revision. (Show Details)

use new fish by @Stan

Vulcan added a comment.Jan 9 2021, 7:21 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/2736/display/redirect for more details.

Freagarach added inline comments.
binaries/data/mods/public/gui/common/setup_resources.xml
3 ↗(On Diff #15081)

Refs. D2329.

wraitii accepted this revision.Jan 10 2021, 9:58 AM
wraitii added a subscriber: wraitii.

I think this is a no-brainer and you should merge it for A24.

This revision is now accepted and ready to land.Jan 10 2021, 9:58 AM

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
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.framewor

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

Freagarach added inline comments.Jan 11 2021, 8:53 AM
binaries/data/mods/public/gui/common/tooltips.js
712 ↗(On Diff #15094)

I'd add what was there, that they skew the results (and add a period to the end of the sentence).

Silier added inline comments.Jan 11 2021, 9:21 AM
binaries/data/mods/public/gui/common/tooltips.js
712 ↗(On Diff #15094)

we don't do average anymore so that is not relevant

Freagarach added inline comments.Jan 11 2021, 9:22 AM
binaries/data/mods/public/gui/common/tooltips.js
712 ↗(On Diff #15094)

Ah true ^^'

This revision was automatically updated to reflect the committed changes.