Revising the loading screen tips and adding new ones #6957

Merged
Stan merged 1 commits from Vantha/0ad:loading-screen-tips-revision into main 2024-09-06 14:53:39 +02:00
Member

This pull request is continuing D4189. (Should I add a reference to this pr to the diff?)
I have made the changes to the texts I deem right, and I'm opening it for review now.

(By the way, I'm aware the images aren't updated yet)

This pull request is continuing [D4189](code.wildfiregames.com/D4189). (Should I add a reference to this pr to the diff?) I have made the changes to the texts I deem right, and I'm opening it for review now. (By the way, I'm aware the images aren't updated yet)
Vantha added 1 commit 2024-08-23 13:38:25 +02:00
revising the loading screen tips
All checks were successful
0ad-freebsd/pipeline/pr-main This commit looks good
0ad-windows/pipeline/pr-main This commit looks good
0ad-checkrefs/pipeline/pr-main This commit looks good
0ad-linux/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main This commit looks good
72b7406d4d
Vantha requested review from wraitii 2024-08-23 13:38:25 +02:00
Vantha requested review from marder 2024-08-23 13:38:25 +02:00
Vantha requested review from Imarok 2024-08-23 13:38:25 +02:00
Vantha requested review from s0600204 2024-08-23 13:38:25 +02:00
Author
Member

Also, this is my first pull request here, so I hope I have done everything as intended:) If not, let me know.

Also, this is my first pull request here, so I hope I have done everything as intended:) If not, let me know.
Owner

You can post a message on that diff, such as "Continuation over at #6957", and close the diff.

You can post a message on that diff, such as "Continuation over at https://gitea.wildfiregames.com/0ad/0ad/pulls/6957", and close the diff.
Owner

Was about to complain about the images, but you did good not uploading them, since the CI should have failed and it did not. cc @Itms.

Was about to complain about the images, but you did good not uploading them, since the CI should have failed and it did not. cc @Itms.
sera requested changes 2024-08-23 15:33:12 +02:00
Dismissed
@ -1,3 +1,3 @@
ELEPHANT STABLE
The structure is available to some civilizations to train elephant units.
Units gain experience while garrisoned inside the building.
Available to the Carthaginians, Kushites, Mauryas, Persians, Ptolemies, and Seleucids to train Elephants.
Member

No one will ever remember to update this tip text when adding a new civ with a elephant stable. So I'd avoid any mention of civs here. Saying only available for some is fine tho.

No one will ever remember to update this tip text when adding a new civ with a elephant stable. So I'd avoid any mention of civs here. Saying only available for some is fine tho.
Author
Member

Makes sense. I will change it.

Makes sense. I will change it.
Vantha marked this conversation as resolved
ShadowOfHassen requested changes 2024-08-23 15:50:13 +02:00
ShadowOfHassen left a comment
Member

This should be the changes that I think need done. Sorry for any repeats I had some difficulties with resuming the review in the middle.

This should be the changes that I think need done. Sorry for any repeats I had some difficulties with resuming the review in the middle.
@ -3,2 +2,2 @@
Construct rams and train citizen soldiers.
Garrison units to slowly heal them and protect the army camp from attacks and decay.
Buildable in neutral or enemy territory. Good for setting up a secret base behind enemy lines or to consolidate gains within enemy territory.
Constructs Rams and trains Citizen Soldiers of Advanced rank.
Member

Constructs Rams and trains high-rank Citizen Soldiers might be a better way of putting this?

Sorry Gitea doesn't have suggestions like GitHub so you'll have to make the changes yourself.

Constructs Rams and trains high-rank Citizen Soldiers might be a better way of putting this? Sorry Gitea doesn't have suggestions like GitHub so you'll have to make the changes yourself.
Vantha marked this conversation as resolved
@ -2,3 +2,1 @@
Train all citizen soldiers. Some civilizations can unlock the training of champions as well.
Units gain experience while garrisoned inside the building.
Build one early to train citizen soldiers while you phase up your settlement.
Trains all Citizen Soldiers. Some civilizations can unlock the training of Champions in it as well.
Member

Should category names be capitalized? I think unit's proper names should be capitalized, but I don't think something like Champions should.

Should category names be capitalized? I think unit's proper names should be capitalized, but I don't think something like Champions should.
Author
Member

Well, codewise 'Champion' is considered a unit class and is therefore to be capitalized (according to the English style guide). I agree it looks a bit off at first but it's in line with the tooltips. It's fine in my opinion.

Well, codewise 'Champion' is considered a unit class and is therefore to be capitalized (according to the English style guide). I agree it looks a bit off at first but it's in line with the tooltips. It's fine in my opinion.
First-time contributor

Barracks don't train "all" citizen soldiers, only citizen infantry. Stables train citizen cavalry.

Barracks don't train "all" citizen soldiers, only citizen infantry. Stables train citizen cavalry.
Vantha marked this conversation as resolved
@ -3,2 +2,2 @@
Units gain experience while garrisoned inside the building.
Build one early to train citizen soldiers while you phase up your settlement.
Trains all Citizen Soldiers. Some civilizations can unlock the training of Champions in it as well.
Units gain experience while garrisoned inside it.
Member

I'm not sure "it" is necessary here

I'm not sure "it" is necessary here
Author
Member

Ok. Will remove it.

Ok. Will remove it.
Vantha marked this conversation as resolved
@ -5,1 +2,4 @@
Trains all Citizen Soldiers. Some civilizations can unlock the training of Champions in it as well.
Units gain experience while garrisoned inside it.
Build one early to train Citizen Soldiers while you phase up your settlement.
Build in a forward base to resupply your assault with fresh troops.
Member

It does that? I'm not a crazy 0 A.D. gamer, but don't you need to build a barrack in your sphere of influence?

It does that? I'm not a crazy 0 A.D. gamer, but don't you need to build a barrack in your sphere of influence?
Member

I didn't know you could do that. I thought you could only build barracks in your area of control.

I didn't know you could do that. I thought you could only build barracks in your area of control.
Author
Member

Yes, you are right. It's a misleading formulation. What this sentence is supposed to say is "Build in your (already existing) forward base ..." (and not that the barracks can be used to start a new one).
How about changing it to "Build near the front lines..."?

Yes, you are right. It's a misleading formulation. What this sentence is supposed to say is "Build **in your** (already existing) forward base ..." (and not that the barracks can be used to start a new one). How about changing it to "Build near the front lines..."?
Member

That works!

That works!
Contributor

Trains Infantry Citizen Soldiers (line 2)

Trains Infantry Citizen Soldiers (line 2)
Author
Member

Trains Infantry Citizen Soldiers (line 2)

I'll go for just Citizen Infantry. That's the technically correct term here I believe.

> Trains Infantry Citizen Soldiers (line 2) I'll go for just Citizen Infantry. That's the technically correct term here I believe.
Vantha marked this conversation as resolved
@ -0,0 +1,3 @@
BARTER
At the Market structure, a player can exchange a resource for a different type of resource.
Member

I think the ending is a little awkward. Maybe to change it to something like "At the Market structure, a player can exchange a resource for another of a different type."

I think the ending is a little awkward. Maybe to change it to something like "At the Market structure, a player can exchange a resource for another of a different type."
Author
Member

