1
1
forked from 0ad/0ad
Commit Graph

18763 Commits

Author SHA1 Message Date
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
b9a53529b9 Remove war dog slaughter attack
Differential Revision: https://code.wildfiregames.com/D1363
Reviewed by: elexis
Comments by: bb
This was SVN commit r21473.
2018-03-09 19:51:11 +00:00
edf91718b5 Refactor distributePointsOnCircle into distributePointsOnCircularSegment, refs #5061.
This was SVN commit r21472.
2018-03-09 09:39:53 +00:00
595edeaa2f Sound and Target Marker for freehand positioning of units
Patch by OptimusShepard
Refs #5060
Differential Revision: https://code.wildfiregames.com/D1352
This was SVN commit r21471.
2018-03-08 23:17:47 +00:00
48e861724d petra: be less restrictive for building a cc in islands with a dock
This was SVN commit r21470.
2018-03-08 21:17:39 +00:00
20a0df4ae2 petra: fixes in choice of best defenders when several islands + some cleanups
This was SVN commit r21469.
2018-03-08 21:09:31 +00:00
56b8fe31fd Disable speed bonus for formations
Differential Revision: https://code.wildfiregames.com/D1360
Patch by: Angen
This was SVN commit r21468.
2018-03-08 19:36:32 +00:00
12633bdaa8 Adjust melee and slaughter max range to better match animations
Differential Revision: https://code.wildfiregames.com/D988
Patch by: Grugnas
This was SVN commit r21467.
2018-03-08 19:11:34 +00:00
8ae6c448ee Fix the two incorrect replacements in b5c43fc5f9, refs #4950.
This was SVN commit r21466.
2018-03-08 19:00:04 +00:00
734ca44533 On Danubius, send soldier attack commands last, so that observers follow these units rather than the ships after the ungarrisoning.
Since healers can't attack enemies, they have left the gaia attacker
group immediately to start patroling.
To fix that, change healers to guard random soldiers of that group,
preferably heroes or champions.
Use absolute formation template paths.

This was SVN commit r21465.
2018-03-08 14:15:03 +00:00
147ef2b892 Allow observers to follow gaia commands on triggerscript maps.
This was SVN commit r21464.
2018-03-08 14:10:45 +00:00
adb84c50fb Fix oversight in 14da2f841f.
This was SVN commit r21463.
2018-03-08 14:06:41 +00:00
a14b351e87 Add a more detailed tooltip to the mainmenu lobby button
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D1358
This was SVN commit r21462.
2018-03-07 19:16:14 +00:00
212b74f7e5 petra: make the ai able to build docks in islands in which it has no cc, and use them for trade.
This was SVN commit r21461.
2018-03-07 18:45:16 +00:00
061371da92 more petra cleanup following eslint
This was SVN commit r21460.
2018-03-07 18:41:39 +00:00
14da2f841f TriggerHelper functions to retrieve entities by player and by class.
Removes repetitive RangeManager and Identity component querying from
triggerscripts.
It means that mostly map specific logic remains in the triggerscript.
This should bring TriggerScript coding a bit closer to map authors who
aren't exactly software developers.
Call the RangeManager entity getters on Danubius and Survival multiple
times on init to further simplify code, as these microseconds on init
are irrelevant.

This was SVN commit r21459.
2018-03-07 13:54:58 +00:00
3f7ea11059 TriggerHelper SetUnitStance helper function for a very frequent triggerscript order.
This was SVN commit r21458.
2018-03-07 12:36:45 +00:00
2a1929d378 Fix a typo (ritualIdx / heroIdx) in the Danubius OwnershipChange in 026dcf10eb / D204.
Simplify that function by tracking entities using Sets instead of
Arrays, even though it costs two Set-to-Array conversions.

This was SVN commit r21457.
2018-03-07 12:21:09 +00:00
d49f684139 Enable the Kushite mercenary camps
Differential Revision: https://code.wildfiregames.com/D1356
Reviewed by: mimo
This was SVN commit r21456.
2018-03-07 01:24:39 +00:00
a787471f56 Move unused celt building prop meshes to the old public
Found by checkref.pl

This was SVN commit r21455.
2018-03-06 21:59:38 +00:00
f83a56287c Move some old trees to old public. Found with checkrefs.pl
They are too low poly to be used sadly.

This was SVN commit r21454.
2018-03-06 21:19:25 +00:00
408a8d55c4 Remove unused/old meshes found by checkref.pl
This was SVN commit r21453.
2018-03-06 21:08:17 +00:00
0ffb130744 petra: cleanup following eslint continuation
This was SVN commit r21452.
2018-03-06 19:39:13 +00:00
307e395012 petra: more cleanups following eslint
This was SVN commit r21451.
2018-03-06 19:15:31 +00:00
46dadfb386 Rename missing hero in 6fd60ff14a
Refs: 097c19a6a0

This was SVN commit r21450.
2018-03-06 18:59:46 +00:00
6fd60ff14a Rename some heroes using the common scheme.
Those heroes were introduced in 097c19a6a0
The new convention from now on will be civ_hero_name(_type(_weapontype))
where parenthesis are optionnal.
However it would be nice to when a infantry hero is added for instance,
than the other one specify it's cavalry
Since it requires map changes, it will be up to the person introducing
it.

This was SVN commit r21449.
2018-03-06 18:50:44 +00:00
06c64bd8da petra (partial) cleanup following eslint
This was SVN commit r21448.
2018-03-06 18:47:33 +00:00
4ded9cbec2 ai: cleanup of common-api following eslint
This was SVN commit r21447.
2018-03-06 18:34:33 +00:00
d3fd524f88 Remove _unpacked from rome_mechanical_siege_onager since it doesn't have a Pack component, refs 9fd718186d.
Fix lineendings.

