1
0
forked from 0ad/0ad
Commit Graph

18881 Commits

Author SHA1 Message Date
c387ce54f4 petra: remove a useless leftover test
This was SVN commit r21599.
2018-03-21 18:06:18 +00:00
29492badb7 Delete sheep corpses when starting to build a foundation,
so that units don't try to gather forever while not being able to reach
it and
so that the sheep corpse can't be selected and seen anymore.

Differential Revision: https://code.wildfiregames.com/D21
Fixes #4268
Based On Patch By: wraitii
Reviewed By: temple
Previously Reviewed By: Itms
This was SVN commit r21597.
2018-03-21 01:44:15 +00:00
adfd2cfae1 Add missing map-bounds check to the wall builder constraints missing in 8b2a7f26e0.
Reported By: Imarok
This was SVN commit r21596.
2018-03-21 01:04:42 +00:00
a3faf5f71d Fix paired tech after 33340265c8
Reviewed by: temple
Differential Revision: https://code.wildfiregames.com/D1409
This was SVN commit r21595.
2018-03-20 22:56:00 +00:00
ed86efa57a Fix infinite UnitAI loop when units are moved out of world (after promotion)
Reviewed By: temple
Trac Tickets: #5079

Differential Revision: https://code.wildfiregames.com/D1406
This was SVN commit r21594.
2018-03-20 18:20:10 +00:00
e3dc84692d Reduce defense wall gate health
Differential Revision: https://code.wildfiregames.com/D1390
Patch by: Angen
Comments by: mimo
This was SVN commit r21593.
2018-03-20 01:13:50 +00:00
c58440abda Fanatic and sword champ armor adjustment
Differential Revision: https://code.wildfiregames.com/D1404
Suggested by: Feldfeld
Reviewed by: Hannibal_Barca
This was SVN commit r21592.
2018-03-20 01:08:00 +00:00
8527f8f240 Update the salad bowl cheat
Differential Revision: https://code.wildfiregames.com/D1407
Reviewed by: elexis
This was SVN commit r21591.
2018-03-20 01:05:38 +00:00
1bcc48455a New icon for Leonidas using the new background scheme, by wowgetoffyourcellphone
This was SVN commit r21590.
2018-03-20 00:08:20 +00:00
5eaea653d4 Add lion, ram statues and palms around the healer circle and a kushite statue in its center of Jebel Barkal.
Paint a path texture at the city gates to indicate it's passability.
Increase palm distances in the city to lessen the likelihood of units
spawned in formation being trapped at the spawnpoint.

This was SVN commit r21589.
2018-03-19 20:58:14 +00:00
8c939da8d2 Fix reverse spear hold position. It was way higher than it should have.
Noticed by: wowgetoffyourcellphone
This was SVN commit r21588.
2018-03-19 18:29:33 +00:00
101edaa167 Reworked environment settings on Elephantine, based on patch by wowgetoffyourcellphone,
specifically less ambient color saturation.
Simplify the triggerscript.

This was SVN commit r21587.
2018-03-19 15:16:55 +00:00
41a1967b6b Rename g_Callbacks to g_CloseCallbacks in the options page, so that one has better variable names in case of adding more callback types.
Move a color to a global so that mods can change it.

Proposed by Vladislav in eee8217b45
Reviewed by Vladislav in irc today

This was SVN commit r21586.
2018-03-19 14:36:04 +00:00
3be63d9865 Add ceasefirecounter to default.cfg, rename watershadows to shadowsonwater
Differential Revision: https://code.wildfiregames.com/D1379
Reviewed by: bb
This was SVN commit r21585.
2018-03-18 19:02:18 +00:00
b36363a53e Don't exceed vision range in hold ground and stand ground query ranges
Differential Revision: https://code.wildfiregames.com/D1394
Reviewed by: bb
Comments by: elexis
Refs: #4725