Sounds reasonable.

Sounds reasonable.
Author
Member

Or maybe make it plural since you can't really exchange "a" resource? And change the "player" to "you"?
"At the Market structure, you can exchange resources for others of a different type."?

Or maybe make it plural since you can't really exchange "_a_" resource? And change the "player" to "you"? "At the Market structure, you can exchange resources for others of a different type."?
Member

That's actually better.

That's actually better.
Vantha marked this conversation as resolved
@ -0,0 +1,3 @@
BARTER
At the Market structure, a player can exchange a resource for a different type of resource.
Rates are affected globally by all players. Turn this into an advantage by checking prices regularly.
Member

This is a cool fact I didn't know. If there's only so much metal on the map, I could gather it, then buy a ton of it, inflating the market and messing up the other opponents.

(Of course that assumes I can make it past the second level without the AI swarming me...)

This is a cool fact I didn't know. If there's only so much metal on the map, I could gather it, then buy a ton of it, inflating the market and messing up the other opponents. (Of course that assumes I can make it past the second level without the AI swarming me...)
Author
Member

I agree. I was really impressed when I first found out about this too.

I agree. I was really impressed when I first found out about this too.
Vantha marked this conversation as resolved
@ -3,2 +2,3 @@
The main Warship for the Britons, Gauls, and Iberians.
Can transport up to 40 units.
Can be improved with greater health and garrison capacity.
Can be upgraded to greater health and garrison capacity.
Member

"upgraded to" sounds awkward. I'm kind of fan of the "improved with" of the original text, but "upgraded with" also works.

"upgraded to" sounds awkward. I'm kind of fan of the "improved with" of the original text, but "upgraded with" also works.
Author
Member

I'm fine with reverting it. I wanted to indicate that it's a technology that does it.

I'm fine with reverting it. I wanted to indicate that it's a technology that does it.
First-time contributor

I think we need to be careful with terminology, because the 'Upgrade' feature is something separate from technologies. 'Upgrade' improves one entity at a time, while technologies effect entire classes of entities.
"Research Special Technologies to improve with greater health and garrison capacity." or something like this.

I think we need to be careful with terminology, because the 'Upgrade' feature is something separate from technologies. 'Upgrade' improves one entity at a time, while technologies effect entire classes of entities. "Research Special Technologies to improve with greater health and garrison capacity." or something like this.
@ -2,3 +2,2 @@
Strong stone walls that help you protect your city.
When your ranged infantry units are occupying the turrets, they have additional armor and can shoot at the enemy.
Vulnerable to siege weapons like catapults, rams and war elephants.
Ranged Infantry occupying the turrets get increased resistance and can shoot at the enemy.
Member

Can resistance be changed to defense? Defense sounds a lot better.

Can resistance be changed to defense? Defense sounds a lot better.
Author
Member

Not sure if that's the correct term.

Not sure if that's the correct term.
Member

It's technically resistance if that's what it says in the files, but I think defense gives new players a clearer idea of what it is.

It's technically resistance if that's what it says in the files, but I think defense gives new players a clearer idea of what it is.
Author
Member

In this sentence configuration, the word can also be interpreted symbolically - the units' defensive capabilites are enhanced by the fact they can take cover when occupying turrets. So, fine, I'll change it to defense.

In this sentence configuration, the word can also be interpreted symbolically - the units' defensive capabilites are enhanced by the fact they can take cover when occupying turrets. So, fine, I'll change it to defense.
First-time contributor

I think it's more evocative to use "calls to action" in the sentence structure and wording. So, something like "Garrison Ranged Infantry on wall battlements to give them a strong defense and greater ranged attack." This tells the player to commit to an action which will improve their combat effectiveness. So, I would use commanding language whenever possible.

Not every sentence needs to be commanding or a call to action, but the more you structure things that way, the stronger the information feels.

I think it's more evocative to use "calls to action" in the sentence structure and wording. So, something like "_Garrison_ Ranged Infantry on wall battlements to give them a strong defense and greater ranged attack." This tells the player to **commit to an action** which will improve their combat effectiveness. So, I would use commanding language whenever possible. Not every sentence needs to be commanding or a call to action, but the more you structure things that way, the stronger the information feels.
Vantha marked this conversation as resolved
@ -0,0 +1,5 @@
CIVIC CENTER
Member

Could you rename the file to center? I think the development is supposed to be done in English US and centre is British.

Could you rename the file to center? I think the development is supposed to be done in English US and centre is British.
Author
Member

Yeah, will do.

Yeah, will do.
@ -0,0 +1,4 @@
DEFENSE TOWER
Strong watchtower, which helps you defend your position.
Has a large vision range and will shoot arrows any enemy in sight.
Member

at any enemy in sight. Typo.

_at_ any enemy in sight. Typo.
Author
Member

Will correct it. Good catch.

Will correct it. Good catch.
Vantha marked this conversation as resolved
@ -0,0 +1,5 @@
DOCK
Buildable in neutral and allied territory.
Constructs various Ships for economic and military needs.
Member

Is there a reason the word ships is capitalized?

Is there a reason the word ships is capitalized?
Author
Member

Adressed in another inline comment.

Adressed in another inline comment.
Vantha marked this conversation as resolved
@ -2,2 +2,2 @@
The structure is available to some civilizations to train elephant units.
Units gain experience while garrisoned inside the building.
Available to the Carthaginians, Kushites, Mauryas, Persians, Ptolemies, and Seleucids to train Elephants.
Units gain experience while garrisoned inside it.
Member

"it" might not be necessary at the end of the statement

"it" might not be necessary at the end of the statement
Author
Member

I'll remove it.

I'll remove it.
Vantha marked this conversation as resolved
@ -1,3 +1,3 @@
EMBASSIES AND MERCENARY CAMPS
Special structures allowing you to hire mercenaries for your army.
Mercenaries will not gather resources and cost only metal, but they are experienced and strong.
Special structures allowing you to hire Mercenaries for your army.
Member

Is "Mercenaries" a technical term? I think in cases like "ships" and mercenaries, the word doesn't have to be capitalized, because they aren't the proper name of a unit.

Is "Mercenaries" a technical term? I think in cases like "ships" and mercenaries, the word doesn't have to be capitalized, because they aren't the proper name of a unit.
Author
Member

Adressed in another inline comment.

Adressed in another inline comment.
Vantha marked this conversation as resolved
@ -1,5 +1,5 @@
FISHING
Fish the seas for a bountiful harvest.
Fishing boats carry a large amount of food per trip.
Fishing boats carry a large amount of food per trip making it faster than gathering food on fields.
Member

Per trip is not needed, and the next paragraph says what you added.

Per trip is not needed, and the next paragraph says what you added.
Author
Member

How about removing the next line to avoid the duplication? (I think that was my original intent here)

How about removing the next line to avoid the duplication? (I think that was my original intent here)
Member

That works.

That works.
Contributor

Fishing boats carry a large amount of food per trip making it faster than gathering food on fields.
-> Fishing boats carry a large amount of food per trip and gather faster than workers on fields.

(its not really the capacity that makes them faster, they have a much higher gather rate)

