1
0
forked from 0ad/0ad
Commit Graph

14830 Commits

Author SHA1 Message Date
5f859a90d2 Use the new arrow and variants to reduce duplication for merc and maurya
This was SVN commit r24913.
2021-02-13 23:53:12 +00:00
8bd8eb7acb Use the new arrow and variants to reduce duplication for pers
This was SVN commit r24912.
2021-02-13 23:52:56 +00:00
8c0adac8a4 Use the new arrow and variants to reduce duplication for ptol
This was SVN commit r24911.
2021-02-13 23:52:25 +00:00
e8cfcdb6e4 Use the new arrow and variants to reduce duplication for rome
This was SVN commit r24910.
2021-02-13 23:52:04 +00:00
3da97821e7 Use the new arrow variants to reduce duplication for spart
This was SVN commit r24909.
2021-02-13 23:51:34 +00:00
808af6148f Unify sele damage level by using variants. Use the new arrow variant to reduce duplication
This was SVN commit r24908.
2021-02-13 23:50:50 +00:00
7697615fb4 Unify cart damage level by using variants. Use the new arrow variant to reduce duplication
This was SVN commit r24907.
2021-02-13 23:50:16 +00:00
1141c060f4 Add a variant for projectiles for bolt artillery and normal arrows.
This was SVN commit r24906.
2021-02-13 23:49:21 +00:00
7c2be449de Fix attack notifications with buildings
Differential Revision: https://code.wildfiregames.com/D3566
This was SVN commit r24904.
2021-02-13 21:31:16 +00:00
0b432e7c9c Replace background color of trees by an average color to remove artifacts on filtering, flickering on some cards (when a background color leaks to the main color).
Script by: @Vladislavbelov
This was SVN commit r24902.
2021-02-13 17:48:29 +00:00
2c67a569c0 Replace background color of bushes by an average color to remove artifacts on filtering, flickering on some cards (when a background color leaks to the main color).
Script by: @Vladislavbelov
This was SVN commit r24901.
2021-02-13 17:47:55 +00:00
fc39ff52fc Fix player+AI setup in MP gamesetup
Data race introduced in 612515a163.

Reported by: Langbart
Fixes #6020

Differential Revision: https://code.wildfiregames.com/D3564
This was SVN commit r24900.
2021-02-13 17:34:24 +00:00
6085d14ca9 Increase the cose of cavalry/infantry levy techs.
Patch by: borg-
Differential Revision: https://code.wildfiregames.com/D3458
This was SVN commit r24898.
2021-02-13 16:48:17 +00:00
Angen
16fc7bb2de [Petra/AI] Handle permadeaths for heroes hotfix
caused by a79a47effe and de3ed2cd19 petra will be blocked by not being
able to train hero again as she does not do rotations.
add check for matchlimits reached for permadeaths
more propper solution to handle training with numbers greater than 1
will be needed in the future.

Differential revision: D3559
Accepted by: @Freagarach
This was SVN commit r24897.
2021-02-13 11:38:58 +00:00
fba69b2672 Fix this.capacities not always existing when processing value modification messages.
692e236499 assumed that `this.capacities` would always exist, but that
proved incorrect, in particular if a value modification message is sent
before ownership change is processed.

Fix that by initializing them on init.

Reported by: Langbart
Fixes #6019

Differential Revision: https://code.wildfiregames.com/D3562
This was SVN commit r24896.
2021-02-13 10:52:17 +00:00
674cdae166 Fix issues with formation + packing.
- e7e218a3bc contained a small mistake: this.order wasn't cleared when
clearing the orderqueue, which led to a broken codepath in
PushOrderFront.
- Since 71a61d5f50, formation orders their members to reform in IDLE.
This will automatically pack any unpacked siege.

Reported by: langbart
Tested by: langbart
Fixes #6018

Differential Revision: https://code.wildfiregames.com/D3561
This was SVN commit r24895.
2021-02-13 10:08:10 +00:00
f175bc4f8d Fixes big screenshots with water (reflection or refraction camera), adds big screenshot customization.
Commented By: Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D3557
This was SVN commit r24891.
2021-02-12 21:20:07 +00:00
44dc2ca6f2 Reduce the normal strength. the default is way too big.
This was SVN commit r24890.
2021-02-12 14:14:35 +00:00
bc30f422c0 Disable Parallax for new trees. Parallax isn't really visible anyway, and the work should be covered by the normal map. It's also very performance costly.
Add a fallback material for the basic_trans_wind_parallax_spec.xml so it
default to a less costly one on lowest settings.

Rename basic_trans_wind_parallax_spec.xml to
basic_trans_wind_norm_spec.xml to reflect there is no parallax disabled.

Discussed with @vladislavbelov.

This was SVN commit r24889.
2021-02-12 14:06:37 +00:00
6e0d90b67b Fix clear command in lobby.
Missed in f78d3ddf71.

Noticed by @Langbart
Differential revision: D3556
Reviewed by: @Angen
Fixes: #6008

This was SVN commit r24888.
2021-02-12 10:32:07 +00:00
4d083660aa Fix kushite buildings death variants, Noticed by @Edwarf.
Add smoke to the gaul cc

This was SVN commit r24884.
2021-02-11 18:57:14 +00:00
0f3d4a30a0 Fix some ptolemies death variants, Noticed by @Edwarf
This was SVN commit r24883.
2021-02-11 18:56:30 +00:00
95b0407388 Fix macedonian buildings death variants, Noticed by @Edwarf
This was SVN commit r24882.
2021-02-11 18:55:55 +00:00
2d288a3b11 Fix mercenary camps death variants Noticed by @Edwarf
This was SVN commit r24881.
2021-02-11 18:51:14 +00:00
b5c7611860 Fix incorrect mercenary icon. Noticed by @Edwarf
This was SVN commit r24880.
2021-02-11 18:49:14 +00:00
037f2b71c4 Fix Spartan destruction variants not having smoke use the variant.
This was SVN commit r24879.
2021-02-11 14:56:42 +00:00
34da01301c Introduce destructions variants and use them to clean structures death variants.
- Remove unused decals as the rubble takes over
- Add destruction smoke to most buildings
- Fix very small destruction smoke for gates
- Fix fortress props "popping up" when ranges and arsenals are
destroyed.

This was SVN commit r24878.
2021-02-11 13:18:29 +00:00
c61ea0334b Fix some icons on borg-'s request
This was SVN commit r24877.
2021-02-11 11:23:20 +00:00
183377c302 New sling sounds
Patch by: @Samulis
This was SVN commit r24874.
2021-02-11 00:21:33 +00:00
02f8d1739f Reduced metallic impact for all melee sounds, blended existing sword sounds into sword attacks.
Patch by: @Samulis
This was SVN commit r24873.
2021-02-11 00:20:45 +00:00
98d60dab18 Improve training sounds for merchants and priests
Patch by: @Samulis
This was SVN commit r24872.
2021-02-11 00:17:58 +00:00
0ee2399458 Increase the difference between the chopping and building sounds
Patch by: @Samulis
Reported by: @Badosu
This was SVN commit r24871.
2021-02-11 00:16:13 +00:00
e7e218a3bc Fix no-formation orders after several formation orders.
When giving several queued formation-walk orders, then a queued
non-formation order (such as gathering), the gather order would be
silently dropped. This did not happen if only one formation-walk order
was given, which is why this issue was not noticed in 59d0885d68

