Commit graph

69 commits

Author SHA1 Message Date
phosit
e0c189a43e
Fix string format in economy walkthrough
This has been introduced in 29ac569511.

Fixes: #8788
2026-03-05 20:20:19 +01:00
Dunedan
93ce94655d
Use @stylistic/brace-style for eslint
Up to now `eslint-plugin-brace-rules` was used to enforce a common brace
style for JavaScript code. This plugin was however updated the last time
over 9 years ago and will be incompatible with ESLint v10, as that
[removes `context.getSourceCode()`][1], the plugin relies on.

To keep the eslint config working with ESLint v10, this replaces
`eslint-plugin-brace-rules` with the [`@stylistic/brace-style`][2] rule
from `@stylistic/eslint-plugin`, a package we already use.

While `@stylistic/brace-style` doesn't offer an option to format braces
in exactly the same way as before, the "allman" style seems to be the
one closest to the existing code.

[1]: https://eslint.org/blog/2025/11/eslint-v10.0.0-alpha.0-released/#removed-deprecated-rule-context-members
[2]: https://eslint.style/rules/brace-style
2026-01-12 21:33:52 +01:00
phosit
75805f4b23
Remove the relaypoint before training units
While not as efficient this order is easier to reason and let's player
pause.
2025-10-28 09:52:53 +01:00
phosit
e195c52e30
Rewrite the phrase about production availability
It's easier to understand and to translate in a language where a
formulation with "Respectively" is not common.
2025-10-28 09:52:53 +01:00
phosit
c3727a6a79
Rewrite the phrase about building multiple houses
It was hard to understand.
2025-10-28 09:52:53 +01:00
phosit
727be2fb45
Replace hunt by slaughter in phrase about chicken
It's not really hunting when nobody flees.
"Slaughter" is used later when talking about the same action.
2025-10-28 09:52:53 +01:00
phosit
a6e4e22ca2
Replace civ by player in phrase about color
The color is not specivic to the civ but to the player.
2025-10-28 09:52:53 +01:00
phosit
29ac569511
Don't hardcode Shift as a hotkey in tutorial
It's not possible to format warnings. "a hotkey" is used instead.

Also when the hoplite icon is pressed, without using batches, the
warning doesn't restate that the hopplite should be pressed.
2025-10-28 09:52:53 +01:00
phosit
4f38600c39
Replace "I" with the hotkey in eco walkthrough 2025-10-28 09:52:53 +01:00
wowgetoffyourcellphone
3592814aa8 Gendered Civilians
Adds a randomly male and female Civilian unit which replaces the old "Female Citizen" for each civ.
New actors, new portraits, some new body textures, but the same stats as the old Female Citizen.
Updates maps, technologies, skirmish templates, et al. including the Tutorials.

Co-Authored By: Itms
Reviewed By: Vantha
2025-09-02 10:23:44 +02:00
Itms
994645930c
Move maps XML files out of LFS
Fixes #7519.

Reviewed-By: Dunedan
Reviewed-On: https://gitea.wildfiregames.com/0ad/0ad/pulls/8014
2025-06-11 10:33:57 +02:00
Ralph Sennhauser
d2222ee0ac
Fix eslint rule 'prefer-const'
The remaining ones that can be fixed automatically.

eslint --no-config-lookup --fix --rule '"prefer-const": 1'

Ref: #7812
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
2025-05-12 18:44:28 +02:00
wowgetoffyourcellphone
8da6c758fc Add small metal/ore mine objects to the game.
New small metal mine models and actors.
New sparkle particles.
Remove refs to old metal ore mines from existing maps.

Fix refs to temperate_small_01_01, which should have been temperate_small_01
2025-04-15 18:14:37 +02:00
Dunedan
8482f25800
Fix a bunch of spelling mistakes
This fixes a bunch of spelling mistakes found in user facing strings.

