Differential D2156

hero templates regnal numbers
ClosedPublic
Actions

Authored by Nescio on Aug 7 2019, 10:36 AM.

Details

Reviewers

Freagarach

Group Reviewers

Restricted Owners Package

(Owns No Changed Paths)

Commits

rP24472: Standardise hero regnal numbers.

Summary

This patch standardizes the regnal numbers in hero template file names, for consistency and to allow for future additions (e.g. if an Alexander the Great campaign would be created in the distant future, they presumably want Darius III, not Darius I).

Test Plan

Check if nothing is overlooked.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 8769
Build 14377: Vulcan Build	Jenkins
Build 14376: arc lint + arc unit

Event Timeline

Nescio created this revision.Aug 7 2019, 10:36 AM

Owners added a subscriber: Restricted Owners Package.Aug 7 2019, 10:36 AM

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

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

Harbormaster failed remote builds in B8769: Diff 9257!Aug 7 2019, 10:36 AM

(Spaces in map file names remain problematic (D1042).)

Nescio edited reviewers, added: Restricted Owners Package; removed: Itms.Aug 26 2019, 6:17 PM

Nescio planned changes to this revision.Jul 2 2020, 9:16 PM

A pain to commit, but a very nice addition.

rebased
also rename associated aura files

Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Dec 28 2020, 12:28 PM

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

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

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

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

Harbormaster completed remote builds in B14615: Diff 14863.Dec 28 2020, 12:57 PM

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

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

Freagarach requested changes to this revision.Dec 29 2020, 9:16 AM

Freagarach added inline comments.

binaries/data/mods/public/simulation/templates/units/pers/hero_xerxes_i_chariot.xml
4 ↗	(On Diff #14863)

This revision now requires changes to proceed.Dec 29 2020, 9:16 AM

fix aura line spotted by @Freagarach

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

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

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

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

Harbormaster completed remote builds in B14636: Diff 14887.Dec 29 2020, 1:45 PM

Nice addition.
Compleat (checkrefs passes and UnitDemo loads fine).

This revision is now accepted and ready to land.Dec 29 2020, 5:13 PM

This revision was landed with ongoing or failed builds.Dec 30 2020, 9:18 AM

Closed by commit rP24472: Standardise hero regnal numbers. (authored by Freagarach). · Explain Why

This revision was automatically updated to reflect the committed changes.

Freagarach added a commit: rP24472: Standardise hero regnal numbers..

Revision Contents
Changeset List

Path

Size

binaries/

data/

mods/

public/

maps/

scenarios/

Cinema_Demo.xml

4 lines

Laconia 01.xml

2 lines

Sandbox - Macedonians.xml

6 lines

Sandbox - Mauryas.xml

2 lines

Sandbox - Persians.xml

6 lines

Sandbox - Ptolemies 2.xml

8 lines

Sandbox - Seleucids.xml

6 lines

The Persian Gates.xml

2 lines

skirmishes/

	Egypt (3v3).xml
	Egypt

6 lines

simulation/

data/

cheats/

createHeros.json

2 lines

templates/

structures/

6 lines

2 lines

2 lines

6 lines

ptol_civil_centre.xml

6 lines

sele_civil_centre.xml

6 lines

units/

mace_hero_alexander.xml

	mace_hero_alexander_iii.xml
	mace_hero_alexander.xml

mace_hero_craterus.xml

mace_hero_demetrius.xml

mace_hero_philip.xml

	mace_hero_philip_ii.xml
	mace_hero_philip.xml

	mace_hero_philip_ii_pikeman.xml
	mace_hero_philip_pike.xml

mace_hero_philip_pike.xml

mace_hero_pyrrhus.xml

	mace_hero_pyrrhus_i.xml
	mace_hero_pyrrhus.xml

	maur_hero_chandragupta.xml
	maur_hero_maurya.xml

maur_hero_maurya.xml

pers_hero_cyrus.xml

	pers_hero_cyrus_ii.xml
	pers_hero_cyrus.xml

pers_hero_darius.xml

	pers_hero_darius_i.xml
	pers_hero_darius.xml

pers_hero_xerxes.xml

pers_hero_xerxes_chariot.xml

	pers_hero_xerxes_i.xml
	pers_hero_xerxes.xml

	pers_hero_xerxes_i_chariot.xml
	pers_hero_xerxes_chariot.xml

ptol_hero_cleopatra.xml

	ptol_hero_cleopatra_vii.xml
	ptol_hero_cleopatra.xml

ptol_hero_ptolemy_I.xml

ptol_hero_ptolemy_IV.xml

	ptol_hero_ptolemy_i.xml
	ptol_hero_ptolemy_I.xml

	ptol_hero_ptolemy_iv.xml
	ptol_hero_ptolemy_IV.xml

sele_hero_antiochus_great.xml

	sele_hero_antiochus_iii.xml
	sele_hero_antiochus_great.xml

	sele_hero_antiochus_iv.xml
	sele_hero_antiochus_righteous.xml

sele_hero_antiochus_righteous.xml

	sele_hero_seleucus_i.xml
	sele_hero_seleucus_victor.xml

hero templates regnal numbersClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 9257

binaries/data/mods/public/maps/scenarios/Cinema_Demo.xml

binaries/data/mods/public/maps/scenarios/Laconia 01.xml

binaries/data/mods/public/maps/scenarios/Sandbox - Macedonians.xml

binaries/data/mods/public/maps/scenarios/Sandbox - Mauryas.xml

binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml

binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml

binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml

binaries/data/mods/public/maps/scenarios/The Persian Gates.xml

binaries/data/mods/public/maps/skirmishes/Egypt (3v3).xml

binaries/data/mods/public/simulation/data/cheats/createHeros.json

binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml

binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml

binaries/data/mods/public/simulation/templates/structures/maur_palace.xml

binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml

binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml

binaries/data/mods/public/simulation/templates/structures/sele_civil_centre.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_alexander_iii.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_philip_ii.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_philip_ii_pikeman.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml

binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus_i.xml

binaries/data/mods/public/simulation/templates/units/maur_hero_chandragupta.xml

binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml

binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml

binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus_ii.xml

binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml

binaries/data/mods/public/simulation/templates/units/pers_hero_darius_i.xml

binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml

binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml

binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_i.xml

binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_i_chariot.xml

binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml

binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra_vii.xml

binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml

binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml

binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_i.xml

binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_iv.xml

binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml

binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_iii.xml

binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_iv.xml

binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml

binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_i.xml

binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml

hero templates regnal numbers
ClosedPublic
Actions

Revision Contents
Changeset List