1
0
forked from 0ad/0ad
Commit Graph

15159 Commits

Author SHA1 Message Date
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