To fix it, explicitly only drop pre-"leave formation" orders in the
queue for formation members.

Reported By: faction02
Differential Revision: https://code.wildfiregames.com/D3550
This was SVN commit r24869.
2021-02-10 19:23:39 +00:00
11fde58751 Fix positioning of the research progress icons below the counters overlay
Bug found by: ffffffff
Differential Revision: https://code.wildfiregames.com/D3525
This was SVN commit r24868.
2021-02-10 16:59:50 +00:00
8ea4f3186c Allow capture when falling back to "WalkAndFight" in COMBAT.APPROACHING
COMBAT.APPROACHING will fallback to WalkAndFight if the order is forced
and the movement fails (happens e.g. on target death).
That behaviour was added in 5568bd4c16 (and tweaked in d9c6879450), to
make the unit move to the general position asked by the player as a
fallback.
However, it did not allow capture, which meant units would occasionally
start attacking structures, instead of capturing (the default).
This makes that fallback allow capture in all cases, which is generally
more expected than the reverse.

Fixes #6003

Differential Revision: https://code.wildfiregames.com/D3548
This was SVN commit r24866.
2021-02-10 13:49:13 +00:00
e94e1f1fcf Better fix for formation waltzing, revert 5d96346ac5.
5d96346ac5 proved unsufficient to fix formation 'waltzing'. This is a
better fix, which makes sure units actually try to reach their
designated offset in the first place.
Further, it removes code that recalculated offsets un-necessarily, which
led to an issue with "sloppy" formations such as open and closed orders.

Fixes #5997

Differential Revision: https://code.wildfiregames.com/D3543
This was SVN commit r24865.
2021-02-10 09:59:39 +00:00
06639a0383 Ignore MoveToChasingPoint orders when not chasing.
Reported By: Freagarach
Reviewed By: Angen
Fixes #6002

Differential Revision: https://code.wildfiregames.com/D3547
This was SVN commit r24863.
2021-02-10 08:14:38 +00:00
Angen
f1e812bc32 Reuse the same formation controller when formationtemplate does not change
When reforming manually, the case of formation template beeing the same
was ignored what resulted in creating new formation controllers.

Differential revision: D3542
This was SVN commit r24859.
2021-02-08 18:39:26 +00:00
f222dd2d3e Make pages relying on hotkeys more resilient
Reviewed by: @wraitii
Differential Revision: https://code.wildfiregames.com/D3541
This was SVN commit r24856.
2021-02-08 13:56:40 +00:00
a4c698ac48 Fix units restarting orders when tasked to attack/gather/repair/heal same unit.
FSM states would be left/re-entered, resetting the timer, which did not
happen pre a16e7c0a56 and is undesirable in general.
This explicitly checks for a few cases where timers are relevant.

Essentially a Patch by: Freagarach
Differential Revision: https://code.wildfiregames.com/D3531
This was SVN commit r24855.
2021-02-08 10:20:34 +00:00
831e4a183f Fix a crash in the mod selector when using the mod downloadder.
When closing the mod downloader, the list of enabled mod is reset, which
can lead to an out-of-index assertion failing in the engine if an
enabled mod was selected before.

Reported by: Vas
Fixes #6001

Differential Revision: https://code.wildfiregames.com/D3537
This was SVN commit r24854.
2021-02-08 10:13:06 +00:00
612515a163 Debounce gamesetup network messages & slider changes to avoid lag.
Gamesetup Net synchronisation messages are sent on any change, which
includes slider changes. They can be quite slow for clients to process,
so it makes sense to introduce some 'debounce' here. I picked 400ms
somewhat arbitrarily.

Sliders also call UpdateGameAttributes, which can also lag, so run it
only once per 50ms at most.

Reported by: nani
Differential Revision: https://code.wildfiregames.com/D3536
This was SVN commit r24852.
2021-02-07 18:00:57 +00:00
65195211a8 [gameplay] Reduce iberian fireship attack
86ddf09640 had buffed them by giving them Fire damage, which ships have
no resistance against. This made the too strong.

Patch By: Feldfeld
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D3538
This was SVN commit r24851.
2021-02-07 15:59:54 +00:00
Angen
ab2fb3e6b0 [gameplay-a24] Tweak elephant stable building time
As pointed out by Edwarf in the forum post, the elephant stable is
rather expensive compared to the arsenal (both are city-phase
structures).
This patch keeps the elephant stable's resource costs unchanged (it is
visually larger than the other three military structures), but lowers
the building time from 240 s to 180 s.

Differential revision: D3515
Reviewed by: @borg-
Patch by: @Nescio
This was SVN commit r24850.
2021-02-07 12:56:59 +00:00
Angen
819db85ab6 [gameplay-a24] Make unlock_spies technology cheaper
As pointed out by Edwarf in this forum post, the espionage technology is
rather expensive. This patch removes the wood and stone costs and
reduces the research time.

Differential revision: D3516
Reviewed by: @borg-
Patch by: @Nescio
This was SVN commit r24849.
2021-02-07 12:53:23 +00:00
Angen
8135928ff4 Fix wrong selecting of the match when updating list introduced in 1a8de6d2b8
hostUsername is member of stanza
stanza does not have gameName but name

Reviewed by: @wraitii
Differential revision: D3524
This was SVN commit r24848.
2021-02-07 12:50:42 +00:00
d88db989a0 Reduce interline space for lobby/gamesetup chats.
Post f78d3ddf71, chat uses a list, which has natively a larger interline
space.
This introduces a new style to revert to A23-like interline, making chat
denser and better looking.

Patch By: nani
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D3533
This was SVN commit r24846.
2021-02-07 11:18:21 +00:00
d17079a640 Fix Phoenician Trireme
Reviewed by: Freagarach
Fixes: #5998
Differential Revision: https://code.wildfiregames.com/D3526
This was SVN commit r24843.
2021-02-06 20:30:07 +00:00
b3cbee6ba9 Performance improvements to VertexBuffer.
Patch By: dm
Tested By: OptimusShepard, Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D2528
This was SVN commit r24834.
2021-02-04 23:26:37 +00:00
6dba34e915 Fix team population in summary graphs.
Introduced in 57d0e7bd96, missed in 9145e03bf5.

Differential revision: D3519
This was SVN commit r24832.
2021-02-04 17:40:47 +00:00
3ea0e0c903 Use power-of-two sized image in Catafalque page
Should fix concern raised on a30c4a69f7 raised by @vladislavbelov


Differential Revision: https://code.wildfiregames.com/D3332
This was SVN commit r24829.
2021-02-04 00:38:05 +00:00
333f7b4fb4 Fixes building snapping for non-square foundations. Fixes #5976
Tested By: Freagarach, Langbart, Stan
Differential Revision: https://code.wildfiregames.com/D3510
This was SVN commit r24827.
2021-02-03 17:03:44 +00:00
90d39107a7 Fix Z-fight in the menu
Fixes 5657c5211b

Reported by: Vladislavbelov
Differential Revision: https://code.wildfiregames.com/D3494
This was SVN commit r24825.
2021-02-03 11:01:08 +00:00
5c71960883 Fix map browser scrolling
When hovering over the background, the scrolling was suddenly reversed
and could loop around.

Tested By: Langbart
Fixes #5993

