1
1
forked from 0ad/0ad
Commit Graph

20954 Commits

Author SHA1 Message Date
84d92ecfaf Disable artillery towers and bolt towers in-game.
Introduced by 21106e011f and d4db7d2e0b respectively, these templates
were introduced without taking gameplay considerations into account, and
players disliked them.
De-activate them from regular play until a better solution can be found.

Test Plan: Check for completeness and correctness. Agree unbuildable is
an improvement over brokenness.

Patch by: Nescio
Accepted by: borg-, wraitii
Differential Revision: https://code.wildfiregames.com/D2495
This was SVN commit r23928.
2020-08-03 14:11:16 +00:00
ea725cc289 Fix text input max_length attribute. fixes 5593f573f4
Reviewed by: @wraitii
Fixes #5266
Differential Revision: https://code.wildfiregames.com/D2377
This was SVN commit r23927.
2020-08-03 12:39:25 +00:00
01118c1196 Fix issues relating to SDL and wxWidgets interaction in Atlas.
This fixes the transfer of key inputs from WxWidgets to SDL, making it
possible to type in the in-game GUI from Atlas.

Also fixes whitespace issues in some Atlas files.

The following improvements are OSX specific:
- fixes an SDL assertion related to unused subsystems in Atlas.
- Remove the 'osxguiapplication' override. This fixes the editor
starting up in the background and not accepting input when launched from
in-game.
- To prevent an issue with sdl/wxwidgets conflict when running from
inside the game, actually boot a new instance (see #2427)


Reported by: wik (Many thanks for your investigations)
Tested by: trompetin17, Stan
Fixes #2427
Fixes #2846

Differential Revision: https://code.wildfiregames.com/D2788
This was SVN commit r23926.
2020-08-03 12:23:16 +00:00
375c319639 Improve ship pickup.
Improve unitAI: don't move if the requester can reach us and we are
close enough. This avoids an issue where ships moved more than necessary
when picking up many units.
Also improve requester UnitAI -> retry pickup if the target entity is
Idle.
Improve unitMotion: periodically recompute paths in "known bad path"
mode to adapt to moving targets.
Expose UnitMotion reachability to scripts and other code.

This adds a test map for some common and some tricky pickup cases, using
triggers.

Based on a patch by: causative
Reviewed By: Freagarach
Fixes #3472

Differential Revision: https://code.wildfiregames.com/D665
This was SVN commit r23925.
2020-08-03 12:02:24 +00:00
88dc6d8e1e Do not let every entity with UnitAI listen to "OnGlobalConstructionFinished".
All entities with UnitAI wastefully listened to global
ConstructionFinished messages. Now the message is only sent to assigned
builders.

Differential Revision: D2697
Reviewed by: @wraitii.
This was SVN commit r23924.
2020-08-03 10:13:54 +00:00
7bf1bf3f66 Alphabetize entity limits and statistics classes.
This makes it less likely to add double entries. Also corrects
indentation in the `<StatisticsTracker>`-node.

Patch by: @Nescio.
Differential revision: D2834
This was SVN commit r23923.
2020-08-03 09:25:22 +00:00
a6e41c545e Allow women citizen to lay the same foundations as citizen soldiers.
Women could already build/repair such buildings, they simply could not
be used to place foundations.
This reduces micro and removes a minor annoyance.

Accepted By: Nescio, borg-, badosu, itms
Differential Revision: https://code.wildfiregames.com/D2911
This was SVN commit r23921.
2020-08-02 12:43:14 +00:00
d0ff48bc7a Fix gathering infinite loop when the gatherer is out of the world.
Promoted units move out of the world but keep their current orders,
which can trigger invalid states.
As cleanup, handle this case in GATHER.FINDINGNEWTARGET

A more general fix seems possible by putting the UnitAI in a default
state.

Reported by: psypherium
Reviewed By: Angen
Fixes #5788

Differential Revision: https://code.wildfiregames.com/D2920
This was SVN commit r23920.
2020-08-02 11:40:46 +00:00
21cdcf44bc Fix segfault when sending a very large net chat message.
This crash occured on the receiver machine, making it effectively a
remote crash attack.

Reported by: Riddler66
Based on a patch by: elexis
Fixes #5726

Differential Revision: https://code.wildfiregames.com/D2629
This was SVN commit r23918.
2020-08-01 15:25:13 +00:00
5473393e30 Add an interface for Reinforcement Learning.
Implement a simple HTTP server to start games, receive the gamestate and
pass commands to the simulation.
This is mainly intended for training reinforcement learning agents in 0
AD. As such, a python client and a small example are included.

This option can be enabled using the -rl-interface flag.

Patch by: irishninja
Reviewed By: wraitii, Itms
Fixes #5548

Differential Revision: https://code.wildfiregames.com/D2199
This was SVN commit r23917.
2020-08-01 10:52:59 +00:00
164af0742a Use new FastMoving class instead of Cavalry in AI/petra.
This class is an AI hint that such units are to be treated as moving
fast, e.g. war dogs, or cavalry.
This makes it easier to introduce camels and chariots correctly.

Further work is required to make the AI unit choices less hardcoded.

Patch by: Nescio
Reviewed By: Angen, wraitii
Differential Revision: https://code.wildfiregames.com/D2251
This was SVN commit r23916.
2020-08-01 10:35:44 +00:00
17e6d8b24b Delete paired wall technologies.
“Rubble Materials” and “Geometric Masonry”, paired techs, could be
researched by most civs. They had limited use, were incoherent with
civ-specific art, and were researchable at wall-towers, at which points
techs that affect walls make less sense.

As such, they are deleted.

Patch by: Nescio
Accepted By: borg-, wraitii
Differential Revision: https://code.wildfiregames.com/D2880
This was SVN commit r23915.
2020-08-01 10:32:35 +00:00
ff08e383a0 Resolve issue with palisade health in Structure Tree
The "health" of the palisade wallset was not being displayed correctly
in the
Structure Tree for any civ that didn't have the same resultant civbonus
effect
as the first civ shown when the 'Tree was opened.

The issue was caused by caching the parsed form of an entity template
when it is
first requested, then using that for *every* civ.

This wouldn't matter if every civ had completely different entities from
every
other civ, and no civ had civbonus technologies that affect shared
entities.

However, in "vanilla" 0 A.D., the templates of the palisade wallset, and
those
of the sheep, pig, and goat trainables, are shared between multiple
civs. And
the athen, brit, gaul, mace, and spart civs all have civbonus
technologies that
affect structure health.

(And as for mods, who knows...)

The solution provided here is to cache parsed entities by civ, like we
already
do with technologies.


Issue raised by @Nescio in b2842e8021

This was SVN commit r23913.
2020-07-31 00:14:31 +00:00
bb0f680e42 Fix missing coma in bbb83d2c08.
This was SVN commit r23912.
2020-07-30 06:07:24 +00:00
ab7cf4c3bf Remove stretching from the 5x8 and 5x9 decals
Patch by: @wowgetoffyourcellphone
This was SVN commit r23911.
2020-07-29 20:59:02 +00:00
1d7c382e9a Fix warning with disabled templates in 70c71bff0f.
The code assumed that a player was being passed when it wasn't.

Reported by: Angen
Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D2904
This was SVN commit r23910.
2020-07-29 09:45:42 +00:00
2946a06239 Add missing gravel and normal files from previous commit
This was SVN commit r23909.
2020-07-28 23:49:25 +00:00
5461865eff New dirt and gravel decal textures.
Patch by: @wowgetoffyourcellphone
Textures created by Lennart Demeshttps://cc0textures.com/ and adapted by
wowgetoffyourcellphone

This was SVN commit r23908.
2020-07-28 21:07:07 +00:00
09332fe5ab Fixes the broken animation "attack_slaughter" of the camelry archer actors
Patch by: @Mr.lie
Differential Revision: https://code.wildfiregames.com/D2909
This was SVN commit r23907.
2020-07-28 20:31:56 +00:00
bbb83d2c08 Fixes the broken animation of the persian champion_cavalry_archer
Patch by: @Mr.lie
Differential Revision: https://code.wildfiregames.com/D2907
This was SVN commit r23906.
2020-07-28 20:23:54 +00:00
bb
8f946aa3d9 Split Audio and Map credits from Art.
Fix some lineendings

Differential Revision: D2912
Patch By: Nescio
This was SVN commit r23905.
2020-07-27 15:19:19 +00:00
bd48a45aad Add more animations to the atlas drop-down list and delete non-existent animations
Patch by: @Mr.lie
Differential Revision: https://code.wildfiregames.com/D2906
This was SVN commit r23904.
2020-07-27 07:36:38 +00:00
828fdf7096 Fix the "pick" tool being in the incorrect hand.
Patch by: @Mr.lie
Differential Revision: https://code.wildfiregames.com/D2903
This was SVN commit r23903.
2020-07-27 07:35:20 +00:00
Angen
f0f0d6eed7 Allow selectable component to overwrite shape of displayed selection from footprint
Removing strict binding of selection to footprint by adding optional
choice similar in footprint. If present, that one will be used, else it
will fallback to footprint size.
Allowing to use any selection shape without affecting gameplay, because
foorprint is used for projectile hit detection.

Differential revision: https://code.wildfiregames.com/D2844
Reviewed by: wraitii
This was SVN commit r23900.
2020-07-26 18:26:20 +00:00
Angen
f074096cf3 Use average rotation of members when giving formation controller into the world
Differential revision: https://code.wildfiregames.com/D2890
Reviewed by: wraitii
Comments by: Freagarach
This was SVN commit r23899.
2020-07-26 18:22:26 +00:00
6201574fc0 Fix Citizen cavalry axemen attack and clean up melee cav templates.
Patch by: Nescio
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2888
This was SVN commit r23897.
2020-07-25 09:23:08 +00:00
8af88dfc58 Civilisation .json style corrections
Patch by: Nescio
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2222
This was SVN commit r23896.
2020-07-25 09:17:20 +00:00
41572245cf Unify infantry walking speed / vision.
Ranged units have a base walk multiplier of 1.2, melee of 1.0. Pikemen
are slightly slower.

Heros have 100 vision range, infantry have 80.

Approved by: borg-, wraitii
Differential Revision: https://code.wildfiregames.com/D2884
This was SVN commit r23895.
2020-07-25 08:47:25 +00:00
14cc16fbdc Fix various tooltip/text oversights.
This patch fixes some oversights missed in recent commits:
* `pers.json` entry in D2532/d1d4a1d6b9.
* `brit.json` entry in D2533/c04a1ebac3.
* Delete two auras rendered obsolete in D2686/c1d71abe0b.
* Tooltip and `mace.json` entry in D2867/9eff418cb5.
* `maur.json` entry in D2821/133d163689.
* `sele.json` entry in D2858/95cc3937bd.
* Indentation, tooltip, and `{civ}.json` entries in D2839/32615ae6be.
* Indentation, tooltip, and `{civ}.json` entries of Hellenistic
Metropolis technology.
* Purged some non-existent things in various `{civ.json}` files.
* Added a history string and updated the technology tooltip for the
Immortals.
* Fixed Cart walls civ bonus tooltip.

Patch by: Nescio
Reviewed By: borg-
Differential Revision: https://code.wildfiregames.com/D2885
This was SVN commit r23894.
2020-07-25 08:35:40 +00:00
e804da16fd Update Briton war dog.
The war dog was OP in the early game, and useless in the late game.

Patch by: borg-
Comments by: Nescio
Approved by: badosu, Lionkanzen, Nescio, wraitii
Differential Revision: https://code.wildfiregames.com/D2879
This was SVN commit r23893.
2020-07-25 08:30:13 +00:00
45a10a16dc Tweak the Spartan "Agoge" tech, affect champions only.
The agoge did not concern perioikoi, thus should not affect the citizen
soldiers.

Spartan hoplites are supposed to be the strongest infantry in the game,
this makes them again more effective than Macedonian Silver Shields.

Patch by: borg-
Accepted by: Nescio
Differential Revision: https://code.wildfiregames.com/D2846
This was SVN commit r23892.
2020-07-25 08:17:26 +00:00
66c147f06e Buff "archery tradition" tech.
The health reduction was too drastic and made this tech unbalanced. It
is removed, in favour of slightly smaller buffs and a lower cost.

Patch by: borg-
Comments by: Nescio
Reviewed By: wraitii, Nescio
Differential Revision: https://code.wildfiregames.com/D2876
This was SVN commit r23891.
2020-07-25 08:10:20 +00:00
4641890ad1 Enable Macedonian gastraphetēs (crossbowmen) at the siege workshop.
Patch by: Nescio
Accepted by: borg-, wraitii
Differential Revision: https://code.wildfiregames.com/D2901
This was SVN commit r23890.
2020-07-25 08:04:05 +00:00
1475360ebe Reduce palisade health and repair ratio.
Patch by: Nescio
Approved by: borg-, LionKanzen, wraitii
Differential Revision: https://code.wildfiregames.com/D2803
This was SVN commit r23889.
2020-07-25 07:59:28 +00:00
1a6f155780 Disable Persian Hall & Ishtar gate as buildable structures.
The Kardakes mercenaries, trainable at the Persian Hall, are
historically problematic. Few sources exist on Kardakes troops, but they
seem to have been rather heavy infantry, and likely not mercenaries. As
such, they would be rather redundant with the Immortal.
The elephants are attested, and might be reintroduced later.

Further, the Ishtar Gate is Neo-Babylonian and predates the 0 A.D.
timeline. As such, given its limited use, it is removed as a buildable
structure.

Patch by: Nescio
Accepted by: borg-, wraitii
Differential Revision: https://code.wildfiregames.com/D2742
This was SVN commit r23888.
2020-07-25 07:54:46 +00:00
fc50efd7eb Train champion chariots at the Persian fortress.
This unit is historically well attested, such as the Battle of Cunaxa or
the Battle of Gaugamela.
This unit is currently added at the fortress, though another pass for
chariots in general is needed.

Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D2683
This was SVN commit r23887.
2020-07-25 07:28:23 +00:00
031f2221fa Update gate cost to be proportional to wall costs & not cost stone.
Patch by: Nescio
Comments by: Feldfeld
Reviewed By: borg-
Differential Revision: https://code.wildfiregames.com/D2687
This was SVN commit r23886.
2020-07-25 07:16:30 +00:00
eb0d89e220 Delete unused function left behind in e9361705ae
e9361705ae cleaned up our config setup, but left behind isOverriden,
triggering a compilation warning.

Reported by: Imarok
This was SVN commit r23885.
2020-07-25 07:05:36 +00:00
1368f87590 Fixes actor seed for deleted entities in Atlas.
This was SVN commit r23882.
2020-07-24 19:13:09 +00:00
8190dd9054 Fix Atlas crash introduced by aeaba3c14c
Reviewed by: @Angen @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D2898
This was SVN commit r23881.
2020-07-24 18:53:03 +00:00
57bbd774f6 Makes FXAA working only for GLSL and disabled for ARB.
Also adds option dependency. FXAA was introduced in 113b1c49b9.

Patch By: OptimusShepard
Differential Revision: https://code.wildfiregames.com/D2780
This was SVN commit r23880.
2020-07-24 18:48:18 +00:00
bff1481b32 Allow the interval to be changed in the templates for the Resource Trickle component.
Reviewed by: @Freagarach
Fixes #5632
Differential Revision: https://code.wildfiregames.com/D2794
This was SVN commit r23879.
2020-07-24 18:39:51 +00:00
bf87c2e686 Split attack range and vision range queries.
This splits the "LOS"-query from the "Attack"-query. The LOS-query is
only enabled for skittish animals for now and entities without cmpAttack
don't try to set up an Attack-query anymore.

Differential Revision: D2824
Reviewed by: @bb.
This was SVN commit r23877.
2020-07-24 06:07:27 +00:00
663eb0eba0 Javelinist -> Javelineer.
Changes user facing Javelinist (athlete) to Javelineer (soldier).

Differential Revision: D2591
Patch by: @Nescio.
Reviewed by: @Freagarach, @Gallaecio, @wraitii.
This was SVN commit r23876.
2020-07-23 16:50:49 +00:00
bb
2769424407 Cleanup of Capturable component
Comments By: wraitii, Stan, Freagarach
Differential Revision: D2826
This was SVN commit r23875.
2020-07-23 13:46:56 +00:00
bb
db90b7add8 Defeat players on conquestStructures nomad who don't build anything.
Differential Revision: D1469
Reviewed By: Angen
Comments By: temple, elexis
Reported By: petherfile, hannibal barca
fixes: #3749

This was SVN commit r23874.
2020-07-23 13:40:04 +00:00
edb956424e Allow world population capacity.
This allows to specify a world population capacity that is divided
evenly amongst living players.

Differential Revision: D2426
Reviewed by: @Angen
This was SVN commit r23873.
2020-07-23 09:00:34 +00:00
69ff754148 x → × in game speeds
Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D2895
This was SVN commit r23871.
2020-07-22 16:27:48 +00:00
d5fbba314a [gui] replace hyphen-minus with em-dash in credits
Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D2820
This was SVN commit r23870.
2020-07-22 16:24:29 +00:00
bb
8dca7f221c Add all (visible) classes found by P217 in Identity.js
Remove a useless class from palisade_fort (already a visible class)

This was SVN commit r23869.
2020-07-22 14:26:17 +00:00