1
0
forked from 0ad/0ad
Commit Graph

21393 Commits

Author SHA1 Message Date
3ecad00672 [gameplay] Delete armor_hero_01 technology
This unique technology for heroes was not useful.

Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D2939
This was SVN commit r24679.
2021-01-18 11:17:52 +00:00
e5d00c29d7 Removes showsky from intro after 549b6893ce. Fixes #5935
This was SVN commit r24678.
2021-01-18 11:15:48 +00:00
b890cc4780 Fix savegame list being too high.
It was occluding the input field when saving, and the border in any
case.

Reported by: nifa
Differential Revision: https://code.wildfiregames.com/D3383
This was SVN commit r24677.
2021-01-18 11:06:44 +00:00
f0b87ff13c Fix market waypoints.
(setting waypoints to more than 2 markets still does not work properly,
but it also did not in A23).

Fixes #5923

Differential Revision: https://code.wildfiregames.com/D3400
This was SVN commit r24676.
2021-01-18 11:00:02 +00:00
d0a42f2f00 Further Hotkey fixes.
12cceed3d9 broke meta-key releases. This fixes that.
Also fix a much older issue where pressing new keys would not release
less specific hotkeys.

Add tests.

Reported by: Imarok
Tested by: langbart
Fixes #5930
Fixes #5927

Differential Revision: https://code.wildfiregames.com/D3396
This was SVN commit r24675.
2021-01-18 10:58:16 +00:00
85a54b904e Fix trailing coma after 1cb4ee1634
This was SVN commit r24673.
2021-01-18 08:05:19 +00:00
e01140b1b2 Improve detection of empty notification messages
In the case that a player started or aborted researching a phase
technology, a
blank line was being added to the chat history of the player in question
and
any mutual ally or observer, where the player, ally, or observer had
their
`gui.session.notifications.phase` setting at the default value of
"completed".