Fishing boats carry a large amount of food per trip making it faster than gathering food on fields. -> Fishing boats carry a large amount of food per trip and gather faster than workers on fields. (its not really the capacity that makes them faster, they have a much higher gather rate)
Vantha marked this conversation as resolved
@ -2,2 +2,2 @@
A quick, cheap wooden wall available to all factions.
Most factions have access to them in Village Phase.
A quick, cheap wooden wall.
Accessible to most civilizations in Village Phase.
Member

Available might be better than Acessable

Available might be better than Acessable
Author
Member

Ok.

Ok.
First-time contributor

Also, maybe we can be consistent with where to put things in the bullet point list. "Availability" strings could/should be the first item in the list consistently.

Also, maybe we can be consistent with where to put things in the bullet point list. "Availability" strings could/should be the first item in the list consistently.
Author
Member

Agreed. I will bring the entire list of tips into consistency.

Agreed. I will bring the entire list of tips into consistency.
Vantha marked this conversation as resolved
@ -1,3 +1,3 @@
TREASURES
Collectible chests and bare resources on land and shipwrecks on the shore.
Provide you with a resource boost, so keep an eye out for them as you explore.
Collectible chests, bare resources on land and shipwrecks on the shore.
Member

comma after land

comma after land
Author
Member

True. I will add it.

True. I will add it.
Vantha marked this conversation as resolved
Owner

When uploading images, do note that you will have to git mv all the files that have changed names. As the game looks for the same name than the tip, but with the png extension instead of the txt one.

When uploading images, do note that you will have to git mv all the files that have changed names. As the game looks for the same name than the tip, but with the png extension instead of the txt one.
Vantha added 1 commit 2024-08-23 19:09:37 +02:00
more improvements to the loading screen tips
All checks were successful
0ad-freebsd/pipeline/pr-main This commit looks good
0ad-checkrefs/pipeline/pr-main This commit looks good
0ad-windows/pipeline/pr-main This commit looks good
0ad-linux/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main This commit looks good
d6f12ba20f
Author
Member

Was about to complain about the images, but you did good not uploading them, since the CI should have failed and it did not. cc @Itms.

A question in general, should I always upload patches without any binary data like images first?

When uploading images, do note that you will have to git mv all the files that have changed names. As the game looks for the same name than the tip, but with the png extension instead of the txt one.

Yes, I'm aware.

> Was about to complain about the images, but you did good not uploading them, since the CI should have failed and it did not. cc @Itms. A question in general, should I always upload patches without any binary data like images first? > When uploading images, do note that you will have to git mv all the files that have changed names. As the game looks for the same name than the tip, but with the png extension instead of the txt one. Yes, I'm aware.
Owner

Was about to complain about the images, but you did good not uploading them, since the CI should have failed and it did not. cc @Itms.

A question in general, should I always upload patches without any binary data like images first?

No! That time is over 😃 You can send any assets you want. Just make sure that you have run git lfs install at some point, or else Gitea will reject raw binary files.

> > Was about to complain about the images, but you did good not uploading them, since the CI should have failed and it did not. cc @Itms. > > A question in general, should I always upload patches without any binary data like images first? No! That time is over 😃 You can send any assets you want. Just make sure that you have run `git lfs install` at some point, or else Gitea will reject raw binary files.
Itms removed review request for s0600204 2024-08-23 19:33:05 +02:00
Itms removed review request for Imarok 2024-08-23 19:33:07 +02:00
Itms removed review request for marder 2024-08-23 19:33:08 +02:00
Itms removed review request for wraitii 2024-08-23 19:33:09 +02:00
Vantha added 1 commit 2024-08-23 21:48:32 +02:00
applysome suggested changes
All checks were successful
0ad-freebsd/pipeline/pr-main This commit looks good
0ad-checkrefs/pipeline/pr-main This commit looks good
0ad-windows/pipeline/pr-main This commit looks good
0ad-linux/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main This commit looks good
0a769f59b0
Author
Member

Was about to complain about the images, but you did good not uploading them, since the CI should have failed and it did not. cc @Itms.

A question in general, should I always upload patches without any binary data like images first?

No! That time is over 😃 You can send any assets you want. Just make sure that you have run git lfs install at some point, or else Gitea will reject raw binary files.

Ok, cool. 👍
On another note, all the reviewers ... were they added automatically or did I overlook to (un)check any option when creating this pull request?

> > > Was about to complain about the images, but you did good not uploading them, since the CI should have failed and it did not. cc @Itms. > > > > A question in general, should I always upload patches without any binary data like images first? > > No! That time is over 😃 You can send any assets you want. Just make sure that you have run `git lfs install` at some point, or else Gitea will reject raw binary files. > > Ok, cool. 👍 On another note, all the reviewers ... were they added automatically or did I overlook to (un)check any option when creating this pull request?
Owner

They were added automatically, but it still needs some refinement :)

They were added automatically, but it still needs some refinement :)
Owner

Would you mind updating this patch without the images to check it does indeed fail?

Would you mind updating this patch without the images to check it does indeed fail?
Owner

Would you mind updating this patch without the images to check it does indeed fail?

(that can easily be done by just touching the last commit timestamp with git commit --amend --reset-author and then force-pushing)

> Would you mind updating this patch without the images to check it does indeed fail? (that can easily be done by just touching the last commit timestamp with `git commit --amend --reset-author` and then force-pushing)
phosit added the
Theme
UI – Game setup
label 2024-08-24 17:05:29 +02:00
Author
Member

Would you mind updating this patch without the images to check it does indeed fail?

(that can easily be done by just touching the last commit timestamp with git commit --amend --reset-author and then force-pushing)

I'm not quite following here. I already updated the patch a couple of times without the images. What do you mean?

> Would you mind updating this patch without the images to check it does indeed fail? > (that can easily be done by just touching the last commit timestamp with `git commit --amend --reset-author` and then force-pushing) I'm not quite following here. I already updated the patch a couple of times without the images. What do you mean?
Owner

We fixed something on our end, which should now make the pipeline fail when you don't upload the images. And we wanted to take the opportunity to test it with this PR :)

We fixed something on our end, which should now make the pipeline fail when you don't upload the images. And we wanted to take the opportunity to test it with this PR :)
Vantha added 1 commit 2024-08-24 22:38:50 +02:00
apply suggested change
Some checks reported warnings
0ad-checkrefs/pipeline/pr-main This commit looks good
0ad-freebsd/pipeline/pr-main This commit is unstable
0ad-windows/pipeline/pr-main This commit is unstable
0ad-macos/pipeline/pr-main This commit is unstable
0ad-linux/pipeline/pr-main This commit looks good
de8a61fb32
Author
Member

Ok, I see. I just updated it (without adding the images yet). Let's see if it fails.

Ok, I see. I just updated it (without adding the images yet). Let's see if it fails.
Owner

Oh sorry looks like you need to rebase your branch first.
git fetch && git rebase origin/main && git push --force

