1
0
forked from 0ad/0ad
Commit Graph

21250 Commits

Author SHA1 Message Date
0f1ba33750 Improved lumbering sounds by @Samulis
Refs: https://github.com/0ADMods/SoundsMod/pull/2

This was SVN commit r24578.
2021-01-12 23:55:15 +00:00
e5cbd3decd Removes unused GL texture properties after removed FFP.
This was SVN commit r24577.
2021-01-12 23:18:29 +00:00
f1a3b446f7 Removes the unused terrain rendering function after removed FFP.
This was SVN commit r24576.
2021-01-12 23:14:08 +00:00
2556fb9ba9 Use the correct sound for healer creation
Patch by: @lion.kanzen
This was SVN commit r24575.
2021-01-12 23:08:22 +00:00
5093182c4e Improved foraging leaves sound (when gathering fruit). Actually enable the sound. Fix naming.
Patch by: @Samulis
This was SVN commit r24574.
2021-01-12 23:02:57 +00:00
01c10bf74d New selection sound for the library by @lionkanzen
This was SVN commit r24573.
2021-01-12 22:47:05 +00:00
f44c16462b Improved archery sounds by @samulis
Refs: ​https://github.com/0ADMods/SoundsMod/pull/2

This was SVN commit r24572.
2021-01-12 22:42:14 +00:00
3a1dbf315e Improved javelin attack sounds by @Samulis
Refs: https://github.com/0ADMods/SoundsMod/pull/2

This was SVN commit r24571.
2021-01-12 22:33:07 +00:00
9dbf1554f4 Improved pike attack sounds by @Samulis
Refs: https://github.com/0ADMods/SoundsMod/pull/2

This was SVN commit r24570.
2021-01-12 22:32:18 +00:00
f96c3a24a9 Improved spear attack sounds by @Samulis
Refs: https://github.com/0ADMods/SoundsMod/pull/2

This was SVN commit r24569.
2021-01-12 22:29:56 +00:00
7bf454398c Improved sword attack sounds by @Samulis
Refs: https://github.com/0ADMods/SoundsMod/pull/2

This was SVN commit r24568.
2021-01-12 22:28:27 +00:00
Angen
3273ff13bf [gameplay] 10% loot for support units and ranged slinger
Change loot for support units and citizen soldiers following champion
loot pattern from 84a3f36537

10% loot is present for other citizen soldiers so this makes quite sense
for support units as well

last rebalance done in 94791c53c6

Differential revision: D3327
Comments by: Nescio, borg-
This was SVN commit r24567.
2021-01-12 19:30:30 +00:00
a0288b9c9b Rename Gaul Theater to Assembly.
Its function is different. Meaningful values remain unchanged.

Patch by: @Nescio
Differential revision: D3331
This was SVN commit r24566.
2021-01-12 19:25:35 +00:00
a3eccc043d Hint the location for "You have been attacked" notifications
Icon edited by Stan.
Fixes: #5132
Differential Revision: https://code.wildfiregames.com/D1461
This was SVN commit r24565.
2021-01-12 19:13:16 +00:00
1449ddf439 Correct technology tooltips and formatting.
Also puts resources on a new line and purges entries with `0`.
Moves the Immortal class visible since it is used by a technology (and
thus should be known to a player).

Patch by: @Nescio
Differential revision: D3338
This was SVN commit r24564.
2021-01-12 18:52:12 +00:00
7460d0e56e Revert dad2857538 / Keep track of serialized objects using a GCHashTable
This reverts dad2857538. That diff had two issues:
- It modifies the JS objects, which means subsequent serialization in
quicksave are 'dirty'.
- It doesn't work with non-extensible objects. That's rather annoying,
and has already caused problems.
It also revert f0faab7a42, which was necessary because of the second
issue.

Fixes #5908

Differential Revision: https://code.wildfiregames.com/D3336
This was SVN commit r24563.
2021-01-12 18:43:45 +00:00
511fe22a83 Add a map to test some 'dancing' evasion behaviour.
Test some cases of projectile evasion using:
- Manual dancing
- Patrol dancing
- 'Square' dancing.
- 'Zigzag' dancing.

