1
0
forked from 0ad/0ad
Commit Graph

20744 Commits

Author SHA1 Message Date
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
84a3f36537 Tweak champion cost to make the viable again.
Overall costs are reduced by around 25%, keeping a high Metal cost, and
they are made uniform across champions as a baseline.
Loot is adjusted.

Patch by: borg-
Accepted By: badosu, Nescio, wraitii
Differential Revision: https://code.wildfiregames.com/D2816
This was SVN commit r23868.
2020-07-22 09:42:18 +00:00
f489ab3a16 Abort formation-walking on any message from UnitMotion.
Units in formation can occasionally request many short paths (and thus
introduce crippling lag) if their offset is obstructed.
This particularly happen when the formation is idle, since the offset
then always remains obstructed.

To prevent this, it is OK to immediately stop pathing on any motion
message (obstructed, failure, success). This does not break formation
movement since messages are only sent when the formation controller is
not moving (this finishes what was started in 0535eb9b92).

Ideally, this hack could be removed if the short-pathfinder was quick
enough / units were better at aborting.

Fixes concern raised by Freagarach on a7da40ac2f.

Refs #5624 in that the max-short-path range is the source of the lag.

Reviewed By: Angen
Differential Revision: https://code.wildfiregames.com/D2871
This was SVN commit r23867.
2020-07-22 09:31:08 +00:00
bb
2ef3fd7a77 Clean up market classes:
template_structure_economic_market.xml → Market
template_structure_military_dock.xml → Dock
<Market/TradeType> node → Trade
requirement for bartering: BarterMarket → Barter

Change Petra accordingly


Also changing:
    Renamed the Gates class to Gate, LongWall to WallLong (cf.
WallTower), and StoneWall to Wall, to match their template file names.
Adjusted AI code, technologies, and templates accordingly.
    Entity build restrictions:
        renamed Apadana to Palace;
        replaced UniqueStructure with IshtarGate and TempleOfVesta.
        added Council to the (unbuildable) spart_gerousia.xml, since
it's functionally identical to athen_prytaneion.xml.
    Introduced the following classes:
        Council, IshtarGate, Library, TempleOfVesta, and Theater, to
match their build restrictions.
        WallMedium and WallShort, to complement the already existing
WallLong and WallTower classes.
        Stoa, TempleOfMars, and TriumphalArch, for completeness.
    Made the ArmyCamp, Colony, Gate, Lighthouse, Naval, Palace,
Palisade, SiegeWall, and StoneWall classes visible.
    Deleted the now unused Apadana, Kennel, SpecialBuilding classes.
    Removed the Village class from outposts and palisades, because those
are not supposed to count towards the phase technology requirements.
        Slightly rephrased the phase technology requirements tooltips.
    Corrected the <GenericName> of the various palisade files.
    Updated Structure tooltips from D2578 that have not already been
committed elsewhere.

Patch By: Nescio
Differenital Revision: D2892

This was SVN commit r23865.
2020-07-21 19:45:30 +00:00
bb
e428678b7e Don't assume health is both plural and singular in all languages.
see 47d5422e64

This was SVN commit r23864.
2020-07-21 16:37:43 +00:00
bb
47d5422e64 Heal HP → Health, Rate → Interval
Patch By: Nescio
Differential Revision: D2842
This was SVN commit r23863.
2020-07-21 16:28:29 +00:00
98108be43e Fix GetTechModifiedProperty mistake in 70c71bff0f & allow multiple token modifiers.
String-values in modifications fail if the modifications do not apply,
as they end up in the "multiply/add" path, following D270 / 70c71bff0f.

Also allow multiple token modifiers, so that multiple tokens may be
added for example. This becomes order-dependent but the positive
outweighs the negative.

Reported By: wowgetoffyourcellphone
Reviewed By: Angen
Differential Revision: https://code.wildfiregames.com/D2894
This was SVN commit r23862.
2020-07-21 08:15:59 +00:00
28e6c936e7 Fix oversights from 215c503e30.
- Re-alphabetise wall templates.
- Inactivate obstruction of turret when occupying a turret position.

Differential Revision: D2896.
Reviewed by: @Nescio, @wraitii.
This was SVN commit r23861.
2020-07-21 06:09:19 +00:00
3ed9df0d6c Allow map to recenter during resize in Atlas. Fixes #1109.
Patch By: Clockwork-Muse
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D825
This was SVN commit r23859.
2020-07-21 02:08:50 +00:00
Angen
25e8b38ba8 Fix message on allied victory with no active players
When starting a game with exactly one player that instantly wins the
game (consequest victory) and after that ceasefire running out will
trigger first the correct victory chat message, then a broken and
undefined have won the game chat message, initiated from the
ceasefiremanager.

Check for allies emptyness and do not send it if no players are active,
what means they all have been defeated or won.

Differential Revision: https://code.wildfiregames.com/D2891
Fixes: #5675

This was SVN commit r23857.
2020-07-20 17:10:08 +00:00
215c503e30 Move the ability to hold a turret to a separate file.
The logic concerning visible garrison points (i.e. turrets) is moved
from `GarrisonHolder` to a separate file.
This is logical because garrisoned != turreted, so this allows for
turrets that cannot be garrisoned (refs. D1958).
Also references #3488.

Differential Revision: D2367
Reviewed by: @wraitii
This was SVN commit r23856.
2020-07-20 10:51:14 +00:00