Oh sorry looks like you need to rebase your branch first. git fetch && git rebase origin/main && git push --force
Vantha added 1 commit 2024-08-25 00:00:43 +02:00
Rename the ship tip files
Some checks reported warnings
0ad-checkrefs/pipeline/pr-main This commit looks good
0ad-freebsd/pipeline/pr-main This commit is unstable
0ad-windows/pipeline/pr-main This commit is unstable
0ad-macos/pipeline/pr-main This commit is unstable
0ad-linux/pipeline/pr-main This commit looks good
0b728b731a
Author
Member

Oh, ok. How about now?

Oh, ok. How about now?
Owner

Did you run the commands above ? Looks like it's still running the non patched version of checkrefs.py

Did you run the commands above ? Looks like it's still running the non patched version of checkrefs.py
real_tabasco_sauce reviewed 2024-08-25 00:19:24 +02:00
@ -4,1 +2,3 @@
Garrison units to slowly heal them and protect the army camp from attacks and decay.
Buildable in neutral or enemy territory. Good for setting up a secret base behind enemy lines or to consolidate gains within enemy territory.
Constructs Rams and trains Citizen Soldiers of Advanced rank.
Garrison units inside it to slowly heal them and protect the Army Camp from attacks and decay.
Contributor

Army camps don't heal units, but I think they used to. Could just say Garrison units inside for protection and for additional arrows.

Army camps don't heal units, but I think they used to. Could just say Garrison units inside for protection and for additional arrows.
Author
Member

Good catch.
Additional arrows doesn't really make sense if arrows haven't been mentioned before. How about inserting the line "Fires arrows at at any enemies in sight" before?

Good catch. Additional arrows doesn't really make sense if arrows haven't been mentioned before. How about inserting the line "Fires arrows at at any enemies in sight" before?
Vantha marked this conversation as resolved
real_tabasco_sauce reviewed 2024-08-25 00:23:12 +02:00
@ -7,0 +2,4 @@
Use Citizens to gather resources.
Female citizens are best at gathering fruit and grain.
Citizen Infantry excel at gathering wood, stone, and metal.
Citizen Cavalry can only gather meat, but that super fast.
Contributor

but that super fast.
->but do so very quickly.

but that super fast. ->but do so very quickly.
Author
Member

Yeah, that's better, thanks.

Yeah, that's better, thanks.
Vantha marked this conversation as resolved
Vantha force-pushed loading-screen-tips-revision from 0b728b731a to db83570615 2024-08-25 10:44:07 +02:00 Compare
Vantha force-pushed loading-screen-tips-revision from db83570615 to c8db8eb982 2024-08-25 11:09:04 +02:00 Compare
Author
Member

Did you run the commands above ? Looks like it's still running the non patched version of checkrefs.py

My bad, I forgot to rebase the branch used for this pull request.
Anyway, it's now fully up-to-date with the upstream repository.
Edit: the build succeeded ...?

> Did you run the commands above ? Looks like it's still running the non patched version of checkrefs.py My bad, I forgot to rebase the branch used for this pull request. Anyway, it's now fully up-to-date with the upstream repository. Edit: the build succeeded ...?
Vantha added 1 commit 2024-08-25 23:47:27 +02:00
some more minor tweaks
Some checks failed
pre-commit / build (pull_request) Successful in 56s
0ad-checkrefs/pipeline/pr-main There was a failure building this commit
0ad-freebsd/pipeline/pr-main This commit is unstable
0ad-windows/pipeline/pr-main This commit looks good
0ad-linux/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main This commit looks good
d014681d06
Author
Member

Now one pipeline failed. This is the intended behaviour, no?

Now one pipeline failed. This is the intended behaviour, no?
Owner

Yes and no, it should have failed but not like that. This is good tho. Else we would have missed it.

Yes and no, it should have failed but not like that. This is good tho. Else we would have missed it.
Vantha added 1 commit 2024-08-26 00:12:59 +02:00
Add a syntagma tip
Some checks failed
0ad-freebsd/pipeline/pr-main This commit looks good
pre-commit / build (pull_request) Successful in 53s
0ad-checkrefs/pipeline/pr-main There was a failure building this commit
0ad-windows/pipeline/pr-main This commit looks good
0ad-linux/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main There was a failure building this commit
d1ee618a5c
Author
Member

Ok.
I found a stray image among the tips called syntagma.png that looks really cool. Would be a shame to leave it unused; I wrote a quick tip for it.

Ok. I found a stray image among the tips called syntagma.png that looks really cool. Would be a shame to leave it unused; I wrote a quick tip for it.
Author
Member

Yes and no, it should have failed but not like that. This is good tho. Else we would have missed it.

Tell me when you've pushed a fix. We can leave this PR open until you can verify it works as intended.

> Yes and no, it should have failed but not like that. This is good tho. Else we would have missed it. Tell me when you've pushed a fix. We can leave this PR open until you can verify it works as intended.
Owner

I think if you rebase and force push again, it should fail correctly.

I think if you rebase and force push again, it should fail correctly.
Vantha force-pushed loading-screen-tips-revision from d1ee618a5c to 7d2c63cd0f 2024-08-26 14:41:21 +02:00 Compare
Author
Member

Ok, I just did so. Let's see.

Ok, I just did so. Let's see.
ShadowOfHassen reviewed 2024-08-26 15:36:22 +02:00
@ -0,0 +1,4 @@
SYNTAGMA
A unique historical formation formed by Macedonian Pikemen.
Features deep and tight ranks of soldiers pointing forward their long pikes ready to pierce any soldier foolish enough to attack the front line!
Member

Tight and deep I think sounds better. Don’t know why and facing might be better than pointing. Otherwise this looks good!

Tight and deep I think sounds better. Don’t know why and facing might be better than pointing. Otherwise this looks good!
First-time contributor

Awkward sentence. So, perhaps:

  • Forms the men into tight ranks and deep files, allowing a wall of forward-thrusting pikes (aka "sarissas") to pierce any enemy soldier foolish enough launch a frontal assault.
Awkward sentence. So, perhaps: - Forms the men into tight ranks and deep files, allowing a wall of forward-thrusting pikes (aka "sarissas") to pierce any enemy soldier foolish enough launch a frontal assault.
Author
Member

Yep, that sounds better to me.

Yep, that sounds better to me.
Vantha marked this conversation as resolved
Vantha added 1 commit 2024-08-26 16:16:45 +02:00
apply a small change to the syntagma tip
Some checks failed
pre-commit / build (pull_request) Successful in 1m15s
0ad-windows/pipeline/pr-main This commit looks good
0ad-freebsd/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main This commit looks good
0ad-checkrefs/pipeline/pr-main There was a failure building this commit
0ad-linux/pipeline/pr-main This commit looks good
4ce4e11541
Author
Member

Did it fail like intended this time?

In the thread on Phabricator there are several versions of the images. I went through them and picked the best for each. And I have to say, most of them look fantastic. The only one I'm not content with is the one for combine orders. I tried improving it myself, but didn't really like any result I got.
It might seem a bit drastic, but how about we just remove the combine orders tip entirely? It's kind of pointless and has alway been a thorn in my side.
@ShadowOfHassen

Did it fail like intended this time? In the thread on Phabricator there are several versions of the images. I went through them and picked the best for each. And I have to say, most of them look fantastic. The only one I'm not content with is the one for combine orders. I tried improving it myself, but didn't really like any result I got. It might seem a bit drastic, but how about we just remove the combine orders tip entirely? It's kind of pointless and has alway been a thorn in my side. @ShadowOfHassen
Member