This was SVN commit r21446.
2018-03-06 13:58:07 +00:00
6113edd746 Refactor and move random template composition triggerscript code used for gaia attacker waves from Danubius (026dcf10eb / D204) and Survival Of The Fittest (18e7d8a518 / D145) to the TriggerHelper.
Eases implementation of new maps with diverse scripted attackers, refs
#5040, D11 and  map difficulties, refs #4963, D1189.
Replaces hardcoded templatenames with calls to a new TriggerHelper
function to query template names, given Classes, Civ, Rank or Packed
state.
Removes the duplicated template counting logic, that was intertwined
with map specific unit classes balancing logic, refs #4805.

Use mimos garrison function from e29dfb7000 / D1146 to support
doubleclicking on garrisoned gaia heroes on Danubius, fixing the bug
described in comment:10 of #4291.
Fix wrong (Trigger) prototype reference in ce65af8dcb.

This was SVN commit r21445.
2018-03-06 13:31:34 +00:00
d8b5439956 Small map cleanup and performance improvements.
This was SVN commit r21444.
2018-03-06 11:44:20 +00:00
b5ad56a83d Unify variants a bit, boost healer idle speed.
Add a third variant for male healers.

This was SVN commit r21443.
2018-03-05 21:03:48 +00:00
460dc0b2f2 Fix uterly slow animation for skirmishers.
Use inheritance for both files, as they are the same. Eventually we
should have different anims for heavy skirmishers.
EOL Properties and EOF for all fix inconsistent indent.
Noticed by: elexis
Introduced by: 83680b0dee
This was SVN commit r21442.
2018-03-05 20:48:41 +00:00
bb
d86148defc Create winning teams for relic and wonder victory instead of letting all allies of a player win.
Create a getNonGaia function
Reset counters on playerDefeat
MarkPlayersAsWon function
Rename MarkPlayerAsWon to MarkPlayerAndAlliesAsWon
Stop letting winningplayers in relic depend on PlayerID

Comments By and Discussion With: elexis
Reviewed By: temple
Differential Revision: https://code.wildfiregames.com/D972
fixes #4648

This was SVN commit r21441.
2018-03-05 18:02:27 +00:00
9886a4fc15 Fix trees on hills on Survival Of The Fittest following f7a2c3d02c / D145.
Use the StaticConstraint to reduce map generation time by 50%, refs
#5011.

This was SVN commit r21440.
2018-03-05 14:38:00 +00:00
1b6407ac7e Rename some constraint arguments to constraints to reflect that one can pass an array too.
This was SVN commit r21439.
2018-03-05 14:35:46 +00:00
ae4bc2c7b1 Add a PassableMapAreaConstraint so that createArea calls can be constrained in advance when the result is going to be used for entity placement.
Simplification in the Area prototype.

This was SVN commit r21436.
2018-03-04 22:34:30 +00:00
4bbb5cc8ef petra: refactor the base management to allow further extensions
This was SVN commit r21435.
2018-03-04 22:32:32 +00:00
b5c43fc5f9 Remove some redundant random map logger ellipses.
This was SVN commit r21434.
2018-03-04 21:09:16 +00:00
cabc9b4a69 Unify the two copies of the custom dock placement logic on Hellas and Pompeii, refs #4805.
Extend it to only place docks where the according body of water has a
minimum size, fixes #5065.
Compute the dock angle similar to GetDockAngle from Commands.js (as the
previous angle computation is wrong if the large body of water doesn't
lie in that direction).

This was SVN commit r21433.
2018-03-04 20:06:15 +00:00
b167c5f6ae Center starting entities
Differential Revision: https://code.wildfiregames.com/D1353
Reviewed by: elexis
This was SVN commit r21432.
2018-03-04 17:43:04 +00:00
55645b8bda petra: fix computation of accessibility for cart super_dock
This was SVN commit r21431.
2018-03-04 13:42:07 +00:00
0e8d47cdf7 petra: fix some (rare) cases where the ai would not build a market
This was SVN commit r21430.
2018-03-04 13:26:46 +00:00
a1c4c23ce4 Adds axes to the CChart and the summary screen.
Comments By: elexis, Imarok
Reviewed By: s0600204
Trac Tickets: #4892
Differential Revision: https://code.wildfiregames.com/D474
This was SVN commit r21429.
2018-03-04 12:42:35 +00:00
5f92726fe7 petra: fix land attacks targeting ships
This was SVN commit r21428.
2018-03-03 18:46:06 +00:00
fc66a2dec1 update the petra description following 5b314fc0ac, as suggested by imarok
This was SVN commit r21427.
2018-03-03 18:36:54 +00:00
6eb8a814ce Improve random map script performance by using squared distance where possible, refs #5011.
RandomPathPlacer.js diff proposed and reviewed by FeXoR

This was SVN commit r21425.
2018-03-03 13:46:57 +00:00
4392d73c5c petra: fasten late game by not waiting to have a huge army before attacking nearly defeated enemies
This was SVN commit r21424.
2018-03-03 10:37:54 +00:00
5b314fc0ac Add a time multiplier for AI levels
Differential Revision: https://code.wildfiregames.com/D1350
This was SVN commit r21423.
2018-03-03 10:05:04 +00:00
bb
a8a29271ce Add a wrong indentation to avoid "unchanged" lines in D1240, #4014
Suggested By: elexis
This was SVN commit r21421.
2018-03-02 21:14:43 +00:00