This was SVN commit r21584.
2018-03-18 18:49:06 +00:00
182103c143 Update some OS X libraries with security fixes and hopefully low regression risks. Refs #4362.
This was SVN commit r21583.
2018-03-18 17:21:29 +00:00
160dcdd477 Fix a few sync issues with horse variants and armors.
This was SVN commit r21582.
2018-03-18 13:33:21 +00:00
d9f29d755a Use variant for some elephants.
This was SVN commit r21581.
2018-03-18 13:04:24 +00:00
349bcc1d1a petra: cache some computations which are done quite often on a few turns and created peaks in the execution time
This was SVN commit r21580.
2018-03-18 12:05:28 +00:00
38ae0d7314 Add some animated healers near the wonder on Jebel Barkal, similar to the ritual place on Danubius.
This was SVN commit r21579.
2018-03-17 23:57:50 +00:00
bb
69f8297bec Give all entities a looter component so building arrows bring in loot too
Briefly Discussed With: elexis

This was SVN commit r21578.
2018-03-17 21:46:28 +00:00
29b8de7411 Cavalry not attacking soldiers on Jebel Barkal wasn't a successful idea.
This was SVN commit r21577.
2018-03-17 19:26:16 +00:00
d6ca86df62 Reenable some textures for Ptol pikemen, use the correct model for advanced units.
This was SVN commit r21576.
2018-03-17 15:38:34 +00:00
d3bdb66fe6 New Kushite icons by wowgetoffyourcellphone.
This was SVN commit r21575.
2018-03-17 13:25:17 +00:00
3c9439ce27 Use primeSortAllPlayers in Latium
All maps should now have correct team placement in terms of
sortAllPlayers vs primeSortAllPlayers.
Differential Revision: https://code.wildfiregames.com/D1392
Reviewed by: elexis
This was SVN commit r21574.
2018-03-16 23:42:17 +00:00
a49f0909f7 Use Shanakdakheto name for kush catafalque
Noticed by: Hannibal_Barca
This was SVN commit r21573.
2018-03-16 23:26:59 +00:00
081eb31341 Use correct promotion template for kush merc jav cav
Noticed by: Hannibal_Barca
This was SVN commit r21572.
2018-03-16 23:04:22 +00:00
262a0f7c68 Show correct cost for trainable gaia animals in structree and viewer
Reported by: causative
Refs: D297

This was SVN commit r21571.
2018-03-16 21:39:06 +00:00
b870bf7139 petra: decrease the need for transport ships in naval maps by canceling transport requests which are not anymore useful
This was SVN commit r21570.
2018-03-16 19:26:27 +00:00
0c3e080779 petra: do not impose anymore a specific base for fields/corrals
This was SVN commit r21569.
2018-03-16 19:01:32 +00:00
2d10c4374f primeSortPlayers should not return a playerID twice, refs 59ce8b3081.
The other maps had never read this playerID, so it wasn't noticed until
Jebel Barkal read it.

Paste: https://code.wildfiregames.com/P115
Reviewed By: temple
This was SVN commit r21568.
2018-03-16 18:44:21 +00:00
ded01c904d Rename "Egypt (4)" to "Egypt (3v3)" for correctness and consistency.
This was SVN commit r21567.
2018-03-16 16:10:37 +00:00
b065af86dd Fix player-owned animals on Egypt.
Differential Revision: https://code.wildfiregames.com/D1388
Patch By: (-_-) / smiley
This was SVN commit r21566.
2018-03-16 16:06:50 +00:00
cffac99d17 Add a difficulty setting for Jebel Barkal, refs #4963.
Allow random map scripts to read the difficulty setting.

Very Easy: Only temples and civil buildings
Easy: CivicCenter, Stables, Barracks, Embassy
Medium: Walls, Fortress, ElephantStables, Tower
Hard: Garrisoned wall turrets and one citizen archer on the walls
Very Hard: 3 Archer champions per wall segment

This was SVN commit r21565.
2018-03-16 15:56:55 +00:00
dc0da7c430 Allow TriggerHelper SpawnGarrisonedUnits to spawn units on visible garrison points / walls, refs D1146 / e29dfb7000.
This was SVN commit r21564.
2018-03-16 15:49:08 +00:00
d881634ba1 Display the map difficulty in the gamedescription (gamesetup and objectives window), refs #4963 / D1189 / 9daa7520ef.
Differential Revision: https://code.wildfiregames.com/D1391
Reviewed By: bb
This was SVN commit r21563.
2018-03-16 14:18:09 +00:00
bb
7127186b70 Add a ceasire autostart option, silences a javascript warning on autostart games
fixes #4606