Differential Revision: https://code.wildfiregames.com/D3514
This was SVN commit r24824.
2021-02-03 10:14:10 +00:00
1ae4f497e8 Fix noisy errors when joining hte lobby and someone is hosting a modded game.
Check for existence explicitly in the lobby GUI.
It would probably be better to not trigger errors in the cache
laoder/JSON code but instead print at the caller, depending, but that
requires changing a lot more code.

Reported by: Asger
Fixes #5988

Differential Revision: https://code.wildfiregames.com/D3506
This was SVN commit r24821.
2021-02-02 14:55:45 +00:00
6b2f16bbc2 [gameplay] - Reduce CS cavalry build time back to 16
Partial revert of 8df9d8dcc3. Following some testing, this build time
increase made early cav rushes too difficult.

Accepted by: borg-, FeldFeld, Valirhant
Reviewed By: Nescio
Differential Revision: https://code.wildfiregames.com/D3508
This was SVN commit r24820.
2021-02-02 09:49:42 +00:00
Angen
0c1a45259f React to Attacked message in IDLE when really idle
Issue described in #5945.
Unit finishing the order such as walking, will reach destination and if
attacked, imediately reacts to the attacker.
Hovewer, more desireble is for unit to look around since entering idle
state and pick the target if any using preference and then react to
attacker.
This issue rised up after finding of new targets have been moved from
enter to timer to avoid infinite loops after alwaysenterstate logic
removal.

Only downside here is unit will receive few hits before reacting as we
are waiting to the timer first. This happens only if unit goes idle.

Differential revision: D3504
Reviewed by: Freagarach
Comments by: wraitii
Fixes: #5945

This was SVN commit r24818.
2021-02-01 19:58:09 +00:00
11ed0fd619 Alpha name V3.
Like the rocket. Lets get this over with.

Patch by: @Nescio
Differential revision: D3498
This was SVN commit r24808.
2021-01-29 14:38:46 +00:00
884b55c124 Correct transliteration of A24 name
The last vowel is long.
(SF has been accidentally broken this morning).

Reported by: Nescio
This was SVN commit r24806.
2021-01-29 11:19:25 +00:00
5701ffccf8 [gameplay] Adjust cavalry movement speed and melee attack range.
Nerf cavalry movement speed somewhat, by reducing walk speed and their
run multiplier.

Further, following 6a66fb8205, units have a chance of going through
their target when chasing them. This diff adjusts melee cavalry ranges
from 4 to 6 to reduce the probability of that happening. The speed
reduction also helps with this.

Refs #5936

Differential Revision: https://code.wildfiregames.com/D3483
This was SVN commit r24802.
2021-01-27 21:22:40 +00:00
8df9d8dcc3 [gameplay] A24 Cavalry build time increase / speed tech cost increase
Slight debuff for cavalry: increase their build time but slightly above
10%, and increase the cost of the +10% movement speed technology.

Accepted By: FeldFeld, borg-, Nescio
Differential Revision: https://code.wildfiregames.com/D3476
This was SVN commit r24799.
2021-01-27 17:54:00 +00:00
847f3a9995 Check for movement success/failure on turn start.
Unit Motion currently checks if the unit is at destination during the
MT_Update_Motion* step, which happens late in the turn (notably, after
Timer.js) and moreover happens while entities are being moved (e.g.
entities with lower IDs have moved already, entities with higher IDs
have yet to do so).

This changes UnitMotion to instead check at turn start, which:
- benefits from in-turn path computations for more fluid movement
- ensure that distance checks aren't done against an entity that has
already moved for the turn.

The latter issue led to units failing to get in range of their target
when chasing them, in some situations.