Differential Revision: https://code.wildfiregames.com/D3325
This was SVN commit r24562.
2021-01-12 18:03:20 +00:00
78764926f8 Fix 9fc6c3c897 - Set entity/template before deserializing.
Following 9fc6c3c897, components Deserialize() was called before
entity/template were set, which is incorrect.

Refs #4698.

Differential Revision: https://code.wildfiregames.com/D3337
This was SVN commit r24561.
2021-01-12 16:15:40 +00:00
Angen
a3c810b5eb Remove U+FEFF character from kush elephant_stables and athen wonder
This character is invisible in templates, but pyrogenesis does not know
how to render it, so it renders missing character, which looks bad.
Thanks @s0600204 for grep investigation.

Reviewed by: @Nescio
Differential revision: D3323
This was SVN commit r24560.
2021-01-12 15:17:07 +00:00
71f9e2a30b Regroup special technologies.
Some techs are shared between multiple civs and having them in a folder
that is named differently (successors/hellenes) can be confusing.
This patch deprecates the subfolders and moves all techs in the main
folder.

(Also did svn propset on *.json to not have to do it for every changed
template.)

Patch by: @Nescio
Differential revision: D888
Comment by: @fatherbushido
This was SVN commit r24558.
2021-01-12 14:50:24 +00:00
962c896f28 Check for cmpUnitAI when extracting formations.
59d0885d68 Changed the way to get formation UnitAIs, but didn't account
for selecting entities with and without UnitAI.
This fixes that.

Differential revision: D3333
Reviewed by: @wraitii
Comments by: @Angen, @Stan
This was SVN commit r24557.
2021-01-12 14:28:09 +00:00
300ff96d98 [Gameplay A24] - Enable Mauryan palace.
- Moves the maiden guard champions and heroes there.
- Removes the need to unlock champions.

Patch by: @Nescio
Differential revision: D3330
Reviewed by: @borg-
This was SVN commit r24556.
2021-01-12 14:25:37 +00:00
ffcfdddb13 Adds author of the original patch for 25332f9b86 to credits.
This was SVN commit r24555.
2021-01-12 08:24:33 +00:00
63975ef977 Fixes include for 25332f9b86, map > unordered_map.
This was SVN commit r24554.
2021-01-12 07:49:48 +00:00
25332f9b86 Adds #include directive support to shaders
Comments By: Stan, wraitii
Tested By: Freagarach, Stan
Differential Revision: https://code.wildfiregames.com/D3030
This was SVN commit r24553.
2021-01-11 23:23:30 +00:00
7a15ee1c21 [Gameplay A24] - Tweak Fortress cost and Health.
- 10% Lower build time.
- Cost changed from stonly [sic] to stone and wood.
- Reduced Health by 10%.
- Removed resistance addition.
- Equalised the Iberian fortress since there is no historical
justification.

Patch by: @Nescio
Differential revision: D3324
Reviewed by: @borg-
Comment by: @Stan
This was SVN commit r24552.
2021-01-11 20:06:45 +00:00
205486d6f3 Fix sound errors when no sound card is detected.
Based on a patch by: @Imarok
Refs: #3285

Differential Revision: https://code.wildfiregames.com/D1481
This was SVN commit r24551.
2021-01-11 18:56:33 +00:00
687a9335f0 Remove cache detection
Reviewed by: wraitii
Fixes: #4360
Differential Revision: https://code.wildfiregames.com/D3165
This was SVN commit r24550.
2021-01-11 17:30:16 +00:00
Angen
7148aa5554 Display gather rates per subtype
Currently gather rates per subtype of resource are averaged , which
hides important information for players. Therefore they do not realise
some units may be better collecting grain or fruit.

Also removing todo from the code.

Thank @Stan for fruit and grain icons without cursor and new fish.

Differential revision: D3310
Accepted by: wraitii
Comments by: Freagarach, Nescio
Ref: #4077

This was SVN commit r24549.
2021-01-11 16:03:16 +00:00
1b2ef6988a [Gameplay A24] - Introduce two new technologies at the stable.
Now the stable is available for all civs (c4eeb82d83) new techs for it
are welcome.
This introduces:
- town-phase technology that gives cavalry +10% health;
- city-phase technology that gives the stable -0.1 corral batch training
time (similar to the one the barracks has).
The two Persian levy technologies, which used to give -20% training time
and -5% health, now simply grant -10% training time instead.