Did it fail like intended this time?

In the thread on Phabricator there are several versions of the images. I went through them and picked the best for each. And I have to say, most of them look fantastic. The only one I'm not content with is the one for combine orders. I tried improving it myself, but didn't really like any result I got.
It might seem a bit drastic, but how about we just remove the combine orders tip entirely? It's kind of pointless and has alway been a thorn in my side.
@ShadowOfHassen

You're call really. I will confess, all my free 0 A.D. time I've spent writing/reading in the past 6 months. So my skill level is probably way lower than yours. Do you find yourself ever using what the combined order tip says? If not maybe it should be cut.

> Did it fail like intended this time? > > In the thread on Phabricator there are several versions of the images. I went through them and picked the best for each. And I have to say, most of them look fantastic. The only one I'm not content with is the one for combine orders. I tried improving it myself, but didn't really like any result I got. > It might seem a bit drastic, but how about we just remove the combine orders tip entirely? It's kind of pointless and has alway been a thorn in my side. > @ShadowOfHassen You're call really. I will confess, all my free 0 A.D. time I've spent writing/reading in the past 6 months. So my skill level is probably way lower than yours. Do you find yourself ever using what the combined order tip says? If not maybe it should be cut.
Owner

Yes checkrefs is failing correctly now :)

Yes checkrefs is failing correctly now :)
Author
Member

You're call really. I will confess, all my free 0 A.D. time I've spent writing/reading in the past 6 months. So my skill level is probably way lower than yours. Do you find yourself ever using what the combined order tip says? If not maybe it should be cut.

Not really. What the text describes is combining hotkeys (not orders). Which is, firstly, pretty obvious to be possible and, secondly, still too advanced to be helpful for the average player. I am going to remove the tip.

> You're call really. I will confess, all my free 0 A.D. time I've spent writing/reading in the past 6 months. So my skill level is probably way lower than yours. Do you find yourself ever using what the combined order tip says? If not maybe it should be cut. Not really. What the text describes is combining hotkeys (not orders). Which is, firstly, pretty obvious to be possible and, secondly, still too advanced to be helpful for the average player. I am going to remove the tip.
Owner

You could ask @wowgetoffyourcellphone for help with the tip image.

You could ask @wowgetoffyourcellphone for help with the tip image.
Contributor

Did it fail like intended this time?

In the thread on Phabricator there are several versions of the images. I went through them and picked the best for each. And I have to say, most of them look fantastic. The only one I'm not content with is the one for combine orders. I tried improving it myself, but didn't really like any result I got.
It might seem a bit drastic, but how about we just remove the combine orders tip entirely? It's kind of pointless and has alway been a thorn in my side.
@ShadowOfHassen

You're call really. I will confess, all my free 0 A.D. time I've spent writing/reading in the past 6 months. So my skill level is probably way lower than yours. Do you find yourself ever using what the combined order tip says? If not maybe it should be cut.

Its used quite a bit, but not often at all by new players. I think its something learned as players learn the game more, so maybe not really needed as a tip or a trick.

> > Did it fail like intended this time? > > > > In the thread on Phabricator there are several versions of the images. I went through them and picked the best for each. And I have to say, most of them look fantastic. The only one I'm not content with is the one for combine orders. I tried improving it myself, but didn't really like any result I got. > > It might seem a bit drastic, but how about we just remove the combine orders tip entirely? It's kind of pointless and has alway been a thorn in my side. > > @ShadowOfHassen > > You're call really. I will confess, all my free 0 A.D. time I've spent writing/reading in the past 6 months. So my skill level is probably way lower than yours. Do you find yourself ever using what the combined order tip says? If not maybe it should be cut. > Its used quite a bit, but not often at all by new players. I think its something learned as players learn the game more, so maybe not really needed as a tip or a trick.
Vantha added 1 commit 2024-08-27 21:14:04 +02:00
Add tip images and some other small adjustments
All checks were successful
0ad-freebsd/pipeline/pr-main This commit looks good
pre-commit / build (pull_request) Successful in 57s
0ad-linux/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main This commit looks good
0ad-windows/pipeline/pr-main This commit looks good
78aff0e865
Author
Member

Added the images.

Its used quite a bit, but not often at all by new players. I think its something learned as players learn the game more, so maybe not really needed as a tip or a trick.

I agree. Newcomers should rather learn more advanced tricks like this by talking and playing with other players. That is what the community is for.

You could ask @wowgetoffyourcellphone for help with the tip image.

@wowgetoffyourcellphone
One tip image that should maybe be remade is loot.png. Although, I don't have a clue what it could show instead. Any ideas?

Added the images. > Its used quite a bit, but not often at all by new players. I think its something learned as players learn the game more, so maybe not really needed as a tip or a trick. I agree. Newcomers should rather learn more advanced tricks like this by talking and playing with other players. That is what the community is for. > You could ask @wowgetoffyourcellphone for help with the tip image. @wowgetoffyourcellphone One tip image that should maybe be remade is loot.png. Although, I don't have a clue what it could show instead. Any ideas?
Vantha added 1 commit 2024-08-29 11:30:34 +02:00
cutting down too long tips
Some checks reported warnings
pre-commit / build (pull_request) Successful in 43s
0ad-freebsd/pipeline/pr-main This commit is unstable
0ad-windows/pipeline/pr-main This commit is unstable
0ad-linux/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main This commit was not built
6ebb0945cc
Author
Member

I found the trading and gathering tips to be too long to be displayed correctly, so I had to cut them down a bit. (We have to keep a safety margin to the maximum possible length because some translations might take up more space than the English text does)

@ShadowOfHassen Can you do a last double check (especially for the recently changed texts) and give a green light for merging this?

(The tip image I addressed in the last comment ... it's not perfect but I'm fine with leaving it as it is)

I found the trading and gathering tips to be too long to be displayed correctly, so I had to cut them down a bit. (We have to keep a safety margin to the maximum possible length because some translations might take up more space than the English text does) @ShadowOfHassen Can you do a last double check (especially for the recently changed texts) and give a green light for merging this? (The tip image I addressed in the last comment ... it's not perfect but I'm fine with leaving it as it is)
Vantha requested review from ShadowOfHassen 2024-08-29 11:41:05 +02:00
Owner

You need to rebase again :)
In theory you don't need to each time but we changed pipelines quite a bit.

You need to rebase again :) In theory you don't need to each time but we changed pipelines quite a bit.
Vantha added 1 commit 2024-08-29 11:46:56 +02:00
small correction
Some checks reported warnings
pre-commit / build (pull_request) Successful in 41s
0ad-freebsd/pipeline/pr-main This commit looks good
0ad-windows/pipeline/pr-main This commit looks good
0ad-linux/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main This commit was not built
039ec9216c
Vantha force-pushed loading-screen-tips-revision from 039ec9216c to c2204ee715 2024-08-29 12:42:35 +02:00 Compare
Member

It looks good @Vantha

It looks good @Vantha
Author
Member

Ok, nice.
@Stan This pull request is ready to be merged.

