Created a new generic template for the champion maceman; currently there is only one (Mauryan Yoddha), but others might be added in the future.
Cf. the generic hero healer template, which is also used only once.
Details
Test if 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
Successful build - Chance fights ever on the side of the prudent.
Updating workspaces... Build (release)... Build (debug)... Running release tests... Running cxxtest tests (307 tests)...................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (307 tests)...................................................................................................................................................................................................................................................................................................................OK! Checking XML files... Relax-NG validity error : Extra element props in interleave /public/art/actors/structures/carthaginians/stable_elephant.xml:0: Relax-NG validity error : Element variant failed to validate content /public/art/actors/structures/carthaginians/stable_elephant.xml:0: Relax-NG validity error : Element group has extra content: variant Relax-NG validity error : Extra element group in interleave /public/art/actors/structures/carthaginians/stable_elephant.xml:0: Relax-NG validity error : Element actor failed to validate content
googling, maceman indeed says us that the meant unit is called a maceman
binaries/data/mods/public/simulation/components/Identity.js | ||
---|---|---|
65 ↗ | (On Diff #4189) | shouldn't that be Maceman then, so avoid confusion with the mace civ (notice we also have Archer, Slave, Trader etc too, which refers to persons, so Maceman is correct too) |
binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml | ||
28 ↗ | (On Diff #4189) | Maceman |
binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml | ||
5 ↗ | (On Diff #4189) | this should go to the parent, shouldn't it? |
binaries/data/mods/public/simulation/components/Identity.js | ||
---|---|---|
65 ↗ | (On Diff #4189) | Pike, Sling, Spear, Sword also lack “man”. |
binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml | ||
28 ↗ | (On Diff #4189) | See earlier remark. |
binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml | ||
5 ↗ | (On Diff #4189) | No, not in this case. Sometimes civ specific templates redefine the generic name, cf. pers_champion_infantry.xml |
binaries/data/mods/public/simulation/components/Identity.js | ||
---|---|---|
65 ↗ | (On Diff #4189) | But mace is used as reference to macedonian in other code, f.e template names so I guess (and know I would) people would be confused when having the same string (ok cap) for two totally different things. Agree that not all have the "man" but it this case we have a confusion problem. Also you are right when civs are classes they get there full name. (It is indeed choosing between two evils...) |
binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml | ||
5 ↗ | (On Diff #4189) | You are right indeed... |
binaries/data/mods/public/simulation/components/Identity.js | ||
---|---|---|
65 ↗ | (On Diff #4189) | Although I see your point, I don't think it's really a problem here (classes are clearly distinguished from civs). |
binaries/data/mods/public/simulation/components/Identity.js | ||
---|---|---|
65 ↗ | (On Diff #4189) | They are and that is why I would say to have the man extension to avoid confusion, and as that is the real only reason there is no need for changing others, perhaps just meh |
binaries/data/mods/public/simulation/components/Identity.js | ||
---|---|---|
65 ↗ | (On Diff #4189) | Do classes and template names have to match? That is currently not the case. |
binaries/data/mods/public/simulation/components/Identity.js | ||
---|---|---|
65 ↗ | (On Diff #4189) | no since templates can have more than one class and classes can be defined in more than one template. Also classes can be really any string which apply to the to unit, so there is no need to make them matching. It is really just avoiding confusion when looking at two things with exactly the same name, but yet very different meanings (It is nice that at least a barrack template has the barrack class, but a spearman template can have the spear class with is fine too in the same way) |
Going for Maceman
grepped Sword in the sim and the only place currenty used (so non templates) is the steel working tech (this has no effect on sim since maceman just no hack damage currently, but as we are talking about razer sharp things, adding it to macemans is fine. It can be misleading however to mention it in tooltip, since it doesn't change anything, so leaving the tooltip as is). I will add this class there. (Notice there are some wrong names in the tests, but that is out of scope)
binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml | ||
---|---|---|
31–32 ↗ | (On Diff #4189) | don't know why, but not wanting to change the sim with it |