Also, as @Stan pointed out, e.g Arsinoe II II looks weird.

All civilizations have at least eight different AI names, so why do we need these numerals?

" : → ":

Wouldn't it be better if there were a one-on-one correspondence between icons and actors, i.e. a different portrait for each rank? (E.g. basic blue, advanced green, elite yellow, champion red.)

Either restore the order to H-P-C or alphabetize it to C-H-P, but make sure it's consistent throughout the entire game.

Nice catch!

Though palisade without s would be more correct; wall, gate, fence are not pluralized either. And stables was finally corrected to stable a couple of months ago.

Thank you for committing this!

list champions before heroes in the production queues of fortresses

Where is this?

Meh, it's not in there, shouldn't have trusted the description.

It was there in https://code.wildfiregames.com/D1761?id=7871, but I didn't include it in https://code.wildfiregames.com/D1761?id=9552 and apparently forgot to update the summary, my mistake.

Out of curiosity, why did you decide to keep the final s? https://code.wildfiregames.com/D2234?id=9536 moved the templates to palisade_*, without s.

End sentences with a full stop.

By the way, why does it say <repeat count="10"> in line 35 but <repeat count="8"> in line 72?

"or replay"

Sentry?

https://www.lexico.com/en/definition/sentry

Another question, which of the following do you think is best?

1. PgUp and PgDn
2. PageUp and PageDown
3. Page Up and Page Down
4. PgUp (Page Up) and PgDn (Page Down)

Why no colons? It introduces a list, f.e. https://www.thepunctuationguide.com/colon.html

No colon because these are section headers. Cf. the following:

Two very good points, thanks! Those section captions should have neither title case nor colons; I'll check and correct them all.

Check whether the patch is complete (wink wink). Check the phrasing of the tooltip and Intro.txt advertizement [sic] of the hotkeys to reflect that they are used in both pages.

It's probably just a typo, but to advertise is written with -ise in all variaties of English, including American, never with -ize. (Likewise, to capsize is always written with -ize, never -ise. The -ise/-ize UK/US difference only applies to words going back to Greek -ιζ- verbs.)

The changes in this diff arent so worthy for concern if it wasnt a pattern to ignore default.cfg that had led to many mistakes before that would have been found if carefully compared and always cosidered.

Isn't it actually more of a problem that people change keys in the default.cfg file but forget to update the intro.txt file?

By the way, shouldn't there be a hotkey to open the Manual?

Why change anticlockwise to counterclockwise in one file but not in the other?
There actually was no argument provided why it was right to change the string in D1744, but I suppose it's because the word is more common, regardless whether you're a developer or player.

The reason is “anticlockwise” is English and “counterclockwise” is American. Spelling and vocabulary differences matter for translations, but not really for comments in code.

Why changing building to structure in one file but not the other?

Well, I suppose I could change that and similar things in the default.cfg too, but I still think it would be better to do that in a separate patch.

Why describe different behavior for the same hotkey in different places?

?

• put window names inside quotation marks

One example, default.cfg has:

screenshot = F2                          ; Take PNG screenshot
bigscreenshot = "Shift+F2"               ; Take large BMP screenshot

and intro.txt has:

F2 – Take screenshot (in .png format, location is displayed in the top left of the GUI after the file has been saved, and can also be seen in the console/logs if you miss it there)
Shift + F2 – Take huge screenshot (6400×4800 pixels, in .bmp format, location is displayed in the top left of the GUI after the file has been saved, and can also be seen in the console/logs if you miss it there)

In my honest opinion neither replacing the concise former with the verbose former nor vice versa would be an improvement.

That was the part that I was wondering about in D2273.

Yes, I saw your post there today, which prompted me to change it again in this patch.

The same changes should be applied to default.cfg in the same patch I suppose?

Actually I had a look at the binaries/data/config/default.cfg file, but quickly noticed it's too different from the gui/manual/intro.txt file:

• it includes many other settings not in the manual
• it doesn't list many of the manual entries (esp. those that involve clicking or specify multiple cases)
• completely different order
• different format ("code = key ; comment" instead of "key: function")
• file is for developers, does not really contain user-facing text strings
• already out of sync prior to D1719

Taking everything together, I concluded it's too much work and not really necessarily a good idea to update the default.cfg to match the intro.txt file.

Good point! (e.g. “walking ships”)

Thanks, that explains why I couldn't find it in the public folder!

Where and what is default.cfg?

Thanks for the clarifications!

template_bird.xml is not an unit.
How about structures? Those have neither <Controllable>false</Controllable> nor <Controllable>true</Controllable>? I know structures can't move, but they still can get orders (attack, set rally point, ungarrison)?

With this patch, the History and Structure Tree behaviour in A24 seems to be the same as it was in A23, both in pre-game main menu and in in-game session:

• pressing Alt+Shift+H/T opens History/Structure Tree
• pressing Alt+Shift+H/T again when History/Structure Tree is already open, closes it
• clicking the Structure Tree button in History opens Structure Tree
• clicking the History button in Structure Tree opens History

Not necessarily, when a unit is not owned it can't be moved around, this patch allows any entity that is owned to be moved around, regardless of whether it is an animal or not.

So if I understand correctly, all units are now controllable? Is adding the <Controllable>true</Controllable> node then still necessary?

gui/manual/intro.txt has to be redone because of D2110/rP22904.

