Page MenuHomeWildfire Games

Add a "Catafalque Bonuses" page
ClosedPublic

Authored by s0600204 on Mon, Jan 11, 11:18 PM.

Details

Summary

Allowing comparison between different civ's catafalques. (By popular request on D294.)

Screenshot of proposed new Catafalque Bonuses page

Any civ that lacks a catafalque template is skipped - its emblem doesn't appear on the page.

NOTE: This change expects catafalques to have a specific name (catafalque.xml), and be in a certain location (simulation/templates/units/{civ}/). If neither of these are true, a catafalque will not be shown. (This affects modders, or any contributors who wish to relocate or rename vanilla templates.)
Test Plan
NOTE: This revision contains two binary (image) files, which arc might not download automatically when applying this patch to test locally.
  • Check and confirm code sanity
  • Apply patch locally (see above note)
  • Open 0 A.D.
  • From the "Learn to Play" submenu of the Main Menu, use the new "Catafalques Overview" option
  • Confirm no errors

For bonus points:

  • Remove/(rename) a civ's catafalque template
  • Restart 0 A.D. and confirm that the page doesn't complain, and merely skips that civ.

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

s0600204 created this revision.Mon, Jan 11, 11:18 PM
Owners added a subscriber: Restricted Owners Package.Mon, Jan 11, 11:18 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/2780/display/redirect for more details.

s0600204 requested review of this revision.Mon, Jan 11, 11:24 PM

No strong opinion, but the current location of the button suggests that it shows all the catafalques from the civ one is viewing, perhaps a separate button in the learn to play menu?

I tested this and confirmed no errors, even when removing catafalques from the civs until none were left.

binaries/data/mods/public/gui/common/tooltips.js
1025 ↗(On Diff #15154)

+\n

Works good in Delenda Est.

https://i.imgur.com/u7bUicd.png

I mirror this opinion, that the button should go in the Learn to Play slide out, and then also maybe at the bottom of the Structure Tree.

No strong opinion, but the current location of the button suggests that it shows all the catafalques from the civ one is viewing, perhaps a separate button in the learn to play menu?

s0600204 updated this revision to Diff 15419.Sun, Jan 17, 2:39 PM
s0600204 marked an inline comment as done.
s0600204 edited the test plan for this revision. (Show Details)

Page is now opened from the Main Menu instead of the civinfo page

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/2917/display/redirect for more details.

Freagarach accepted this revision.Mon, Jan 18, 10:11 AM

Tested: couldn't break. No obvious coding flaws.

This revision is now accepted and ready to land.Mon, Jan 18, 10:11 AM
This revision was automatically updated to reflect the committed changes.