Fixes #7716
2025-04-11 06:24:32 +02:00
Dunedan
95fcfeb496 Escape non-breaking space in tutorial
Patch by: materiagris via https://github.com/0ad/0ad/pull/44
This was SVN commit r28109.
2024-06-12 08:32:09 +00:00
bb
157c6af18e Make the space in 0 A.D. non-breaking throughout the codebase.
Avoid cases of filenames
Update years in terms and other legal(ish) documents
Don't update years in license headers, since change is not meaningful

Will add linter rule in seperate commit

Happy recompiling everyone!

Original Patch By: Nescio
Comment By: Gallaecio
Differential Revision: D2620
This was SVN commit r27786.
2023-07-27 20:54:46 +00:00
wowgetoffyourcellphone
f4bd43d3e7 Mapping | Improve the look of the tutorial map.
This was SVN commit r27365.
2023-01-06 00:54:29 +00:00
Stan
50234ba533 Slighty offset the stone mine on the tutorial map to prevent overlap.
Patch by: @Langbart
Accepted by: @marder
Thread:
https://wildfiregames.com/forum/topic/73619-tutorial-map-woman-overlapping-stone-mine

Differential Revision: https://code.wildfiregames.com/D4540
This was SVN commit r26625.
2022-03-12 19:29:18 +00:00
Freagarach
137ec9f3d4 Fix typo in tutorial.
Triple click should have been an <Alt>+DoubleClick.
While at it, removed the unneeded brackets at the hotkey translations.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4314
Fixes: #5409

This was SVN commit r25977.
2021-10-28 06:21:14 +00:00
Freagarach
a00c2674b5 Fix AI attacking some bridges.
Our bridges are nothing more than actors, so using one is correct.
We also delete the template files to prevent others from making the same
mistake (if someone encountered and fixed the bug in a mod they have
modified templates anyway).

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4297
Reviewed by: @bb
Comments by: @Angen
Fixes #6352

This was SVN commit r25972.
2021-10-26 16:34:44 +00:00
Angen
76228f107c Fix mention of 'farm' instead of 'field' in tutorial
It was reported that the word farm in the Introductory Tutorial is
incorrect and it should be replaced with Field.
Game refers to them as 'Field' so change is correct.

Differential revision: D4299
Patch by: @Langbart
Fixes: #6345

This was SVN commit r25955.
2021-10-10 12:49:17 +00:00
Freagarach
2fc07741e3 Fix two inaccuracies in the tutorial text.
Grapes -> berries. ae5ef6d898
South-West lake -> South.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4257
Reviewed by: @marder
Fixes: #6314

This was SVN commit r25899.
2021-09-07 14:49:53 +00:00
wraitii
b4b7a1fc3a Fix issues with Introductory Tutorial
- Actually win at the end, thus advancing the campaign
- Count rams properly
- Show the ready button for the city-phase when cheating.

Reported by: langbart
Fixes #6188

Differential Revision: https://code.wildfiregames.com/D4161
This was SVN commit r25788.
2021-06-13 08:55:37 +00:00
Freagarach
6023a273df Fix phasing requirements of tutorial.
Introduced in 2ef3fd7a77.
Fixed by switching the order of task of the barracks and outpost.

Patch by: @nwtour
Differential revision: D3820
This was SVN commit r25214.
2021-04-09 06:02:22 +00:00
wraitii
22ea79a56f Fix the 'Introductory Tutorial' found in the 'tutorial campaign'.
Some information & resources were outdated, preventing progress.

Patch by: nwtour
Differential Revision: https://code.wildfiregames.com/D3764
This was SVN commit r25171.
2021-03-31 15:58:16 +00:00
Freagarach
c4ab28cdbe Improve consistency in tutorial and random map texts.
- Combines multi-spaces into one.
- `\u000a` -> `\n`.
- Proper quotation marks instead of programmers quotes.
- A few typos.
- Capitalise classes.

Scenarios and skirmishes are excluded due to checkrefs.pl not being able
to handle proper quotes in XML.