This was SVN commit r21561.
2018-03-16 00:12:58 +00:00
bb
648cd44576 Set a relicCount from autostart, so the triggerscripts actually will spawn relics
Should fix the concern in 6d54ab4c1f
Reported By: mimo
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1393
This was SVN commit r21560.
2018-03-15 23:46:29 +00:00
bb
c5d9ea7c06 reflect the 6b88ca6a11 changes in the readme.txt
Noticed By: elexis
This was SVN commit r21559.
2018-03-15 23:34:38 +00:00
8f77e88b15 Fix a segfault, due to an infinite loop in an actor.
The kush gate door would make the kush gate struct pop, which in turn
would
call the door and etc.
Reported by: Dunedan
This was SVN commit r21558.
2018-03-15 21:58:47 +00:00
6d93be0f58 Fix the display of light broken by cc67d54aeb
Reviewed by: Elexis, vladislav
Differential Revisions : https://code.wildfiregames.com/D1389
Refs: https://code.wildfiregames.com/D1262
https://code.wildfiregames.com/D1372

This was SVN commit r21557.
2018-03-15 18:19:12 +00:00
7e207e1f4c Implement walls on Jebel Barkal, beautify the map, improve the trigger script and add stables/cavalry attckers, refs #5040.
Display "Napata will attack in %(time)s!" to observers, string addition
permitted by Itms.

Mapgen:
Use the EntitiesObstructionPlacer from 04679a8e2b, the wall constraints
and return values from 8b2a7f26e0,
so that there are no walls at the hill and to keep gates free.
Add palms to the city blocks and guardians at the central path.
Carve out temple areas using the EntitiesObstructionPlacer, rather than
having half the temple submerged by the mountain.
More treasures on the hill and in the city and allow mines on top of the
hill.

Triggerscript:
Make units always patrol, since the attack-walk order runs out and then
units accumulated after eradicating a player.
This also fixes the inconsistency that units captured after that order
ran out, but not before.
Don't use the violent stance since this also allows capturing.
Move attacker targetClasses to attacker balancing composition object, so
that it can be fine-tuned for every attackergroup.

Balancing:
Place Stables which only spawns melee cavalry which only attack traders,
women and siege engines.
Nerf fortresses by not exclusively spawning champions (temples still
do).

This was SVN commit r21556.
2018-03-15 03:52:45 +00:00
04679a8e2b Implement an EntitiesObstructionPlacer that allows random maps to avoid exactly the obstruction area of given entities (rather than avoiding a guesstimated disk area).
This was SVN commit r21555.
2018-03-15 01:47:26 +00:00
8b2a7f26e0 Simple support for Constraints in the Wall Builder random map library, so that one can place walls while avoiding collisions, refs #5003.
Return the placed entities, so that one can parse and elegantly avoid
them afterwards, in particular determine gate positions.
placeCircularWall uses the startAngle as orientation, since that is much
easier to pass than the opposite vector of the center of the wall.

This was SVN commit r21554.
2018-03-15 01:42:47 +00:00
3d02ea73bd Improved Ptol textures by wackyserious.
This was SVN commit r21553.
2018-03-14 23:17:54 +00:00
edac66788a Fix a bug in Latium and Ardennes Forest
Differential Revision: https://code.wildfiregames.com/D1387
Reviewed by: elexis
Refs: #4960

This was SVN commit r21552.
2018-03-14 23:05:06 +00:00
ee7bc3dfa0 Add a nonbuilder filter template, use on survival of the fittest
Differential Revision: https://code.wildfiregames.com/D1385
Reviewed by: elexis
Comments by: ffffffff, smiley
This was SVN commit r21551.
2018-03-14 22:40:46 +00:00
fd3193bd7d Fix some resource collisions on random maps.
Remove water settings on Alpine Valley, which had water in cab65bb932
but was removed in 992a8ee0b8 otherwise.

This was SVN commit r21550.
2018-03-14 22:25:40 +00:00
1446edd771 petra: add a missing check on exhausted resource
This was SVN commit r21549.
2018-03-14 19:13:17 +00:00
5dac54b900 Don't exclude gaia soldiers and structures the killed entities statistics, but only animals.
This is especially relevant for triggerscript maps with spawned gaia
units, such as Jebel Barkal, Danubius, Survival Of The Fittest.

Differential Revision: https://code.wildfiregames.com/D1384
Reviewed By: temple
Cheering By: bb, fpre, Imarok
This was SVN commit r21548.
2018-03-14 10:46:46 +00:00