Commit graph

28 commits

Author SHA1 Message Date
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
bb
6d54ab4c1f Implement combine victory conditions
Excluding the changes to scenario and skirmisch maps
Transform gameType string to victoryCondition array in load/replaymenu
Adapt the gamesetup to use checkboxes for every victory condition and an
array for storing them
Allow multiple queries in conquestCommon
Remove conquest from regicide, wonder and capture the relic
Move the endless gamedescription from settings to gamedescription
Fixing wrong tabulation from a8a29271ce

This commit will break all scenario and skirmisch maps, their "Gametype"
string needs to be transformed in a "VictoryCondition" array as is done
in the tutorial map (counting endless as an empty array). This counts
for mods too!
Old svn replays and savegame will throw warnings/errors as they are
incompatible after this commit. So svn users will need to delete all
those.

Comments on ai and autostart games By: mimo
Comments on Atlas By: Vladislav
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1240
fixes: #4014

This was SVN commit r21474.
2018-03-09 21:51:18 +00:00
Gallaecio
1a1f6ba048 build (human units) → train, build (siege weapons) → construct
This was SVN commit r21034.
2018-01-27 13:54:12 +00:00
elexis
d5af005a00 Expose INVALID_PLAYER to the JS simulation and use it instead of -1 for consistency with the C++ counterpart.
This was SVN commit r20953.
2018-01-22 01:02:29 +00:00
Gallaecio
11bcc7c0e7 Solve some issues reported on Transifex, and update translation files
This was SVN commit r20781.
2018-01-07 00:10:14 +00:00
elexis
de4e51c447 Replace the hardcoded keynames of the Introductory Tutorial strings with the sprintf solution from 4055c564e9 / D1184.
Remove hardcoded default batch training size and GUI row count hint
(which could have become invalidated too easily).

Differential Revision: https://code.wildfiregames.com/D1199
Reviewed By: mimo
This was SVN commit r20778.
2018-01-06 16:25:45 +00:00
mimo
4925b8d21a fix 4842b2158b
This was SVN commit r20774.
2018-01-05 17:34:21 +00:00
Gallaecio
4842b2158b [i18n] Normalized female citizen references, updated POT and PO files.
This was SVN commit r20742.
2017-12-31 21:30:27 +00:00
mimo
4055c564e9 add a hotkey to toggle tutorial panel + add hotkey parameters to tutorial messages
Discussed with elexis

Differential Revision: https://code.wildfiregames.com/D1184
This was SVN commit r20725.
2017-12-30 13:31:14 +00:00
mimo
a2f7038ff6 fix oversight in 8de5c26540
This was SVN commit r20592.
2017-12-05 18:10:44 +00:00
bb
ae74075a22 Rename TriggerHelper.EntityHasClass to TriggerHelper.EntityMatchesClassList
and so making that function much more general by using MatchesClassList.

Some suggestion and checking by leper
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1020
This was SVN commit r20432.
2017-11-10 12:14:16 +00:00
mimo
8a066abe69 move the Introductory_Tutorial to the tutorial folder
This was SVN commit r20086.
2017-08-31 18:07:03 +00:00
mimo
744581a255 Remove the tutorial-ai which is obsolete
Discussed with Elexis

Differential Revision: https://code.wildfiregames.com/D526
This was SVN commit r20084.
2017-08-31 17:48:50 +00:00
mimo
abbdd391b5 Simplify work in translation of tutorials by cutting long strings by paragraph
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D802
also includes https://code.wildfiregames.com/D755

This was SVN commit r20009.
2017-08-20 18:04:48 +00:00
mimo
8a32deb5ca Fix tutorial stuck after building farm
Trac Tickets: #4696, #4697

Differential Revision: https://code.wildfiregames.com/D774
This was SVN commit r19998.
2017-08-19 09:38:52 +00:00
Imarok
7605b00c0e Fix af0f74074e
This was SVN commit r19926.
2017-07-29 17:16:04 +00:00
Imarok
af0f74074e StatusBar style cleanup
Reviewed By: elexis, bb
Differential Revision: https://code.wildfiregames.com/D719
This was SVN commit r19925.
2017-07-29 17:10:54 +00:00
mimo
61b243fdc6 fixes to the economic tutorial (D194) following 15e2b42525
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D520
This was SVN commit r19628.
2017-05-21 16:41:39 +00:00
mimo
15e2b42525 New economic tutorial based on triggers, accessible from the "learn to play" button
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D194
This was SVN commit r19599.
2017-05-17 17:33:36 +00:00
mimo
caabffd70a create maps/tutorials folder and move the starting_economy_walkthrough map there for the tutorial patch (D179) as these maps are currently useless (tutorialAI broken) and phabricator does not deal correctly with such changes
This was SVN commit r19276.
2017-03-06 21:29:45 +00:00