Page MenuHomeWildfire Games

fix various oversights
ClosedPublic

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

Details

Summary

This patch fixes some things missed in recent commits:

  • insert attack sounds into maceman templates (D2855/rP24499 was rebased before D1354/rP24478 was committed)
  • let Kushites start with an healer on (most) skirmish maps (D2843/rP24422 added them only to random maps)
  • correct fortress tooltips (D1762/rP24393 gave fortresses a territory root, D2801/rP24470 removed champion cavalry and chariots from them)
  • Rome siege walls are much narrower and lower than other walls and thus need smaller foundations (not done in D2502/rP23609)
  • removed the unused IshtarGate visible class
  • move the Ishtar Gate of Babylon out of the pers/ folder; it was built during the Neo-Babylonian Empire, i.e. predating the Persian Empire; Stonehenge isn't in the brit/ folder either (D2472/rP23888 removed it from the building lists)
  • rename two unused icons (barracks.pngmilitary.png and ishtar_gate.pngbull.png) to allow D2551 to rename their used counterparts (pers_barracks.pngbarracks.png and pers_gate.pngishtar_gate.png)
  • insert placeholder icons in all free and autoresearched technologies that didn't have one already
  • insert @Freagarach into the balancing credits
Test Plan

Check for correctness and completeness

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 4 2021, 4:13 PM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Jan 4 2021, 4:13 PM
Vulcan added a comment.Jan 4 2021, 4:15 PM

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
fatal error: file '/Users/wfg/Jenkins/workspace/macos-differential/build/workspaces/gcc/../../../libraries/source/spidermonkey/include-unix-debug/mozilla/StaticAnalysisFunctions.h' has been modified since the precompiled header 'obj/network_Debug/precompiled.h.gch' was built
note: please rebuild precompiled header 'obj/network_Debug/precompiled.h.gch'
1 error generated.
make[1]: *** [obj/network_Debug/NetMessageSim.o] Error 1
make: *** [network] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/2677/display/redirect

Nescio edited the summary of this revision. (Show Details)Jan 4 2021, 4:29 PM
Nescio edited the summary of this revision. (Show Details)
Nescio removed subscribers: Restricted Owners Package, Restricted Owners Package.
Nescio published this revision for review.Jan 4 2021, 4:32 PM
Freagarach added inline comments.Jan 5 2021, 9:02 AM
binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
10 ↗(On Diff #14989)

Champion Archers and Elephants?

binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
10 ↗(On Diff #14989)

Champion Infantry and Elephants?

binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
10 ↗(On Diff #14989)

Champion Infantry and Elephants?

Nescio updated this revision to Diff 15001.Jan 5 2021, 12:51 PM
Nescio edited the summary of this revision. (Show Details)
  • "Champions" → "Champion Infantry and Elephants", per @Freagarach
  • insert @Freagarach into the balancing credits
Owners added subscribers: Restricted Owners Package, Restricted Owners Package, Restricted Owners Package.Jan 5 2021, 12:51 PM
Nescio removed subscribers: Restricted Owners Package, Restricted Owners Package, Restricted Owners Package.Jan 5 2021, 12:52 PM
Freagarach accepted this revision.Jan 5 2021, 12:55 PM

Thanks again for your keen eye and hard work!

This revision is now accepted and ready to land.Jan 5 2021, 12:55 PM
This revision was landed with ongoing or failed builds.Jan 6 2021, 7:45 AM
This revision was automatically updated to reflect the committed changes.
Owners added subscribers: Restricted Owners Package, Restricted Owners Package, Restricted Owners Package.Jan 6 2021, 7:45 AM