Rebased because of D1808/rP22905.

Still, the question remains whether using “attack speed” is indeed clearer and less confusing than “attack time”. Also, how about similar stats (e.g. entities' <Cost/BuildTime>, healers' <Heal/Rate>, siege engines' <Pack/Time>, etc.)?

Thank you, I'm glad this one is finally committed!

Shouldn't template_unit_fauna.xml have <Controllable> set to false and template_unit_fauna_herd_domestic.xml and gaia/fauna_arctic_wolf_domestic.xml true?

And I've tested by doing the following:

• svn up and deleted cache
• rebuilt the game with clean-workspaces.sh then update-workspaces.sh
• binaries/system/pyrogenesis

It turns out the problems I reported on the forums last Friday are still there:

• when opening "Learn To Play/Structure Tree" from the main menu:
  • clicking the "History" button closes it and returns to the main menu (instead of opening History)
  • pressing Alt+Shift+H opens History as it should
  • pressing Alt+Shift+T re-opens the Structure Tree (when it's already open, it should close)
• mutatis mutandis for "Learn To Play/History"

Then I did arc patch D2273 and tried again. Clicking the History/Structure Tree button opens the corresponding window, as it should, so this patch apparently solves that problem. However, pressing Alt+Shift+H/T still re-opens the corresponding window, even though it should actually close it when it's already open, so that problem is still there.

Unfortunately I don't understand these lines of codes, therefore I don't consider myself capable of properly reviewing this.

Thank you!

I suppose each item is a civ bonus?

Each entry is a civilization bonus, team bonus, special technology, special building, or hero.

If you have a better suggestion for the comment sentence, feel free to be bold and go ahead!

So I wonder wheter that dot comes from.

Some of the {civ}.json use non-empty placeholder strings; they're removed in D2222.

Thank you for that last explanation!

comment

@Krinkle, yes, I agree, the entire tooltip could use a critical look and perhaps a redesign; especially concerning the various resource stats.
However, what do you mean exactly with fractions? Display 1.2 as 6/5? Wouldn't that make comparing things harder for typical users?

Should also always account for mods.
The simulation templates are 0ad content, but the simulation components (even the GUI too) are meant to work with arbitrary game content (as far as I'm concerned).

The armour percentage for level x is 1 - 0.9^x; although it's theoretically possible for a mod to use decimal levels, I doubt people would really use e.g. x = 1.23.

Perhaps it was originally added because 3.0 crush (27%) looks more noble than 3 crush (27%) x)

Or perhaps it's just because attack damage has (and needs) a decimal?

But I wouldn't say there is no consistency, since the tooltip strings above and below the armor tooltip also uses one decimal place (Capture Attack, Melee Attack, Armor, Speed, Gather Rate)..

Health doesn't have decimals, whereas e.g. resource trickle can have numerous.

I don't have strong disagreement on the armor tooltip itself, so I suppose it's okay.

The current situation or the proposed patch?

(Shouldn't Melee attack come prior to Capture Attack?)

Why? Isn't capturing the default?
Speaking of which, I think it would be more logical to list armour between health and capture attack; but that discussion is beyond the scope of this patch.

(All techs and promotion and whatsoever also result in natural numbers for armor too?)

Yes; unlike attack damage, resource costs, health, etc., which typically use multiply modifications, the data/ files use only add for Armour.

Also perhaps it wouldnt hurt to remove the trailing 0 in the templates.

I suppose I could write a patch for that, if I were sure someone would review it; there is already quite a review backlog.

And perhaps even going further and making Armor a natural number in the simulation component Schema?

That wouldn't hurt, but is it necessary?

Hopefully this is what you meant.

Like this?

Better?

LaTeX I at least understand without difficulty, JavaScript not really.

Commas should also be translated, everything.

But the line-endings ('\n') don't seem to be translated either?

What if there is a language that wants to have the bullet point on the right side, or what if they want to add an addional symbol after the text?

Presumably `translate('• ' + text), however, are the subHeadings here not already translated somewhere else? So wouldn't wrapping it inside mean the string would be translated twice?

What do we do against the duplication?

var item = sprintf(translate('• '));? I don't know for sure, just a guess.

translate

So you mean the bullets ought to be translated?

Well, I do remember a patch where someone (@Angen?) updated the loading tips, I recommended replacing the itemization hyphens with bullets, and you requested moving those from the txt files to the js code. Or did you mean a different one?
In this particular case, the important question is whether inserting bullets improves readability (compare the two screenshots).

There is no consistency for tooltips, nor does this patch aim to implement such a thing. All it does is remove the .0 from the armour values.

All armour levels in 0 A.D. are integers

Is this the truth?
If I look into the code, it looks contrary, no?

In principle I suppose they could have decimals, but in practice all values (do a grep -r Armour in the simulation/data/ and simulation/templates/ ) are multiples of 1, therefore they're all displayed with a trailing zero, which would be removed by this patch.

Did you try this? Because I just observed two (not significant, I know) PetraAI vs PetraAI-matches and they did not produce a war dog (nor a Kennel, but even when I intervened and built a Kennel no wardogs were trained).

Good question! I just ran three Britons vs Britons vs Britons games, but in none of those they built kennels, hence no war dogs.
I do recall Britons training war dogs when I tried this out some weeks ago, but that was in a A23 mod, admittedly, and I may have changed other things then as well; I can't reproduce it with this patch.