As a side effect, this means that UnitAI move requests always take one
turn to succeed, so orders should be updated to check for range (or
they'll waste a turn). This is done for garrisoning, other orders were
already doing so.

Also includes a small tweak to avoid units rotating randomly when they
have no movement to accomplish.

Patch by: bb
Reviewed By: wraitii
Refs #5936

Differential Revision: https://code.wildfiregames.com/D3230
This was SVN commit r24797.
2021-01-27 15:11:57 +00:00
Angen
c2155e31c0 Add private and public icons to the game list
Display locked icon for matches with password, unlocked otherwise.
This should help players to avoid clicking to the locked matches, when
they do not know password.

Differential revision: D3480
Fixes: #5949
Comments by: Stan, Freagarach, wraitii, borg
This was SVN commit r24795.
2021-01-26 20:30:20 +00:00
Angen
16a91c37e9 Limit possibility of brute force attacks when guessing password
As suggested by elexis, 1a8de6d2b8 should get some protection against
brute force attacks on password.

This is supposed to prevent attackers from getting connection data by
guessing the password.

Each failed attempt increases the counter.
XmppClient on the server side checks for the users with certain number
of failed attempts, determined in CNetServer, and refuses to check the
password, answering with banned message.
So they cant guess again in given match. Effect of this block will
dissapear after new match is created.

Differential revision: D3467
Comments by: wraitii, Stan
Tested by: Stan, Freagarach
Ref: #5913

This was SVN commit r24794.
2021-01-26 20:20:48 +00:00
515d34d277 Hotkey editor fix: don't modify hotkeys in place.
The hotkey editor could modify hotkeys despite the changes being
cancelled.

Refs #2604, Fixes #5982

Differential Revision: https://code.wildfiregames.com/D3481
This was SVN commit r24793.
2021-01-26 16:44:53 +00:00
5d99cb4580 Fix some icons issues.
- Mercenaries should be green.
- Cart super dock icon used an old background
- Due to the reduced panel icon size it was easy to confuse the stables
with the barracks
- Due to the reduced panel icon size it was easy to confuse the corral
with the farmstead.png

Reported by: @wraitii @borg-
This was SVN commit r24792.
2021-01-26 11:08:01 +00:00
1edaeedfab Fix StandGround freezing units.
Units no longer stop when ordered to stand ground. Use the Stop
command/hotkey instead.

Reviewed By: Freagarach
Fixes #5975

Differential Revision: https://code.wildfiregames.com/D3463
This was SVN commit r24791.
2021-01-26 09:29:49 +00:00
44f5c6ff50 New public key for A24 mods.
Reviewed By: Stan
Differential Revision: https://code.wildfiregames.com/D3471
This was SVN commit r24788.
2021-01-25 17:31:25 +00:00
7bbd351c67 Alpha 24 name: Xšayaṛša
Per team survey & many suggestions in the forum.

Differential Revision: https://code.wildfiregames.com/D3474
This was SVN commit r24787.
2021-01-25 17:31:11 +00:00
08afe8950d Fix persian cav archer being a Chariot.
Forgotten in 5063adb30f.

Reviewed By: Stan
Differential Revision: https://code.wildfiregames.com/D3477
This was SVN commit r24786.
2021-01-25 16:36:35 +00:00
Angen
32bea42e68 Fix invalid variable used in getConnectionFailReason
Introduced in 0342f01580.
Reported by: @Stan
This was SVN commit r24783.
2021-01-24 17:59:55 +00:00
Angen
04a7d95eff Limit gather rate tooltip to 2 decimal places
Gather rates are not rounded, so after some modifiers are applied, they
appear as ugly decimal numbers.
Limiting them into 2 decimal places for readability and it looks nicer.

Differential revision: D3460
Reviewed by: @wraitii
This was SVN commit r24782.
2021-01-24 15:28:13 +00:00
5b367ac37e Fix some issues found by @GunChleoc
This was SVN commit r24780.
2021-01-24 11:36:58 +00:00
6ebf8309e2 Increase outpost base vision to 10
Outposts have a vision range of 4. This however does not always reveal
FoW around them, which looks rather odd (see D3054).
Give them 10 vision so that it's obvious they are working, and clarify
the tooltip that garrisoning is needed to make them helpeful.

Fixes #5974

Differential Revision: https://code.wildfiregames.com/D3464
This was SVN commit r24779.
2021-01-24 11:02:00 +00:00
ae18a5474c Reduces shadow biases for landscape shaders.
Tested By: Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D3457
This was SVN commit r24777.
2021-01-23 19:40:58 +00:00
93a352ad16 Fix UnitAI range queries - allow queries to ignore sizes - partial revert of d0fc8ff67d
Units sometimes ignored targets that entered their LoS. The cause is
d0fc8ff67d: range queries returned units farther away, and those units
might actually be out of range if distance is computed center-to-center,
which both UnitAI and LOS do. This meant that code relying on range
query updates was possibly broken, and indeed units missed things (see
ticket).

This introduces a boolean to switch between pre-d0fc8ff67d behaviour
(entity-as-point, center-to-center range queries) and post-d0fc8ff67d
(entities-as-circumscribing-circle, edge-to-edge range queries).
The former is used for UnitAI (where the new behaviour bugged), auras
(where varying structure sizes made it awkward) and build
restrictions(which simply did not really need it).

Reverts 7f1ee23d88, 050c5401b1 (with the exception of the iber monument
footprint), and the template changes in d0fc8ff67d itself.

It also reduces alertRaiser ranges slightly, this was missed in the
original diff.

#3381 is not reopened as BuildingAI still uses the new range queries.

Reported by: Freagarach
Comments By: Angen
Fixes #5968

Differential Revision: https://code.wildfiregames.com/D3456
This was SVN commit r24776.
2021-01-23 18:57:46 +00:00
Angen
498f5eb083 Fix cheering issue entering from idle state
Introduced in e543b01077.
Units entering cheering from idle state, may not check their surrounding
for pottential targets yet, so they will react incorrectly when
attacked.
Pointed out by @Freagarach in
https://code.wildfiregames.com/D1977?id=10404#inline-52415 and turned
out to be issue.

Differential revision: D3455
Fixes: #5966
Reviewed by: @wraitii
This was SVN commit r24774.
2021-01-23 15:07:15 +00:00
55f741e644 Fix issues with Cheering and PushOrderFront
Make sure that any pending cheering order is deleted when leaving the
Cheering state, otherwise other unitAI states can behave weirdly.

This fixes issues with units cheering at incorrect time, then not
correctly picking their next target in a fight.

Reported by: snelius
Reviewed By: Angen
Refs #5966

Differential Revision: https://code.wildfiregames.com/D3452
This was SVN commit r24773.
2021-01-23 14:08:41 +00:00
59af6a9c46 Fix hero cavalry spearman bonus
Missed in D3256 / 61236cae5b

Patch by: borg-
Differential Revision: https://code.wildfiregames.com/D3453
This was SVN commit r24772.
2021-01-23 14:01:35 +00:00
8addf36ba8 Fix error in GATHERING when disbanding formation while members gather.
Since 59d0885d68, there is a "LeaveFormation" order to support
queued-disbanding. However, I misread the code paths and FinishOrder()
isn't always called.
This fixes that oversight.

Reported by: Freagarach
Differential Revision: https://code.wildfiregames.com/D3450
This was SVN commit r24771.
2021-01-23 08:07:56 +00:00
Angen
7b6ff0745a [Petra/Ai] Fix not researching free and instant technologies
When Petra encounters free technology or technology with no
researchtime, she will not start it and blocks the queue.
Also fixing seleucids.

Differential revision: D3388
Reviewed by: @wraitii
Comments by: @Freagarach, @Stan
This was SVN commit r24769.
2021-01-22 20:58:34 +00:00
e7e6fe139e Allows to override GL version for SDL.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D3448
This was SVN commit r24768.
2021-01-22 19:40:02 +00:00
0ce8efc286 Small icon changes, use a custom icon for the gallic plow
This was SVN commit r24767.
2021-01-22 19:28:52 +00:00
d92feab275 Fix target height computation when launching projectiles.
The Y coordinate at which to fire a projectile is currently assumed to
be the target's current Y, which is incorrect if the target is moving on
a slope.
This fixes that.

Note that this was purely visual, since projectiles still hit the target
regardless, as the height component is totally ignored, even if the
projectile is underground (in fact, the projectile's position is not
known in DelayedDamage::MissileHit, which just assumes it lands where it
said it would when fired).

As noted by bb in f737831167

Fixes #5939

Differential Revision: https://code.wildfiregames.com/D3425
This was SVN commit r24766.
2021-01-22 18:16:13 +00:00
6b05cc9d3c Fix AI undefined error from garrisoned entities.
Introduced in 9e96bca85e.

Reported by: Freagarach
Fixes #5960

Differential Revision: https://code.wildfiregames.com/D3451
This was SVN commit r24765.
2021-01-22 17:35:45 +00:00
9ae6f904ad Fix the non merc rhompaia having a green color
Patch by: @borg-
Differential Revision: https://code.wildfiregames.com/D3449
This was SVN commit r24761.
2021-01-22 09:19:48 +00:00
993ccc6034 [PetraAI] - Teach PetraAI to fear fire.
In 86ddf09640, fire damage was introduced for the Iberian fire ship (and
the Theban fire raiser), this adds that damage type to the config of
PetraAI.
Poison (a24c8419c5) is only used in Status Effects (which PetraAI
doesn't understand anyway) so is not added.

Differential revision: D3432
Reviewed by: @Angen
This was SVN commit r24758.
2021-01-22 06:32:03 +00:00
1a218ec4fd Fix game speed multiplier sometimes being outside overlay box and resizing in a strange way.
Reviewed by: Freagarach
Trac Tickets: #5924
Differential Revision: https://code.wildfiregames.com/D3391
This was SVN commit r24755.
2021-01-21 17:37:23 +00:00
9145e03bf5 Fix values of miscellaneous summary tab shifted.
Introduced in 57d0e7bd96. Caused by incomplete filtering.

Differential revision: D3340
Fixes: #5946
Reviewed by: @wraitii
Tested by: @Langbart
Comment by: @toonijn
Suggestions from: @Imarok

This was SVN commit r24754.
2021-01-21 17:12:56 +00:00
920181b838 Fix texture bleeding on sele CC.
Reported by: @gameboy
Thread:
https://wildfiregames.com/forum/topic/35564-msaa-anti-aliasing-has-no-effect/

This was SVN commit r24753.
2021-01-21 16:07:11 +00:00
8c429b9a68 Fix unit-only Attack move.
attackmoveUnit is more specific than attackMove, so since d0a42f2f00
won't fire at the same time. However the GUI code expected that,
breaking it.

Instead, properly check for either attackmove or attackmoveUnit.

Also fix an issue with d0a42f2f00 where hotkeys would be release if
switching to a more specific combination of the same hotkey.

Reported by: snelius
Fixes #5944

Differential Revision: https://code.wildfiregames.com/D3436
This was SVN commit r24752.
2021-01-21 15:58:33 +00:00
b28e6fda42 Fix PreferredClasses following 1f2286305d
1f2286305d introduced a "Unit+!Ship" preferred class. However, Preferred
classes don't actually use MatchesClassList, and thus this resulted in
no preference whatsoever. This is fixed.

Further, Macemen & elephants have no particular preferred classes,
unlike all other land units which are either Unit+!Ship or Human (which
implies !Ship). This is fixed by setting them to !Ship, for consistency.

Reported by: snelius (and also Valirhant, I believe)
Trac Tickets: #5945

Differential Revision: https://code.wildfiregames.com/D3442
This was SVN commit r24751.
2021-01-21 14:34:08 +00:00
7a33d391cf Fix starting camera on Sicilia Nomad.
Since this map doesn't have CCs, camera would not work see
7cf83f19fd#inline-5512
Refs: 7cf83f19fd

This was SVN commit r24750.
2021-01-21 13:35:27 +00:00
541fdd3f90 Fix string issues in edecd14b7b
(see edecd14b7b)

Reviewed By: Nescio, borg-
Differential Revision: https://code.wildfiregames.com/D3434
This was SVN commit r24749.
2021-01-21 12:17:14 +00:00
2b4ce98fee Fixes translation error in 5cc49c2326/https://code.wildfiregames.com/D1808
Noticed by: @Edwarf
This was SVN commit r24748.
2021-01-21 12:16:10 +00:00
ae5ef6d898 Add back the camels to the tutorials.
Fixes: #5951
Reported by: @Freagarach
Refs: c72861b708, 4981cdedad

This was SVN commit r24747.
2021-01-21 11:53:01 +00:00
d85a73fabf Fixes simple ARB water after 9df127f9d1. Completely removing losMatrix usages. Fixes #5952
This was SVN commit r24746.
2021-01-21 11:35:20 +00:00
4af962618e Add Shift+Space as an alternative Pause hotkey
Mac keyboards have no "Pause" button. As an alternative, introduce
'Shift+Space' (used in Factorio).
P is already used for Patrol.

Reported by: langbart
Fixes #5943

Differential Revision: https://code.wildfiregames.com/D3435
This was SVN commit r24743.
2021-01-21 09:31:50 +00:00
b7000b373a Refactors water_high shader, cleanups water changes after 9df127f9d1.
This was SVN commit r24739.
2021-01-20 22:36:11 +00:00
6e8208aee6 [gameplay] Buff Iber champion cavalry damage
With the new 'fire' status effect, the damage against buildings was much
lower than in A23. This upgrades it from 2 to 6.

Reported by: soloooy0
Patch by: borg-
Differential Revision: https://code.wildfiregames.com/D3430
This was SVN commit r24738.
2021-01-20 21:44:02 +00:00
5db90dd8ab Upgrade ship_movement_speed / tower_health icons
Patch by: borg
Differential Revision: https://code.wildfiregames.com/D3302
This was SVN commit r24737.
2021-01-20 21:39:54 +00:00
2daec55dcd Fix attack notification (a3eccc043d)
Reviewed by: Freagarach
Differential Revision: https://code.wildfiregames.com/D3387
This was SVN commit r24736.
2021-01-20 21:00:40 +00:00
06c570bf7b Fix game speed button being unusable in min resolution
Reviewed by: ffffffff
Fixes: #5926
Differential Revision: https://code.wildfiregames.com/D3389
This was SVN commit r24735.
2021-01-20 20:48:50 +00:00
9df127f9d1 Removes shader code duplication to calculate LOS.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D3428
This was SVN commit r24732.
2021-01-20 18:46:32 +00:00
Angen
71eaeb853c Fix not applying modifiers on upgrades in structure tree
When one hovers over gate in structure tree (e.g. gauls), it shows
unmodified hp.
As soon as one opens template viewer, one can see correct values.

Reason is that when getting values of upgrades, civ modifiers are not
applied.

Differential revision: D3427
Reviewed by: @wraitii, @s0600204
This was SVN commit r24730.
2021-01-20 18:42:40 +00:00
3d4d617079 [gameplay] Tweak Maurya worker elephant
Maurya players had little incentive to build further support elephants.
This reduces their cost to make it more interesting for players.
It also reduces their Resistance, which was un-naturally high for a
support unit.

Patch by: FeldFeld
Accepted by: borg-
Differential Revision: https://code.wildfiregames.com/D2852
This was SVN commit r24729.
2021-01-20 18:34:09 +00:00
Angen
1a8de6d2b8 Hide ip and port from users until they want to join, add optional password
Current issue with the lobby, is that we make ips of hosts public for
anyone to read. This patch consists of 3 parts.
1.) Removing ips and ports from lobby javascript
2.) Removing need of script on the server to attach public ips to game
stanza by asking the host using xmppclient as proxy.
3.) Implementing password protected matches, to deny this information to
not trusted players.