This was happening because in the above case the returned value of
`ChatMessageFormatSimulation.phase` class's `.parse()` method is `{text:
""}`.


Related a3eccc043d
Fixes #5921

This was SVN commit r24671.
2021-01-17 19:37:45 +00:00
692e236499 Speed up carry capacity tech research / resource value modification.
Carry capacity changes triggered 4x recomputation of gather rates
(because modifiersManager isn't as efficient as it can be), and this was
slow enough to matter. This reduces the work sufficiently to not matter
much.

Reviewed By: Freagarach
Differential Revision: https://code.wildfiregames.com/D3373
This was SVN commit r24670.
2021-01-17 18:29:11 +00:00
Angen
2d9e74598a [Petra/Ai] Fix not traning champion cavalry and infantry after 925170f600 and 8ee6774d12
Since champions have been moved to barracks, researching unlocking
technologies became the must in order to train them.
Therefore:

Specificaly research `unlock champion` technologies.
Increase priority of minor techs to 250.
Remove some duplicated checks.

Differential revision: D3380
Reviewed by: @wraitii
This was SVN commit r24669.
2021-01-17 16:13:31 +00:00
6bb1de61ec Format hotkey tooltip when an alternate key-name is used
Some keys have multiple names that they may be identified by in config
files,
such as the Escape key which may be identified by either "Esc" or
"Escape", or
the number-pad keys which may be identified with a name in the form
"Num{xxx}"
(e.g. "NumMinus") or the alternate "Keypad {x}" (e.g. "Keypad -").

The alternate names were not being picked up and formatted correctly
when
displayed in tooltips. Now they are.


Accepted By: wraitii
Differential Revision: https://code.wildfiregames.com/D3358
This was SVN commit r24668.
2021-01-17 16:04:51 +00:00
5657c5211b Make the in-game menu go over the dev overlay.
There was a Z-conflict since the addition of the hotkeys button.

Patch by: ffffffff
Fixes #5928

Differential Revision: https://code.wildfiregames.com/D3393
This was SVN commit r24667.
2021-01-17 15:58:11 +00:00
3872ee43b5 Fix 768c84aa46 style, add tests.
Patch by: @bb
Small fixes by: @Stan
Reviewed by: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D3103
This was SVN commit r24665.
2021-01-17 15:44:14 +00:00
4c4da81cc4 Fix no pch build.
This was SVN commit r24664.
2021-01-17 15:40:10 +00:00
549b6893ce Removes sky toggling by a hotkey.
Reported By: Langbart
This was SVN commit r24663.
2021-01-17 14:27:44 +00:00
57389cb9cb Partly restores the requested functionality to hide skies removed in 78d4dd0109.
This was SVN commit r24662.
2021-01-17 13:28:37 +00:00
1cb4ee1634 Combines terrain and units ambient colors into the single color.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D3237
This was SVN commit r24661.
2021-01-17 13:10:00 +00:00
6ddbf75db1 Increase PMP version for checkrefs.pl after 2f8c7cf575.
This was SVN commit r24660.
2021-01-17 11:01:11 +00:00
931afb9989 [Gameplay] - Purge Roman Sibylline Books and Cart Exploration techs.
Since it affects gameplay also in a negative way (units wandering off
farther) and that entities with already high vision range benefit much
more than those with smaller vision ranges (the area is pi times radius
square).

Patch by: @borg-
Differential revision: D3365
Reviewed by: @Nescio, @wowgetoffyourcellphone
Comments by: @Freagarach, @wraitii
This was SVN commit r24659.
2021-01-17 09:50:27 +00:00
abe35ed029 [Gameplay] - Reduce Archer and Structure ranges.
Due to the new way attack ranges are calculated (d0fc8ff67d), structures
can shoot significantly further, making raiding much harder.
This patch lowers the maximum attack range of archers and structures
from 70 to 60, and of slingers from 50 to 45 (javelineers keep 30), as
requested by @Feldfeld and @ValihrAnt. It also reduces the vision range
of defensive structures and artillery accordingly.

Patch by: @Nescio
Differential revision: D3381
Reviewed by: @wraitii
Informally accepted by: @borg-
Comment by: @Angen
This was SVN commit r24658.
2021-01-17 09:42:20 +00:00
8ee6774d12 [Gameplay] - Move infantry from fortress to barracks only.
Having some civs able to train their champions at the barracks, others
at (not too expensive) specific structures and some only at the (still
expensive) fortress is neither consistent nor balanced.

Patch by: @Nescio
Differential revision: D3384
Reviewed by: @borg-
Idea approved by: @wraitii
This was SVN commit r24657.
2021-01-17 09:36:00 +00:00
6ea368d236 Fix missing geometry for the celt carnyx.
Reported by: @wowgetoffyourcellphone
Thread:
https://wildfiregames.com/forum/topic/35390-missing-geometry-for-carnyx

This was SVN commit r24656.
2021-01-17 09:34:46 +00:00
fc7aa1d01e [Gameplay] - Tweak Ptol structure cive bonus again.
Changes from Cost and Build time to Cost and Health, for that is less
complicated.

Patch by: @borg-
Differential revision: D3355
Reviewed by: @Nescio
Comments by: @Freagarach, @wraitii
This was SVN commit r24655.
2021-01-17 09:10:09 +00:00
2f8c7cf575 Increases the maps version to 7 for XML and PMP files.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D3281
This was SVN commit r24653.
2021-01-17 02:12:04 +00:00
4a69e9117e Removes usages of GetRenderPath to checking for support of shaders.
This was SVN commit r24652.
2021-01-16 23:18:56 +00:00
78d4dd0109 Removes useless option to show sky
Differential Revision: https://code.wildfiregames.com/D3382
This was SVN commit r24651.
2021-01-16 21:16:31 +00:00
1eb342c595 Fix missing 'else return' in isPressed following 12cceed3d9
Reported by Vladislavbelov & nephele

This was SVN commit r24650.
2021-01-16 17:16:02 +00:00
e9fa4445f5 Swap Ptolemaic Slinger & Javelineer
D3269 / 1649a8c221 made Mercenaries unable to gather. Ptolemies
Javelineers are mercs, so thy now had a non-gatherer starter unit,
putting them at a disadvantage.
This swaps the Merc javelineer with the slinger to correct for that.

Patch by: Nescio (for Stockfish0ad)
Differential Revision: https://code.wildfiregames.com/D3378
This was SVN commit r24649.
2021-01-16 15:57:42 +00:00
55fd2b3441 Fix typos in 12cceed3d9
Fix 12cceed3d9

This was SVN commit r24648.
2021-01-16 15:46:56 +00:00
61236cae5b Improve cavalry balance.
- Spear cavalry counters Cavalry better
- Sword cavalry performs better against ranged units, having lower hack
armor but better pierce armour.
- Sword cavalry performs worse against Spear cavalry (same reason).

Patch by: borg-
Differential Revision: https://code.wildfiregames.com/D3256
This was SVN commit r24647.
2021-01-16 15:36:20 +00:00
78dc5ffc7d Fix a few template oversights in recent commits.
This patch fixes a few oversights:
* When redoing D3287, a typo slipped in, spotted by @borg-: “wood”
instead of “food”.
* From the same patch, @Angen suggested to change a technology name,
from “Metal Shield” to “Metal Rim”.
* When redoing D2494, I missed that the ptol polybolos has a third less
reload time; as a consequence its damage per second is now 50% higher
than that of other bolt-shooters; this patch fixes that by adjusting its
damage.
* Likewise, D3235 adjusted archer attacks but omitted the crossbowman,
which currently has half the base damage of its champion counterpart but
three times the reload time, which means its damage per second is only
one-sixth the archer's; this patch raises its base damage sixfold to
give the crossbowman the same damage per second as the archer.

Patch by: Nescio
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D3375
This was SVN commit r24646.
2021-01-16 15:32:29 +00:00
12cceed3d9 Fix hotkeys not releasing properly.
a4852c4c01 changed hotkeys to use scancode, but didn't change g_keys to
reflect that, and this could break hotkey release.
This fixes that by explicitly using scancodes. Note that we might want a
g_keys map in the future, but it seems un-necessary at the moment.

Also remove the last remnants of 'negated' hotkeys, which were disabled
following b995135138.

Tested By: OptimusShepard
Fixes #5922

Differential Revision: https://code.wildfiregames.com/D3379
This was SVN commit r24645.
2021-01-16 15:24:58 +00:00
7f1ee23d88 Fix AI's handling of buildRestriction distances following d0fc8ff67d
d0fc8ff67d / D2759 make buildRestriction distances take obstruction
sizes into account.
This requires AI adjustment, which wasn't done then.

Differential Revision: https://code.wildfiregames.com/D3364
This was SVN commit r24643.
2021-01-16 10:41:59 +00:00
e2ff38453f Fix lag on OOS with AIs
Following 9fc6c3c897, the OOS debugSerializer would try to serialize AI
objects entirely. This is extremely slow (might be an infinite loop in
some cases).
Instead, it should print the result of Serialize() in those cases.

(The original idea was that it would print more debugging information,
but in practice it seems to mostly print things that show up when
diffing but aren't actually sources of OOS, so essentially garbage).

Fixes #5917

Differential Revision: https://code.wildfiregames.com/D3361
This was SVN commit r24641.
2021-01-16 10:33:00 +00:00
925170f600 [Gameplay A24] - Unlock Champion Cavalry with a technology.
This puts them on-par with champion infantry.

Patch by: @Nescio
Differential revision: D3372
Reviewed by: @borg-
Comment by: @wraitii
This was SVN commit r24640.
2021-01-16 06:50:45 +00:00
5cccc7b282 [Gameplay A24] - Remove Spartan population penalty.
Since they don't have much bonuses (structure health, stronger female
citizens) to stand up against two penalties (no stone walls and this).
This removes the population penalty; other civilisations have better
bonuses but no such penalties.
Besides, Sparta was larger than other city states in ancient Greece,
both in terms of area and army size.

Patch by: @Nescio
Differential revision: D3376
Reviewed by: @borg-
This was SVN commit r24639.
2021-01-16 06:41:28 +00:00
b5c783e519 [Gameplay A24] - Tweak Melee Infantry range.
- axemen, macemen, swordsmen: 3.5 -> 3
- spearmen: 4.5 -> 4
- pikemen: 7 -> 8
In single combat or small numbers the effect of this patch is probably
negligible; however, in large groups more pikemen could hit a single
target. Given that pikemen have by far the lowest damage per second,
increasing the range differences won't hurt.
In reality pikes were two to three times as long as spears, and up to
six pikes extended in front before an opponent could touch the first
pikemen, so this improves historical realism too.

Patch by: @Nescio
Differential revision: D3080
Reviewed by: @borg-
Comment by: @wratiii
This was SVN commit r24638.
2021-01-16 06:37:51 +00:00
91ee0093ca [Gameplay A24] - Tweak War Elephant damage.
Now that rams are available to all civs, it's no longer necessary for
elephants to keep having the same amount of crush damage as rams.
This patch therefore reduces their crush damage by 20%, but raises their
hack damage by 50%, making them less effective vs structures but better
against units.

Patch by: @Nescio
Differential revision: D3371
Reviewed by: @borg-, @wraitii
This was SVN commit r24637.
2021-01-15 18:28:48 +00:00
afff5b9f8d [Gameplay A24] - Reduce ranged soldier resistance.
A frequent complaint is that ranged troops are too effective in 0 A.D.
They're supposed to die quickly, however, they get the same resistance
increases as melee troops. This limits the advanced and elite resistance
bonus to melee only (thus also excluding healers) and reduces the
resistance of ranged champions and heroes by two levels, to stay in pace
with their elite counterparts.
As a consequence, nothing changes for basic ranged troops, but advanced
are about 11% easier to kill, and elite, champion, and heroes about 23%.

Patch by: @Nescio
Differential revision: D3369
Reviewed by: @wraitii
Comment by: @borg-
This was SVN commit r24636.
2021-01-15 18:24:59 +00:00
1649a8c221 [Gameplay A24] - Differentiate mercenaries further from Citizen Soldiers.
Mercenaries:
- Can't gather but can build structures.
- Cost 60% less food, neither wood nor stone, but metal.
- Less training time.

Patch by: @Nescio
Differential revision: D3269
Reviewed by: @borg-, @wraitii
This was SVN commit r24635.
2021-01-15 18:18:57 +00:00
2eda2a0ab4 [Gameplay A24] - Add Carnyx unit to Gaul.
The carnyx was a long, bronze, Celtic trumpet and used on the
battlefield; its sound would intimidate opponents.
This patch introduces a trainable infantry champion for the carnyx-using
actor, at the assembly, and adds a generic template and an aura file,
which lowers the attack damage of nearby enemy soldiers a bit.
While it has an aura that could make a difference, it has no training
restrictions (unlike heroes); to compensate for that, it has a higher
cost, less resistance and less attack damage than other champions. If it
turns out to make the Gauls too strong, its values can be adjusted in
the future.
Having this (historically attested) unit would make the Gauls less
similar to other civs.

The specific name was suggested by @genava55 on the forums.
Icon adapted by @Stan from @niektb.

Original patch by: @Stan
Redone by: @Nescio
Differential revision: D3320
Reviewed by: @borg-
Comments by: @Freagarach
This was SVN commit r24634.
2021-01-15 18:11:14 +00:00
aede7473f2 Makes the color of tutorial new messages softer.
This was SVN commit r24633.
2021-01-15 17:25:12 +00:00
6f3c0e18cf Remove heightmap grascale pictures and corresponding scenarios due to uncertain copyright status
Differential Revision: D2777
	Fixes #5112
	Patch by @Nescio
	Accepted by @FeXoR

This was SVN commit r24632.
2021-01-15 16:51:06 +00:00
6a67e9a52d Address concerns in 5473393e30 (RL interface)
Fixes 5473393e30.

This:
- Puts RL code under the RL namespace to avoid name collisions
- Avoids usage of new/delete
- Adds more documentation
- Does general cleanup (const-correctness, move semantics, argument
types, early returns...)

Patch by: irishninja
Comments by: Vladislavbelov, wraitii
Differential Revision: https://code.wildfiregames.com/D2947
This was SVN commit r24631.
2021-01-15 16:30:05 +00:00
6282960991 Removes useless option for shadows on water
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D3368
This was SVN commit r24630.
2021-01-15 15:45:39 +00:00
de2b16a904 Prevent the game from playing sounds too often (8 times for a cavalry slaughter animation) and allow for subprops with a different event time to still play the sound at the same as their parent.
Comments by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D3118
This was SVN commit r24629.
2021-01-15 14:34:45 +00:00
01d24173d2 Make the Athenian long_walls tech cost stone.
A pure stone cost makes it easier to research and more unique.

Patch By: borg-
Accepted By: wraitii, Nescio
Differential Revision: https://code.wildfiregames.com/D3356
This was SVN commit r24628.
2021-01-15 13:02:24 +00:00
3dd37c687e Fixes PCH and removes unused warnings after 25332f9b86.
This was SVN commit r24627.
2021-01-15 11:21:24 +00:00
b57ee3c18d Use arrow sounds instead of flesh sounds for javelins.
Patch by: @Samulis
This was SVN commit r24626.
2021-01-15 10:09:03 +00:00
b1a89fbd89 Replaces UNICODE characters in the code by consistent ASCII characters.
Beside consistency improves reading for such console tools like svn diff
or vim diff.

This was SVN commit r24625.
2021-01-15 10:07:36 +00:00
171afdc7a6 Make foundations not ConquestCritical
Foundations were originally made conquest critical in 722578fdcd.
However, it remains rather frustrating that a player can evade defeat by
placing an unbuilt, uncommitted foundation. While allies can revive a
player with only a foundation, that cannot happen in 1v1, where it is
simply undue frustration, and the inconvenience seems greater than the
feature.
This thus removes them again from the conquest critical list.

Patch By: nephele
Differential Revision: https://code.wildfiregames.com/D2674
This was SVN commit r24624.
2021-01-15 10:02:31 +00:00