Page MenuHomeWildfire Games

rename gaul theatre to assembly and changes its parent
ClosedPublic

Authored by Nescio on Jan 11 2021, 11:13 PM.

Details

Reviewers
Freagarach
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP24566: Rename Gaul Theater to Assembly.
Summary

Although its shape resembles a theatre, the gaul theatre is actually supposed to have a different function. This patch therefore renames it to assembly.xml. Now I'm aware an assembly is strictly speaking a group of people, not a building, but the same is true for e.g. congress, parliament, and senate; I doubt people will get confused by the new file name.
Furthermore:

  • It changes the template's parent from template_structure_special_theater.xml to simply template_structure.xml, which means more duplicate lines now, but is cleaner, and makes future differentiation easier.
  • It introduces an Assembly visible class.
  • It adjusts the footprint, obstruction, rubble, icon, and sounds.

Meaningful values (e.g. cost, health, territory influence) are not changed; that should be done in a future patch.

Test Plan

Check for mistakes and omissions, verify everything still works.

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 11 2021, 11:13 PM
Owners added a subscriber: Restricted Owners Package.Jan 11 2021, 11:13 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/2779/display/redirect for more details.

Nescio requested review of this revision.Jan 11 2021, 11:19 PM
Freagarach requested changes to this revision.Jan 12 2021, 7:21 AM
Freagarach added a subscriber: Freagarach.
Freagarach added inline comments.
binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml
48 ↗(On Diff #15155)

Foundation resistance has changed.

52 ↗(On Diff #15155)

Perhaps the iber_monument sound?

This revision now requires changes to proceed.Jan 12 2021, 7:21 AM
Nescio added inline comments.Jan 12 2021, 12:30 PM
binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml
48 ↗(On Diff #15155)

Yes, it is. Since it's not actually buildable, that doesn't matter.

52 ↗(On Diff #15155)

Fine by me.

Nescio updated this revision to Diff 15204.Jan 12 2021, 8:05 PM
Nescio edited the summary of this revision. (Show Details)
Freagarach accepted this revision.Jan 12 2021, 8:13 PM
  • Nice change.
  • Incomplete (I'll change the map), but almost.
This revision is now accepted and ready to land.Jan 12 2021, 8:13 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/2808/display/redirect for more details.

This revision was landed with ongoing or failed builds.Jan 12 2021, 8:25 PM
This revision was automatically updated to reflect the committed changes.
Owners added a subscriber: Restricted Owners Package.Jan 12 2021, 8:25 PM