Further description:
Do not send ports and stunip to the bots.

Removed from stanza.
Do not send ip to the lobby.

Removed from mapping gamelist from backend to gui (still on the backend
side, because it is done by script on 0ad server).
Get ip and ports on request when trying to connect.

On the host side, ask stun server what is host's public ip and remember
it.
On the client side, send iq through xmppclient to the hosting player and
ask for ip, port and if Stun is used, then if answer is success,
continue
   with connecting, else fail.
Add optional password for matches.

Add password required identifier to the stanza.
Allow host to setup password for the match. Hash it on the host side and
store inside Netserver. If no password is given, matches will behave
as it is not required.
On the client side, if password for the match is required, show
additional window before trying to connect and ask for password, then
hash it
and send with iq request for ip, port and stun.
Server will answer with ip, port and stun only if passwords matches,
else will asnwer with error string.
Some security:
Passwords are hashed before sending, so it is not easy to guess what
users typed. (per wraitii)
Hashes are using different salt as lobby hashing and not using usernames
as salt (as that is not doable), so they are different even typing the
same password as for the lobby account.
Client remembers which user was asked for connection data and iq's id of
request. If answer doesn't match these things, it is ignored. (thnx
user1)
Every request for connection data is logged with hostname of the
requester to the mainlog file (no ips).
If user gets iq to send connection data and is not hosting the match,
will respond with error string "not_server".
If server gets iq::result with connection data, request is ignored.

Differential revision: D3184
Reviewed by: @wraitii
Comments by: @Stan, @bb, @Imarok, @vladislavbelov
Tested in lobby

This was SVN commit r24728.
2021-01-20 18:31:39 +00:00
a30c4a69f7 Commit the actual images for bbd808349f
(Cursed `arcanist`)


Differential Revision: https://code.wildfiregames.com/D3332
This was SVN commit r24727.
2021-01-20 15:17:20 +00:00
bbd808349f Add a "Catafalque Bonuses" page
Permitting easy(ish) comparison of the bonuses granted by each civ's
Catafalque unit.

Accessible from the Main Menu's "Learn to Play" submenu.


