Page MenuHomeWildfire Games

[gameplay] enable gaul assembly
ClosedPublic

Authored by Nescio on Tue, Jan 12, 10:03 PM.

Details

Summary

This patch is a follow-up to D3331/rP24566 and a prerequisite to D3320.

  • The assembly gets more reasonable costs, garrison capacity, territory influence radius, and foundation resistance values.
  • The Gauls can build their new assembly.
  • The Gauls train their heroes at the assembly, instead of at the fortress.
  • Because the assembly is functionally similar to the Athenian prytaneion, it can share its class and build restriction; the separate Assembly class is deprecated. (For comparison, the Persian Apadana shares a class with the similar Mauryan palace.)
Test Plan

Check for completeness and correctness, agree with the proposed values.

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.Tue, Jan 12, 10:03 PM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Tue, Jan 12, 10:03 PM
Nescio updated this revision to Diff 15216.Tue, Jan 12, 10:06 PM
  • fortress
binaries/data/mods/public/simulation/components/Identity.js
68 ↗(On Diff #15215)

Removed Assembly.

binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml
7–11 ↗(On Diff #15215)

The Spartan Syssition costs 200 stone and 200 metal.

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

Nescio requested review of this revision.Tue, Jan 12, 10:18 PM
borg- added a comment.EditedTue, Jan 12, 10:29 PM

I prefer only wood cost, 450. Make Sense add infantry champions?

Stan added a comment.Tue, Jan 12, 10:35 PM

Well technically it's the assembly of "princes" so heroes and warchiefs make sense maybe even standard bearers, not so much naked fanatics

In D3344#148545, @borg- wrote:

I prefer only wood cost, 450.

Why? It is a hall for princes, so it needs some blingbling ;)

Nescio updated this revision to Diff 15241.Wed, Jan 13, 11:09 AM
Nescio removed a reviewer: Angen.Wed, Jan 13, 11:19 AM
Nescio removed subscribers: Restricted Owners Package, Restricted Owners Package.

Build has FAILED

builderr-debug-macos.txt
fatal error: file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/osx/wxwidgets/lib/wx/include/osx_cocoa-unicode-static-3.0/wx/setup.h' has been modified since the precompiled header 'obj/AtlasUI_Debug/precompiled.h.gch' was built
note: please rebuild precompiled header 'obj/AtlasUI_Debug/precompiled.h.gch'
fatal error: file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/osx/wxwidgets/lib/wx/include/osx_cocoa-unicode-static-3.0/wx/setup.h' has been modified since the precompiled header 'obj/AtlasUI_Debug/precompiled.h.gch' was built
note: please rebuild precompiled header 'obj/AtlasUI_Debug/precompiled.h.gch'
1 error generated.
make[1]: *** [obj/AtlasUI_Debug/Canvas.o] Error 1
make[1]: *** Waiting for unfinished jobs....
1 error generated.
make[1]: *** [obj/AtlasUI_Debug/ScenarioEditor.o] Error 1
make: *** [AtlasUI] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/2828/display/redirect
See console output for more information: https://jenkins.wildfiregames.com/job/macos-differential/2828/display/redirectconsole

borg- added a comment.Wed, Jan 13, 2:30 PM

Why? It is a hall for princes, so it needs some blingbling ;)

Standard cost for gaul buildings.

borg- added a comment.EditedWed, Jan 13, 2:31 PM

I would like to see the three infantry champions trained on assembly and removal of unlock tech, but for this it must be a p2 building.

I would like to see the three infantry champions trained on assembly and removal of unlock tech, but for this it must be a p2 building.

And remove them from temple, barracks, and fortress, you mean? I'm not necessarily opposed, but maybe it would be better to consider doing that in a follow-up patch, since that would alter gaul gameplay more significantly.

Stan added a comment.Wed, Jan 13, 3:30 PM

Yeah, I'd rather not have the champions here except for the carnyx, and that's a discussion for another patch.

borg- accepted this revision.Wed, Jan 13, 4:36 PM

Yes, for another patch. The rest seems ok to me.

This revision is now accepted and ready to land.Wed, Jan 13, 4:36 PM
This revision was landed with ongoing or failed builds.Wed, Jan 13, 5:00 PM
This revision was automatically updated to reflect the committed changes.
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Wed, Jan 13, 5:00 PM