Ok, nice. @Stan This pull request is ready to be merged.
Owner

@ShadowOfHassen To make your review clearer, you can, in the "Files changed" tab, click on the blue "Review" button in the top right and choose "Approve".

@sera Can you confirm your comments are resolved and approve if relevant?

Thanks for the work on this y'all 😄

@ShadowOfHassen To make your review clearer, you can, in the "Files changed" tab, click on the blue "Review" button in the top right and choose "Approve". @sera Can you confirm your comments are resolved and approve if relevant? Thanks for the work on this y'all 😄
sera requested changes 2024-08-31 09:56:11 +02:00
Dismissed
@ -0,0 +1,5 @@
FIRESHIP
Available to the Britons, Gauls, and Iberians.
Member

This is another list of exact civs that might need unexpected updating or isn't accurate for mods

This is another list of exact civs that might need unexpected updating or isn't accurate for mods
First-time contributor

Perhaps something like this that removes the list of civs*

  • A special melee Warship only available to select civilizations.
Perhaps something like this that removes the list of civs* - _A special melee Warship only available to select civilizations._
Author
Member

As I said in the comment on the main thread, I believe we should keep the civilization lists (especially short ones like this) to let players know what civilization they need to choose in order to have access to the said unit.

As I said in the comment on the main thread, I believe we should keep the civilization lists (especially short ones like this) to let players know what civilization they need to choose in order to have access to the said unit.
@ -2,3 +2,1 @@
Heavily armored and slow. Low attack.
Used against cavalry or against other melee infantry to pin them in place.
Available to: Kushites, Macedonians, Ptolemies, and Seleucids.
Available to the Kushites, Macedonians, Ptolemies, and Seleucids.
Member

This is another list of exact civs that might need unexpected updating or isn't accurate for mods

This is another list of exact civs that might need unexpected updating or isn't accurate for mods
Vantha marked this conversation as resolved
@ -0,0 +1,4 @@
SIEGE WARSHIP
The heaviest standard warship. Available to the Carthaginians, Ptolemies, Romans, Seleucids, and Han Chinese.
Member

This is another list of exact civs that might need unexpected updating or isn't accurate for mods

This is another list of exact civs that might need unexpected updating or isn't accurate for mods
First-time contributor

Could say:

  • The heaviest standard warship. Available to select civilizations.

Or something similar when saying such a thing about a unit or building is warranted, but you don't want to list the exact civs, because like you say it can be easily made outdated.

Could say: - _The heaviest standard warship. Available to select civilizations._ Or something similar when saying such a thing about a unit or building is warranted, but you don't want to list the exact civs, because like you say it can be easily made outdated.
@ -3,2 +3,3 @@
High Food and Metal cost, but very powerful.
Available to: Carthaginians, Kushites, Mauryas, Persians, Ptolemies, and Seleucids.
Attack individual units, but also deal splash damage to others nearby. Use them to break apart tight formations.
Available to the Carthaginians, Kushites, Mauryas, Persians, Ptolemies, and Seleucids.
Member

This is another list of exact civs that might need unexpected updating or isn't accurate for mods

This is another list of exact civs that might need unexpected updating or isn't accurate for mods
First-time contributor

Yeah, remove it or put it first in the list for consistency and reword something like:

  • Huge beasts of war, available to some African or Indian civilizations.
Yeah, remove it or put it first in the list for consistency and reword something like: - _Huge beasts of war, available to some African or Indian civilizations._
Author
Member

@sera I understand the practicality in removing the lists, but I believe there lies value in telling players which civilizations have access to a specific unit. I can imagine it to be annoying learning everything about a cool unit except where to actually find them in-game - we don't want players to need to search the entire structure tree for it then, right? Maybe we can agree on a middle ground?

@sera I understand the practicality in removing the lists, but I believe there lies value in telling players which civilizations have access to a specific unit. I can imagine it to be annoying learning everything about a cool unit except where to actually find them in-game - we don't want players to need to search the entire structure tree for it then, right? Maybe we can agree on a middle ground?
Member

I can happily live with it, unfortunately gitea doesn't allow me to resign ...

Feel free to merge either way.

I can happily live with it, unfortunately gitea doesn't allow me to resign ... Feel free to merge either way.
Itms dismissed sera’s review 2024-08-31 11:43:41 +02:00
Reason:

from sera's comment

Owner

whoops, wrong feature used.

whoops, wrong feature used.
Itms requested review from sera 2024-08-31 11:44:51 +02:00
Itms removed review request for sera 2024-08-31 11:44:59 +02:00
Itms dismissed sera’s review 2024-08-31 11:45:20 +02:00
Reason:

uuuh

wowgetoffyourcellphone reviewed 2024-08-31 21:36:08 +02:00
@ -2,3 +2,1 @@
Champion Spearmen and Champion Cavalry Spearmen for Carthage.
Both are trainable from the Temple, instead of the Fortress like most other champions.
Use the Spearmen as heavy infantry against cavalry. Use the Cavalry as heavy shock against siege weapons and skirmishers.
Champion Spearmen and Champion Cavalry Spearmen of the Carthaginians.
First-time contributor

"for the Carthaginians" or "of Carthaginian ethnicity" or "of Punic ethnicity" all work a bit better here.

"for the Carthaginians" or "of Carthaginian ethnicity" or "of Punic ethnicity" all work a bit better here.
Author
Member

I'll go with for the Carthaginians then.

I'll go with for the Carthaginians then.
wowgetoffyourcellphone reviewed 2024-08-31 21:44:56 +02:00
@ -3,2 +3,2 @@
When your ranged infantry units are occupying the turrets, they have additional armor and can shoot at the enemy.
Vulnerable to siege weapons like catapults, rams and war elephants.
Ranged Infantry occupying the turrets get increased defense and can shoot at the enemy.
Vulnerable to Siege Engines like Catapults, Rams and War Elephants.
First-time contributor

So, congruent with what I said above about "commanding" "calls to action", you could reword this to:

  • Knock down Walls with Siege Engines like Catapults, Battering Rams, or War Elephants.
So, congruent with what I said above about "commanding" "calls to action", you could reword this to: - _Knock down Walls with Siege Engines like Catapults, Battering Rams, or War Elephants._
wowgetoffyourcellphone reviewed 2024-08-31 21:46:57 +02:00
@ -0,0 +1,5 @@
CIVIC CENTER
The foundation of your new colony.
Claims large tracts of territory.
First-time contributor
  • Claim large tracts of territory by building them in unclaimed territory.

^Effectively incorporates 2 lines of text into 1, while giving a commanding "call to action" to the player.

- _Claim large tracts of territory by building them in unclaimed territory._ ^Effectively incorporates 2 lines of text into 1, while giving a commanding "call to action" to the player.
Author
Member

Not sure about this one. It contains the words "claim" and "territory" twice...

Not sure about this one. It contains the words "claim" and "territory" twice...
First-time contributor
  • Stake a claim over large tracts of land by building these in unsettled territory.

But I think in this case my original sentence conveys things better within the game's vocabulary.

- _Stake a claim over large tracts of land by building these in unsettled territory._ But I think in this case my original sentence conveys things better within the game's vocabulary.
Author
Member