Accepted by: @Freagarach
Comments by: @wowgetoffyourcellphone
Screenshot: https://code.wildfiregames.com/F1785729
Differential Revision: https://code.wildfiregames.com/D3332
This was SVN commit r24726.
2021-01-20 15:12:08 +00:00
b5bbed4690 [gameplay] Rework attack forge techs
Follow up to D3287/9a3da390b9.
- Remove the specialised infantry/cavalry attack technologies, in favour
of generalist melee/ranged techs to make it easier to switch army
compositions.
- Lower the costs of the technologies substantially.
- Make melee techs cost Food/Metal and Ranged techs Wood/Metal, like
resistance techs.
- City phase upgrades take 60s
- New names and descriptions for the ranged attack technologies.

Initial patch by @borg-, rebased and updated by @Nescio.

Differential Revision: https://code.wildfiregames.com/D3366
This was SVN commit r24725.
2021-01-20 14:23:16 +00:00
406ce2f5e2 Fix error emitted if an Observer opens structree/civinfo via hotkey
This was SVN commit r24724.
2021-01-20 14:11:48 +00:00
78bf609986 Correct grammar in tooltip
Whilst "merely" *is* in the thesaurus as a synonym for "only", it
doesn't work
in this context.

This was SVN commit r24723.
2021-01-20 13:50:33 +00:00
edecd14b7b [gameplay] Update siege techs.
A23 siege techs were rarely used. This:
- Lowers the cost of the attack tech slightly.
- Remove the cost techs which were not very useful or interesting.
- Rework the armor tech into a Health bonus
- Introduces a tech to pack/unpack faster.

Patch By: borg-
Accepted By: Feldfeld
Differential Revision: https://code.wildfiregames.com/D2878
This was SVN commit r24722.
2021-01-20 09:44:30 +00:00
57d0e7bd96 Add resource and population counts to the summary screen.
Patch by: @toonijn
Differential revision: D3395
Fixes: #4554
Reviewed by: @Freagarach, @wraitii
Comments by: @Angen, @Imarok, @Stan
This was SVN commit r24721.
2021-01-20 09:24:26 +00:00
3731886e2c [Gameplay] - Make gather technologies less effective.
Since they were deemed too powerful.

Patch by: @Nescio
Differential revision: D3404
Reviewed by: @Feldfeld, @wraitii
Reservations by: @borg-
Comments by: @Stan
This was SVN commit r24719.
2021-01-20 08:08:34 +00:00
5ee16b6d65 [Gameplay] - Remove starting hoplite from Spartans.
Deemed too overpowered.

Patch by: @Nescio
Differential revision: D3426
Reverts 214299b6c1

This was SVN commit r24718.
2021-01-20 07:15:18 +00:00
a9b1474d4c Armour -> Resistance in aura descriptions.
Refs 0f91c5ac61.

Patch by: @Nescio
Differential revision: D3403
Comment by: @wraitii
This was SVN commit r24717.
2021-01-20 07:11:00 +00:00
ccce5719cc Update <civ>.json information.
Removed false information, added information that was missing.
Removed history of stronger Spartan women in the game.

Initial patch by: @ValihrAnt
Redone by: @Nescio
Cleaned in between by: s0600204
Differential revision: D2720
Comments by: @asterix, @badosu, @borg-, @elexis, @Stan, @wraitii
This was SVN commit r24716.
2021-01-20 07:08:08 +00:00
9ffeb02b8a Fix typo in intro.txt
This was SVN commit r24713.
2021-01-20 00:02:47 +00:00
4a2cc3273e [gameplay] Tweak Ranged spreads, reduce archer spread, tweak cosmetic stats.
The major change here is that Archer spread is reduced to 2 to make them
have much better aim than before at max-range, where they often missed.
This makes their DPS more predictable over their range.

This makes ranged unit's spread proportional between citizen soldiers,
advanced/elite CS, champions and heroes.

Because of the spread reduction and because promotion more strongly
reduces spread, the 10% spread reduction from the archery tradition
technology is removed.

Gravity values are tweaked.
LaunchPoint values are raised and standardised by unit type.

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D3374
This was SVN commit r24709.
2021-01-19 19:15:06 +00:00
9d82ae15af [gameplay] Fix chasing range cavalry
This fixes chasing, particularly chasing ranged cavalry.

- Standardise the range of melee cav to 4.
- Decreases the speed of ranged cavalry slightly to make melee cavalry a
better counter & reduce the ability of ranged cavalry to dominate an
area.
- Fix UnitMotion to better chase units, by increasing direct-range
distance and making "from scratch" short paths recompute better paths
(by increasing the search range).
- Gives some free rotation time for slight angles to units. Angles below
30° take no time to rotate towards. Chasing units that recomputed a lot
of paths could be slowed down substantially by minute angle differences.

Fixes #5936

Differential Revision: https://code.wildfiregames.com/D3402
This was SVN commit r24708.
2021-01-19 19:09:55 +00:00
7ec924107c Fixes RNC and RNG after merging terrain and unit ambient colors in 1cb4ee1634.
This was SVN commit r24706.
2021-01-19 18:54:07 +00:00
1311e22bb4 Add numbered icons for certain technologies.
Refs: D3404

This was SVN commit r24705.
2021-01-19 18:34:52 +00:00
e10202d64d Tweaks to the 'auto formation' feature.
- Add an option to control the 'null formation' override, so it can be
turned off/on independently of having a default formation set. It
defaults to "Walk/Patrol only".
- Make only 'walk' and 'patrol' orders use the default formation.

This makes the system more flexible, and easier to use for competitive
play.

Differential Revision: https://code.wildfiregames.com/D3413
This was SVN commit r24703.
2021-01-19 16:14:07 +00:00
f737831167 Use UnitMotion to predict target position in Attack.js to prevent 'dancing'
Attack.js can use UnitMotion to calculate the position of the unit in
the future, accounting for odd movements such
as zigzags, turnarouds and early stops (to the extent of the current
order).
This improves the resilience of units against the 'dancing' trick.

The linear interpolation is kept as a failsafe and to avoid an edge case
in the new prediction code.

Patch by: bb
Refs #5106

Differential Revision: https://code.wildfiregames.com/D3225
This was SVN commit r24701.
2021-01-19 15:59:03 +00:00
59b468a0df [Gameplay] - Increase Skiritai cost.
As pointed out by @Feldfeld, Spartan swordsmen are much better troops
than basic soldiers, yet hardly cost more. Moreover, 8e19745bba
practically doubled their gather speed (from 25% to 49%).
This raises their cost a bit, to a total of 125 resources, instead of
110. For comparison, basic infantry has a total cost of 100, champion
infantry 220.

Patch by: @Nescio
Differential revision: D3423
Reviewed by: @borg-, @wraitii
This was SVN commit r24700.
2021-01-19 13:55:47 +00:00
0ba74a5cef Minor Hotkey editor QoL: enable Save on changes only.
This enables the 'save' button only when there is (probably) something
to save. It improves the UX of using the editor since it gives feedback
that the hotkeys were indeed saved.

Refs #5867

Differential Revision: https://code.wildfiregames.com/D3419
This was SVN commit r24699.
2021-01-19 13:14:20 +00:00
60ac4543c1 [Gameplay] - Enable Cart apartment.
Basically a beefed up house.

Original patch by: @borg-
Redone by: @Nescio
Icon by: @Stan
Differential revision: D2917
Reviewed by: @borg-, @Palaxin,
Comments by: @Freagarach, @genava55, @wraitii
This was SVN commit r24697.
2021-01-19 11:05:12 +00:00
d42c76ceb7 Fix seleucid mercenary building the library after 04240f05a7
Fixes 04240f05a7

