mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-19 03:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,852 Commits 1 Branch 39 Tags
0c3e08077941b401259bb0cc8ca46e00767e864a
Commit Graph

18852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mimo 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
elexis 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
elexis ded01c904d Rename "Egypt (4)" to "Egypt (3v3)" for correctness and consistency. 
This was SVN commit r21567.
 2018-03-16 16:10:37 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
Stan 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
Stan 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
elexis 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
elexis 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
elexis 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
Stan 3d02ea73bd Improved Ptol textures by wackyserious. 
This was SVN commit r21553.
 2018-03-14 23:17:54 +00:00
temple 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
temple 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
elexis 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
mimo 1446edd771 petra: add a missing check on exhausted resource 
This was SVN commit r21549.
 2018-03-14 19:13:17 +00:00
elexis 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
s0600204 afd69a58b3 Stop new-line characters making lines longer than they should be. 
Reviewed By: Imarok
Fixes: #3351
Differential Revision: https://code.wildfiregames.com/D1299
This was SVN commit r21546.
 2018-03-13 23:06:21 +00:00
Stan 0f86ff6e48 Add a bigger beja shield for everyunit but the pikemen 
https://github.com/0ADMods/kushites/issues/69

This was SVN commit r21545.
 2018-03-13 22:21:14 +00:00
s0600204 d17e3b5560 Finally fix typo reported in db1ec0f7f7/b4d6353a08 (3rd time lucky) 
Refs: db1ec0f7f7, b4d6353a08, aa1bb01110
Concerned: temple, Angen

This was SVN commit r21544.
 2018-03-13 22:14:39 +00:00
Stan 7d143cfd36 Add the new tower to ptol elephants as well. 
This was SVN commit r21543.
 2018-03-13 22:03:31 +00:00
bb 33340265c8 Improve the massbarter onPress scripts, by inlining stuff used only once and uninlining mapped arrays used twice 
refs #5055

This was SVN commit r21542.
 2018-03-13 21:02:13 +00:00
vladislavbelov 2bbdd145ab Little cleanup for the 9f202500ea 
This was SVN commit r21541.
 2018-03-13 20:26:30 +00:00
vladislavbelov 9f202500ea Adds maps paths and a tutorial maps tab in Atlas 
Original Patch By: Phormio
Comments By: elexis
Reviewed By: s0600204
Differential Revision: https://code.wildfiregames.com/D614
This was SVN commit r21540.
 2018-03-13 20:20:45 +00:00
s0600204 aa1bb01110 Remedy the other typo in db1ec0f7f7 identified by temple 
Refs: db1ec0f7f7, b4d6353a08
Concerned: temple

This was SVN commit r21539.
 2018-03-13 19:50:44 +00:00
mimo 059ca55040 petra: some fixes when deciding if an enemy army is a threat or not 
This was SVN commit r21538.
 2018-03-13 19:20:45 +00:00
s0600204 b4d6353a08 Remedy typo in db1ec0f7f7 identified by temple 
Refs: db1ec0f7f7
Concerned: temple

This was SVN commit r21537.
 2018-03-13 18:54:21 +00:00
bb 1b2d23ac50 Make the conquest dropdown uncheck the conquest_structures/units checkboxes, instead of trying to access a variable with 3 different names... 
Notced By Imarok

This was SVN commit r21536.
 2018-03-13 15:33:58 +00:00
bb 2746514175 Order the victory checkboxes the same way as the descriptions are noticed by elexis 
This was SVN commit r21535.
 2018-03-13 15:25:26 +00:00
Imarok 0c522edef3 Fixed swapped names in 0fd8aa2a77 
Noticed by elexis

This was SVN commit r21534.
 2018-03-13 14:55:55 +00:00
mimo df79180fa6 petra fixes to reduce cases of traffic jams on naval maps 
This was SVN commit r21533.
 2018-03-12 21:50:47 +00:00
Stan f590c6ab40 New textures, towers, and cushions for carthaginians elephants. 
Commit Authorization by: Itms
Reviewed by: Lordgood, me, the community
This was SVN commit r21532.
 2018-03-12 21:16:10 +00:00
elexis b8ca5b2033 Remove some duplication in the Jebel Barkal template loading. 
Prevent crash of the map when an odd playercount was chosen due to
primeSortPlayers returning a wrong number of elements as reported by
temple.
Remove some TODOs that likely won't be done soon and don't seem crucial.
Fix missing atlas biome rename in Aethiopia / Fields of Meroe.

This was SVN commit r21531.
 2018-03-12 14:10:00 +00:00
elexis 630341cd17 Sudd map description, refs #5040, inspired by Sundiatas explanations. 
(Preparation for string freeze while the map lies on FeXoRs currently
inaccessible harddrive.)

This was SVN commit r21529.
 2018-03-12 05:24:19 +00:00
elexis ae25564bdd Fix some wrong templates in Jebel Barkal. 
Patch By: temple
This was SVN commit r21528.
 2018-03-12 04:51:58 +00:00
elexis eee8217b45 Implement basic color editing in the options page and use it for the diplomacy colors, refs #4747, 7819ea434e. 
Update the RangeOverlay config option only when the options dialog was
closed, not each turn, refs ee5bb1fd61.

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1291
This was SVN commit r21527.
 2018-03-12 04:48:38 +00:00
elexis 9955a2f3ef Map description for Egypt by mimesot, more bushes and some but not all fixed entity owners. 
This was SVN commit r21526.
 2018-03-12 04:25:37 +00:00
elexis 1d313e7121 Map description for Jebel Barkal, based on description by Sundiata, refs #5040. 
Don't try to spawn units when there are no more spawn points.
Missing rename in 2765283b55.

This was SVN commit r21525.
 2018-03-12 03:13:49 +00:00
elexis 2765283b55 Rename Aethiopia to Fields Of Meroë as proposed by Sundiata and agreed with (-_-) aka smiley, refs #5040, D1359. 
New map description by Sundiata.

This was SVN commit r21524.
 2018-03-12 02:30:14 +00:00
elexis 8adc6d8e93 Display map biome specific preview in the replay menu and loading screen too, refs #4962. 
This was SVN commit r21523.
 2018-03-12 01:39:41 +00:00
bb 6d35fe5d2b Display all gamesetup setting is gamedescription 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1369
fixes: #5049

This was SVN commit r21521.
 2018-03-12 00:28:41 +00:00
Imarok 0fd8aa2a77 Secure lobby authentication - prevent joins as a different player 
Reviewed by: Dunedan, elexis, Itms
Fixes #3549
Differential Revision: https://code.wildfiregames.com/D897
This was SVN commit r21520.
 2018-03-12 00:23:40 +00:00
Stan 520f70ab2c Fix elephant archers having no animations. 
Reported by: Temple
This was SVN commit r21519.
 2018-03-11 23:25:02 +00:00
temple fdc7bdb3e1 Reveal map on Napata Reconstruction 
This was SVN commit r21518.
 2018-03-11 23:14:45 +00:00
Stan 47e42199d0 Make use of the huge number of variants we have for the advanced ptol pikeman. 
They are already being used in Delenda Est and were made by
wackyserious, and committed by Enrique

This was SVN commit r21517.
 2018-03-11 23:00:22 +00:00
Stan 2595530658 New saddles, peytrals, and horse armors by Alexandermb, based on work by Enrique 
New kushites metal plates

Thread :
https://wildfiregames.com/forum/index.php?/topic/23910-task-horse-winged-peytrals-and-new-saddles-by-enrique/

This was SVN commit r21516.
 2018-03-11 22:45:24 +00:00