How about Claim large tracts of land by building them in previously unclaimed territory.?

How about _Claim large tracts of land by building them in previously unclaimed territory._?
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 21:49:57 +02:00
@ -0,0 +1,4 @@
CONTROL GROUPS
You can save your current selection to a hotkey by pressing CTRL + a number from 0 to 9 (by default) simultaneously.
First-time contributor
  • Save your current selection to a hotkey by pressing CTRL + a number from 0 to 9 (by default) simultaneously.

C2A

- _Save your current selection to a hotkey by pressing CTRL + a number from 0 to 9 (by default) simultaneously._ C2A
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 21:52:16 +02:00
@ -0,0 +1,4 @@
CONTROL GROUPS
You can save your current selection to a hotkey by pressing CTRL + a number from 0 to 9 (by default) simultaneously.
After the control group has been created, you can quickly select them again by pressing the assigned number.
First-time contributor
  • After the control group has been created, you can quickly select them again by pressing the assigned number.

Bolded can be removed. See how fewer words here makes it a C2A and also removes extra reading.

I'm getting into the weeds here on precise wording, but if you're interested in textural and verbal communication iterating like this can be fun.

- After the control group has been created, **you can quickly** select them again by pressing the assigned number. Bolded can be removed. See how fewer words here makes it a C2A and also removes extra reading. I'm getting into the weeds here on precise wording, but if you're interested in textural and verbal communication iterating like this can be fun.
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 21:54:14 +02:00
@ -0,0 +1,5 @@
DEFENSE TOWER
Strong watchtower, which helps you defend your position.
First-time contributor

C2A:

  • Defend a vulnerable position by building these strong watchtowers.
C2A: - _Defend a vulnerable position by building these strong watchtowers._
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 21:55:25 +02:00
@ -0,0 +1,5 @@
DEFENSE TOWER
Strong watchtower, which helps you defend your position.
Has a large vision range and shoots arrows at any enemy in sight.
Garrison Infantry inside to increase its firepower.
First-time contributor

See how this^ sentence as written is stronger than something like, "You can garrison..."

See how this^ sentence as written is stronger than something like, "You can garrison..."
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:19:48 +02:00
@ -0,0 +1,4 @@
MAURYAN WORKER ELEPHANT
Serves as the only mobile dropsite in the game, enabling you to efficiently gather resources outside of your territory.
First-time contributor

"only"

This may need changed if we merge to Germans civ.

"only" This may need changed if we merge to Germans civ.
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:21:32 +02:00
@ -0,0 +1,4 @@
MAURYAN WORKER ELEPHANT
Serves as the only mobile dropsite in the game, enabling you to efficiently gather resources outside of your territory.
Units build 25% faster within its aura range.
First-time contributor

No longer has this aura. However, the Worker Elephant can construct buildings.

No longer has this aura. However, the Worker Elephant can construct buildings.
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:23:55 +02:00
@ -0,0 +1,2 @@
ORDER ONE UNIT
When right-clicking While holding the “Order one unit” hotkey (by default ALT), only one random unit from the current selection will perform the assigned task.
First-time contributor
  • Right-click while holding the “Order one unit” hotkey (by default ALT) and only one random unit from the current selection will perform the assigned task.

I honestly didn't know this was a thing.

- _Right-click while holding the “Order one unit” hotkey (by default ALT) and only one random unit from the current selection will perform the assigned task._ I honestly didn't know this was a thing.
Author
Member

Yeah, that's the mechanic behind the "sniping" technique ...

Yeah, that's the mechanic behind the "sniping" technique ...
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:24:48 +02:00
@ -1,4 +1,4 @@
OUTPOSTS
Build in neutral or own territory.
First-time contributor
  • Build in neutral or own territory to see large areas of the map.
- _Build in neutral or own territory to see large areas of the map._
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:25:18 +02:00
@ -1,4 +1,4 @@
OUTPOSTS
Build in neutral or own territory.
Cheap and quickly built, but weak.
First-time contributor
  • Cheap and quickly built, but weak and easily captured.
- _Cheap and quickly built, but weak and easily captured._
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:28:10 +02:00
@ -1,3 +1,3 @@
PALISADE WALLS
A quick, cheap wooden wall available to all factions.
Most factions have access to them in Village Phase.
A quick, cheap wooden wall.
First-time contributor
  • A quick, cheap wooden wall for a moderate defense.

Or something like that. Like, "A quick, cheap wooden wall..." for what? Use it for what? :)

- _A quick, cheap wooden wall for a moderate defense._ Or something like that. Like, "A quick, cheap wooden wall..." for what? Use it for what? :)
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:30:06 +02:00
@ -3,3 +2,1 @@
Structures +25% health.
Build time lengthened by +20% as a consequence.
Persians also have access to a great number of structural and defensive technologies.
Special technology exclusive for the Persians.
First-time contributor

Either:

Best:

  • A special technology exclusive to the Persians.

Or if you really want to use "for":

  • An exclusive special technology for the Persians.

Depends where you want to put the word "exclusive."

Either: Best: - _A special technology exclusive **to** the Persians._ Or if you really want to use "for": - _An exclusive special technology for the Persians._ Depends where you want to put the word "exclusive."
Author
Member

I'll use the first option.

I'll use the first option.
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:33:04 +02:00
@ -0,0 +1,4 @@
QUEUE ORDERS
While holding the “Queue order” hotkey (by default SHIFT), you can queue multiple tasks for units by right-clicking.
First-time contributor

Generally, I'd leave out phrases like "you can" so that the whole sentence becomes a C2A.

Generally, I'd leave out phrases like "you can" so that the whole sentence becomes a C2A.
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:37:03 +02:00
@ -2,2 +2,2 @@
The resource counter panel shows you how much of each resources you have at the moment.
The number below it shows you how many citizens are currently gathering them.
Located in the top left corner of the screen.
Shows you how much of each resources you have at the moment and below how many units are currently gathering them.
First-time contributor

Suggestion:

  • Keep tabs on how much of each resource you've stockpiled in your treasury and how many units are currently gathering them.
Suggestion: - _Keep tabs on how much of each resource you've stockpiled in your treasury and how many units are currently gathering them._
Author
Member

Yes, that's a lot better.

Yes, that's a lot better.
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:37:48 +02:00
@ -3,1 +2,3 @@
The number below it shows you how many citizens are currently gathering them.
Located in the top left corner of the screen.
Shows you how much of each resources you have at the moment and below how many units are currently gathering them.
Keep an eye on it while playing to avoid running out.
First-time contributor

...at a crucial moment.

^Perhaps? To add a small amount of drama?

_...at a crucial moment._ ^Perhaps? To add a small amount of drama?
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:39:06 +02:00
@ -0,0 +1,3 @@
SELECT WOUNDED UNITS
While holding the “Select only wounded units” hotkey (by default 0), you can select wounded units.
You can customize the threshold in Settings > Game Session.
First-time contributor
  • Customize the health threshold in Settings > Game Session.
- _Customize the health threshold in Settings > Game Session._
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:43:04 +02:00
@ -6,0 +2,4 @@
The basic Melee Infantry available to every civilization in the game.
Use against Cavalry for an attack bonus.
Decent melee hack damage makes them good front line troops.
Countered by ranged units and Swordsmen, so support your Spearmen with those or Cavalry yourself.
First-time contributor

