1
0
forked from 0ad/0ad
Commit Graph

16371 Commits

Author SHA1 Message Date
5494110015 [Gameplay] Add forgotten loot in the new cataphract mixin
Patch by: @borg-
Differential Revision: https://code.wildfiregames.com/D5197
This was SVN commit r27950.
2023-11-21 17:31:58 +00:00
a2e7e4a08c [Gameplay] Fix apartment and academy loot
Patch by: @borg-
Differential Revision: https://code.wildfiregames.com/D5191
This was SVN commit r27949.
2023-11-21 17:24:14 +00:00
6a43f91630 Fix oversight in 56f15f0869 regarding iber wall placement
Needed until / if D5082 lands.
Until then we also still need: `g_PlayerbaseTypes`.

Differential revision: https://code.wildfiregames.com/D5196
This was SVN commit r27946.
2023-11-19 20:54:12 +00:00
56f15f0869 Move createBasesByPattern() functionality from rmgen2 to rmgen-common
This means deprecate `createBasesByPattern` in rmgen2 and add new
function `playerPlacementByPattern` in common

Differential revision: https://code.wildfiregames.com/D5194
This was SVN commit r27943.
2023-11-19 15:21:26 +00:00
818ed56c0e Don't rely on default args in placePlayerBase
rather be explicit

Differential revision: https://code.wildfiregames.com/D5193
This was SVN commit r27942.
2023-11-19 12:00:01 +00:00
3c1436223f Move placement options from rmgen2 to rmgen-common
Move the placement functions and the getTeamArray from rmgen2 to
rmgen-common, so that those maps can use the placement options as well,
without having to load the whole rmgen2 library.

Differential revision: https://code.wildfiregames.com/D4948
This was SVN commit r27941.
2023-11-19 11:30:04 +00:00
6002acf833 [Art] Portraits for Persian palace upgrades
This was SVN commit r27940.
2023-11-19 00:18:14 +00:00
2d0339c77f [Art] Fix a few Persian building props.
This was SVN commit r27939.
2023-11-19 00:11:37 +00:00
eeaa4bf159 Fix incorrect random selection for team placement
accepted by: @Freagarach
Differential revision: https://code.wildfiregames.com/D5077
This was SVN commit r27938.
2023-11-18 16:52:40 +00:00
f544c6776b Turret walls on Jebel Barkal & outposts on Danubius again
After they had been broken in 21e866fcf0

Author / patch by: @lairkers

Troubleshooting / comments by @elexis @Freagarach

Fixes #6831

This was SVN commit r27937.
2023-11-18 16:10:58 +00:00
0dcaefc2f6 Add error to TechMan. when trying to finish a non-existing technology (e.g. wrong allied_view tech defined).
This was SVN commit r27935.
2023-11-16 09:40:44 +00:00
a90a3a7e48 [Gameplay] Technology | Roman Roads | A special technology for the Romans
Patch by: @wowgetoffyourcellphone
Accepted by: @real_tabasco_sauce
Comments by: @borg-, @chrstgtr
Differential Revision: https://code.wildfiregames.com/D5183
This was SVN commit r27934.
2023-11-13 15:50:28 +00:00
efbee041e9 [Art] Maps | Improve the terrains on Greek Acropolis 4
This was SVN commit r27932.
2023-11-13 00:05:41 +00:00
d8b89fae71 [Gameplay] Correct loot for mercenaries cavs
Patch by: @borg-
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5187
This was SVN commit r27930.
2023-11-11 18:01:57 +00:00
415d0bb999 [Gameplay] Fix healer loot
Patch by: @borg-
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5186
This was SVN commit r27929.
2023-11-11 18:00:07 +00:00
debbcba9a6 Reduces code duplication of specular calculation in shaders.
Differential Revision: https://code.wildfiregames.com/D5178
This was SVN commit r27924.
2023-11-08 23:07:11 +00:00
84d935444f [Gameplay] Ram Garrison improves Ram performance
Patch by: @wowgetoffyourcellphone
Accepted by: @chrstgtr, @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5179
This was SVN commit r27922.
2023-11-08 05:12:51 +00:00
2e68fccd1d [Gameplay] Rename the Temple of Vesta aura and make it a more explicit CapturePoints bonus
Patch by: @wowgetoffyourcellphone
Accepted by: @real_tabasco_sauce
Supporting Comments: @chrstgtr

Differential revision: https://code.wildfiregames.com/D5182
This was SVN commit r27919.
2023-11-07 16:23:38 +00:00
41cf14be2c [Art] Fixes an oversight in the variant files
Patch by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5149
This was SVN commit r27916.
2023-11-06 04:40:23 +00:00
97412464ca [Gameplay] "Nile Delta" civ bonus for Ptolemies
Makes all farming techs at the Farmstead available in the Village Phase
(I) for the Ptolemies.

Patch by: @borg-
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5180
This was SVN commit r27915.
2023-11-05 23:43:25 +00:00
2c6e7a590f [art] Better foundation for Temple of Amun
This was SVN commit r27913.
2023-11-03 16:22:59 +00:00
4e9e950c8f [Art][Gameplay] A slightly larger chicken model to improve gameplay
This creates a slightly larger chicken model, which helps with visual
identification at the start of the match. I have seen multiple let's
plays where finding the initial chickens took too long (in my opinion),
because I believe they are too small for the game world.

Patch by: @wowgetoffyourcellphone
Original model by: @LangBart
Accepted by: @chrstgtr, @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5177
This was SVN commit r27910.
2023-10-30 03:01:44 +00:00
1352c13369 Make the sea ground height of Elephantine independent from the mapsize.
Fixes: #6848

