Paths

Table of Contentst

Differential D2624

Kushite hero corrections
ClosedPublic
Actions

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

Tags

None

Referenced Files

	F5262361: D2624.id11291.diff
	Sat, Oct 5, 2:33 PM

	F5262354: D2624.id11296.diff
	Sat, Oct 5, 2:31 PM

	Unknown Object (File)
	Wed, Sep 11, 1:27 AM

	Unknown Object (File)
	Wed, Sep 11, 12:15 AM

	Unknown Object (File)
	Sep 3 2024, 2:21 PM

	Unknown Object (File)
	Aug 27 2024, 1:09 PM

	F1228846: D2624.png
	Feb 7 2020, 7:47 PM

Subscribers

Restricted Owners Package

Details

Reviewers

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:

D2624.png (2×1 px, 7 MB)

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

Lint Not Applicable

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

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

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

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

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

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

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

maps/

scenarios/

Sandbox - Kushites.xml

22 lines

simulation/

templates/

units/

kush_hero_arakamani.xml

2 lines

kush_hero_harsiotef.xml

8 lines

kush_hero_nastasen.xml

2 lines

Diff 11296

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

Loading...

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

Loading...

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

Loading...

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

Loading...