Patch by: @Nescio
Differential revision: D3317
Reviewed by: @borg-
This was SVN commit r24548.
2021-01-11 13:54:53 +00:00
2223336ce5 Fix cart super dock production queue.
6013aaebd3 removed training_phoenician_naval_architects but failed to
remove it from the super dock of Carthage.
Noticed by by @Angen.

This was SVN commit r24547.
2021-01-11 13:12:12 +00:00
6013aaebd3 [Gameplay A24] - Change ship technologies.
- +2 damage resistance -> +25% health and moved to city phase.
- +2 damage resistance -> +10% movement speed and moved to city phase.
- batch time modifier -> construction time
- Renames some stuff and cleans production queue.

Patch by: @Nescio
Differential revision: D2987
Reviewed by: @borg-
Comment by: @wraitii
This was SVN commit r24546.
2021-01-11 12:56:41 +00:00
c2479d961f [Gameplay A24] - Make fireships unable to attack anything but ships.
Since they're essentially floating bonfires.

Patch by: @Nescio
Differential revision: D2802
Reviewed by: @wraitii
Informally accepted by: @borg-
Comment by: @elexis
This was SVN commit r24545.
2021-01-11 12:43:00 +00:00
f7a6aa6f70 [Gameplay A24] - Move Citizen Soldier health increase from phase progression to promotion.
Patch by: @Nescio
Differential revision: D3315
Reviewed by: @borg-, @wraitii
This was SVN commit r24544.
2021-01-11 12:35:24 +00:00
d6ff007088 Commit resources at dropsite and add tests.
cdfa6cb8b4 made it such that a ResourceGatherer takes a target to commit
resources, this extends that to dropping resources at the dropsite.
While add it also added some tests for ResourceDropsite and -Gatherer.

Differential revision: D3300
Comments by: @Stan, @wraitii
This was SVN commit r24543.
2021-01-11 11:59:07 +00:00
1c505439f7 Fix some C++-style notes from b5df81af76.
/ b5df81af76

Differential revision: D3096
Reviewed by: @vladislavbelov, @wraitii
Comments by: @Angen, @Stan
This was SVN commit r24542.
2021-01-11 11:26:31 +00:00
ebadfe260a [Gameplay A24] - Make unlock_shared_dropsites independent from unlock_shared_los.
Since one may start a match with all visible and then the tech is
useless and hides what is underneath.

Patch by: @Nescio
Differential revision: D2999
Reviewed by: @borg-
This was SVN commit r24541.
2021-01-11 09:42:38 +00:00
9eebd100ff [Gameplay A24] - Increase defensive structure vision range.
Fix larger structures being able to shoot further than they can see.
(At least for most cases, a large elevation bonus can still mess this
up.)

Patch by: @Nescio
Differential revision: D3314
Reviewed by: @borg-
This was SVN commit r24540.
2021-01-11 09:24:14 +00:00
a46d74b14d [Gameplay A24] - Unify ranged attack ranges.
New values:
- javelineers: 30
- slingers: 50
- crossbowmen: 60
- archers and structures: 70
- archers with archery tradition - 80

