Page MenuHomeWildfire Games
Differential D2033

[art/actors] correct sword prop for three units
ClosedPublic
Actions

Authored by Nescio on Jul 2 2019, 12:31 AM.

Details

Reviewers
Stan
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP23339: Correct sword prop for six units
Summary

This patch:

  • changes the weapon of gaul infantry swordmen to (Celtic) csword, because all other Celtic swordsmen (cavalry, champions, heroes, ptol mercenaries) use it already and the spatha is a Roman cavalry sword;
  • changes the weapon of athen cavalry swordsmen to falcata (kopis/makhaira), a chopping sword, because ancient sources (e.g. Xenophon) emphasize cavalry used that, not a xiphos (similar to gladius or akinakes), a short stabbing sword, unsuitable for horsemen
Test Plan

Ought to be unproblematic.

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.Jul 2 2019, 12:31 AM
Owners added a subscriber: Restricted Owners Package.Jul 2 2019, 12:31 AM
Vulcan added a comment.Jul 2 2019, 12:33 AM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/differential/1873/display/redirect

Harbormaster completed remote builds in B8155: Diff 8687.Jul 2 2019, 12:33 AM
Nescio added a comment.EditedJul 2 2019, 12:34 AM

Separatedly, someone with more knowledge and experience of the art/ files should correct the following:

  • "akin" [sic] into "akinakes"
  • "gladus" [sic] into "gladius"
  • "pillum" [sic] into "pilum"
  • "tessalian" [sic] into "thessalian"

(involves file moves etc.).

Nescio edited reviewers, added: Restricted Owners Package; removed: Stan.Jul 6 2019, 4:26 PM
Alexandermb added a subscriber: Alexandermb.Aug 11 2019, 2:36 AM
In D2033#84727, @Nescio wrote:

Separatedly, someone with more knowledge and experience of the art/ files should correct the following:

  • "akin" [sic] into "akinakes"
  • "gladus" [sic] into "gladius"
  • "pillum" [sic] into "pilum"
  • "tessalian" [sic] into "thessalian"

(involves file moves etc.).

Thanks will have it in mind in the weapon update project. I have doubts about this when i was updating weapons.

Nescio added a reviewer: Alexandermb.Aug 20 2019, 11:59 AM
Stan added a subscriber: Stan.Aug 21 2019, 3:47 PM

The Falcata were committed in rP22743 I believe.

Stan requested changes to this revision.Jan 6 2020, 9:55 PM
Stan edited reviewers, added: Stan; removed: Alexandermb.

Can you rebase /update this? Don't forget to change the sheaths when necessary. Thanks for the patch.

This revision now requires changes to proceed.Jan 6 2020, 9:55 PM
Nescio updated this revision to Diff 10903.Jan 6 2020, 10:17 PM
Nescio edited the summary of this revision. (Show Details)

rebased

Stan accepted this revision.Jan 6 2020, 10:18 PM

Looking good, and I agree with the changes.

This revision is now accepted and ready to land.Jan 6 2020, 10:18 PM
Vulcan added a comment.Jan 6 2020, 10:19 PM

Successful build - Chance fights ever on the side of the prudent.

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

Vulcan added a comment.Jan 6 2020, 10:20 PM

Successful build - Chance fights ever on the side of the prudent.

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

Vulcan added a comment.Jan 6 2020, 10:22 PM

Successful build - Chance fights ever on the side of the prudent.

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

Harbormaster completed remote builds in B10655: Diff 10903.Jan 6 2020, 10:22 PM
Closed by commit rP23339: Correct sword prop for six units (authored by Stan). · Explain WhyJan 6 2020, 10:23 PM
This revision was automatically updated to reflect the committed changes.
Stan added a commit: rP23339: Correct sword prop for six units.
Nescio retitled this revision from Correct sword prop for three units to [art/actors] correct sword prop for three units.May 18 2020, 10:13 AM

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
art/
actors/
units/
athenians/
2 lines
2 lines
4 lines
gauls/
2 lines
2 lines
2 lines

Diff 10904

View Options

ps/trunk/binaries/data/mods/public/art/actors/units/athenians/cavalry_swordsman_a_r.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/athenians/cavalry_swordsman_b_r.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/athenians/cavalry_swordsman_e_r.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/gauls/infantry_swordsman_a.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/gauls/infantry_swordsman_b.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/art/actors/units/gauls/infantry_swordsman_e.xml

Loading...
Wildfire Games · Phabricator