Comments By: @sera
Differential Revision: https://code.wildfiregames.com/D5132
This was SVN commit r27909.
2023-10-29 14:03:52 +00:00
c90aeee2b3 Remove two globals from MapBrowserPage.js
Comments By: @sera, @elexis
Differential Revision: https://code.wildfiregames.com/D5165
This was SVN commit r27904.
2023-10-28 11:32:37 +00:00
261d606c25 [Gameplay] Maps | Update the Watering Holes (4 player) skirmish map
This map is small and should incentivize fast gameplay with its
abundance of hunt and berries.

This was SVN commit r27903.
2023-10-27 19:15:11 +00:00
ba635f2790 [Gameplay] Use 'dock' variants for Athenian Marines and Mercenary Archers
Patch by: @real_tabasco_sauce
Accepted by: @chrstgtr, @borg-
Comments by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5168
This was SVN commit r27902.
2023-10-27 17:08:16 +00:00
8a683854b0 [Gameplay] Add Onager for Romans. This completes the 'Marian Reform' update
Patch by: @real_tabasco_sauce
Accepted by: @borg-, @wowgetoffyourcellphone
Comments by: @Freagarach, @nifa, @Stan

Differential revision: https://code.wildfiregames.com/D5114
This was SVN commit r27901.
2023-10-27 17:00:19 +00:00
6decff312d [Gameplay] "Marian Reforms" update for the Roman civilization
This is a very unique technology that trades in melee citizen-soldier
infantry in exchange for unlocking Legionaries. Legionaries are similar
to Skiritai except they are cheaper.The idea is that these units can
form the bulk of the Roman army, so they should be cheap, but powerful.
Additional champions remain to supplement these units. And for improved
engagement with Centurions, they gain a special second aura just for
Legionaries, called 'Century Maneuvers"

Patch by: @real_tabasco_sauce
Accepted by: @borg-, @wowgetoffyourcellphone
Comments by: @chrstgtr, @Freagarach,
This was SVN commit r27900.
2023-10-27 16:52:03 +00:00
0bc6602a41 [Gameplay] Skirmish Map | Isthmus of Corinth (2 players)
Patch by: @wowgetpffyourcellphone
Accepted by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5164
This was SVN commit r27899.
2023-10-27 16:39:15 +00:00
be2791a5ce [Gameplay] "Hero" temple for Ptolemaic Egyptians. Ptolemaic heroes trained from a new "Temple of Isis", along with a new tech pair: "Pharaonic Cult" vs. "Serapis Cult."
Patch by: @borg-
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Supporting comments by: @chrstgtr
Differential revision: https://code.wildfiregames.com/D5169
This was SVN commit r27898.
2023-10-27 16:34:44 +00:00
9f27a8ef8e Revert Changeset e99fab63d1 "[Gameplay] Celtic female warrior upgrade" after additional discussion between historians and balancers
Refs: e99fab63d1

This was SVN commit r27895.
2023-10-21 15:47:23 +00:00
5025505918 [Gameplay] Dog Kennel for Britons
Back by popular demand; patch requested by @borg-. This gives the "War
Dog" Kennel building back to the Britons. Previously removed in Alpha
24. Its removal widely lamented since then.

War Dogs removed from the Briton Stable as a consequence.

Patch by: @wowgetoffyourcellphone
Accepted by: @borg-, @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5153
This was SVN commit r27890.
2023-10-15 03:45:14 +00:00
750d2d646c [art] Change base textures of these foundation actors from a struct texture to more efficient blank textures. The base mesh consists of only prop points anyway.
This was SVN commit r27889.
2023-10-14 20:14:34 +00:00
a54dbf4bfd Add brief explanations to the tooltips of the alert buttons.
For a bit of added clarity.

Patch by: @abian
Differential revision: https://code.wildfiregames.com/D5095
Fixes #6850

This was SVN commit r27886.
2023-10-13 09:34:51 +00:00
29b57026a6 Remove Engine.IsGameStarted completely
Revert 89e511def9

refs: #4211, bc6da5e3f2