Patch by: @Nescio
Differential revision: D3493
Comments by: @Stan
This was SVN commit r25037.
2021-03-12 06:52:26 +00:00
Stan
ae5ef6d898 Add back the camels to the tutorials.
Fixes: #5951
Reported by: @Freagarach
Refs: c72861b708, 4981cdedad

This was SVN commit r24747.
2021-01-21 11:53:01 +00:00
vladislavbelov
1cb4ee1634 Combines terrain and units ambient colors into the single color.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D3237
This was SVN commit r24661.
2021-01-17 13:10:00 +00:00
vladislavbelov
2f8c7cf575 Increases the maps version to 7 for XML and PMP files.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D3281
This was SVN commit r24653.
2021-01-17 02:12:04 +00:00
bb
87849f4fe9 Fix some translatable strings
Patch By: Nescio
Comments By: Freagarach
Differential Revision: D3134
This was SVN commit r24445.
2020-12-24 16:25:32 +00:00
Angen
c72861b708 Add proper lake to tutorial map
Lake was not showing properly in a24 anymore.
Reported by gameboy on forum:
https://wildfiregames.com/forum/topic/34502-the-disappearing-lake/
Cause is, that water level had the same value as terrain level and since
a24 uses more precise water level computation, high quality water
effects did not show the lake. ( found by @vladislavbelov )

Rise water level in the lake, remove animals, trees, minerals from lake
area add some fish.

Differential Revision: D3240
This was SVN commit r24432.
2020-12-19 20:21:15 +00:00
Freagarach
b57abe806c Move civ-specific templates to subfolders.
See also
https://wildfiregames.com/forum/index.php?/topic/28614-template-folder-structure/.

Differential Revision: D2952
Reviewed By: @Nescio
This was SVN commit r24216.
2020-11-19 10:20:25 +00:00
Freagarach
61eb93d0f7 Move entities from other/ to structures/.
Because they inherit from template_structure.xml.

Patch by: @Nescio
Differential Revision: D3097
This was SVN commit r24193.
2020-11-16 20:06:01 +00:00
Freagarach
41570a2dc1 Fix tower classes in maps.
e07f12bea6 Changed the class names of Defense Towers, but it forgot to
update maps, this patch fixes that.

