1
0
forked from 0ad/0ad
Commit Graph

14997 Commits

Author SHA1 Message Date
80a8c3827b Fix CanAttack for mirages following 88549e77e1
CanAttack queries the miraged Resistance which did not exist, thus
failing.
This mirages Resistance explicitly (fixing parts of #5883)

Fixes 88549e77e1, reverts the mirage.xml change in 738b200dda

Refs #5883

Reported by: Asger_Spear
Differential Revision: https://code.wildfiregames.com/D4001
This was SVN commit r25517.
2021-05-22 10:56:40 +00:00
0dfebc8d2b Let PetraAI check for different templates when finding the best dropsite.
Loops buildable templates to find the best.

Differential revision: https://code.wildfiregames.com/D3876
Comments by: @Angen, @Stan, @wraitii
This was SVN commit r25514.
2021-05-22 07:53:47 +00:00
494d12fb9c Let PetraAI check for droppable resources when finding the best dropsite location.
Instead of hardcoding resources.

Differential revision: https://code.wildfiregames.com/D3874
Comments by: @Angen, @Stan
This was SVN commit r25513.
2021-05-22 07:51:08 +00:00
012ac9f36b Add rated game information to the objectives dialog.
So an joined observer can see that information.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D3964
Comment by: @wraitii
Idea accepted by: @asterix
This was SVN commit r25512.
2021-05-22 07:39:17 +00:00
340aa419f4 Deduplicate add/remove entity to/from AIs resource map.
Also moves the function to the shared_script, since that is the
prototype it uses and the function doesn't use anything of the
terrain_analysis (as per @Angen's request).

Differential revision: https://code.wildfiregames.com/D3906
Comments by: @Angen, @wraitii
This was SVN commit r25511.
2021-05-22 07:35:16 +00:00
8f8e29c092 Fix incompatible mods start: show both incompatible and enabled mods;
As noted by Angen in a26535d023, refs 3bcf360107
When starting with incompatible mods, the non-incompatible mods were no
longer shown. This fixes that.
I think the code looks cleaner from this new control flow that
explicitly only mounts "mod".

Tested by: Angen
Differential Revision: https://code.wildfiregames.com/D3996
This was SVN commit r25510.
2021-05-22 07:33:49 +00:00
3548feb16a Fix entities receiving double hunt order only attacking.
Caused by: 293cd95ccb.
Noticed by @Asger and @Kate.
Special case hunting.

Differential revision: https://code.wildfiregames.com/D3986
Comment by: @wraitii
This was SVN commit r25509.
2021-05-22 05:27:51 +00:00
b2e1181982 Partly revert 5f1f768ed5.
The underlying cause was fixed by 8eb4871c9b.
Reviewed by: wraitii
Differential Revision: https://code.wildfiregames.com/D3836
This was SVN commit r25505.
2021-05-21 21:37:07 +00:00
fe4890e0b2 Improved particles by @wowgetoffyourcellphone
This was SVN commit r25496.
2021-05-21 10:49:11 +00:00
9756fb3dad Darker AO for the stone quary
This was SVN commit r25495.
2021-05-21 10:42:20 +00:00
274fadaf30 More consistent animal portraits by @wowgetoffyourcellphone
This was SVN commit r25494.
2021-05-21 10:41:41 +00:00
bdfacbfdd3 Add a round 9x9 decal
This was SVN commit r25493.
2021-05-21 10:40:20 +00:00
15140751a7 Improved farm decals by @wowgetoffyourcellphone
This was SVN commit r25492.
2021-05-21 10:33:13 +00:00
19f7db1681 Remove the floating property from shipwrecks.
Patch by: @wowgetoffyourcellphone
EOL native.

This was SVN commit r25491.
2021-05-21 09:49:32 +00:00
db829373cb Add new cliff textures
Patch by: @wowgetoffyourcellphone
Textures from: https://cc0textures.com/
Thread
https://wildfiregames.com/forum/topic/17326-your-0-ad-screenshots/page/30/

This was SVN commit r25490.
2021-05-21 09:23:08 +00:00
809dba254a Add new indian biome
Patch by: @wowgetoffyourcellphone
Textures from: https://cc0textures.com/
Thread
https://wildfiregames.com/forum/topic/17326-your-0-ad-screenshots/page/30/

This was SVN commit r25489.
2021-05-21 09:22:17 +00:00
70a6826b51 Add new nuba biome
Patch by: @wowgetoffyourcellphone
Textures from: https://cc0textures.com/
Thread
https://wildfiregames.com/forum/topic/17326-your-0-ad-screenshots/page/30/

This was SVN commit r25488.
2021-05-21 09:21:22 +00:00
e10fa5b80f Add new saharan biome
Patch by: @wowgetoffyourcellphone
Textures from: https://cc0textures.com/
Thread
https://wildfiregames.com/forum/topic/17326-your-0-ad-screenshots/page/30/

This was SVN commit r25487.
2021-05-21 09:19:46 +00:00
b5a1e9ba51 Add new steppe biome
Patch by: @wowgetoffyourcellphone
Textures from: https://cc0textures.com/
Thread
https://wildfiregames.com/forum/topic/17326-your-0-ad-screenshots/page/30/

This was SVN commit r25486.
2021-05-21 09:18:20 +00:00
b00f000477 Add new sudd biome
Patch by: @wowgetoffyourcellphone
Textures from: https://cc0textures.com/
Thread
https://wildfiregames.com/forum/topic/17326-your-0-ad-screenshots/page/30/

This was SVN commit r25485.
2021-05-21 09:16:38 +00:00
91e244d364 Add new temperate europe biome
Patch by: @wowgetoffyourcellphone
Textures from: https://cc0textures.com/
Thread
https://wildfiregames.com/forum/topic/17326-your-0-ad-screenshots/page/30/

This was SVN commit r25484.
2021-05-21 09:15:47 +00:00
8e3ef8dd8f Add new aegean alpine arctic biome
Patch by: @wowgetoffyourcellphone
Textures from: https://cc0textures.com/
Thread
https://wildfiregames.com/forum/topic/17326-your-0-ad-screenshots/page/30/

This was SVN commit r25483.
2021-05-21 09:12:35 +00:00
baeceab0c8 Add new aegean anatolian biome
Patch by: @wowgetoffyourcellphone
Textures from: https://cc0textures.com/
Thread
https://wildfiregames.com/forum/topic/17326-your-0-ad-screenshots/page/30/

This was SVN commit r25482.
2021-05-21 09:11:42 +00:00
0aedcced74 Remove Gate/Defensive from ram preferred classes
This leaves them with 'Structure', undifferentiated. This avoids the
issue reported in #6096 that rams can try to hit unreachable buildings
indefinitely.

Based on a patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D3684
This was SVN commit r25481.
2021-05-21 07:47:54 +00:00
b6f2dee43b Increase pushing range by 60%
Reduces the 'clumpiness' of units, particularly when ordered to move to
a single point. The minimum pushing force was increased to compensate.

Differential Revision: https://code.wildfiregames.com/D3978
This was SVN commit r25479.
2021-05-21 07:23:47 +00:00
37c8e9caa8 Allow right-clicking to show template panel on queued items.
Request at:
https://wildfiregames.com/forum/topic/40311-a24a23-context-information/.

Differential revision: https://code.wildfiregames.com/D3983
This was SVN commit r25478.
2021-05-21 07:11:05 +00:00
e1f9304601 Fix alpine biome in Wild Lake RM.
After 8ee6774d12.

Differential revision: https://code.wildfiregames.com/D3984
This was SVN commit r25477.
2021-05-21 07:07:47 +00:00
a26535d023 Fix mistake in 3bcf360107 which stopped the incompatible mods page from showing.
I didn't quite understand what was supposed to happen here. This makes
things work as before.
While at it, fix a conversion bug & do some more tweaks.

Differential Revision: https://code.wildfiregames.com/D3990
This was SVN commit r25475.
2021-05-20 17:11:26 +00:00
3bcf360107 Mod and mod-mounting cleanup and improvements.
- Non-visual replays now automatically try to load the replay mods. This
removes the annoyance that -mod=public usually had to be passed.
- MountMods is no longer called in InitVfs but later, making it possible
to load the game in one pass & simplifying things considerably.
- Explicitly ignore duplicates when loading mods
- Interface cleanup: failed mods and incompatible mods were redundant,
only incompatible mods is kept.
- Interface cleanup: `AreModsCompatible`becomes
`CheckForIncompatibleMods`, which becomes a private pure function,
simplifying the control flow somewhat.
- Interface cleanup: `CheckAndEnableMods` is just `EnableMods`, which
explicitly updates loaded & incompatible mods.
- `CacheEnabledModVersions` becomes private and is called on behalf of
the user, removing the need to be careful about updating that (fixes my
concern at 44ec2e324e)

Overall, the logic around mounting & enabled mods should be easier to
understand.

Differential Revision: https://code.wildfiregames.com/D3982
This was SVN commit r25474.
2021-05-20 14:36:42 +00:00
21b7e8faaf Better quality acacia trees by @Sundiata. Needed for the map overhaul.
This was SVN commit r25472.
2021-05-20 11:26:49 +00:00
eda2901a33 Translate the default campaign name in NewCampaignModal
Patch by: nwtour
Differential Revision: https://code.wildfiregames.com/D3977
This was SVN commit r25471.
2021-05-20 10:03:51 +00:00
5e6038eeaf Change the visuals of the counters in the top panel.
- Abbreviate large numbers (fixes #6063).
- Added popMax to the population counter.
- Also show `0` gatherers, highlights and changes the font.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D3911
Reviewed by: @Angen, @Freagarach
Comments by: @asterix, @nwtour, @s0600204, @wraitii
This was SVN commit r25470.
2021-05-20 08:55:08 +00:00
13c1b55f42 Fix UnitAI states in PetraAI.
Sometimes PetraAI relies on UnitAI state of an entity, but those were
not changed after modifying UnitAI.
Introduced in ea96e81098 and 3579097d95.

Differential revision: https://code.wildfiregames.com/D3976
This was SVN commit r25468.
2021-05-20 08:31:30 +00:00
453fe486de Triggers: prevent event names from conflicting with added methods
Refs c0157d613d / D3913 which removed the 'actions' suffix. The reason
for this suffix was probably avoiding this type of conflict, but this
new solution does a better job.

Fixes (at least) Survival of the Fittest, which used an
OnOnwershipChanged trigger.

Differential Revision: https://code.wildfiregames.com/D3979
This was SVN commit r25467.
2021-05-20 08:26:04 +00:00
575cd6c953 Removes unused uniforms and attributes from water shader.
This was SVN commit r25466.
2021-05-19 21:51:36 +00:00
88549e77e1 Require 'Resistance' in CanAttack
This was already effectively the case, so this change increases
coherence.

Accepted By: Freagarach
Differential Revision: https://code.wildfiregames.com/D3980
This was SVN commit r25465.
2021-05-19 12:36:22 +00:00
1619be9902 Differentiate movement speeds of ranged cavalry
Ranged cavalry goes from a base 0.89 walkspeed multiplier to:
- 0.8 for crossbowmen
- 0.85 for archers
- 0.9 for javelineers

The intention is to nerf archers slightly.

Patch By: Nescio
Accepted By: ValihrAnt, chrstgtr
Differential Revision: https://code.wildfiregames.com/D3758
This was SVN commit r25464.
2021-05-19 08:21:05 +00:00
5d1d2d27d7 Outposts have vision without garrisoning again.
Reverts D2986 / f9f7b4d49f.

Outposts have 90 base vision, increasing to 120 with the 'Carrier
pigeon' technology.
Outposts no longer decay in neutral territory, thus not needing
garrisoning. To compensate, they decay 10x faster in enemy territory.

Differential Revision: https://code.wildfiregames.com/D3898
This was SVN commit r25463.
2021-05-19 08:13:35 +00:00
9093e7bbe2 TreasureCollecter -> TreasureCollector.
Noticed by @Stan on ea96e81098.

Differential revision: https://code.wildfiregames.com/D3949
This was SVN commit r25461.
2021-05-18 16:51:44 +00:00
4195205904 Use a set for the selection internals.
Avoids recreating an object and frequent casting.
Allows some optimisations.
Simplifies some calls.

Differential revision: https://code.wildfiregames.com/D3934
Comment by: @Stan
This was SVN commit r25460.
2021-05-18 15:56:47 +00:00
40f9372d29 Allow decaying only in enemy territory.
Reviewed By: Freagarach
Differential Revision: https://code.wildfiregames.com/D3969
This was SVN commit r25458.
2021-05-18 12:43:01 +00:00
3939e0f035 Fix autostart without default difficulty.
If a default difficulty is given by the map, use that. Else use the
default of the game.

Patch by: @JCWasmx86
Differential revision: https://code.wildfiregames.com/D3951
This was SVN commit r25455.
2021-05-17 15:59:05 +00:00
2034136560 Implement a workaround for routers without NAT loopback.
This allows joining a lobby game hosted on the same network (behind the
same NAT gateway).
This is relatively primitive to keep things simple: if the server and
the client have the same public IP, it is assumed that they are on the
same network and the client instead requests the local IP.

Differential Revision: https://code.wildfiregames.com/D3944
This was SVN commit r25448.
2021-05-16 15:34:38 +00:00
6b0802836a Fix duplicating promoting entities in XP trickling structures.
The entity received a value modif. message while promoting, triggering a
second promotion.

Differential revision: https://code.wildfiregames.com/D3918
Fixes: #6162
Comments by: @Angen, @Stan
This was SVN commit r25439.
2021-05-15 05:40:13 +00:00
66c75068bc Fix broken non pot texture by @m7600
Reported by: @nwtour
Fixes: #6177 and 318a5d7a2b

This was SVN commit r25437.
2021-05-14 18:06:00 +00:00
79e294ec06 Make fruit (berries and some fruit trees)'s obstructions smaller.
Patch by: @nani
Liked by: @ffffffff
Tested by: me and @Langbart
Differential Revision: https://code.wildfiregames.com/D3957
This was SVN commit r25436.
2021-05-14 15:13:55 +00:00
cb263b9f26 Add a decal to the berry bushes to make them more visible and make the fruits bigger
Suggestions by: @m7600, @wraitii, @JCWasmx86
Reported by: @Yekaterina
Thread:
https://wildfiregames.com/forum/topic/39973-a25-feedbacks-from-testing/

This was SVN commit r25429.
2021-05-13 11:19:37 +00:00
bb
412e870c55 Add defeat condition on civil centre loss
Somewhat obsoleting 171afdc7a6.

Reviewed By: Freagarach
Comments By: Stan, Nescio and wowgetoffyourcellphone
Differential Revision: D3530
This was SVN commit r25422.
2021-05-12 13:34:50 +00:00
441c122331 Fix collecting treasures near position.
Also refactors the order a bit to be more equal to other orders.
Removes the `autocontinue` because it was not useful (since that is more
about doing other tasks than the one ordered).
Follows ea96e81098 97addf2aa7.

Differential revision: https://code.wildfiregames.com/D3942
Tested by: @Langbart
Fixes: #6175

This was SVN commit r25421.
2021-05-11 07:41:40 +00:00
ad62707eef Ensure rated game and cheat won't be enabled at the same time.
Reported by: Freagarach
Differential Revision: https://code.wildfiregames.com/D3943
This was SVN commit r25418.
2021-05-10 07:49:30 +00:00