Accepted By: elexis
Differential Revision: https://code.wildfiregames.com/D5152
This was SVN commit r27883.
2023-10-12 19:20:56 +00:00
0eae7442b9 Remove calls to Engine.IsGameStarted in loadgame/*
Accepted By: elexis
Differential Revision: https://code.wildfiregames.com/D5147
This was SVN commit r27882.
2023-10-12 19:07:04 +00:00
5283ae98f2 [art] More foundation sizes for large buildings, specifically Wonders
This was SVN commit r27877.
2023-10-08 22:36:43 +00:00
1108f98431 [Gameplay] Nerf Chandragupta aura
Patch by: @real_tabasco_sauce
Comments by: @borg-
Accepted by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5124
This was SVN commit r27876.
2023-10-08 05:22:18 +00:00
07fdf0a7f7 [Gameplay] Update PrepareTime for ptol bolt shooter
Ptol bolt shooters have their own prepare time and fire rate, so
following 13c169025c, the ptol bolts were unchanged. This patch brings
this prepare time change to the faster firing bolt shooters.

Patch by: @real_tabasco_sauce
Accepted by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5150
This was SVN commit r27875.
2023-10-07 20:15:33 +00:00
3cb09ffc4e [Art] Reduced normal effect for Rock materials; they were visually very bad
This was SVN commit r27873.
2023-10-05 05:29:14 +00:00
bef7f787a0 [Art] Some minor actor style fixes (tabs to spaces)
This was SVN commit r27872.
2023-10-05 01:23:39 +00:00
681e3cfaab [Gameplay] Create a generic 'Longsword' mixin that adds a small splash attack and apply it to the Thracian Black Cloak
This mixin is genericized in order to be useful for other units if
desired. It adds a splash attack, but removes some regular attack to
balance. With this, a champion or other unit can be easily
differentiated. In this instance, it is applied to the Macedonians'
champion swordsman, the Thracian Black Cloak. These guys use the very
long Rhomphaia and Sika swords of Thraco-Dacian origin.

Patch by: @wowgetoffyourcellphone
Accepted by: @real_tabasco_sauce, @borg-
Differential revision: https://code.wildfiregames.com/D5145
This was SVN commit r27871.
2023-10-05 01:03:27 +00:00
e99fab63d1 [Gameplay] Celtic female warrior upgrade
Celtic women were famous for their ferocity and aggressiveness against
enemies and it was common for them to fight alongside men in battles,
especially if the battle had been lost, the women being a strong last
line of defense.


Patch by: @borg-
Accepted by: @chrstgtr, @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5125
This was SVN commit r27870.
2023-10-05 00:54:49 +00:00
3ea20662f7 Move the game loading out of the SavegameLoader
Accepted By: elexis
Differential Revision: https://code.wildfiregames.com/D5130
This was SVN commit r27867.
2023-10-02 19:31:06 +00:00
13c169025c [Gameplay][Balance] Reduce bolt and cata prepare time to help with responsiveness/feel
Reduce prepare time for catapults and bolt shooters. Catapults have
recently been nerfed and buffed with a small splash attack. Bolt
shooters are a little underutilized. Both of these units share a
'clunkiness' which is due to their pack/unpack time, minimum range, and
long prepare time. This patch hopes to address part of this clunkiness
by decreasing the prepare time for catas and bolt shooters. This makes
the unit seem more responsive to new commands to attack a different
unit/structure.

Patch by: @real_tabasco_sauce
Accepted by: @wowgetoffyourcellphone
Comments by: @chrstgtr, @Freagarach
Differential revision: https://code.wildfiregames.com/D5131
This was SVN commit r27865.
2023-10-01 02:24:23 +00:00
03ec53b610 [Gameplay] Create a 'cataphract' mixin to differentiate Cataphract cavalry from other Cavalry
Adds 1/1/1 armor, but +10 metal cost and -5% speed and slightly slower
acceleration and turning

Patch by: @wowgetoffyourcellphone
Accepted by: real_tabasco_sauce
Comments by: @borg- & @chrstgtr
Differential revision: https://code.wildfiregames.com/D5141
This was SVN commit r27864.
2023-09-30 05:01:02 +00:00
fcf555b4a8 [Gameplay] Put back Carthaginian champion cavalry to temples and reduce cost of Colonization tech.
Author: @borg-
Accepted by: @chrstgtr, @real_tabasco_sauce, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5136
This was SVN commit r27858.
2023-09-25 02:17:26 +00:00
ce35c37153 [Gameplay] Adjustments to Hippocrates
This makes some adjustments to Hippocrates by renaming his auras and
tweaking their effects.

Patch by: @wowgetoffyourcellphone
Accepted by: @borg-, @real_tabasco_sauce

Differential revision: https://code.wildfiregames.com/D5138
This was SVN commit r27857.
2023-09-24 20:06:44 +00:00
f810418cb6 [Gameplay] Slightly reduce cost of Carthaginian apartment and allow their house to upgrade to apartment
Patch by: @real_tabasco_sauce
Accepted by: @wowgetoffyourcellphone
Supportive Comments by: @borg-
Other comments by: @chrstgtr
Differential revision: https://code.wildfiregames.com/D5117
This was SVN commit r27852.
2023-09-22 06:23:55 +00:00
4c8c08af8e [Gameplay] Turn off elephant friendly fire
Patch by: @real_tabasco_sauce
Accepted by: @borg-, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5054
This was SVN commit r27851.
2023-09-22 05:39:18 +00:00
da84ce48fa [Gameplay] Give the name of the civilization for the generic name of the relic
Patch by: @borg-
Accepted by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5134
Fixes #6728

This was SVN commit r27850.
2023-09-22 05:35:13 +00:00
d046748fe3 [Gameplay] Cavalry units created from a Han academy should be able to enter it
Patch by: @borg-
Accepted by: @Freagarach, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5133
Refs #6745

This was SVN commit r27849.
2023-09-22 05:32:46 +00:00
132a6fd3da [Gameplay] Reduce loom cost
Accepted by: @borg-, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5118
This was SVN commit r27848.
2023-09-22 05:29:30 +00:00
5ac0b48639 [Gameplay] Druids Aura, "Deas Celtica"
Druids increase attack rates of soldiers near them slightly. This
fulfills a decade+ design element in the old Celtic civ design profiles.

Patch by: @borg-
Positive Comments by: @chrstgtr
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D5116
This was SVN commit r27836.
2023-09-11 00:15:53 +00:00
95530eb44a Refactor Capturable Farmstead feature/templates
Attempts to address Invalid warning messages for capturable farmsteads
and creates a mixin as suggested by @Langbart

Renames the "farmsteads_" template files to "mill_" to eliminate
confusion with standard buildable farmsteads and changes the refs in the
skirmish maps to suit.

Genericizes the name to Rotary Mill instead of Farmstead, again to
eliminate confusion between the two (the former is a capturable map
object, while the latter is a player-buildable structure).

Fixes #6818
Differential revision: https://code.wildfiregames.com/D5113
This was SVN commit r27835.
2023-09-11 00:08:13 +00:00
99e6a2fed8 GAMEPLAY | Add a chariot mixin for chariot units which differentiates them from regular cavalry
Accepted by: @real_tabasco_sauce
Comments by: @Freagarach
Differential revision: https://code.wildfiregames.com/D5119
This was SVN commit r27834.
2023-09-10 23:26:09 +00:00
becc09c23e Add some chat messages to PetraAI.
Adds some nice variation.

Patch by: @abian
Differential revision: https://code.wildfiregames.com/D5100
This was SVN commit r27832.
2023-09-08 09:22:57 +00:00
c3d9943dd0 Bring back (small) splash for catapults, heavy ship.
Catapults and heavy warships received a nerf to their range, which was
also designed to stop infinite targeting of structures outside of vision
range. This was a substantial nerf, from 100 range to 85. This change
compensates for this range reduction by slightly improving their
versatility.
This is not the same splash we have seen in previous alphas, as it is
only a radius of one meter. It also makes them exciting as you could
land some epic shots if your enemy is very tightly bunched.

Patch by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5053
Accepted by: @borg-
Comments by: @chrstgtr, @wowgetoffyourcellphone
This was SVN commit r27831.
2023-09-08 09:14:11 +00:00
1dc7ca055f [Gameplay] Roman Civ Bonus | Rome can train women in houses without needing to research "Fertility Festival." This is to represent the population density of ancient Rome.
Patch by: borg-
Accepted by: @wowgetoffyourcellphone, @real_tabasco_sauce
Differential Revision: https://code.wildfiregames.com/D5112
This was SVN commit r27829.
2023-09-07 04:22:10 +00:00
333c28d2e9 [Gameplay] Differentiate Macedonia
Patch by @borg-

Accepted by: @real_tabasco_sauce, @chrstgtr
Differential Revision: https://code.wildfiregames.com/D5096
This was SVN commit r27828.
2023-09-07 04:12:40 +00:00
9a05fa69ee [Gameplay] Agis given an aura
Patch by borg-

Differential Revision: ​D5099
This was SVN commit r27827.
2023-09-07 04:06:26 +00:00
a10e025324 Fix typo in c917c39a0d.
Reported by @Mr.lie at
https://wildfiregames.com/forum/topic/108069-diplomacy-broken-since-rev-27722.
Based on a patch by: @elexis
This was SVN commit r27824.
2023-09-04 13:05:36 +00:00
d832791fb1 Lightens the repair icon slightly for the UI.
Fixes #6856

This was SVN commit r27806.
2023-08-18 05:49:22 +00:00
86e22731e7 Fix missing space in TaC of the userreporter.
Reported by rodrigo.vegas at Transifex.

This was SVN commit r27805.
2023-08-17 06:37:39 +00:00
986751d234 Add 10% health on hoplite tradition tech.
With the change to the Spartan bonus, it is interesting to add +10%
health to the hoplite tradition tech.
The hoplites dominated warfare for a long time, and it is fair to keep
this bonus somehow.

Patch by: @borg-
Differential revision: https://code.wildfiregames.com/D5098
Accepted by: @real_tabasco_sauce, @wowgetoffyourcellphone
This was SVN commit r27804.
2023-08-16 10:23:28 +00:00
3ad1e487a9 Add a civbonus entry to rome.json explaining centurions.
Patch by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5083
Comments by: @asterix, @borg
This was SVN commit r27803.
2023-08-16 10:07:23 +00:00
0ee8a1499c Add and adjust civbonus entries for spart.json and athen.json.
Patch by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D5087
Comment by: @borg-
Accepted by: @borg-, @wowgetoffyourcellphone
This was SVN commit r27802.
2023-08-16 10:01:48 +00:00
abe2ab4f08 Don't show the amount in the mutli-entity view when merely one type of a unit is selected.
Patch by: @abian
Differential revision: https://code.wildfiregames.com/D5075
Fixes #6841

This was SVN commit r27801.
2023-08-16 09:56:57 +00:00
48de9e32f0 Fix performance drop and memory leak on networked AI matches.
When playing a network game with at least one AI, and an AI dies, after
a while there will be an increasing lag on the system, eventually
freezing the screen for e.g. 4 seconds every 5 seconds.
It turned out that once the AI is dead, the savedEvents grew endlessly.
Causing issues down the line (hashing).

That is now fixed by discarding savedEvents when the AI is defeated.

Patch by: @lairkers
Differential revision: https://code.wildfiregames.com/D5042
Comments by: @phosit, @wraitii
This was SVN commit r27800.
2023-08-16 09:48:24 +00:00
3bb17ea06c Fix Liu Bang's cavalry attack aura
Reported here: https://wildfiregames.com/forum/topic/107591-hero-bug/

Fixes #6837

Differential Revision: D5080
Accepted by: Freagarach
Comments by: sera and real_tabasco_sauce
This was SVN commit r27794.
2023-08-12 16:59:13 +00:00
bb
157c6af18e Make the space in 0 A.D. non-breaking throughout the codebase.
Avoid cases of filenames
Update years in terms and other legal(ish) documents
Don't update years in license headers, since change is not meaningful

Will add linter rule in seperate commit

Happy recompiling everyone!

Original Patch By: Nescio
Comment By: Gallaecio
Differential Revision: D2620
This was SVN commit r27786.
2023-07-27 20:54:46 +00:00
2f930661ce Differentiate Athenians.
This gives them a new hero (Hippocrates; recruitable from the tempel)
and some unique Naval bonuses.

Patch by: @borg-
Differential revision: https://code.wildfiregames.com/D3727
Accepted by: @real_tabasco_sauce
Comments by: @chrstgtr, @ValihrAnt, @wowgetoffyourcellphone
This was SVN commit r27779.
2023-07-22 14:52:34 +00:00
c5de5f0fb2 Add descriptions to formations.
Patch by: @abian
Differential revision: https://code.wildfiregames.com/D5074
Fixes #6838
Comment by: @real_tabasco_sauce
This was SVN commit r27778.
2023-07-22 14:14:03 +00:00
bc85236a38 Fix formation slow-down after stopping.
Introduced in 291f17b3c5.
Reported by @gameboy at
https://wildfiregames.com/forum/topic/107588-problems-with-different-queues-when-marching/.

Differential revision: https://code.wildfiregames.com/D5064
Comment by: @wraitii
This was SVN commit r27777.
2023-07-22 14:04:59 +00:00
557f911479 Fix missing ? in 435d842bc1.
Noticed by @elexis.

This was SVN commit r27776.
2023-07-22 13:56:28 +00:00
7da94fc18f Differentiate Sparta.
This differentiates Sparta by giving them P1 champions, a Hero-oriented
team bonus and a new unit.

Sparta should rely heavily on their extremely powerful melee infantry,
hence the focus is on that with choice and upgrade.

Patch by: @borg-
Differential revision: https://code.wildfiregames.com/D4736
Accepted by: @chrstgtr, @real_tabasco_sauce
Comments by: @Langbart, @marder, @wowgetoffyourcellphone
This was SVN commit r27775.
2023-07-22 13:54:09 +00:00
ede3605b2f Removes forbidden and unused USE_SPECULAR from model shader.
This was SVN commit r27770.
2023-07-19 18:04:40 +00:00
f2938aaa28 Refactors normal calculation in model and terrain shaders.
Differential Revision: https://code.wildfiregames.com/D5081
This was SVN commit r27769.
2023-07-19 17:29:13 +00:00
ce25351443 Fix typo in CanTrade.
Introduced in c917c39a0d.
Reported by @gameboy at
https://wildfiregames.com/forum/topic/107586-an-error-occurred/?do=findComment&comment=553753.

Also adds a small test.

Differential revision: https://code.wildfiregames.com/D5060
Reviewed by: @wraitii
This was SVN commit r27737.
2023-06-23 12:58:14 +00:00
435d842bc1 Fix Gaia not being its own mutual ally.
For `!0 === false`.
Reported by: @gameboy at
https://wildfiregames.com/forum/topic/107586-an-error-occurred/.
Introduced in c917c39a0d.

Differential revision: https://code.wildfiregames.com/D5058
Reviewed by: @wraitii
This was SVN commit r27736.
2023-06-23 12:53:49 +00:00
f4caf15710 Fix missed allied view tech in init.
Noticed by @gameboy at
https://wildfiregames.com/forum/topic/107586-an-error-occurred/.
Introduced in c917c39a0d.

Differential revision: https://code.wildfiregames.com/D5057
Reviewed by: @wraitii
This was SVN commit r27735.
2023-06-23 12:51:03 +00:00
3190729f85 Small bugfix in Petra's Defense manager
We were incorrectly comparing an object to a number.
I don't think this will drastically change the AI behaviour as it's
rather an edge case.

Reviewed By: Freagarach
Differential Revision: https://code.wildfiregames.com/D5030
This was SVN commit r27732.
2023-06-23 07:22:43 +00:00
7df7566d7c Fix 'Options' asking for confirmation without changes during a game.
Since 281bb0b2ec, opening the 'Options' menu in-game will show that
there are pending changes, even if the user has done nothing.
Unfortunately the cinematic logic to hide silhouettes, which comes from
cfd08bbf28, is broken following those changes. We use the configuration
to hide them, which results in us, indeed, changing the configuration.

There isn't really a good short term fix. This change only attemps to
reset the setting if we changed it for a cinematic, which fixes the
issue, but has drawbacks.
Ideally, we would use a superior config level, but we need to be careful
about exposing that to JS.

Reported by: langbart
Fixes #6821

Differential Revision: https://code.wildfiregames.com/D5040
This was SVN commit r27730.
2023-06-23 07:19:16 +00:00
c917c39a0d Pull Diplomacy out of cmpPlayer.
Who says only players should be able to conduct diplomacy?
Also separation of concerns, more maintainable files.

Differential revision: https://code.wildfiregames.com/D4921
Comments by: @elexis, @Stan
Refs. #5894

This was SVN commit r27722.
2023-06-19 06:33:33 +00:00
5e12848511 Remove these 3 terrains, which are no longer necessary.
This was SVN commit r27715.
2023-06-16 17:10:35 +00:00
e2fb23731c Fix | Mauryan Palace
Reported to me by: Stan'
Fixes #6825

This was SVN commit r27713.
2023-06-16 16:39:55 +00:00
85bb745295 Fix | Art | Royal Palm texture transparency.
Reported by: @nifa
This was SVN commit r27709.
2023-06-16 16:02:47 +00:00
fdd30b3d85 Some cleaning in the Barter component.
- Add explicit variables for magic values.
- `let`s to `const`.
- Don't start the regen timer when not needed.

Differential revision: https://code.wildfiregames.com/D4965
Comments by: @Stan
This was SVN commit r27707.
2023-06-16 06:25:36 +00:00
291f17b3c5 Reset speed when stopping.
And use an explicit function for running.

Differential revision: https://code.wildfiregames.com/D4957
Comments by: @Stan
This was SVN commit r27706.
2023-06-15 06:56:41 +00:00
0e57957a09 Maps | Fix and improve the Libyan Oasis 2p skirmish map
This was SVN commit r27704.
2023-06-14 16:21:35 +00:00
5ede423224 Art | Fix | Fix texture refs to some head actors
This was SVN commit r27703.
2023-06-14 16:20:40 +00:00
298f207e5b Improve AttackEntitiesByPreference by short-circuiting on best possible preference.
Similar trick to D3446 / c87229aa48 - we can short-circuit if we find
units that match our best possible preference.
This is, in particular, almost a 40% wall time improvement on Combat
Demo Huge, but it should apply in a number of more normal cases.

Differential Revision: https://code.wildfiregames.com/D5020
This was SVN commit r27701.
2023-06-14 07:52:30 +00:00
cce7d02036 Bugfix & optimisations to ApplyModifiers
This functions is amongst the most called in JS, so it's important to
make it speedy.

- Bugfix: if 'originalValue' is falsy, the result was never cached. This
in particular affected the minRange of archers, which is 0. It's a large
optimisation on combatDemoHuge, but the effect elsewhere is less likely
to be noticeable.
- Don't go through the helper to get the player Entity ID, in this case
it's slower.
- Concat is slower than Flat() in this case according to my profiling.
- Some micro-optimisation by strict equality.

Differential Revision: https://code.wildfiregames.com/D5012
This was SVN commit r27696.
2023-06-14 07:27:06 +00:00
5893c4bc85 Allow to set the biome with the autostart command.
Basically a patch by: @wraitii
Differential revision: https://code.wildfiregames.com/D4976
Comments by: @bb, @sera
Accepted by: @Langbart
Fixes #6521

This was SVN commit r27692.
2023-06-14 06:35:27 +00:00
f64b3f773e Art | Misc actor and texture improvements
This was SVN commit r27690.
2023-06-14 01:23:30 +00:00
14dd3c0aad Make Farmstead aura icon appear over affected Fields as well as gatherers
This was SVN commit r27689.
2023-06-14 01:19:27 +00:00
70c83b9c3d Art | Add a new variant texture for Spartan women
This was SVN commit r27688.
2023-06-14 01:18:03 +00:00
466968ca3e Art | Buildings | New Gallic structure textures with roof shingles instead of thatch.
This was SVN commit r27687.
2023-06-14 01:16:47 +00:00
227bc8db02 Maps | Update a bunch of skirmish maps and add a new one (Arabian Oases 2p)
This was SVN commit r27686.
2023-06-14 01:13:44 +00:00
075d8589f3 Art | Player color for Greek defense tower
This was SVN commit r27685.
2023-06-14 01:07:15 +00:00
9aa118d6be Art | Move Mauryan heads to the correct folder.
This was SVN commit r27684.
2023-06-14 01:01:56 +00:00
22cbd39bbd Civs | Remove AI names which duplicate in-game heroes.
This was SVN commit r27683.
2023-06-14 00:57:58 +00:00
aa7dfc196e Art | New model for the Mauryan Palace
This was SVN commit r27682.
2023-06-14 00:56:01 +00:00
59a805dac8 Art | Fix the ostrich feather actors for Nubian units
This was SVN commit r27681.
2023-06-14 00:36:05 +00:00
50453f1e1f Art | Use a better portrait for Whales
This was SVN commit r27680.
2023-06-14 00:34:18 +00:00
df2a0cf3ab Art | New and improved terrains
New Farmland terrains for various biomes

Remove alpha channel from numerous terrain normal maps

This was SVN commit r27679.
2023-06-14 00:32:34 +00:00
46b374b855 Art | Greatly improve the look of some ship sail actors
This was SVN commit r27678.
2023-06-14 00:18:27 +00:00
50e78c1af5 Art | Some new assets
Mediterranean Bush (dry)
Stone and Rock fences by @Wow
New props for Briton and Gallic formation standards
New Kushite Shields by @Stan
Saharan capturable farmstead
Celtic Shrine (with improved textures)
Royal Palm tree

This was SVN commit r27677.
2023-06-14 00:15:28 +00:00
95546c8a1d Art | unit portraits | Update a bunch of unit portraits
This was SVN commit r27676.
2023-06-13 23:20:27 +00:00
553149957d Art | Technology portraits | Update some older tech portraits and add a few new ones.
This was SVN commit r27675.
2023-06-13 23:13:41 +00:00
3991c5c857 Speed up timer update by using Map.forEach
According to JIT profiling on SM 115, using ForEach is faster than
iterating.
This is a micro optimisation, maybe 2% faster for OnUpdate, which means
we might see an overall improvement < 0.4%.

The reason this is faster here is that Iterating needs to construct an
array to store the result, whereas ForEach just uses the values
directly. This means this probably doesn't apply to iterating if we
don't need both the key/value pair.

Differential Revision: https://code.wildfiregames.com/D5010
This was SVN commit r27674.
2023-06-13 15:57:18 +00:00
7350b9042e Don't poll territory in Position component
CmpPosition::TurnStart checks whether the territory changed underneath
each entityevery turn. The only user of this is TerritoryDecay
(structures, for the most part). It is rather inefficient to have this
done for all entities.
The simplest solution is to listen to position-changed messages in
TerritoryDecay instead. This should hardly ever happen in vanilla 0
A.D., except in Atlas, so it's basically free.

This sort of reverts 19965ce37a (original implementation) and
c44b48bd59.

Accepted By: Freagarach (concept only)
Differential Revision: https://code.wildfiregames.com/D5009
This was SVN commit r27673.
2023-06-13 15:48:03 +00:00
2a17a2866e Update the rules for new lobby usernames
Right now usernames for the lobby can consist solely of numbers and
special characters. This can result in nonsensical usernames and is
prone to be abused. While we can't entirely prevent nonsensical
usernames, we can at least do a bit better.

Therefore, this adjusts the rules for the validation of new lobby
usernames in pyrogenesis. Previously these rules were:

- length: between 1 and 20 characters
- valid characters: lower- and uppercase letters, numbers, ".", "_", "-"

The new rules are:

- length: between 3 and 20 characters
- valid characters: lower- and uppercase letters, numbers, ".", "_", "-"
- must contain at least one letter

These validation changes are relevant for new user registrations only
and don't affect existing users. As this also just adjusts the
client-side validation, users will also still be able to register
usernames according to the old rules, e.g. when using an older version
of 0 A.D., until the same change gets rolled out at a later point in
time server-side as well.

This was SVN commit r27670.
2023-06-08 15:21:04 +00:00
b131e641f5 Fix visual glitch in slaughtering: This adds a PrepareTime to the Slaughter attack. Has negligible affect on gameplay, but fixes a minor, but ugly visual glitch where the animal dies too quickly, without even being stabbed first.
Differential Revision: https://code.wildfiregames.com/D5017
Accepted by: @chrstgtr
Supportive comments by: @real_tabasco_sauce, @Freagarach, @Feldfeld
This was SVN commit r27669.
2023-06-07 15:58:26 +00:00
f2ca8f7787 Balance the splash damage of Elephants.
- Move the Crush damage from Splash to direct hit.
- Reduce overall damage slightly

Accepted By: Feldfeld
Differential Revision: https://code.wildfiregames.com/D5008
This was SVN commit r27668.
2023-06-06 07:10:03 +00:00
0d5cc1b994 Fix game crash when communicating with the lobby on macOS 13
Summary:
On macOS Ventura (at least version 13.2.1 and above), the game crashes
instantly when clicking on buttons communicating with the lobby.

This issue is solved by upgrading nettle to 3.9 and GNUTLS to 3.8.

Patch by: froissant
Accepted By: wraitii
Trac Tickets: #6807

Differential Revision: https://code.wildfiregames.com/D5018
This was SVN commit r27667.
2023-06-06 07:07:50 +00:00
9707931878 Fixes Vulkan hazards reported by validation layers.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D5024
This was SVN commit r27665.
2023-06-05 16:32:18 +00:00
71e3d1303d Disables UV1 vertex attribute without USE_AO for model_common shader.
This was SVN commit r27656.
2023-05-30 17:07:58 +00:00
cd8eb70859 Disables framebuffer invalidating by default for GL as some drivers perform it incorrectly.
Fixes #6805

Tested By: Itms
Differential Revision: https://code.wildfiregames.com/D5003
This was SVN commit r27654.
2023-05-29 20:53:10 +00:00
58eebfcc64 Art Fix | Roman minimap symbol is now the she-wolf of Rome suckling Romulus and Remus, instead of the problematic fasces symbol of Roman power.
This was SVN commit r27652.
2023-05-24 22:11:13 +00:00
ecdd98d879 Remove unused and now broken mesh.
The archive builder reported not being able to convert it as it uses the
previous armature.

This was SVN commit r27651.
2023-05-24 09:38:54 +00:00
04f55f7cf5 Check the validity of a couple pointers in low-level tests, refs #5288.
Reported By: PVS-Studio
Patch By: animus
Reviewed By: phosit
Differential Revision: https://code.wildfiregames.com/D4994
This was SVN commit r27647.
2023-05-18 16:52:29 +00:00
f0b01f0896 Mark ModifiersManager as a system component.
Patch by: @Langbart
Refs: #6801 #6792

This was SVN commit r27642.
2023-05-11 20:51:18 +00:00
52b308750f Fix a bug with the AI after 91509290d6
This was SVN commit r27641.
2023-05-11 09:24:19 +00:00
c278da73d9 Fix issues with the component documentation.
Reported by: @Langbart
Fixes: #6792

Differential Revision: https://code.wildfiregames.com/D4985
This was SVN commit r27638.
2023-05-10 15:55:51 +00:00
173e016172 Allow starting by command with sandbox AI.
|| takes 0 as false; ?? doesn't.

Patch by: @Freagarach
Accepted by: @sera, @Langbart
Fixes: #6771

Differential Revision: https://code.wildfiregames.com/D4975
This was SVN commit r27637.
2023-05-10 15:34:38 +00:00
91509290d6 Workaround TriggerHelper.js not being able to spawn units correctly because of promotion.
Avoid duplication by moving the function to Transform.js.
Add tests to Transform.js
Add tests to TurretHolder.js
Optimize slightly Trainer.js by removing some useless
Engine.QueryInterface calls.
Refs #6784 (symptoms in TriggerHelper.js are fixed underlying cause not)

`SkirmishReplacer` is called before the Modifier Manager so it does not
suffer the same fate.
Entities using `ChangeEntityTemplate` function are still affected.
Maps calling Engine.AddEntity directly are still affected.

Ideally this should be handled by hotloading components instead of
creating new entities each time. See =>
https://code.wildfiregames.com/D4991
Tested using:
908dd631d9

Differential Revision: https://code.wildfiregames.com/D4984
This was SVN commit r27636.
2023-05-10 15:13:52 +00:00
1c7e157e28 [Maps] Fix incorrect fruit bush in Gulf of Bothnia - Frozen Lake biome
"fruitBush": "gaia/fauna_deer" was an oversight/ hack and is just bad
practice.

patch by: @real_tabasco_sauce
comments by: @phosit
Differential revision: https://code.wildfiregames.com/D4990
This was SVN commit r27635.
2023-05-09 17:45:44 +00:00
7cd980f2e1 Move some engine required files to the mod mod.
Most of the shaders are explicitely interned by the engine except for
the one called "Model" which is not required (you can have maps with
just terrain for visualization)
The rng files are called by the engine to validate structure.
The game has two overrides for high quality and normal water to be
"ocean" and "default" respectively
The minimap flare folder is hardcoded see #6795
The default material now calls the dummy shader instead of the model one
when in modmod
Move the default skybox, it will be required by _default.xml
The terrain materials are moved as well, for completeness, although they
are currently not referenced.

This commit does not include atlas needed files as it cannot run without
the public mod anyway for now. It will be done in a separate commit when
we have the ingame editor that will require _default.xml for instance.

This commit is also needed to generate the spir-v shaders in the correct
mods, in order to be able to launch the game with mod mod only.

Refs: #6636 #5366
Fixes: #6294

Differential Revision: https://code.wildfiregames.com/D4906
This was SVN commit r27629.
2023-05-06 17:14:41 +00:00
15874868e2 Alpha 27 | Fix | Add garrisoned prop points for standard Greek houses.
Reported by Gurken Khan:
https://wildfiregames.com/forum/topic/96804-alpha26-feedback-and-suggested-changes/?do=findComment&comment=550459

This was SVN commit r27626.
2023-05-01 20:46:22 +00:00
04230f7e03 Adds SPIR-V to effect XML files.
Differential Revision: https://code.wildfiregames.com/D4986
This was SVN commit r27624.
2023-04-29 20:36:37 +00:00
69f01932c7 Update Transifex configurations for the new API using the tx migrate command specified on https://github.com/transifex/cli/releases
This was SVN commit r27619.
2023-04-27 13:06:30 +00:00
c3d61fecf2 Fix missing texture/duplicate sprite reported by checkrefs.py
This was SVN commit r27618.
2023-04-26 15:15:51 +00:00
abb280d75a Alpha 27 Name: Agni
This is a Sanskrit word meaning fire and connoting the Vedic fire deity
of Hinduism.

Poll: https://wildfiregames.com/forum/topic/106110-alpha-27-naming-poll/

This was SVN commit r27617.
2023-04-26 12:03:17 +00:00
dffaf9d103 Alpha 27 | Fix vision revealers by removing redundant components from the templates and truly make them invisible in-game.
Fixes #6791

This was SVN commit r27611.
2023-04-17 15:06:00 +00:00
a28fddcf72 Adds an option to disable mouse grab in fullscreen.
Refs #6649
Refs #545

Differential Revision: https://code.wildfiregames.com/D4974
This was SVN commit r27603.
2023-04-12 06:59:37 +00:00
ef71533d70 Use a lower default MTU for ENet hosts, and make it configurable.
This fixes packet loss issues on some VPN solutions.

Patch By: sera
Differential Revision: https://code.wildfiregames.com/D4967
This was SVN commit r27599.
2023-04-10 08:21:07 +00:00
ac3d187dcd Fixes model water and waterfall shaders outputting color on shadow pass.
This was SVN commit r27594.
2023-03-28 06:51:00 +00:00
bd20a95d4f Alpha 27 | Art| Fix: "Garrisoned" prop point for Athenian "Parthenon" Wonder model
Reported by: @Stan' from @zyli's log here:
https://wildfiregames.com/forum/topic/106298-petra-error/?fbclid=IwAR1R-MFsqFxFwDdqgBONIevkXRf1V1bPdosTYxyJigxOQo1VPkPQDHDdlzc#comment-548226

This was SVN commit r27593.
2023-03-27 18:14:36 +00:00
952aed8e7f Alpha 27 | Art | Fix: Add garrison flag for Athenian Gymnasion.
Reported here:
https://wildfiregames.com/forum/topic/96804-alpha26-feedback-and-suggested-changes/page/3/#comment-547882

This was SVN commit r27591.
2023-03-24 18:59:22 +00:00
e96ec4d1bd Alpha 27 | Art | Fix: palm_tropical UV maps
Fixes #6756

This was SVN commit r27589.
2023-03-21 18:52:39 +00:00
405b92e653 Disable actual turn rate for ships - make their turning purely visual
They can't dance either way and this improves their pathfinding behavior
as well as their visual movement.

Comments from @Stan @Freagarach @wraitii @real_tabasco_sauce

Differential Revision: https://code.wildfiregames.com/D4971
This was SVN commit r27587.
2023-03-19 19:40:10 +00:00
87202eccad Adjust footprint of packed roman ballista
It look very stretched

This was SVN commit r27586.
2023-03-18 10:25:30 +00:00
d493560fc8 [Gameplay] - Balance changes to catapult/ heavy warship stats and fix them firing infinitly at targets outside their vision range
Fixes: #6708

Reported by @borg- @andy5995, ticket creation & suggested solutions by
@Langbart
Previous version of the batch accepted by @real_tabasco_sauce, positive
comments from @chrstgtr

Differential Revision: https://code.wildfiregames.com/D4962
This was SVN commit r27585.
2023-03-18 07:58:44 +00:00
33c95dec01 [Gameplay] - Adjust batch modifier from upgraded Han CC
Reported on the Forums:
https://wildfiregames.com/forum/topic/106426-incredibly-fast-training-times/

Solution: Use half the current value (for now)

Refs: #6755 because of the description

accepted by: no one, but there seemed to be a general agreement that a
reduction would be ok.

Differential Revision: https://code.wildfiregames.com/D4961
This was SVN commit r27584.
2023-03-18 07:24:13 +00:00
e56355baaf Fix mistake in previous commit.
Reported by: @wowgetoffyourcellphone
This was SVN commit r27582.
2023-03-17 06:50:55 +00:00
1263c53b58 Fix han sales having broken scale causing visual glitches.
Also use the correct normal and spec textures for the sail.

This was SVN commit r27581.
2023-03-16 17:01:23 +00:00
4fbe948be7 Fixes grass with normal and specular textures.
Tested By: Langbart, marder, wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4968
This was SVN commit r27575.
2023-03-12 12:00:21 +00:00
574c93f094 Fix a bug introduced in cc4d68c68d.
The `alive` variant could sometimes be set preventing the garrison flag
from showing.
Reported by: Gurken Khan
Thread: https://wildfiregames.com/forum/topic/106480-flagless-uxelon/

This was SVN commit r27571.
2023-03-08 16:27:02 +00:00
39e3272116 Fix string issue noted by @rollieoo at Transifex.
This was SVN commit r27570.
2023-03-06 15:03:54 +00:00