Patch by: @Nescio
Differential revision: D3297
Reviewed by: @borg-
This was SVN commit r24539.
2021-01-11 09:21:24 +00:00
ec26d3ef3f [Gameplay A24] - Deprecate Gaul Tavern.
Taverns only appeared as a consequence of growing Roman influence
(https://wildfiregames.com/forum/topic/24495-celtic-reference/page/6/?tab=comments#comment-399399)
in the first century BC.
Moves fanatics to their temple.

Patch by: @Nescio
Differential revision: D3316
Reviewed by: @borg-
Comments by: @Stan
This was SVN commit r24538.
2021-01-11 09:16:56 +00:00
9b78b4476e Some cleaning in input.js.
Make linter useful again.

- var -> let
- Linter issues (except default cases for switches).
- Delete unused comments.
- Removed some trailing commas in objects.

Differential revision: D3298
This was SVN commit r24537.
2021-01-11 09:10:38 +00:00
0bf18827d9 Restore civ-specific buildings to the civinfo page
Adds a new class `CivSpecific` which, when combined with the `Structure`
class,
is then used by the `civinfo` page to identify buildable structures
specific to
a selected civilisation. (The `SpecialBuilding` class previously used
was
removed from templates over half a year ago.)

This should resolve the main concern raised on 190d6e7cf5.

The `civinfo` captions have also been updated to match.

Patch by: @Nescio
Accepted by: @s0600204
Differential Revision: https://code.wildfiregames.com/D2733
This was SVN commit r24535.
2021-01-11 00:09:17 +00:00
Angen
2c34cde895 Fix strange character at the end of kush arsenal specific name
Currenlty when one looks into specific name of kush arsenal there is
weird character at the end.
According Nescio there is empty character.
Introduced in 2b3c829e74

Differential revision: D3313
Reviewed by: @Nescio
This was SVN commit r24534.
2021-01-10 17:52:42 +00:00
be286d4345 Increase turn rate of most unit types slightly
Following general comments by players that the new turn rates were too
slow for good feeling/gameplay, this increases turn rates for most
units.
This remains a rather conservative increase, so further changes may be
needed.

Differential Revision: https://code.wildfiregames.com/D3274
This was SVN commit r24533.
2021-01-10 13:23:39 +00:00
c7fac7ee88 Small fixes for status effects
Fixes the default name.
Remove comment that was invalid after 876b035336.
Deepfreeze data.

Reviewed By: Freagarach
Differential Revision: https://code.wildfiregames.com/D3306
This was SVN commit r24532.
2021-01-10 09:54:12 +00:00
fe2e6fd696 Allow mods to insert or delete individual resource icons more easily.
In 52f311da2b code was made resource agnostic except a few places.
This fixes one of them.
(Notice that this approach also addresses Vladislavs recommendation to
load all textures at XML parsing time rather than at JS runtime
(D1745).)

Ticket: #3934
Patch by: @elexis
Differential revision: D2329
Reviewed by: @Freagarach, @wraitii
This was SVN commit r24531.
2021-01-10 09:41:00 +00:00
5ee8354e99 Fix windows SEH hook when crashing in an std::thread
Follows 107d3d461f and other 'pthread->std::thread' diffs.

Windows uses Structured Exception Handling to allow reporting errors
(both C++ and hardware) nicely. This works by wrapping the code in a
__try __catch block.
The pthread wrapper did this automatically, but we now need to do it
explicitly for std::thread.

Tested by: Stan
Differential Revision: https://code.wildfiregames.com/D3261
This was SVN commit r24530.
2021-01-10 08:39:54 +00:00
f876db857a Remove duplication from cmpAutoBuildable init.
Differential revision: D3296
Reviewed by: @wraitii
Comment by: @Stan
This was SVN commit r24529.
2021-01-10 07:25:52 +00:00
312dbbea9e [Gameplay A24] - Give all civs rams.
To allow all civs to counter rams.
The rams are to be differentiated in future patches. This is kind of a
placeholder to fix balancing.

Patch by: @Nescio
Differential revision: D2815
In favour: @badosu, @Feldfeld, @genava55, @ValihrAnt, @wraitii
Reservations: @borg-, @Imarok,

This was SVN commit r24528.
2021-01-10 07:23:45 +00:00
082bd8bd44 [Gameplay A24] - Differentiate domestic animals.
Since 8cb7c4ec34 they had the same cost/health/food, this fixes that.
- Enables all four animals at all corrals; the Mauryas have a zebu
instead of an ordinary cow, and cart, kush, ptol sanga cattle, since in
reality the big four (goat, sheep, pig, cattle) had already spread
throughout the Old World in the Stone Age and in our time frame were
available practically everywhere; it was not an either-or situation;
each animal had a somewhat different function.
- Gave them different stats:
-- 1:1 cost:health ratio
-- 1:2 cost:meat ratio
-- Four goats approximately equal three sheep or two pigs or one cow.

Patch by: @Nescio
Differential revision: D3301
Reviewed by: @borg-
Comments by: @Angen, @wraitii
This was SVN commit r24527.
2021-01-10 07:08:12 +00:00