Reported by: Hidan
Differential Revision: https://code.wildfiregames.com/D3414
This was SVN commit r24696.
2021-01-19 08:54:07 +00:00
c777c11641 Delete obsolete ptol nubian archer
The Ptolemy have not used it since A21, and Kushites have a better
Nubian archer.

Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D3415
This was SVN commit r24695.
2021-01-19 08:51:16 +00:00
f1de414a6d Fix sound not played when being attacked by non-capture attacks.
Wrong assumptions on reviewing 2627714c07 and 7f7a3edfae made it such
that non-capture attacks did not play a being-attacked sound anymore.
We only want a different sound when being captured.

Differential revision: D3408
Tested by: @Stan
This was SVN commit r24694.
2021-01-19 07:22:27 +00:00
214299b6c1 [Gameplay] - Let Spartans start with a Champion.
The Kushites start their games with an healer, the Mauryas with an
elephant. The Spartans were known for their superior hoplites; this
patch gives them one champion infantry at game start, to make them feel
a bit different from other factions. It won't suddenly make them win
games, although it could help a bit defending against very early raids.
Somewhat relevant forum threads:
https://wildfiregames.com/forum/topic/35419-differentiating-civs-spartans/
and
https://wildfiregames.com/forum/topic/22868-rethinking-the-meta-with-sparta-a-historical-approach/?tab=comments#comment-338125.

Patch by: @Nescio
Differential revision: D3412
Reviewed by: @Palaxin, @wraitii
Reservations by: @ValihrAnt
Comment by: @borg-
This was SVN commit r24693.
2021-01-19 07:03:36 +00:00
77dc5ef955 [Gameplay] - Merge wonder population auras.
Since wonders already have many bonuses by default.
This merges the two population auras to one that increases the
population cap after researching the technology and instead of flat +50,
it now is relative: +20%.

Patch by: @Nescio
Differential revision: D2951
Reviewed by: @Palaxin
Comments by: @badosu, @borg-,
Reservations by: @bb, @Freagarach
This was SVN commit r24692.
2021-01-19 07:00:07 +00:00
11ef6b17d0 [gameplay] Tweak market technologies
- Remove movement speed technology, which was a straight trade bonus.
- Buffed health tech from +2 armour to +50% HP, moved to town phase,
made costlier.
- Changed gain of trade techs to +15% each.

The intent is to slightly reduce the snowballing effect from trade
techs.

Patch by: Nescio
Comments by: borg-
Differential Revision: https://code.wildfiregames.com/D3357
This was SVN commit r24690.
2021-01-18 20:23:21 +00:00
279f1823df [gameplay] Cleanup to / rebalancing of animal templates
All animals have the default resistance of 1H/1P/1C. This makes macemen
able to kill them again.
Damage has been reduced on some templates.
HP has been reduced across the board.
Fix the goat cost with respect to other domestic animals after
D3301/082bd8bd44.

Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D3397
This was SVN commit r24689.
2021-01-18 20:19:38 +00:00
c57a4d90a1 Fix segfault from a formation infinite loop.
#5932 reported a segfault. The direct cause is an infinite loop in
Order.Repair in a formation controller.
There are multiple issues at play here, but the core problem is that the
controller has been marked for destruction, but remains alive over the
turn and UnitAI timers can fire. This leads to an unexpected state that
triggers an infinite loop.

To avoid this problem, immediately switch the formation controller to a
clean state when it's being disbanded.

Fixes #5932

Differential Revision: https://code.wildfiregames.com/D3410
This was SVN commit r24688.
2021-01-18 18:29:40 +00:00
04240f05a7 [gameplay] Tweak mace, ptol, sele specific structures
- Make the library a Ptolemaic exclusive. The tech discount is 15%
unstackable.
- Enable Theater for Ptolemy & Seleucid, tweak stats.
- 'Hellenistic Metropolis' is now in the Civil Centre, and no longer
affects military colonies/crannogs.
- The Ptolemaic lighthouse no longer reveals all shores, instead simply
has a very large vision range. It's moved to City Phase.
- The Carthaginian super dock is moved to city pahse as well.

Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D3350
This was SVN commit r24687.
2021-01-18 18:19:11 +00:00
8172dbbde0 Fix lobby gamelist issues when clients join and leave a match.
This patch will:

  - Pass `gameRegisterStanza` to `playerAssignmentsControl` constructor.
  - Remove handlers for `onClientJoin` and `onClientLeave` from
`gameRegisterStanza` class.
  - Call `gameRegisterStanza` method `sendImmediately` only once after
all handlers have run and after updating g_PlayerAssignments .
  - Remove from `gameRegisterStanza` the dependency on
`playerAssignmentsControl` since the `onClientJoin` and `onClientLeave`
handlers are removed.

Reviewers: Angen, wraitii

Accepted By: wraitii
Trac Tickets: #5929, #5933

Differential Revision: https://code.wildfiregames.com/D3406
This was SVN commit r24686.
2021-01-18 16:47:25 +00:00
d583048690 [gameplay] Make siege engines uncapturable
Siege engines are faster to destroy than to capture. As such, capture as
a default is annoying, since it's not the best tactical choice.
Unfortunately, fixing this for now means removing "Capturable" from
siege engines.

Rams/Siege towers retain 50 Pierce Armour, others get 25.

Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D2493
This was SVN commit r24685.
2021-01-18 16:06:08 +00:00
82a07e23fb Fix MapBrowser in MP
Network settings must be synchronised when the map selection is
submitted. Fixes ae9ea5b859.

Reported by: Imarok
Differential Revision: https://code.wildfiregames.com/D3405
This was SVN commit r24684.
2021-01-18 13:22:06 +00:00
6062a95720 Fix Jebel barka's pmp file.
This was SVN commit r24683.
2021-01-18 13:02:38 +00:00
a5bad817a0 Fix mod selector "refresh list" button.
Object.Keys() on GUI object doesn't work following 7c04ea0211.

Reported by: Stan
Fixes #5931

Differential Revision: https://code.wildfiregames.com/D3399
This was SVN commit r24681.
2021-01-18 11:32:51 +00:00
58039b6017 [gameplay] Restore civic centre garrison healing
This was removed originally in D3264/eb1163b872.
It made early-game aggression less viable.

Approved By: FeldFeld, borg-, ValihrAnt
Differential Revision: https://code.wildfiregames.com/D3401
This was SVN commit r24680.
2021-01-18 11:21:35 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
ce9e965afd Remove population bonus from most non-house buildings.
Houses increase the population limit. Various other structures did it
too as a side-effect.
This changes that, making houses more unique.

This also removes the Gaul/Brit bonus that most buildings increased
population, as they already build structures 20% faster and that is
deemed a sufficient early-game advantage.

Accepted By: borg-
Differential Revision: https://code.wildfiregames.com/D2950
This was SVN commit r24623.
2021-01-15 09:19:08 +00:00
46a5b704ac Avoid GUI errors for captured structures with paired tech of different civ.
If there is a building that has a paired tech researchable, where the
two techs have a civ requirement but the parent pair tech doesn't, then
the selection panels will throw errors.
This has happened with add6b0206c,
https://wildfiregames.com/forum/index.php?/topic/24732-de-alpha-24/page/2/
and other incidences.
Now when both paired techs have an unmet civ dependency they are not
shown, when one of them hasn't, it is shown.