Differential Revision: D3063
Reviewed By: @Nescio
This was SVN commit r24147.
2020-11-09 08:02:30 +00:00
Freagarach
adca4ba1f4 Introduce subfolders for geology templates.
This moves:
- geology_metal_*.xml -> ore/*_small.xml
- geology_metal_*_slabs.xml -> ore/*_large.xml
- geology_stone_*.xml -> rock/*_small.xml
- geology_stonemine_*_quarry.xml -> rock/*_large.xml

To have folders per resource subtype as was already the case for fish,
treasures and ruins.

Patch by: @Nescio.
Differential Revision: D1010
This was SVN commit r24070.
2020-09-25 08:37:04 +00:00
Freagarach
162b9e2f6b Introduce subfolders for flora templates.
This moves fruit templates to gaia/fruit/ and wood (tree) templates to
gaia/tree, thus sorting them by resource subtype, as is the case for
fish, ruins and treasures already.

Patch by: @Nescio.
Differential Revision: D1009
This was SVN commit r24069.
2020-09-25 08:29:10 +00:00
Freagarach
d6449bf3f0 Rename blacksmith -> forge.
A blacksmith is a person, a forge is the blacksmith's workshop.
This renames templates and corrects simulation and sound files.

Patch by: @Nescio.
Differential Revision: D2971
Approved by @genava55, @Gallaecio, @wraitii.

This was SVN commit r23998.
2020-08-26 15:00:00 +00:00
Freagarach
24e0e50a9d Javelinist -> Javelineer in templates.
Follow up to f489ab3a16.

Patch by: @Nescio.
Differential Revision: D2914
This was SVN commit r23956.
2020-08-10 05:59:56 +00:00
bb
1f68e4d740 De-uglyfy introductory tutorial's Launchattack function
Store components when used several times
Check all components for existance when used
Use ProcessCommand instead of injection order directly in unitAI

This was SVN commit r23779.
2020-06-18 16:24:59 +00:00
bb
29098b456b Remove all spaces, caps, parentheses and hyphens from map file names.
PersistMatchSettings are broken by this commit.

Comments By: leper, itms, Stan, vladislav, elexis
Patch By: Nescio
Differential Revision: D1042
This was SVN commit r23719.
2020-05-31 19:10:15 +00:00
Stan
0a7649318b New Poplar trees.
Patch by: @BigTiger
This was SVN commit r23527.
2020-03-08 22:12:13 +00:00
wraitii
d3a73f0611 Rename generic ballista template to boltshooter and onager to stonethrower to avoid ambiguity. Remove template_unit_mechanical.xml and remove '_mechanical' from ship and siege template paths.
The template tree included 'template_unit_mechanical.xml', which had two
children, '*_ship.xml' and '*_siege.xml'.
This template did little and implied a relevant common ancestor to ship
and siege units. As organic units do not descend from a generic
'Organic', this was not necessary.

This commit removes this template and the '_mechanical' bit from
children templates to simplify.

Additionally, this renames:
 - template_unit_mechanical_siege_ballista.xml to
template_unit_siege_boltshooter.xml
 - template_unit_mechanical_siege_onager.xml to
template_unit_siege_stonethrower.xml
This helps avoid ambiguity, as our Roman ballista for example throws
stones (even if it is a torsion engine), and 'ballista' refers to a bolt
shooter in Age of Empires 1 (and in AoE 2 for the Elephant Ballista,
confusingly not named a scorpion like other bolt shooters in that game).

Patch By: Nescio
Reviewers: Wraitii

Subscribers: Itms, O14 Maps, wraitii, elexis, Vulcan, Stan

Differential Revision: https://code.wildfiregames.com/D1760
This was SVN commit r22204.
2019-04-21 17:04:15 +00:00
Gallaecio
1b656dfb41 rally-point → rally point
Patch By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D1527
This was SVN commit r22128.
2019-03-17 17:02:23 +00:00
Gallaecio
9d28b1945d Remove quotes made unnecessary by capitalization
Patch By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D1537
This was SVN commit r22127.
2019-03-17 16:56:19 +00:00
Stan
25e71d9235 Split a sentence
Patch by: @Gallaecio
Reported by: kingu on Transifex.
Differential Revision: ​​​​​​https://code.wildfiregames.com/D1539
This was SVN commit r21985.
2018-12-29 17:56:45 +00:00
Stan
e9520f8fce barracks → Barracks
Patch by: @Gallaecio
Reported by: kingu on Transifex.
Differential Revision: ​​​​​https://code.wildfiregames.com/D1536
This was SVN commit r21983.
2018-12-29 16:43:56 +00:00
Stan
7df4a60719 constructed → ready (a field)
Patch by: @Gallaecio
Reported by: kingu on Transifex.
Differential Revision: ​​​​​https://code.wildfiregames.com/D1534
This was SVN commit r21982.
2018-12-29 16:21:20 +00:00
Stan
dba5a59f81 reaffect → reassign
Patch by: @Gallaecio
Reported by: GunChleoc on Transifex
Differential Revision: ​​​​​https://code.wildfiregames.com/D1526
This was SVN commit r21981.
2018-12-29 16:10:06 +00:00
Gallaecio
788ca1f69d Revert 51afc72886, it violates current freezes
This was SVN commit r21826.
2018-05-26 18:26:31 +00:00
Gallaecio
51afc72886 reaffect → reassign
Reported by GunChleoc on Transifex.

This was SVN commit r21825.
2018-05-26 18:22:12 +00:00