1
0
forked from mirrors/0ad
Commit Graph

20837 Commits

Author SHA1 Message Date
Freagarach f616cc77ae Move "fauna_fish* -> "fish/*".
Mostly since fish don't inherit from fauna.

Patch by: @Nescio.
Differential Revision: D2774
This was SVN commit r24031.
2020-09-10 07:40:47 +00:00
wraitii 33e01af15e Fix formation walking following "improved ship pickup"/375c319639
Summary:
As reported by @bb and @Angen , 375c319639 broke formation walking in a
few situations.

The issue is that f489ab3a16/D2871 requires formation members to get no
messages until the controller is stopped, but 375c319639 didn't use the
correct function (on account of a missed rebase), so members stopped too
early.

Reported by: bb, Angen
Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D3006
This was SVN commit r24029.
2020-09-08 13:48:12 +00:00
Angen bcf329a884 Shrink selection panel icons
Current gui has no space for more structures/formations to be displayed
and some
civilisations are very close to hit this limit.
Alternative would be scrolling option or pages, but until then this is
acceptable solution.

Differential Revision: https://code.wildfiregames.com/D2875
Patch by: Nescio
Reviewed by: Angen, geneva55
Comments by: wraitii, Stan
This was SVN commit r24028.
2020-09-07 17:36:44 +00:00
Angen 87ec9457c3 [Petra] update usage of Elephant class
Remove Champion class from siege functions related to melee elephants.
Improve mobile dropsite code by replacing Elephant class with Unit
class.
Remove code related to fact support elephants can build as it is not
case anymore.

Differential Revision: https://code.wildfiregames.com/D2964
Patch by: Nescio
Reviewed by: Angen
This was SVN commit r24027.
2020-09-07 17:25:12 +00:00
bb 29e2a44f75 Fix broken translations of b606cad5da
This was SVN commit r24025.
2020-09-06 18:37:40 +00:00
Angen 1f5766079d Clean Formation.js
var -> let
comments - capital leters, dots
a:help - dots
spaces

Differential Revision: https://code.wildfiregames.com/D3001
Comments by: Nescio, Jenkins
This was SVN commit r24024.
2020-09-06 14:08:56 +00:00
Angen 9be759fb08 [UnitAI] inline last if in ShouldChaseTargetedEntity
This was SVN commit r24023.
2020-09-06 09:17:13 +00:00
bb b606cad5da Indent attack tooltips
Show splash per attacktype and indent

Patch By: Nescio
Comments By: Freagarach
Differential Revision: D2984
This was SVN commit r24022.
2020-09-04 20:21:59 +00:00
Freagarach f9f7b4d49f Garrison outposts visually.
Instead of disappearing inside an open structure, this lets garrisoned
entities show up on the platform of an outpost.
Also corrects some dimensions.

Patch by: @Nescio.
Differential Revision: D2986
Idea accepted by: @wraitii.
Reviewed by: @borg-.
This was SVN commit r24021.
2020-09-04 13:46:08 +00:00
Freagarach e744cfdd61 Add turret points to gates.
Gates can be garrisoned like regular wall pieces now, which looks nice.
Different civs have different amount of entities that can be placed due
to differneces in their actors:
- 4: brit, gaul, maur
- 5: sele
- 6: kush, pers
- 8: athen, cart, iber, mace, spart, roman siege wall gate
- 10: ptol, rome

Patch by: @Nescio.
Differential Revision: D2760
Informally accepted by: @badosu, @borg-, @genava55.
This was SVN commit r24020.
2020-09-04 13:33:04 +00:00
Freagarach 7f503c5f53 Allow a few more units on walls.
Medium walls now have four slots up from three.
Long walls now have eight slots up from five.

This looks nice and improves realism by making walls a tad easier to
defend.

Patch by: @Nescio.
Differential Revision: D2783
Idea accepted by: @genava55, @borg-.
This was SVN commit r24019.
2020-09-04 13:13:07 +00:00
Freagarach 00e25707dc Do not chase entities in FOW/SOD
Refs #1832 by fixing the non-animal cases.

Differential Revision: D2698
Reviewed by: @bb, @wraitii.
Fixes #3394

This was SVN commit r24017.
2020-09-02 16:10:08 +00:00
wraitii 900dfd67d4 Debuff outpost and remove un-necessary technologies.
Outposts ought to be used to get more vision, not as an accessory to
rushing.
Technologies were not very potent and hardly ever researched.

Patch by: borg-
Reviewed By: Nescio, wraitii
Differential Revision: https://code.wildfiregames.com/D2933
This was SVN commit r24016.
2020-09-02 07:26:05 +00:00
wraitii 0c0bd2d58f Balance economy techs to make City Phase less of a snowball.
City Phase economic technologies gave +50% gathering rate increases, on
top of the pre-existing ones, which was such a huge bonus that players
could never recover from being late.

This patch balances techs so that Village and Town phase technologies
are stronger, and City phase not so potent.
Research times also increase with each phase.

Patch by: borg-
Reviewed by: wraitii, badosu
Differential Revision: https://code.wildfiregames.com/D2916
This was SVN commit r24015.
2020-09-02 07:19:45 +00:00
wraitii 344d1cc837 Slightly buff melee units by making ranged units promote slower.
Ranged units are more durable, and generally stronger than melee units
currently.
Making them promote slower (+25%) slightly reduces the gap.

Patch by: borg-
Reviewed By: wraitii, genava55, badosu
Differential Revision: https://code.wildfiregames.com/D2899
This was SVN commit r24014.
2020-09-02 07:12:15 +00:00
wraitii 7c534eae8a Allow training Axeman Cavalry at barracks.
Missed in dd5c7edea3 which introduced this template.

Patch by: borg-
Reviewed by: wraitii
Differential Revision: https://code.wildfiregames.com/D2954
This was SVN commit r24013.
2020-09-02 07:03:32 +00:00
wraitii dab3e58a56 Move cavalry movement tech to village phase and make it cheaper.
Having two technologies was too strong a bonus.

Patch by: borg-
Reviewed By: Nescio, wraitii
Differential Revision: https://code.wildfiregames.com/D2966
This was SVN commit r24012.
2020-09-02 06:59:33 +00:00
wraitii e916b8cc01 Improve splash damage falloff calculation to account for obstruction size.
Splash falloff was calculated using centre-to-point distance, where
nearest-edge to nearest-edge ought to have been used.
Use DistanceToPoint to correct for that.

Make sure the damage multiplier cannot go negative.
Remove GetUnitSize in favour of GetSize.

Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D2963
This was SVN commit r24010.
2020-08-31 15:01:04 +00:00
wraitii 32886202a3 Fix AI using Maurya elephant archers as hunters following 164af0742a
The Maurya elephant archer is a fast moving citizen soldier, despite
being unable to gather.
This led to an issue post 164af0742a.

Reviewed By: bb
Fixes #5800

Differential Revision: https://code.wildfiregames.com/D2962
This was SVN commit r24009.
2020-08-31 09:05:34 +00:00
Freagarach 0292962756 Standardise attack bonus tooltips.
- Use multiplication symbol.
- Correct "vs." to "vs".

Patch by: @Nescio.
Differential Revision: D2610
Reviewed by: @Gallaecio.
Opposition by: @wraitii.
This was SVN commit r24007.
2020-08-29 09:45:19 +00:00
Freagarach 0530602405 Readd safeguard against killing an entity multiple times.
Also don't try to calculate more when we are damaged with zero (`0`)
amount.

Differential Revision: D2981
Reviewed by: @Angen.
This was SVN commit r24006.
2020-08-29 05:47:06 +00:00
bb 5e6a2322e7 Damage parent of mirage instead of trying to damage the mirage
Reviewed By: Freagarach
Differential Revision: D2979
This was SVN commit r24005.
2020-08-28 18:05:33 +00:00
Freagarach 221d5d4062 Fix applying StatusEffects after 0f91c5ac61.
Fixes the ordering of arguments in HandleAttackEffects by StatusEffects.
Fixes wrongly written effectType.

Differential Revision: D2977
Reviewed by: @bb.
This was SVN commit r24004.
2020-08-28 12:42:32 +00:00
Freagarach 6c27687c0c Sort nodes in templates and data.
The nodes in the templates ought to be sorted alphabetically as should
the modifications in technologies and auras. This makes that so.
(Also added the `Civ` to the Identity of template_formation, for it is
necessary although commented out.)

Differential Revision: D2976
Reviewed by: @Nescio.
This was SVN commit r24003.
2020-08-28 08:03:29 +00:00
Freagarach 0f91c5ac61 Rename Armour to Resistance and change the way it is processed.
- Renames Armour-node to Resistance.
- Support resistance against Capture.
- Puts resistance against effects in separate nodes.
- Some cleaning.

Differential Revision: D2229
Reviewed by: @bb (accepted), @wraitii.
Comments by: @Stan, @Nescio.
This was SVN commit r24001.
2020-08-27 10:24:59 +00:00
bb 37d31a5e3d Group buildings by function in the right selection panel
Patch By: Nescio
Differential Revision: D2807
This was SVN commit r24000.
2020-08-26 15:35:48 +00:00
Freagarach 4881a7ea0e Also move loading image after d6449bf3f0, noticed by @Nescio.
This was SVN commit r23999.
2020-08-26 15:34:23 +00:00
Freagarach d6449bf3f0 Rename blacksmith -> forge.
A blacksmith is a person, a forge is the blacksmith's workshop.
This renames templates and corrects simulation and sound files.

Patch by: @Nescio.
Differential Revision: D2971
Approved by @genava55, @Gallaecio, @wraitii.

This was SVN commit r23998.
2020-08-26 15:00:00 +00:00
bb 2dd772c99f Add some missing credits
Based on patch by: Nescio
Differential Revision: D2882
This was SVN commit r23997.
2020-08-26 12:49:29 +00:00
Imarok 5f1f768ed5 Fix gametime overlay and watermark in summary screen
Reviewed by: wraitii
Differential Revision: https://code.wildfiregames.com/D148
This was SVN commit r23996.
2020-08-26 10:34:25 +00:00
Freagarach b9f82cb7ae Disable WorldPopulation option for scenarios.
Differential Revision: D2949
Reviewed by: @bb.
This was SVN commit r23995.
2020-08-25 14:40:32 +00:00
bb 3372b4618c Fix lineendings for json files
Noticed and proposed by: Nescio
Differential Revision: D2958
This was SVN commit r23994.
2020-08-25 14:17:12 +00:00
Freagarach 3c893ba402 Move "GetDamageBonus"-function from its own helper file to "Attacking.js"-helper.
Also cache calls to `cmpIdentity` to improve performance for multiple
bonuses.

Differential Revision: D2970
Reviewed by: @bb.
This was SVN commit r23993.
2020-08-24 15:17:50 +00:00
bb 0a26c55513 Fix more JsDocs numbers/bools/strings
This was SVN commit r23992.
2020-08-24 11:50:31 +00:00
bb 3ff65b451f Fix jsDocs object => Object
This was SVN commit r23991.
2020-08-24 11:01:25 +00:00
Stan 2627714c07 Allow to play different sounds based on what attacked you
Discussed with: @Lion.Kanzen
Sound by: @Samulis
Reviewed by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D2859
This was SVN commit r23989.
2020-08-21 10:45:37 +00:00
Stan 7d180bcf14 New Kush and Maur portraits, arakamani by @Sundiata, background changes by @wowgetoffyourcellphone, and the harsiotef and chanakya by @m7600
This was SVN commit r23987.
2020-08-20 15:32:41 +00:00
Stan 1316dbf162 New Pers portraits by @m7600, xerxes background retexture by @Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23986.
2020-08-20 15:30:07 +00:00
Stan def60ee383 New Rome portraits by @m7600
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23985.
2020-08-20 15:29:31 +00:00
Stan e72406ae29 New Sele portraits by @m7600
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23984.
2020-08-20 15:29:18 +00:00
Stan 1ca34da2b9 New Ptol portraits by @m7600
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23983.
2020-08-20 15:27:52 +00:00
Stan 484ce28d2f New Helo portraits by @m7600, tweaks on phillip's eye by @wowgetoffyourcellphone, background change on Alexander by @Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23982.
2020-08-20 15:25:49 +00:00
Stan f5cfa2b018 New Iber portraits by @m7600
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23981.
2020-08-20 15:24:14 +00:00
Stan bdb9fa18c5 Cart Hero portraits by m7600 (hamilcar) and modified background by @wowgetoffyourcellphone and Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23980.
2020-08-20 15:21:56 +00:00
Stan d8709f84f3 New Celt portraits by @m7600 and @Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/27520-task-improve-hero-portraits/

This was SVN commit r23979.
2020-08-20 15:19:47 +00:00
Stan aba6223c85 New Athenians portraits by @m7600
This was SVN commit r23978.
2020-08-20 15:17:42 +00:00
Freagarach da8c747e3b Move gaia/fauna_hawk -> birds/buzzard.
The "hawk" is actually a buzzard, so renamed.
Moved outside of the "gaia" folder so mapmakers can easily identify
between birds that cannot be interacted with ("birds" folder) and those
that *can* be interacted with ("gaia" folder) even though they may have
the same template name.

Patch by: @Nescio.
Differential Revision: D2254
This was SVN commit r23977.
2020-08-20 08:45:37 +00:00
Stan 3c31a6d706 Update the thracian rhomphaia icon green to red, add an icon for the gastaphretes by @wowgetoffyourcellphone, delete an unused icon.
This was SVN commit r23976.
2020-08-19 13:27:13 +00:00
Itms 4e63ddbfd9 Add a NVTT version check at compile-time, fixes #5757, refs #5804.
This will prevent users who have an old NVTT installed on their system
from experiencing crashes. Other NVTT issues at runtime should be fixed
by clearing the cache.

Differential Revision: https://code.wildfiregames.com/D2765
This was SVN commit r23974.
2020-08-18 17:30:41 +00:00
Itms 996b37f07b Fix logic issue with the DXT1a texture format, refs #4549.
Before the NVTT upgrade, no DXT1a file would have been properly decoded:
they would all have been mistaken for a 8bpp greyscale due to a logic
issue in our code, which would have triggered a crash. I did not notice
the logic issue when performing the upgrade. As a result, decoding those
files now fails silently: their alpha bit will be ignored and they will
be handled as DXT1.

This patch fixes the logic and allows us to decode DXT1a properly, in
accordance with the format specifications. Currently, we do not use this
format.

Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2522
This was SVN commit r23973.
2020-08-18 16:45:56 +00:00