Fixes: #5915
Original patch by: @elexis
Changes by: @Freagarach
Differential revision: D2171
Comment by: @Imarok
This was SVN commit r24621.
2021-01-15 08:55:01 +00:00
6a871f7d3c Building snapping loading screen tip.
Since many players might not notice the new snapping feature
(a8f241da5d), a loading screen tip is nice.

Patch by: @elexis
Differential revision: D2545
Comments by: @bb, @Nescio, @vladislavbelov
Some minor changes by: @Freagarach
This was SVN commit r24620.
2021-01-15 08:47:31 +00:00
313bd29786 Add loading screen tip for heroes.
Because heroes permanently die (de3ed2cd19) it is nice to users of that.

Differential revision: D3294
Comments by: @Nescio, @Stan
This was SVN commit r24619.
2021-01-15 08:36:57 +00:00
0944856cc1 Allow hotkeys/config settings to be empty.
This changes ConfigDB to support empty settings, marked with `= ""`. It
also changes hotkey to handle unused hotkeys, but stil have them appear
in the hotkey editor.
Fixes an issue where the current editor would bug when saving an empty
hotkey.
Removes the old system for unused hotkeys, adjust hotkey files
accordingly.

Reported by: FeldFeld
Differential Revision: https://code.wildfiregames.com/D3307
This was SVN commit r24618.
2021-01-15 08:05:10 +00:00
e5bd8a7aa5 Fix Jebel Barkal giant.
Adjusts the jb.js to not try and place walls outside of the map.
Only adds really added walls to the entity list (refs. #5919).

Patch by: @elexis
Differential revision: D3299
Tested by: @Freagarach, @Stan
Fixes: #5177
Refs. #5150

This was SVN commit r24617.
2021-01-15 07:59:19 +00:00
03fa2f4728 [Gameplay A24] - Adjust elephant temlate values.
- Changes the Hero Elephant damage to twice that of Champion Elephants
(consistent with other classes).
- Reduces Champion Elephant crush damage resistance to the same of other
Champions.
- Give all elephants the same walk speed.
- Removed the bonus vs cav from GAIA elephants.

Patch by: @Nescio
Differential revision: D2853
Reviewed by: @borg-, @wraitii
Comments by: @Feldfeld
This was SVN commit r24615.
2021-01-15 07:49:35 +00:00
9c88071149 Fix gamesetup map size not updating for clients.
Clients don't get map size updates shown in the gamesetup (they do
appear in the description).

Tested by: Freagarach
Differential Revision: https://code.wildfiregames.com/D3351
This was SVN commit r24614.
2021-01-15 07:48:12 +00:00
8421ba77fb Fix PetraAI not building many houses.
Previous to 7f77cf2f3e the AI got its population bonus per entity from
the Cost component, which every entity happened to have.
Thereafter, the population bonus was handled by a separate component,
which was not always present leading to `(void 0)` additions to the pop
cap and PetraAI not constructing houses.

Differential revision: D3360
Reviewed by: @Angen, @wraitii
This was SVN commit r24613.
2021-01-15 05:59:23 +00:00
89060a3efa [Gameplay A24] - Enable elephant stables for all civs with elephants.
And moves elephant training thereto.
This means the Persians get to train them again, by popular demand.
Mauryas are not the only ones anymore that have the elephant stables,
but they can build it earlier.

Patch by: @Nescio
Differential revision: D3362
Reviewed by: @borg-
This was SVN commit r24612.
2021-01-15 05:53:26 +00:00
c064772609 Adjust subsection sizes of civinfo page
To better fit the content being displayed.

Patch by: @Nescio
Accepted by: @s0600204
Differential Revision: https://code.wildfiregames.com/D3295
This was SVN commit r24611.
2021-01-14 22:56:54 +00:00
346bd50c8c Do not show message box in lobby for an empty message with no sender.
Reviewed By: wraitii
Trac Tickets: #5348

Differential Revision: https://code.wildfiregames.com/D3354
This was SVN commit r24609.
2021-01-14 19:12:12 +00:00
86ddf09640 [Gameplay A24] - Drastically change artillery attacks.
Artillery is not that effective in 0 A.D., partly because their damage
per second is unimpressive (especially compared to rams or war
elephants), partly because of their splash damage.
Splash damage was added in f72d820cd4 (nearly eight years ago). The
values have changed multiple times, as has the exact calculation (see
simulation/components/Attack.js). While it's quite interesting in
theory, in practice it's not that effective. @fatherbushido explained
how it works on the forums. It's important to understand the actual
splash damage depends on the distance to the centre of entities, in
contrast to ordinary attacks, which do full damage when they hit the
footprint (edge).
Splash damage has some serious problems:
- It may have no effect vs entities with footprints longer than the
splash radius, such as many (most?) structures and warships.
- The AI does not take it into account.
- It's anachronistic: exploding shells did not exist yet in 0 A.D.'s
timeframe. Missiles were rigid objections, and even the very largest
projectiles were well under a metre in diameter.

This patch therefore removes splash damage from artillery (except bolt
shooters).
Fireships and fireraisers now deal fire damage instead of a combination
of other damage types.

Basically, stone throwers are good against large unit masses and
structures only, while bolt shooters are unit killers.
Artillery and bolt towers no longer get additional projectiles from
garrisoned units.
Roman artillery does not get a larger range but keeps the increased
damage.

Patch by: @Nescio
Differential revision: D2494
Reviewed by: @borg-, @wraitii
Comments by: @Angen, @Stan
This was SVN commit r24608.
2021-01-14 16:18:26 +00:00
c2f5ddfc68 Fix wrong variable usage in UnitActions.js.
Introduced in 32583008a0. Experienced by @wraitii.

Differential revision: D3359
Reviewed by: @wraitii
This was SVN commit r24607.
2021-01-14 12:29:26 +00:00
0c673522b6 [Gameplay A24] - Adjust some siege engine stats.
- Changes footprints to better match their visuals.
- Lowers ram cost to compensate for ther reduced effectiveness (against
units).
- Loot = 20% cost.
- Change experience loot to relate to health.
- Give Kush ram +2 garrison capacity and +20 attack damage since it is
the same actor as the Persian ram.
- Adjust fireraiser template.

Patch by: @Nescio
Differential revision: D3345
Reviewed by: @borg-
This was SVN commit r24606.
2021-01-14 12:27:05 +00:00
837a9dfac5 [Gameplay A24] - Move shared vision / dropsites to CC.
Since they are conceptually more policical techs than commercial.

Patch by: @Nescio
Differential revision: D3321
Reviewed by: @borg-
This was SVN commit r24605.
2021-01-14 12:17:46 +00:00
9a3da390b9 [Gameplay A24] - Seperate forge armour techs.
This separates the pierce and hack damage resistance techs but lets them
apply to all soldiers (including elephants).

Patch by: @borg-
Differential revision: D3287
Reviewed by: @Nescio, @wraitii
This was SVN commit r24604.
2021-01-14 12:14:03 +00:00
e3b2cc61c1 Use the same background for the techs.
This was SVN commit r24603.
2021-01-14 12:11:17 +00:00
3886776a04 Fix some icons as per Nescio's comment on 0138039a67
Refs: https://code.wildfiregames.com/D1779 14a8ec3b20

This was SVN commit r24602.
2021-01-14 11:09:08 +00:00