Commit Graph

15255 Commits

Author SHA1 Message Date
65cd29696d Don't stop gathering after starting by autocontinue when in a formation.
FinishOrder called SetWaitingOnController, although the order
(constructing) had pushed another order (gather).
This is done now by telling we finished the order only when really idle.

This seems to boil down to the question: If we issued an order to a
formation, and its members have wandered off (imagine attacking an
entity and our members have finished the initial target but attack
nearby ones) do we want the whole formation to continue attacking or
execute the next order.

Also fixes reforming whilst attacking when an attack order was issued by
the player.

Reported by: @Langbart at https://code.wildfiregames.com/D2175#182343
Differential revision: https://code.wildfiregames.com/D4282
Tested by: @Langbart
This was SVN commit r25947.
2021-10-03 05:59:54 +00:00
9f556c8b5a Check for visibility on finding treasures in UnitAI.
Fixes an infinite loop when the next treasure is outside LOS.

Differential revision: https://code.wildfiregames.com/D4286
Comments by: @Angen, @bb
Fixes: #6329

This was SVN commit r25946.
2021-10-03 05:43:56 +00:00
4597cecd50 Rename misnamed lastGatheredType in ResourceGatherer.
Since it stores not the last gathered, but the last tasked type.
As discussed on IRC
(http://irclogs.wildfiregames.com/%230ad-dev/2021-09-16-QuakeNet-%230ad-dev.log).

Differential revision: https://code.wildfiregames.com/D4277
Reviewed by: @bb
Comments by: @Angen, @Stan, @wraitii
This was SVN commit r25942.
2021-09-24 06:33:53 +00:00
be8a2258ed Fix negative number of gatherers upon ownership changes.
Differential revision: https://code.wildfiregames.com/D4274
Reviewed by: @bb
Comments by: @Langbart, @Stan, @wraitii
Fixes: #6328

This was SVN commit r25941.
2021-09-24 06:27:18 +00:00
0541aa04ff Let fish and fruit regenerate slightly.
This adds minor regeneration to fish (when not gathered) and fruit
(always) as a nice extra for casual players.
The values are chosen to be low, as to not affect competitive play much.

Patch by: @Nescio
Differential revision: https://code.wildfiregames.com/D3868
Comments by: @chrstgtr, @marder, @Stan, @wraitii
This was SVN commit r25940.
2021-09-24 06:22:09 +00:00
a70a20fd42 Select formations as a whole by default.
One can override this behaviour by using a hotkey when (de)selecting
entities.
The aim of this system is to reduce micromanagement a bit.

Differential revision: https://code.wildfiregames.com/D2175
Comments by: @Angen, @azayrahmad, @Langbart, @marder, @Stan,
@submariner, @wowgetoffyourcellphone, @wraitii
Refs. #4545

This was SVN commit r25939.
2021-09-24 06:11:10 +00:00
0e599a3176 Moves cursor to VideoMode to draw it via SDL.
It removes the software implementation intentionally. Because it
duplicates SDL functionality. But it might be added in future on demand.

Tested By: bb, Langbart
Differential Revision: https://code.wildfiregames.com/D4278
This was SVN commit r25936.
2021-09-21 22:44:46 +00:00
b4f0464591 Fix some typos in the hotkey specs.
Fixes the concern raised at 09ad8bfbe5.

Differential revision: https://code.wildfiregames.com/D4268
Reviewed by: @bb
This was SVN commit r25935.
2021-09-21 05:44:07 +00:00
bb
b27f9901cc Add tooltip to playerFilter in lobby
Missed in 8459160038

This was SVN commit r25929.
2021-09-19 12:40:37 +00:00
b12e282277 Fix black buttons as observer on a GAIA market.
Reported by: langbart
Reviewed By: bb
Fixes #6219

Differential Revision: https://code.wildfiregames.com/D4164
This was SVN commit r25927.
2021-09-17 17:01:50 +00:00
bb
ca4ee134fc Add tooltip to modmod explaining about loading order
Patch By: Ceres
Reviewed By: marder
Comments By: Stan
Differential Revision: D4252
This was SVN commit r25925.
2021-09-17 14:41:09 +00:00
d59bb01a3c [PetraAI] - Disable some useless techs.
Don't try to research some techs which are useless when we have no ally.
Ideally we don't put these techs in the config as well, but check the
usefulness and/or dependencies.

Differential revision: https://code.wildfiregames.com/D4218
Reviewed by: @Angen
Comments by: @Stan
This was SVN commit r25923.
2021-09-15 16:10:40 +00:00
21be3944f4 Increase the spacing in the top panel and synchronize the colour in the tooltip for gatherers.
With the addition of the new resource icons for stone and metal, the
text was too close to the icon so the distance between the text and the
icon is increased.
Also, synchronises the colour of the number of gatherers in the top
panel with the colour in the tooltip explanation.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4032
Comments by: @Stan, @wraitii
This was SVN commit r25922.
2021-09-15 06:27:11 +00:00
Angen
2d1ed7ecd5 [AI] Remove code duplication from map component
Differential revision: D4235
This was SVN commit r25921.
2021-09-13 18:07:14 +00:00
64c53753de Improve desert_small's texture look using the new textures. Rename them to match the conventions
Fixes #6324

This was SVN commit r25918.
2021-09-12 22:38:32 +00:00
Angen
2c87f6110e Fix translation of "%(unit)s can't be controlled'
Message is translated correctly.
Issue was sprintf replaced %(unit)s before message was going to be
translated so string was never found in dictionary.
Introduced in b97d251322

Differential revision: D4254
Patch by: @Ceres
Based on code by: @nwtour
Reviewer: @Angen

This was SVN commit r25916.
2021-09-11 09:23:56 +00:00
Angen
666097f96c Fix typo in validatemods introduced in 71121b8a89
Correct form is 'required' not 'require' causing to skip the check.

Differential revison: D4255
Patch by: @Langbart
This was SVN commit r25915.
2021-09-11 09:17:24 +00:00
f2f412a6d2 Fix attacking miraged entities.
After 738b200dda, where the mirage should be queried in the
Start/StopAttacking functions.

Reported by: @bb
Differential revision: https://code.wildfiregames.com/D4267
Reviewed by: @bb
This was SVN commit r25914.
2021-09-11 04:47:25 +00:00
e56d46548b Fix renaming fields losing the ability to be gathered.
Introduced in c888844b3a.
The problem was trying to set the amount to Infinity by substracting
Infinity from it.

Differential revision: https://code.wildfiregames.com/D4263
Tested by: @Langbart
Fixes: #6317

This was SVN commit r25912.
2021-09-10 06:22:43 +00:00
e9f1b0799a Two fixes in PetraAI after the basesManager introduction.
Introduced in 4e664dd712.
The basesManager assumed at least one base (as was the case earlier).
`this` was used in a passed function, which therefore was undefined.

Differential revision: https://code.wildfiregames.com/D4253
Tested by: @marder
Comments by: @Langbart, @Stan
This was SVN commit r25911.
2021-09-10 06:19:45 +00:00
84aa4f8aeb More generalised testing in the PositionHelper.js.
Noted by: @vladislavbelov on D2940
Differential revision: https://code.wildfiregames.com/D3060
Reviewed by: @bb
This was SVN commit r25910.
2021-09-10 06:13:38 +00:00
9552a9720c Add pushFront logic to the entity collection of the AI.
Not done in afd1eaee0d.
Also remove references to `queued` and `pushFront` in the `setStance`
functions, since they (currently) have no meaning.

Reported by: @bb
Differential revision: https://code.wildfiregames.com/D4261
Reviewed by: @bb
This was SVN commit r25902.
2021-09-08 06:05:22 +00:00
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
bb
480228f964 Add quadratic scaling function in rmgen library and use it for decorations.
Patch By: FeldeFeld
Reviewed By: Stan, smiley
Differential Revision: D4212
This was SVN commit r25894.
2021-09-04 09:48:06 +00:00
bd24a30567 Move camera to holder when moving to grouped units.
Instead of doing nothing.

Differential revision: https://code.wildfiregames.com/D4242
Reviewed by: @bb
Fixes: #5863
Comment by: @Langbart
This was SVN commit r25893.
2021-09-04 05:25:42 +00:00
Angen
18d9cadf7d Update map size in description panel
Since dc18d94030
Fixes: #6312

This was SVN commit r25889.
2021-09-03 18:31:31 +00:00
7f59f46988 Remove redundant z-value from MiniMap.xml.
Introduced in 6b903e4a92.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4248
This was SVN commit r25888.
2021-09-03 17:07:31 +00:00
Angen
ba7bde9f31 Remove passability magic numbers from terrain-analysis
Put passability values to prototype variables.
Code looks more readable.

Differential revision: D4236
Refs: #6256
Comments by: @Freagarach, @Stan
This was SVN commit r25883.
2021-09-01 16:30:31 +00:00
6b903e4a92 Display the number of idle workers in that respective button.
Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4217
This was SVN commit r25882.
2021-09-01 16:28:28 +00:00
Angen
0c2c071aac Fix mod calling function from public
public mod does not have to be activated, moving compatibilityColor to
mod

Differential revision: D4237
Refs: #6294
Comments by: @bb
This was SVN commit r25881.
2021-09-01 16:24:12 +00:00
Angen
9b865f9b02 Update message for not supported commands
Tell user about help command, when requested command is not supported

Differential revision: D4229
Reviewed by: @Langbart, @Freagarach
Comments by: @bb
This was SVN commit r25880.
2021-08-30 18:35:56 +00:00
500ee2cf19 Actually implement the hotkey for the Call to Arms feature.
Refs. 4b1270f841.

Differential revision: https://code.wildfiregames.com/D4243
Reviewed by: @JCWasmx86
This was SVN commit r25879.
2021-08-30 14:58:28 +00:00
bb
380df3cf73 Enlarge "Watch Replay" button in summary screen for long translations
Patch By: Langbart
Reviewed By: marder
Differential Revision: D4168
refs #6024

This was SVN commit r25877.
2021-08-29 20:38:10 +00:00
4e664dd712 [PetraAI] - Manage bases in a separate BasesManager.
The HQ should only care about high-level stuff, hence something like
managing/looping individual bases is now done in a `BasesManager`,
similar to the `AttackManager`.

Differential revision: https://code.wildfiregames.com/D4192
Comments by: @Angen
Fixes: #6185

This was SVN commit r25876.
2021-08-29 06:47:05 +00:00
2c4427b488 A bit more refactoring in the ProductionQueue's item logic.
Remove some duplication.
Split tech and entity data.

Differential revision: https://code.wildfiregames.com/D4227
This was SVN commit r25875.
2021-08-29 05:38:23 +00:00
bb
8459160038 Lobby player search input
Based on patch By: ffffffff
Comments By: vladislavbelov
Reviewed By: Angen
Differential Revision: D285
This was SVN commit r25873.
2021-08-28 10:55:39 +00:00
bb
5b41b982f9 Give all tabs hotkeyTooltips
Removes the manual hotkey tooltips from summary and gamesetup in favor
of the general one.

Based on patch By: ffffffff
Reviewed By: Freagarach
Comments By: elexis, Stan
Differential Revision: D1264
This was SVN commit r25872.
2021-08-28 10:36:14 +00:00
bb
7180e72d52 Reset the dust color at red sea and egypt 3v3 maps
Reported By: elexis
Reviewed By: Stan
Differential Revision: D4228
This was SVN commit r25870.
2021-08-28 10:16:20 +00:00
dd90dbf8b5 Allow to enable Cartography at the start of a match.
Adds a checkbox to the game setup to allow players to have Cartography
autoresearched from the start of the match.
Refs.
https://wildfiregames.com/forum/topic/27265-theres-any-mod-so-you-can-see-what-your-allies-see-from-the-start.

Patch by: @Jammyjamjamman
Differential revision: https://code.wildfiregames.com/D4191
Reviewed by: @Angen
Comments by: @andy5995, @Langbart
This was SVN commit r25869.
2021-08-28 06:15:36 +00:00
4b1270f841 Implement "Call to the Arms"-button.
This allows a player to task entities to drop off their resources and
subsequently attack-move to a specified location with one button.

Patch by: @JCWasmx86
Icon by: @Stan
Differential revision: https://code.wildfiregames.com/D4149
Fixes: #1364
Comments by: @Langbart
Based on a patch by: @Freagarach (https://code.wildfiregames.com/D1868)
This was SVN commit r25868.
2021-08-28 05:52:37 +00:00
Angen
81ad9f746b Do not require restart when chaning Background pause option
Background pause does require a game restart to take effect.
Adding function to update it on runtime since only place where it is
used is in main.cpp.

Differential revision: D4181
Fixes: #6236
Tested by: @Langbart
This was SVN commit r25866.
2021-08-27 18:54:20 +00:00
Angen
0eb9bc0762 [PetraAI] inline in DefenseManager
Differential revision: D4200
Reviewed by: @Freagarach
This was SVN commit r25864.
2021-08-27 18:43:50 +00:00
Angen
f95835308a Fix wrong number in tooltip for phase requirements
Introduced in 29ab4b5af3
Reported
https://wildfiregames.com/forum/topic/41264-alpha-25-pre-releaserelease-candidate-build-testing/page/13/?tab=comments#comment-444019

Differential revision: D4202
Reviewed by: @Freagarach, @asterix
This was SVN commit r25863.
2021-08-27 18:40:47 +00:00
Angen
701ecb095e [AI] Simplify getMetadata in sharedscript
Metadata are stored in an object {} making check for key in the object
irrelevant, since not existing key will result in returning undefined
value.
On top of that, merging metadata existance if condition into returning
statement.

Differential revision: D4195
Reviewed by: @Freagarach
This was SVN commit r25862.
2021-08-27 18:35:20 +00:00
4a9bac2811 Bump version to alpha 26.
Last alpha 25 commit was [[SVN:25860]]

Accepted by: @Freagarach, @asterix
Comments by: @wraitii
Differential Revision: https://code.wildfiregames.com/D4215
This was SVN commit r25861.
2021-08-27 16:32:34 +00:00
af4896b4c5 Set matchID at the start of a new match. Fix ratings being broken.
Refs: dc18d94030

Patch by: @user1
Discussed with: @bb
Reviewed by: @wraitii
This was SVN commit r25859.
2021-08-25 11:05:53 +00:00
84c2dc3f15 Add seagulls on top of fish to make them easier to spot.
This was SVN commit r25857.
2021-08-22 17:11:55 +00:00
54b832b6a6 Make big grass 25% smaller to improve visibility a bit on some maps. Ideally Random maps like wildlake would not put some next to the CCs.
This was SVN commit r25856.
2021-08-22 17:10:56 +00:00
2cf908a974 Fix game setup lobby player stats stanza.
Patch by: @nani
Differential revision: https://code.wildfiregames.com/D4213
Reviewed by: @Angen
This was SVN commit r25851.
2021-08-19 17:01:19 +00:00
Angen
8f5b5670ff Fix gui objects failing on undefined in modmod
Differential revision: D4209
Since some revision wraitii will probbaly know, I am not going to look
for it, guiobjects require exact data type so casting does not work when
it is not done beforehand.
Error reported by Stan.
Now installing pyromod should not trigger errors.

This was SVN commit r25849.
2021-08-17 17:29:54 +00:00
32f3d18a15 Fix walk and fight with formations.
Introduced in c87229aa48, FindWalkAndFightTargets returns after the
first UnitAI finds a target, instead of also querying the rest of the
members.

Differential revision: https://code.wildfiregames.com/D4208
Comments by: @Stan, @wraitii
Fixes: #6260

This was SVN commit r25847.
2021-08-03 16:43:43 +00:00
c48d0c562f Fix fromations gathering treasures.
Introduced in ea96e81098.
The formation ignored the order to collect a treasure, but got into a
individual state (which should not happen).
Subsequent orders may fail due to unimplemented components/functions.

Reported by: @wowgetoffyourcellphone in
https://wildfiregames.com/forum/topic/39973-a25-feedbacks-from-testing/page/15/?tab=comments#comment-444979.

Differential revision: https://code.wildfiregames.com/D4207
Tested by: @wowgetoffyourcellphone
Comments by: @Stan, @wraitii
Fixes: #6266

This was SVN commit r25846.
2021-08-03 16:42:56 +00:00
Angen
8b0d82be33 Reject FormationWalk if entity is not part of formation anymore
Attack orders can be and looks like are pushed in front of formationwalk
order.
That is generally also logic in single entity behaviour.

In case formation gets destroyed and then target dies, attacker is
supposed to stop attacking target immediately.
That essentially leads to getting to old formationwalk command, what was
not issue for packable units until 674cdae166, that introduced
formationcompoennt into the order.

Hovewer abandoning this order without being in formation makes more
sense. Probably this one and FormationLeave should be FORMATIONMEMBER
specific commands and error out in INDIVIDUAL state, but thats too much
refactoring and potential rabbit hole.

Differential revision: D4206
Reviewed by: @wraitii
Accepted by: @asterix
Fixes: #6263

This was SVN commit r25845.
2021-08-02 16:48:00 +00:00
d3e1184191 Check range extra while gathering to prevent animation changes when gathering from dropsite.
Introduced in 3c4a341906.

Reported by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D4198
This was SVN commit r25837.
2021-07-25 18:14:39 +00:00
5fba65e97d Don't lose trade gain when ordering a trader.
Introduced in 8f04d2ee90 due to overeagerly stopping trade when leaving
the trading-state.
Noticed in:
https://wildfiregames.com/forum/topic/41264-alpha-25-pre-releaserelease-candidate-build-testing/page/9/?tab=comments#comment-437888.

Differential revision: https://code.wildfiregames.com/D4197
Comment by: @Stan
This was SVN commit r25835.
2021-07-23 05:24:41 +00:00
c7a6d49fc8 Translate map name in game setup
Patch by: @s0600204
Tested by: @Langbart
Differential Revision: https://code.wildfiregames.com/D4188
Fixes: #6241

This was SVN commit r25833.
2021-07-20 22:08:36 +00:00
2bda444435 Fix foundation and corpses phenotypes being different than the source entity.
Reported by: @wowgetoffyourcellphone
This was SVN commit r25832.
2021-07-20 22:04:19 +00:00
c6a9e7188e Fix actor being different after foundation has been built.
Reported by: @wowgetoffyourcellphone
Introduced in: 5b3bdf3647

This was SVN commit r25831.
2021-07-20 21:51:29 +00:00
72a20be1df Fix rare crash on Linux when opening dropdowns.
Patch by: @wraitii
Accepted by: @Angen
Fixes #5598
Fixes #6225

Differential Revision: https://code.wildfiregames.com/D4183
This was SVN commit r25830.
2021-07-20 20:59:45 +00:00
5eec8039b4 Fix segfault with daytime option in gamesetup.
Based on patch by: @Angen, @wraitii
Fixes #6238
Differential Revision: https://code.wildfiregames.com/D4182
This was SVN commit r25829.
2021-07-20 20:52:25 +00:00
b06dd26dd7 Fix PetraAI constructing ships as ordinary units.
Since 3d7af82328 PetraAI constructed many ships (and cavalry) because
they have the "Ranged" class and we didn't check for "Infantry" anymore
when training workers.

Basically a patch by: @Angen
Differential revision: https://code.wildfiregames.com/D4193
Reviewed by: @Angen
Refs. #6250 by fixing the ships case.
Fixes the concern on 3d7af82328.

This was SVN commit r25828.
2021-07-20 05:18:50 +00:00
fe6ce8d402 (Partly) Fix PetraAI building a lot of siege and not using it.
Following 3d7af82328.
The used classes for adding siege were wrong.

Reported in
https://wildfiregames.com/forum/topic/45178-a25-svn-version-25810-not-playable/.
Differential revision: https://code.wildfiregames.com/D4184
Refs. #6250 by (partly) fixing the siege case.
Reviewed by: @Angen
This was SVN commit r25826.
2021-07-18 05:05:13 +00:00
Angen
f891ed4e53 Fix treasure in statistics
Introduced in ea96e81098.
Wrong entity is passed when getting statistic tracker, so collected
treasure is not updated correctly in statistics.
Reported on forum:
https://wildfiregames.com/forum/topic/47585-a25-svn-treasures-collected-not-registering-under-resources-summary-playing-atlas-mountains/?tab=comments#comment-441383

This was SVN commit r25824.
2021-07-13 16:46:32 +00:00
68e40575a4 Disable autoqueue when changing ownership.
PetraAI can't cope with that and it may be a suprise for other players
as well, when a captures production entity has autoqueue enabled.

Differential revision: https://code.wildfiregames.com/D4185
Refs: #6213

This was SVN commit r25819.
2021-07-05 06:18:26 +00:00
4c2d060d73 Move wild lake biome specific entities to a json file like hellas.
Fix map not generating with nubia and steppe biomes (Missing farmsteads
and mercenaries)
Fix an oak being placed no matter the biome and use a biome tree instead
Use the goat instead of a sheep for the alpine biome.

Refs: 4de9c4c164, #6180

This was SVN commit r25816.
2021-06-29 16:48:57 +00:00
dddaa67abd Fix unicode build for Atlas on OpenSuse.
Based on a patch by: @MatSharrow
Reviewed by: @wraitii
Differential Revision: https://code.wildfiregames.com/D4178
This was SVN commit r25815.
2021-06-29 12:41:31 +00:00
7871d74521 Give picking up treasures back its sound.
Introduced in ea96e81098.

Reported by: Gurken Khan in
https://wildfiregames.com/forum/topic/41264-alpha-25-pre-releaserelease-candidate-build-testing/?do=findComment&comment=437100.
Differential revision: https://code.wildfiregames.com/D4180
Tested by: @Langbart
Fixes: #6237

This was SVN commit r25814.
2021-06-29 09:04:24 +00:00
42c3fc12cf Don't show turreted entities as idle.
Introduced in: 21e866fcf0

Reported by: @Palaiologos
Differential revision: https://code.wildfiregames.com/D4179
Tested by: @Langbart
Comments by: @Angen, @wraitii
Fixes: #6233

This was SVN commit r25813.
2021-06-29 08:51:21 +00:00
79fb6e6ab2 Fix incorrect comment/default parameter introduced in e1a0cabf5a
Reported by: Freagarach
Differential Revision: https://code.wildfiregames.com/D4176
This was SVN commit r25811.
2021-06-26 09:09:04 +00:00
8c7d77a610 Fix serialisation crash when patrolling.
6778fc4ea6 introduced waiting at the patrol points, but it was possible
that at such a point an enemy was noticed, thus quiting the "look
around" state, deleting `this.stopSurveying`, which was later `++`-ed.
That lead to an `NaN` property which got serialised. `NaN` serialisation
crashes as of 0e7fafebe1.

Differential revision: https://code.wildfiregames.com/D4177
Reported in:
https://wildfiregames.com/forum/topic/41264-alpha-25-pre-releaserelease-candidate-build-testing/page/4/?tab=comments#comment-435709
Reviewed by: @wraitii
This was SVN commit r25804.
2021-06-17 07:40:24 +00:00
d8f0bde05e Reset the campaigns previews
I had used a debug image which I left in and which looks broken.
Removing it defaults to the normal 'missing preview' 0 A.D. image which
looks more correct.

Differential Revision: https://code.wildfiregames.com/D4172
This was SVN commit r25801.
2021-06-16 15:53:19 +00:00
8e26bd0446 Fix bug with map-dependent random settings
Settings like Landscape, Daytime & team placement are map dependent. If
"random" map is chosen, we first must select the map before selecting
these.
This wasn't done correctly and so starting "random" map that picked e.g.
Unknown could fail.

Biomes were already correctly handled.

Reported by: langbart
Fixes #6227

Differential Revision: https://code.wildfiregames.com/D4173
This was SVN commit r25800.
2021-06-16 15:52:19 +00:00
eafa7fc005 Mirage unrepairable in cmpRepairable.
e0800bc092 introduced a `repairable` toggle, but did not mirage that
function, meaning one could not repair an allied miraged structure.

Reported by: Langbart
Patch by: Freagarach
Refs #6226

Differential Revision: https://code.wildfiregames.com/D4171
This was SVN commit r25799.
2021-06-15 08:46:14 +00:00
6f49e7bd6b New key for signing A25-compatible mods.
This was SVN commit r25798.
2021-06-14 19:42:00 +00:00
fde057dd1c Provide Magadha description.
Text by: @wowgetoffyourcellphone
Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4169
Comment by: @marder
Fixes: #6222

This was SVN commit r25796.
2021-06-14 06:15:28 +00:00
08400276e1 Slight size increase for the parchment background of loading screen tips.
Prevents overflow in some translations, and aligns it better with the
tip image.

Patch by: Langbart
Fixes #4754

Differential Revision: https://code.wildfiregames.com/D4167
This was SVN commit r25793.
2021-06-13 15:12:14 +00:00
893ea3cd10 Alpha 25 Name: Yaunā
This is the old Persian variant of Ionian.

Differential Revision: https://code.wildfiregames.com/D4130
This was SVN commit r25792.
2021-06-13 15:08:27 +00:00
467f2140be Fixup 21bbeb4bbc
I momentarily forgot that `arc patch` only pretends it works with binary
files on SVN.

This was SVN commit r25791.
2021-06-13 15:07:03 +00:00
7ca15b42fd Add a tip about the default formation feature.
Differential Revision: https://code.wildfiregames.com/D4166
This was SVN commit r25790.
2021-06-13 15:02:54 +00:00
21bbeb4bbc Update some MR map previews.
Updates the map previews of all the Best for MP maps & Empire

This removes the fancy mainland biome switch because it was the only map
to do that and we lack the tools to automate it.

Differential Revision: https://code.wildfiregames.com/D4159
This was SVN commit r25789.
2021-06-13 14:56:16 +00:00
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
9ef19ad795 Remove African Plains from "best for Mp" maps
Too similar to either Nearestern Badlands or Mainland.
It seems better to remove it from the filter for this release.

Differential Revision: https://code.wildfiregames.com/D4160
This was SVN commit r25787.
2021-06-13 08:46:12 +00:00
caebc4d3f9 Update the splash screen.
Link to the forums instead of solely the known issues. We have an FAQ
button already, and there are fewer known issues than in the past.

Remove the bit about formations, which isn't really relevant anymore,
and instead add a request for contributions.

Differential Revision: https://code.wildfiregames.com/D4156
This was SVN commit r25785.
2021-06-13 08:40:26 +00:00
a5399d34b8 Floor turn rates to 4
The pathfinders are not aware about turn time, and pathing becomes quite
poor with such low turn rates, leading to units that take much longer to
move than they used to.

Until the pathfinders are updated, we should refrain from using very low
turn rates on actual units.

Refs #6142

Differential Revision: https://code.wildfiregames.com/D4163
This was SVN commit r25784.
2021-06-13 08:11:48 +00:00
dd779872c4 Small tweak of map flare characteristics
Refs #3491

Differential Revision: https://code.wildfiregames.com/D4099
This was SVN commit r25783.
2021-06-12 22:35:30 +00:00
bfc20bc847 Add a background to campaign load page
Differential Revision: https://code.wildfiregames.com/D4157
This was SVN commit r25781.
2021-06-12 17:20:01 +00:00
7e423fe20e Only show the full template run name + template name if they're different.
The campaign screen currently shows both the name of the run (selected
by the user) and the name of the campaign. This is, by default, the
same, and thus looks weird.

Reported by: langbart, marder
Tested by: marder
Differential Revision: https://code.wildfiregames.com/D4158
This was SVN commit r25780.
2021-06-12 17:19:09 +00:00
956b3f96db Improvement to autoqueue usability
The graphical interface will show autoqueued units as 'ghost' units so
the player gets immediate feedback on what's happening.
The autoqueue disengages if it runs out of resources or entity limits:
this reflects that the autoqueue cannot resume on its own.

By changing the spot where the autoqueue pushes items, the autoqueue no
longer 'buffers' one unit in advance, but remains very slightly less
efficient than manual queuing. This also prevents cheats from leading to
a ton of units accidentally being created.

Accepted By: Freagarach
Refs #6213

Differential Revision: https://code.wildfiregames.com/D4144
This was SVN commit r25779.
2021-06-12 09:43:57 +00:00
42d6893eb8 Fix lobby dgame details panel with incompatible mods.
There was an issue in 07e44a75a1 that made the game details mostly red
with incompatible mods.
This fixes that: now only the 'Mods' title is red, and I added specific
text to highlight why it's colored that way.

Based on a patch by: Langbart
Differential Revision: https://code.wildfiregames.com/D4153
This was SVN commit r25778.
2021-06-12 08:57:34 +00:00
721cfa7ae6 Improve some options texts.
Differential revision: https://code.wildfiregames.com/D3741
Comments by: @Nescio, @wraitii
This was SVN commit r25777.
2021-06-12 05:56:23 +00:00
f537fdd87d Look for resources nigh the order when forced.
When tasked to gather, entities looked for resources close to their
current location when the target was invalid (e.g. full).
Now on forced orders the entities will look for resources close to that
order's location, when possible.

Differential revision: https://code.wildfiregames.com/D4146
Fixes: #6085
Reviewed by: @Imarok
Tested by: @Langbart
Comments by: @marder, @Stan, @wraitii
This was SVN commit r25776.
2021-06-12 05:47:06 +00:00
b3458d408a Add a setting for the minimap flare lifetime.
Tested by: marder, Langbart
Differential Revision: https://code.wildfiregames.com/D4135
This was SVN commit r25775.
2021-06-11 20:47:09 +00:00
abe7211e15 Remove duplicated loading tip images
In 9b50e4475f I committed some duplicated images.
Noticed by: wowgetoffyourcellphone
This was SVN commit r25774.
2021-06-11 19:07:34 +00:00
ded4859e6e Fix missing templates on wild_lake.js.
Broken in 8ee6774d12

Reported by: @Nobbi
This was SVN commit r25773.
2021-06-11 15:41:40 +00:00
e1a0cabf5a RM generation: improve metal mines generation
Introduces a new helper to place mines. use it on 'Best for MP' maps for
stone and metal.

The amount of metal will scale with the # of players, and will place
slightly more mines overall for fairer distribution.

This should make 1v1 and 4v4 more playable on these maps.

Differential Revision: https://code.wildfiregames.com/D4148
This was SVN commit r25772.
2021-06-11 15:14:40 +00:00
ffd62e08d8 Speed up Corinthian Isthmus / Lorraine Plain RM generation
Both maps were using extremely high smoothness setting, that did nothing
but lag extremely.

Differential Revision: https://code.wildfiregames.com/D4150
This was SVN commit r25770.
2021-06-11 06:38:16 +00:00
fa218b66bb Loading tips: Dynamically adjust the title height and fix the width
Tested by: Langbart
Differential Revision: https://code.wildfiregames.com/D4152
This was SVN commit r25768.
2021-06-10 19:59:23 +00:00
9b50e4475f Brush up the loading tips
New loading screen tips. Update for the pictures and the text.

Patch by: marder
Reviewed by: Freagarach
Some based on work of: wowgetoffyourcellphone
Fix #6191

Differential Revision: https://code.wildfiregames.com/D4107
This was SVN commit r25767.
2021-06-10 17:25:18 +00:00
4de9c4c164 Fixes for some random maps.
- Hellas_biome isn't a RM but as a JSON script it does load, and then
silently fails on mapgen. Explicitly fail.
- Fix player.js when a valid position cannot exist.
- Fix unknown.js when landscape isn't set in the settings.

Reported by: vladislavbelov
Refs #6180

Differential Revision: https://code.wildfiregames.com/D4147
This was SVN commit r25765.
2021-06-10 13:16:10 +00:00
b84e268a1f Fix arctic biome with postrocessing and tweak for nubia and steppe
- Arctic biome was much too bright with postprocess (error in
717a9d0252)
- Change sun angle in Nubia to make the grass less yellow at default
camera angle
- Change sun angle in Steppe to make the game look less flat at default
camera angle.

Patch by: marder
Differential Revision: https://code.wildfiregames.com/D4145
This was SVN commit r25764.
2021-06-10 06:48:38 +00:00
0b6486dc7a Fix 0 A.D. quitting 'too fast' when it gains focus after alt+F4
There appears to be an SDL issue with linux and X11 that causes Keydown
events to be sent immediately when 0 A.D. gains focus. This can loead to
Alt-F4 quitting 0 A.D. immediately upon focus gain, such as when another
application was quit via Alt-F4.

The typical bug case was:
- Open 0 A.D.
- Open another app
- Alt-F4 other app
- 0 A.D. immediately receives alt-F4 as well and exits.

Since SLD handles this hotkey natively via SDL_QUIT, it seems easier to
default to "no hotkey", as that fixes the problem.

Reported by: Imarok
Fixes #6092

Differential Revision: https://code.wildfiregames.com/D4132
This was SVN commit r25762.
2021-06-09 18:39:06 +00:00
4ee03b544d Disable the flare button for observers.
Use the new button that Stan committed in b3ec0d48ba
Reviewed by: Freagarach
Differential Revision: https://code.wildfiregames.com/D4136
This was SVN commit r25761.
2021-06-09 16:34:53 +00:00
f620ed8750 Make grass greener in temperate biome
And slightly reduce the desaturation since it now looks better.

Patch by: marder
Differential Revision: https://code.wildfiregames.com/D4139
This was SVN commit r25758.
2021-06-09 08:55:44 +00:00
717a9d0252 Further RM biome tweaks
- Make Savanna and Nubia have a .25 Forest probability.
- Remove brightness changes from HDR, this made postproc look too
different, particularly on Savanna
- Lower postproc impact on constrast/saturation for the same reasons.
- Lighten up Aegean, Alpine, Savanna, Nubia, slightly darken Arctic
- Make Aegean water a bit bluer. Likewise lightwen Savanna water.
- Fix the sun elevation/rotation on Nubia, Sahara and Savanna
- Remove the HDR settings of Cantabrian Highlands
- Remove the water/HDR settings of Corinthian Isthmus RM

Comments by: marder
Differential Revision: https://code.wildfiregames.com/D4124
This was SVN commit r25757.
2021-06-09 08:17:12 +00:00
324b4bdf64 Small tweak to the Roman Army Camp balance
- Max garrison reduced to 20, like fortresses (caps the capture regen
rate)
- Can construct rams
- Cost an additional 100S/100M

The capture stats have been tweaked but there's no fundamental change.

See also D4080

Differential Revision: https://code.wildfiregames.com/D4109
This was SVN commit r25756.
2021-06-09 06:42:20 +00:00
a36e7d6986 Make elephant archers cost 2 population.
This is intended to make a deathball of elephant archer less OP, as the
units are difficult to mass but really strong once that is done.

See D3599 for larger changes.

This was SVN commit r25755.
2021-06-09 06:40:35 +00:00
05ace86b76 Fix caledonian meadows.
Broke in 6cc6d8c156

Refs #6180

Differential Revision: https://code.wildfiregames.com/D4131
This was SVN commit r25754.
2021-06-09 06:35:17 +00:00
b8758c8941 Prevent ProductionQueue.AddItem for going over the entity limits / Fix autoqueue being able to train infinite heroes.
Autoqueue can ignore entity limits like Heroes, because AddItem does not
check for them, only commands.js. This changes that, fixing the
autoqueue.

Reported by: Player of 0AD
Tested by: langbart
Refs #6213

Differential Revision: https://code.wildfiregames.com/D4133
This was SVN commit r25753.
2021-06-09 06:33:52 +00:00
184ed2fb55 Apply modifiers from civ/team bonus auras in Reference Suite
The Reference Suite (Structure Tree, Civ Info, Viewer) wasn't taking
into
account civilization- or team-bonus auras when calculating entity stats.

This wasn't really a problem (for Vanilla 0AD) prior to a18d97b047, as
civ-bonus auras don't exist in Vanilla 0AD, and our team-bonus auras
didn't
apply to the owning civ before that change. Now they do, the Suite needs
to
take them into consideration.


Differential Revision: https://code.wildfiregames.com/D4093
This was SVN commit r25751.
2021-06-08 23:35:44 +00:00
06672206d4 (Re)display phase idents in Structure Tree
They were all set to hidden-by-default as part of b7ff371d00, only there
wasn't anything to tell them to unhide when we actually want them. This
commit
fixes that.


Differential Revision: https://code.wildfiregames.com/D4114
This was SVN commit r25750.
2021-06-08 23:20:39 +00:00
870e689e5f Unit pushing: fix pairs of unit being allowed to overlap.
Following 40cbde1925, the minimum pushing force is 0.2. This also
happens to be the maximum pushing force any pair of units can exert on
each other, so they can freely overlap instead of being pushed.

This tweaks settings slightly to fix that problem.

Reported by: marder
Differential Revision: https://code.wildfiregames.com/D4129
This was SVN commit r25748.
2021-06-08 16:38:06 +00:00
b7ff371d00 Prevent OOM crash in Reference Tree on error
The structTree, in case of errors, could have enough items to draw to
trigger an OOM failure in the Arena allocator.

This fixes that by hiding elements by default and some c++ memory
optimisation (mostly, this should make all platforms take the same
memory footprint for VisibleObject).

Discussed with vladislavbelov and s0600204

Differential Revision: https://code.wildfiregames.com/D4114
This was SVN commit r25746.
2021-06-08 14:57:59 +00:00
858148d332 Add garrison flags for all wonders.
Fixes: #6160
Refs: #4581

This was SVN commit r25745.
2021-06-08 12:04:08 +00:00
f3be9bd465 Fix forge garison flag and add some missing death particles.
Refs: #4581
Refs: #6160

This was SVN commit r25744.
2021-06-08 11:42:31 +00:00
1aa944b0bb Slightly improved parchment.png texture.
Patch by: @marder
Refs:  D4107

This was SVN commit r25743.
2021-06-08 11:05:44 +00:00
055c2d009b Change the mine selection sound and make it louder.
Patch by: @Langbart
Fixes #6184

Differential Revision: https://code.wildfiregames.com/D4102
This was SVN commit r25742.
2021-06-08 10:42:15 +00:00
d03112d2f6 Fix gamesetup issues with map filters.
Redo 09a33b6626.
When the host set te 'best for mp' mapfilter and a non-default maps,
ordering issues bugged things out.
This handles things slightly better.

Fixes #6208

Differential Revision: https://code.wildfiregames.com/D4121
This was SVN commit r25741.
2021-06-08 08:51:36 +00:00
224a96373b Revert parts of 09a33b6626
There is an issue when no matchsettings.json is present.

This keeps the network synchronisation fix, that worked.

This was SVN commit r25739.
2021-06-07 19:55:05 +00:00
f5f493681d Fix atlas crash with RM capture the relic.
As no default values got set, some game settings became NaN, which
triggered exceptions.
This sets sane default.

This also includes better debugging logic in case of exception, so it's
easier to know what happens.

Fixes #6200

Reported by: langbart
Differential Revision: https://code.wildfiregames.com/D4113
This was SVN commit r25736.
2021-06-07 18:48:16 +00:00
d95eda9eb3 Add description for new hotkeys
Adds a proper description for flare & last attackfocus hotkeys.
Fixes eb2e489898 and 8e63a0322c

Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D4116
This was SVN commit r25734.
2021-06-07 18:45:03 +00:00
275ee9d75b Disable TreasureCollector component in siege engines.
This is unexpected and does not seem particularly useful/sensical.

Patch by: pszemsza
Fixes #5214

Differential Revision: https://code.wildfiregames.com/D3929
This was SVN commit r25733.
2021-06-07 12:54:08 +00:00
7e9bb4d4e8 Only save MP match settings if the player is the controller
Broken in 72f0fdb41b.

Differential Revision: https://code.wildfiregames.com/D4112
This was SVN commit r25732.
2021-06-07 11:45:14 +00:00
09a33b6626 Fix MP gamesetup issues with mapfilter
- Settings weren't sent to the server when mapfilters change.
- Because of ordering issues, the 'multiplayer' mapfilter would be
activated at the wrong time and things would go haywire.
- Likewise, selecting a non-default map with a non-default filter
wouldn't work well.

Fixes #6208

Differential Revision: https://code.wildfiregames.com/D4111
This was SVN commit r25731.
2021-06-07 11:40:43 +00:00
70f2ac6788 Fix error on resign with formation
Formation controllers that were about to be destroyed could bug out.
It's plausible this bug would also happen with regular units, but
couldn't reproduce.

Differential Revision: https://code.wildfiregames.com/D4110
This was SVN commit r25730.
2021-06-07 11:38:16 +00:00
a8480b1dc9 Fix incorrect animation for african elephants
Patch by: @wowgetoffyourcellphone
This was SVN commit r25729.
2021-06-07 09:48:34 +00:00
b3ec0d48ba Add a disabled flare icon for observers.
This was SVN commit r25728.
2021-06-07 08:51:23 +00:00
cdb73b29f2 Lower Forge technology costs, introduce a 3rd level.
Follows 9a3da390b9 / b5bbed4690.
Forge technologies are cheaper in A24, but still too expensive to use
directly, making the forge not immediately useful.
This changes the technologies from 2 levels to 3, and further decreases
costs.
Instead of 600/400 then 900/600, costs are 200/100, 350/250 then
500/400. This makes the Town Phase techs immediately accessible, and
lengthens impact of City Phase with stronger late techs.

Iberians and Mauryas had a special "wootz steel" tech that gave
swordsmen +20% damage, this is folded into the 3rd level. I have not
changed the effect because the tech was cheap, but we shall see.

Patch by: Nescio
Comments by: borg-, Valihrant
Differential Revision: https://code.wildfiregames.com/D3679
This was SVN commit r25726.
2021-06-07 07:33:59 +00:00
d0989ee3ac Expand Experience trickle to stables and elephant stables
Increases consistency, unlikely to be overpowered. Temple and Fortress
were considered but found risky of being too strong.

Patch by: langbart
Differential Revision: https://code.wildfiregames.com/D3994
This was SVN commit r25725.
2021-06-07 06:55:59 +00:00
8e853a7a0d Lower infantry crossbowmen walk speed.
Their lowered prepare time (since c78ead79e6) makes them too good at
hit-and-run, they should be slower since a crossbow is encumbering.

Accepted By: ValihrAnt
Differential Revision: https://code.wildfiregames.com/D4096
This was SVN commit r25724.
2021-06-07 06:50:26 +00:00
add76379d4 Correctly reset teams when changing scenario.
When switching scenarios, teams should always be reset.
Do nothing in skirmish mode.

Reported by: Stan
Differential Revision: https://code.wildfiregames.com/D4104
This was SVN commit r25723.
2021-06-07 06:46:11 +00:00
88e6671388 Lower Champion Elephant armor against Pierce.
Elephants go from 2150 real HP to 2100 against Hack and 1700 against
Pierce.
The intention is to make them more vulnerable to range (and somewhat
spearmen as well).

Suggested by: Valihrant
Differential Revision: https://code.wildfiregames.com/D4058
This was SVN commit r25721.
2021-06-07 06:40:38 +00:00
d9511564ce Fixup tooltips after 73dcf36976
Some civ-specific variants had specific tooltips.

Differential Revision: https://code.wildfiregames.com/D4095
This was SVN commit r25720.
2021-06-07 06:36:42 +00:00
cc4087f3fe Don't open the template viewer when in special input state
Fix #6041

Differential Revision: https://code.wildfiregames.com/D4105
This was SVN commit r25716.
2021-06-06 19:00:04 +00:00
eb2e489898 Add a hotkey to focus on the last attack alarm
Fix #5608

Differential Revision: https://code.wildfiregames.com/D4101
This was SVN commit r25715.
2021-06-06 18:29:48 +00:00
e0b492a83a Removes old gui_* materials, replaced by a single canvas2d material.
This was SVN commit r25714.
2021-06-06 18:25:04 +00:00
30e135693e Implements configurable cascade shadows.
Tested By: Langbart, Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D3972
This was SVN commit r25711.
2021-06-06 16:44:54 +00:00
40cbde1925 Further Pushing tweaks: more customisable, longer ranges.
This overall decreases the deathball effect from units walking to each
other a bit.
- Fix formations - this cleans up a UnitMotion hack for formations,
making it possible to increase pushing ranges without breaking closely
knit formations like testudo.
- Make MINIMAL_PUSHING and the MOVE_EXTENSION configurable, and add a
STATIC_EXTENSION as well.
- Increase the pushing range significantly, making units sparser.

Differential Revision: https://code.wildfiregames.com/D4098
This was SVN commit r25708.
2021-06-06 15:25:52 +00:00
063408c252 New pikemen small shields.
Patch by: @wowgetoffyourcellphone,
This was SVN commit r25707.
2021-06-06 14:28:28 +00:00
cea23ac864 Improve the UVMap of some old rocks. They were looking very weird with some of the new textures.
This was SVN commit r25706.
2021-06-06 14:27:02 +00:00
683759c4c6 Fix some texture bug on tree_oak_new_c the uv was referencing some transparent parts of the texture. The texture was also a bit too transparent on the bark.
Reported by: @vladislavbelov
This was SVN commit r25705.
2021-06-06 11:23:32 +00:00
374b869480 Tweaks to the alpine RM biome
- Rename to subalpine to fit the theme better & tweak tooltip
- improve the shore textures
- remove the snow dir texture which contrasted too heavily.

Differential Revision: https://code.wildfiregames.com/D4027
This was SVN commit r25701.
2021-06-06 08:24:39 +00:00
3f2265a09e Update for the Steppe RM biome
- Change the grass actor, which was too lighting dependent and heavy on
performance
- Change the main terrain texture which was quite noisy
- Change shore textures to be more seamless.

Based on a patch by: marder
Differential Revision: https://code.wildfiregames.com/D4025
This was SVN commit r25700.
2021-06-06 08:21:35 +00:00
8af0689b5f Fix gamesetup player assignment issue when joining
Switch some logic from C++ to JS in PREGAME for player assignments. Refs
#3049

Fixes #6204

Reported by: Imarok
Tested By: Imarok
Differential Revision: https://code.wildfiregames.com/D4092
This was SVN commit r25699.
2021-06-06 08:02:28 +00:00
73dcf36976 Remove territory root from fortresses.
Reverts D1762 / 014c2922f2.
Because any territory connected to a root does not decay, this made it
possible to anchor CC territories by adding a fortress somewhere, thus
making it much, much harder to push against an enemy territory.
This led to a much more turtley gameplay and overall made the game
worse.

For now, I do not reintroduce the larger territory range (which was
reduced in 014c2922f2).

Differential Revision: https://code.wildfiregames.com/D3989
This was SVN commit r25697.
2021-06-06 07:35:40 +00:00
fdb4040838 Adds HiDPI mode for testing. HiDPI on Windows isn't supported in SDL yet. So we use a custom code.
Differential Revision: https://code.wildfiregames.com/D4076
This was SVN commit r25692.
2021-06-05 19:01:37 +00:00
8e63a0322c Map flares
Add flaring on the map and resize the minimap buttons.
Target marker and button by Stan.
Reviewed/Commented by wraitii, elexis, vladislavbelov
Refs: #3491
Refs: #57

Differential Revision: https://code.wildfiregames.com/D1751
This was SVN commit r25691.
2021-06-05 17:37:18 +00:00
3bb5f364c2 (Reference Suite) Support aura-based civilization bonuses
As a side effect of 6b7a80b260, this is now trivial to do.

We don't (currently) have any aura-based civ bonuses in Vanilla 0A.D.,
but hopefully modders will find it useful.

This was SVN commit r25690.
2021-06-05 16:39:59 +00:00
6b7a80b260 (Reference Suite) Fetch teambonus auras from player_{civ}.xml files
(The `civ` key (in the team bonus aura templates) was added in
190d6e7cf5 for the
purpose of identifying which aura belongs to which civ. It's no longer
used.)

Proposed by: @Nescio
Comments by: @Freagarach
Refs: 190d6e7cf5
Differential Revision: https://code.wildfiregames.com/D3864
This was SVN commit r25689.
2021-06-05 16:24:25 +00:00
ad8c7cb2e0 Fixup artic biome: add lillies replacement
Since lillies wouldn't make too much sense, add rocks.

Differential Revision: https://code.wildfiregames.com/D4087
This was SVN commit r25688.
2021-06-05 10:47:20 +00:00
7de9487a87 "New maps" demo campaign
This shows off the new maps, and shows off campaigns in a straighforward
manner.

Differential Revision: https://code.wildfiregames.com/D4020
This was SVN commit r25684.
2021-06-04 18:04:17 +00:00