Details

Reviewers

Gallaecio
Freagarach
wraitii

Commits

rP23876: Javelinist -> Javelineer.

Summary

According to wiktionary, a javelinist is an athelete (cf. cyclist) and a javelineer is a soldier (cf. musketeer). Although both terms are too rare to appear in my Oxford dictionary, I think it's plausible (and better pronounceable), hence this patch.
No files are moved (that would be a lot of work).

Test Plan

Check for mistakes and omissions.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

/ps/trunk

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 12300
Build 23365: Vulcan Build	Jenkins
Build 23364: Vulcan Build (macOS)	Jenkins
Build 23363: Vulcan Build (Windows)	Jenkins
Build 23362: arc lint + arc unit

Event Timeline

Nescio created this revision.Jan 21 2020, 9:13 PM

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

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (key-spacing):
|    | Extra space before value for key 'Phenotype'.
|----|    | /zpool0/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js
|  21|  21| cmpIdentity = ConstructComponent(6, "Identity", {
|  22|  22| 	"Civ": "iber",
|  23|  23| 	"Lang": "iberian",
|  24|    |-	"Phenotype":  { "_string": "female" },
|    |  24|+	"Phenotype": { "_string": "female" },
|  25|  25| 	"GenericName": "Iberian Skirmisher",
|  26|  26| 	"SpecificName": "Lusitano Ezpatari",
|  27|  27| 	"SelectionGroupName": "units/iber_infantry_javelinist_b",
Executing section cli...

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

Harbormaster completed remote builds in B10915: Diff 11141.Jan 21 2020, 9:17 PM

Gallaecio accepted this revision.Jan 22 2020, 12:13 PM

This revision is now accepted and ready to land.Jan 22 2020, 12:13 PM

Does this need a rebase?

rebased

Owners added a subscriber: Restricted Owners Package.Jul 4 2020, 4:45 PM

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

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (key-spacing):
|    | Extra space before value for key 'Phenotype'.
|----|    | /zpool0/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js
|  21|  21| cmpIdentity = ConstructComponent(6, "Identity", {
|  22|  22| 	"Civ": "iber",
|  23|  23| 	"Lang": "iberian",
|  24|    |-	"Phenotype":  { "_string": "female" },
|    |  24|+	"Phenotype": { "_string": "female" },
|  25|  25| 	"GenericName": "Iberian Skirmisher",
|  26|  26| 	"SpecificName": "Lusitano Ezpatari",
|  27|  27| 	"SelectionGroupName": "units/iber_infantry_javelinist_b",
Executing section cli...

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

Harbormaster completed remote builds in B12300: Diff 12548.Jul 4 2020, 5:04 PM

Grep says it's complete. Playtesting reveals no errors.

binaries/data/mods/public/simulation/components/tests/test_Identity.js
24	Could fix this double space while at it?

I feel like this introduces inconsistencies, particularly since it changes the class.
IMO either:

Only change the human name
Change the files too.

There is not always a bijection between templates and classes; e.g. template_unit_fauna.xml has the Animal class. In this patch the class is renamed because it's a visible class, i.e. an user-facing text string. Calling a unit a “Javelineer” in its name but a “Javelinist” a few lines below seems rather inconsistent, and possibly confusing (e.g. aura and technology tooltips), whereas template file names are not dispayed in game.
Ideally the templates ought to be renamed too, but that'll be a lot of work, involving hundreds of files (including maps), so that'll be a lot of work. It could be done, but it's probably better to do that in a follow-up patch after this one is committed, but not here, to keep things reviewable.

rebased