Minus "yourself."

Minus "yourself."
Author
Member

I added the yourself because of the "those" (Swordsmen)...

I added the yourself because of the "those" (Swordsmen)...
wowgetoffyourcellphone reviewed 2024-08-31 22:49:24 +02:00
@ -0,0 +1,6 @@
TEMPLE
Town Phase structure available to all civilizations.
Trains Healers to heal your troops on the battlefield.
First-time contributor

C2A: (you, player) "Train Healers from here to..."

C2A: (you, player) "Train Healers from here to..."
Author
Member

I think in this case a regular sentence fits better than a C2A. It is telling the player what a temple can do and not what or how they should use it. Does that make sense?

I think in this case a regular sentence fits better than a C2A. It is telling the player what a temple can do and not what or how they should use it. Does that make sense?
wowgetoffyourcellphone reviewed 2024-08-31 22:49:49 +02:00
@ -0,0 +1,6 @@
TEMPLE
Town Phase structure available to all civilizations.
Trains Healers to heal your troops on the battlefield.
Offers a series of helpful healing technologies.
First-time contributor
  • Research a suite of helpful healing technologies.
- _Research a suite of helpful healing technologies._
Author
Member

Same as above.

Same as above.
wowgetoffyourcellphone reviewed 2024-08-31 22:50:59 +02:00
@ -1,4 +1,4 @@
TERRITORY DECAY
Decay happens when structures are not connected to an allied Civil Center.
Structures too far off an allied territory root (usually a Civic Center) gradually lose capture point.
First-time contributor

points

point**s**
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:51:29 +02:00
@ -1,4 +1,4 @@
TERRITORY DECAY
Decay happens when structures are not connected to an allied Civil Center.
Structures too far off an allied territory root (usually a Civic Center) gradually lose capture point.
The decay process can be slowed down or reversed by garrisoning some units in the structure.
First-time contributor

"Slow down or reverse the decay process by..."

"Slow down or reverse the decay process by..."
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:52:08 +02:00
@ -0,0 +1,4 @@
TRADING
Train Traders for trading on land at the market and Merchantmen for seaborne trade at the Dock.
First-time contributor

Market.

**M**arket.
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:52:51 +02:00
@ -0,0 +1,4 @@
TRADING
Train Traders for trading on land at the market and Merchantmen for seaborne trade at the Dock.
Create a trade route by selecting a Trader or Merchantman and right-clicking on two trade points (Dock or Market). Longer distances yield more profits!
Use the "Barter & Trade" dialog next to the menu in the top right corner to set how much of each resource type you want to trade for.
First-time contributor

I like "Open" here instead of "Use," but it's nbd.

I like "Open" here instead of "Use," but it's nbd.
Author
Member

Nah, I agree, will change it.

Nah, I agree, will change it.
Vantha marked this conversation as resolved
wowgetoffyourcellphone reviewed 2024-08-31 22:54:32 +02:00
@ -2,2 +2,2 @@
Collectible chests and bare resources on land and shipwrecks on the shore.
Provide you with a resource boost, so keep an eye out for them as you explore.
Collectible chests, bare resources on land, and shipwrecks on the shore.
Provide you with a valubable resource boost, so keep an eye out for them as you explore.
First-time contributor

Perhaps "instant" is more important of a feature here than the resource boost being valuable. Treasures are different from other resource nodes by being instantly collectible and not requiring transport and/or drop-off.

Perhaps "**instant**" is more important of a feature here than the resource boost being valuable. Treasures are different from other resource nodes by being instantly collectible and not requiring transport and/or drop-off.
Vantha marked this conversation as resolved
Author
Member

Hey @wowgetoffyourcellphone thanks for the review. And sorry for the late reply.
I was (maybe wrongly) hesitant to fixate on one style, but if you think call to action is what to exclusively use here, I'll go with it.

(Beware that some conversations you commented on were outdated, so a few of the suggestions have already been applied. I should probably resolve the outdated conversations)

Hey @wowgetoffyourcellphone thanks for the review. And sorry for the late reply. I was (maybe wrongly) hesitant to fixate on one style, but if you think call to action is what to exclusively use here, I'll go with it. (Beware that some conversations you commented on were outdated, so a few of the suggestions have already been applied. I should probably resolve the outdated conversations)
Vantha force-pushed loading-screen-tips-revision from c2204ee715 to 49eb6816c4 2024-09-01 17:00:25 +02:00 Compare
Vantha added 1 commit 2024-09-01 17:02:23 +02:00
apply some more suggestions
Some checks reported warnings
0ad-freebsd/pipeline/pr-main This commit looks good
checkrefs / checkrefs (pull_request) Successful in 56s
pre-commit / build (pull_request) Successful in 1m12s
0ad-windows/pipeline/pr-main This commit looks good
0ad-linux/pipeline/pr-main This commit looks good
0ad-macos/pipeline/pr-main This commit is unstable
5c9e70a8d4
Author
Member

@wowgetoffyourcellphone Anything else to change? Or is it ready to be merged?

@wowgetoffyourcellphone Anything else to change? Or is it ready to be merged?
Author
Member

Can we merge this now?
Do I need to squash the commits into one?

Can we merge this now? Do I need to squash the commits into one?
Owner

Yeah would be nice for you to squash it (You can keep multiple commits if you think it makes sense)
Regarding merging it has @wowgetoffyourcellphone answered somewhere?

Yeah would be nice for you to squash it (You can keep multiple commits if you think it makes sense) Regarding merging it has @wowgetoffyourcellphone answered somewhere?
Vantha force-pushed loading-screen-tips-revision from 5c9e70a8d4 to e9257edcdb 2024-09-04 17:49:48 +02:00 Compare
Author
Member

Ok, I don't think multiple commits are necessary in this case, I squashed them into one.

Regarding merging it has @wowgetoffyourcellphone answered somewhere?

No, not yet.

(By the way, I can't get git to track the renaming of the tip text files, even after manually running git mv for every single one.)

Ok, I don't think multiple commits are necessary in this case, I squashed them into one. > Regarding merging it has @wowgetoffyourcellphone answered somewhere? No, not yet. (By the way, I can't get git to track the renaming of the tip text files, even after manually running git mv for every single one.)
Stan approved these changes 2024-09-06 14:29:13 +02:00
Stan left a comment
Owner

@wowgetoffyourcellphone wrote:
Looks good

So I don't see any reason to delay it further unless @ShadowOfHassen has something to say.

> @wowgetoffyourcellphone wrote: > Looks good So I don't see any reason to delay it further unless @ShadowOfHassen has something to say.
Member

No, it looks good to me!

No, it looks good to me!
Stan merged commit 09f55a1afc into main 2024-09-06 14:53:39 +02:00
Member

🥳🥳🥳🥳🥳

🥳🥳🥳🥳🥳
Author
Member

Thanks for all the help, guys. Cool 👍

Thanks for all the help, guys. Cool 👍
Sign in to join this conversation.
No reviewers
No Milestone
No project
No Assignees
7 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: 0ad/0ad#6957
No description provided.