Page MenuHomeWildfire Games
Differential D2624

Kushite hero corrections
ClosedPublic
Actions

Authored by Nescio on Feb 7 2020, 7:47 PM.

Details

Reviewers
Stan
Commits
rP23487: Correct the contents of the kush_hero_harsiotef.xml template, which used to be…
Summary

This patch does three things:

  • correct the contents of the kush_hero_harsiotef.xml template, which used to be simply a copy of kush_hero_nastasen.xml
  • standardize the Kushite hero specific names, as discussed with @Sundiata on the forums
  • insert Harsiotef in the Kushite sandbox map and remove a champion cavalry to keep the <Entity> uid numbers proper

The game can handle it:

Test Plan

Try out the Kushite sandbox map, check out the heroes individually, observe everything 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.Feb 7 2020, 7:47 PM
Owners added a subscriber: Restricted Owners Package.Feb 7 2020, 7:47 PM
Vulcan added a comment.Feb 7 2020, 7:47 PM

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

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1722/display/redirect

Harbormaster failed remote builds in B11069: Diff 11291!Feb 7 2020, 7:47 PM
Vulcan added a comment.Feb 7 2020, 7:48 PM

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

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/1203/display/redirect

Nescio added a comment.Feb 7 2020, 7:49 PM

And Vulcan failed again because of the map file (D1042).

Vulcan added a comment.Feb 7 2020, 7:49 PM

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

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

Stan added inline comments.Feb 7 2020, 7:59 PM
binaries/data/mods/public/maps/scenarios/Sandbox - Kushites.xml
12758 ↗(On Diff #11291)

What happened here?

Nescio added inline comments.Feb 7 2020, 8:03 PM
binaries/data/mods/public/maps/scenarios/Sandbox - Kushites.xml
12758 ↗(On Diff #11291)

See summary: to keep the heroes together, I deleted a champion cavalry, and moved the siege tower up.
The new lines 12758 to 12762 correspond to the old lines 12835 to 12839.

Nescio added inline comments.Feb 7 2020, 8:36 PM
binaries/data/mods/public/maps/scenarios/Sandbox - Kushites.xml
12758 ↗(On Diff #11291)

And the old lines 12759 to 12762 correspond to the new lines 12843 to 12847.

Stan accepted this revision.Feb 7 2020, 8:43 PM
This revision is now accepted and ready to land.Feb 7 2020, 8:43 PM
This revision was landed with ongoing or failed builds.Feb 7 2020, 10:26 PM
Closed by commit rP23487: Correct the contents of the kush_hero_harsiotef.xml template, which used to be… (authored by Stan). · Explain Why
This revision was automatically updated to reflect the committed changes.
Stan added a commit: rP23487: Correct the contents of the kush_hero_harsiotef.xml template, which used to be….

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
maps/
scenarios/
22 lines
simulation/
templates/
units/
2 lines
8 lines
2 lines

Diff 11296

View Options

ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Kushites.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_harsiotef.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml

Loading...
Wildfire Games · Phabricator