Commit Graph

13191 Commits

Author SHA1 Message Date
4981cdedad New bushes, trees (Oaks, firs, Birch) by Big Tiger, as well as new cliffs, and decals.
This was SVN commit r22383.
2019-06-17 18:22:07 +00:00
4967d176b9 Define variables before mentioning them in scripted component tests, and add a linter rule for this.
Patch By: Krinkle
Differential Revision: https://code.wildfiregames.com/D1986
This was SVN commit r22380.
2019-06-16 20:48:28 +00:00
f4babd9b34 Wrap damage types in a Damage element in XML templates to prepare for genericizing them.
Patch By: Freagarach
Reviewed By: Wraitii
Differential Revision: https://code.wildfiregames.com/D1950
This was SVN commit r22379.
2019-06-16 17:08:27 +00:00
9e8a43401e fixed anomaly in doum palm
This was SVN commit r22377.
2019-06-15 19:43:22 +00:00
7a25c9e88e Holly oaks, fixing some weird normals on the atlas cedar, and a few edits to the quarry stone and texture maps I don't remember doing, but I can trust past me to have made good decisions, right?
This was SVN commit r22376.
2019-06-15 19:00:12 +00:00
190f8d3566 Calculate entity limit counts correctly when SpawnUnits fails in ProductionQueue.
When adding a batch of unit, these in-training units get added to the
production queue and to the entity limit count.
These in-training units need to be removed from the entity limit counts
when spawning them, or we would be double-counting them. This was done
when creating the cached entities, but this was too early: entities
might fail to spawn, for example when there is no room around the
foundation.

Change that so the entity limit count is now decremented right before
giving spawned entities the correct owner (which triggers EntityLimits
OnGlobalOwnershipChanged, which adds the spawned entities to the entity
limit count).

Additionally, add Init to TrainingRestrictions so that the test setup
doesn't complain. Other components have an empty Init instead of
checking for Init in the test setup (and 61/67 have an Init function) so
it seems more standard this way.


Reported By: elexis
Reviewed By: wraitii
Patch By: Angen
Tests By: wraitii
Differential Revision: https://code.wildfiregames.com/D1879
This was SVN commit r22375.
2019-06-15 17:27:24 +00:00
5992943f43 Fix resource-returning order sometimes not working correctly (introduced by 0c20afdfda)
Differential Revision: https://code.wildfiregames.com/D1975
This was SVN commit r22374.
2019-06-15 15:07:27 +00:00
2bcf4f678b Refactors Developer Overlay using an object instead of global functions.
Reviewed By: wraitii
Commented By: elexis
Differential Revision: https://code.wildfiregames.com/D1928
This was SVN commit r22370.
2019-06-12 19:21:44 +00:00
63e1c9ff1a Fix typo in 0b41e8ee61.
This was SVN commit r22368.
2019-06-11 20:09:40 +00:00
0b41e8ee61 Fix leftovers from 0c20afdfda - improve repairing, chasing and fleeing behaviour.
0c20afdfda made states more caller-independent but did not change some
callsites to be compatible with that. This fixes those.

This does not fix chasing entirely however since unitMotion does not
always recognize that the target moved enough that the entity will never
be in range.
This will be fixed upstream.

Differential Revision: https://code.wildfiregames.com/D1968
This was SVN commit r22367.
2019-06-11 20:06:25 +00:00
eee977fd7d Fix wrong actor file for persian cavalry javelinist base actor when gathering meat
Patch by: @Angen
Differential Revision: https://code.wildfiregames.com/D1967
This was SVN commit r22359.
2019-06-10 10:13:24 +00:00
641a1a4b85 Remove duplication of attack variant from Kush hero 'hero_infantry_archer_amanirenas.xml'.
Patch by: @Angen
Differential Revision: https://code.wildfiregames.com/D1966
This was SVN commit r22358.
2019-06-10 10:11:07 +00:00
6e6f7699d0 Fix repairing/garrisoning range checks following 4fda917f46
4fda917f46 introduced mistakes in range checks which sometimes broke
garrisoning and repairing.

Reported By: gameboy
Differential Revision: https://code.wildfiregames.com/D1963
This was SVN commit r22353.
2019-06-09 16:59:27 +00:00
4fda917f46 Prevent UnitMotion from stopping on its own, and rename "MoveCompleted" to "MovementUpdate"
UnitAI is now solely in charge of moving and stopping, making UnitMotion
behaviour easier to predict, which will ultimately help with unitAI
development. It might temporarily make units more resilient than before
however.

UnitMotion also tells UnitAI that it's arrived with "MoveCompleted"
messages, but these actually could be wrong - unitAI could decide that
we didn't want to stop after all - so change the name for something less
misleading.

Differential Revision: https://code.wildfiregames.com/D1886
This was SVN commit r22351.
2019-06-09 11:16:40 +00:00
27b686215a Remove "MoveStarted" messages
"MoveStarted" messages were sent by UnitMotion when the unit started
moving (sort of) or failed to do so. This was used by formations and
guarding but was not really necessary as this can be done in "enter" or
in a timer.

Differential Revision: https://code.wildfiregames.com/D1885
This was SVN commit r22350.
2019-06-08 12:53:28 +00:00
08bfcf144b Allow techs to affect unit counters stats.
Reviewed by: @wraitii
Differential Revision: https://code.wildfiregames.com/D1782
This was SVN commit r22346.
2019-06-06 20:44:30 +00:00
c219ee54b2 Move "IsInRange" family of functions to the Obstruction Manager and make the commutative.
These functions were placed in UnitMotion, which had nothing to do with
range checks and made them available only to moving entities for no
particular reason.

This patch also adds support for square-square range checks and
shape-shape distance checks.

Modified from a patch by bb on top of work from wraitii.

Differential Revision: https://code.wildfiregames.com/D981
This was SVN commit r22345.
2019-06-06 19:37:23 +00:00
7c88828814 Add a glow material that supports normal maps as well.
This was SVN commit r22343.
2019-06-05 23:17:37 +00:00
7d53fb19a2 Additional fixes following 0c20afdfda - units no longer return to gather nearby resources when depleting a chicken/tree/...
Reuse the timer code in the gathering sub-state to avoid broken
duplication.

Reported By: minohaka
Test By: Angen
Differential Revision: https://code.wildfiregames.com/D1956
This was SVN commit r22342.
2019-06-05 20:44:43 +00:00
3ac1a004fa Fixes black water glitches for certain wind angles with the approximate solution.
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D1804
This was SVN commit r22341.
2019-06-05 20:13:31 +00:00
dd67d0769e Resolve issues with 0c20afdfda - unitAI order cleanup and unitMotion MoveTo change
0c20afdfda had two issues:
- some of the unitAI code did not return true when switching states in
the "enter" phase
- missed a return false in unitMotion.cpp

This fixes the issue noticed by @bb.

Differential Revision: https://code.wildfiregames.com/D1947
This was SVN commit r22339.
2019-06-05 17:27:12 +00:00
800bf0da24 Improve UTF-8 character handling in Atlas
(Also prevents the compile-time warnings reported in the abandoned
D1432)

Accepted by: Itms
Patch linting by: Stan, Vladislav, wraitii
Also tested by: Imarok
Fixes: #4936
Differential Revision: https://code.wildfiregames.com/D1395
This was SVN commit r22335.
2019-06-03 20:19:53 +00:00
wackyserious
9618c1fc2f Roman helmets texture recolor
-Adjusted the hue and saturation of the textures to achieve visual
uniformity.

Reviewed by: Stan
This was SVN commit r22331.
2019-06-01 10:44:01 +00:00
2b5aaad399 Revert 899714f667 to faciliate committing it again with credit in the commit message.
Agreed with: wraitii and liked by vladislavbelov in
https://wildfiregames.com/forum/index.php?/topic/26104-leper-attribution-request-899714f667/
Refs D1504

This was SVN commit r22330.
2019-05-31 21:56:13 +00:00
bb
7d25ab3a45 Merge persian and mauryan Archery Tradition technologies
Add the tech to ranges, and make them also pop upin captured barracks

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1941
This was SVN commit r22329.
2019-05-31 21:35:30 +00:00
bb
658a5a8dd1 Rename Stables class to Stable since we use the singular forms.
Fixes 964934cf4e

Patch By: Angen
Reviewed By: Nescio
Differential Revision: https://code.wildfiregames.com/D1890
This was SVN commit r22328.
2019-05-31 20:47:57 +00:00
5ecacc60f0 Fix the smoothing group issue reported by @vladislavbelov on the chat today, that is made more visible by https://code.wildfiregames.com/D1925.
- Rename civil_centre to civic_center
- Rename the shield prop object to a more explicit name.
- The template and the rubble template should be renamed in another
commit to make sure that do not affect the AI.

This was SVN commit r22327.
2019-05-31 13:21:58 +00:00
bb
bd26f04e5a Set ship status bars in parent
Patch By: Nescio
Reviewed By: wraitii
Comments By: Imarok, Stan
Differential Revision: https://code.wildfiregames.com/D1842
This was SVN commit r22326.
2019-05-31 12:00:49 +00:00
bb
e7f720d7bc Reduce defensive_wall* duplication
Including:
Remove LongWall from gates
Change the ("unused") gate cost component in more reasonable number and
adapt the repairTimeRatio with it to keep the health/second the same

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1794
This was SVN commit r22325.
2019-05-31 11:17:10 +00:00
bb
4495467e65 Seperate stable from barracks
Including:

    moves template_structure_military_barracks_stables.xml to
template_structure_military_stable.xml
    updates all its children accordingly
    merges values from pers_stable.xml into the new generic template
    changes generic name Stable (singular, without s)
    standardizes rubble sizes to 5x5 (pers had 4x4)
    corrects specific name for Greek factions
    adds foundation actor to kush_stable.xml

Patch By: Nescio
Comments By: Angen
Differential Revision: https://code.wildfiregames.com/D1790
This was SVN commit r22322.
2019-05-30 21:00:18 +00:00
bb
93139ab417 Rename pers_stables to pers_stable as rest of {civ}_stable to simplify check done by Petra
Patch By: Angen
Reviewed By: Stan
Differential Revision: https://code.wildfiregames.com/D1860
This was SVN commit r22320.
2019-05-30 16:55:45 +00:00
wackyserious
97fad1fe1d Re-upload the uncompressed PNG files for the previous commits.
There was a setback when I used tinypng to compress the images as it
eliminated necessary image component.

Reviewed by: Stan
This was SVN commit r22318.
2019-05-29 09:44:10 +00:00
wackyserious
dcdff5e9ca New Texture: Macedonian Units
Thread:
https://wildfiregames.com/forum/index.php?/topic/22184-task-greek-unit-texture-update/

Reviewed by: Art Department and forum community.
This was SVN commit r22317.
2019-05-29 09:30:16 +00:00
8cb7c4ec34 New horse and cattle fauna template corrections
Patch by: @Nescio
Reviewed by: @Stan
Differential Revision: https://code.wildfiregames.com/D1874
This was SVN commit r22315.
2019-05-28 20:46:56 +00:00
0c20afdfda Unit Motion: MoveTo family of function no longer returns false if the move is un-necessary, instead unitAI checks explicitly.
This also moves the actual "moving" code to states instead of orders,
making states more self-contained and removing the change of errors when
cleaning up a state.

Differential Revision: https://code.wildfiregames.com/D1865
This was SVN commit r22313.
2019-05-28 11:38:18 +00:00
899714f667 Small commands.js cleanup
Differential Revision: https://code.wildfiregames.com/D1504
This was SVN commit r22311.
2019-05-28 10:00:19 +00:00
0f645b45a9 Fix red squares on some maps when using HQ water effects
This fixes an oversight in rp22297.

Reported By: gameboy
Differential Revision: https://code.wildfiregames.com/D1919
This was SVN commit r22310.
2019-05-28 09:57:14 +00:00
42591587a8 New less broken walls for the gauls, move the gaul walls to the gaul repository, the gaul gate will be moved when it's replaced/improved.
Thread:
https://wildfiregames.com/forum/index.php?/topic/17326-your-screenshots/page/19/
https://wildfiregames.com/forum/index.php?/topic/19465-suggestions-for-the-gauls/page/4/

This was SVN commit r22309.
2019-05-27 22:01:25 +00:00
792027f18d Unify stables names.
Fix some decals,
Remove AO suffix,
Rename struct_b to roof
Use stable_elephant as per the art convention
<general>_<civ>_<type>_<extra>_<variation>

This was SVN commit r22306.
2019-05-26 20:11:58 +00:00
f504c643a0 Allow entities to be affected by Status Effects from ranged attacks.
This implements a status effects receiver component (in a similar
fashion to the damage receiver component). The plan is to further extend
this component notably to handle graphical indication of status effects,
and a variety of other effects.

Currently implemented: ranged attacks can inflict status effects that
reduce HP over time.
This can be resisted by armour.

No units currently utilise this in-game but with proper graphics support
that could be changed.

Patch By: Mate-86
Reviewed By: wraitii
References #1912

Differential Revision: https://code.wildfiregames.com/D1252
This was SVN commit r22304.
2019-05-26 12:44:46 +00:00
ea208f19a3 Health.js cleanup: add tests, add an "IsInjured" function, use this.hitpoints everywhere
Continuation of D1769.

Differential Revision: https://code.wildfiregames.com/D1828
This was SVN commit r22298.
2019-05-25 13:11:46 +00:00
01a8138780 Water GLSL shader improvements around reflections and whitespace fixes.
This improves refractions around entities close to the surface, such as
fishes, by handling depth better and by clipping the water plane a
little lower.

This uses the skybox for reflections when refractions are enabled but
reflections are disabled, making it possible to play with reflections
disabled without having super-ugly water (arguably a performance
improvement).

Differential Revision: https://code.wildfiregames.com/D359
This was SVN commit r22297.
2019-05-25 11:08:57 +00:00
b637fdbae9 Add unit motion integration test map
This uses trigger to create some scientific test cases for unit motion
(the whole unitAI->Motion->Pathfinders stack)

Differential Revision: https://code.wildfiregames.com/D1892
This was SVN commit r22296.
2019-05-25 10:26:03 +00:00
31010f493d Replace , with . in an AI's chat sentence
Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D1912
This was SVN commit r22293.
2019-05-21 17:32:14 +00:00
24b42ef15c Use Alexandermb's shield for the gaul theatron.
This was SVN commit r22292.
2019-05-20 12:51:55 +00:00
3aace01be7 New Briton Blacksmith.
Make all the props in the blacksmith buildings separate
Add three tools, one hammer, two tongs
Use the new briton shields on the blacksmith
Use the new helmets on the blacksmith
Add new crates, and gives it a bit more geometry.
Update the anvil eyecandy prop

This was SVN commit r22290.
2019-05-19 17:50:29 +00:00
3cc010d44e New deer icon by @wowgetoffyourcellphone
Reviewed by: @Stan
This was SVN commit r22289.
2019-05-19 09:18:07 +00:00
904b537483 Fix blood sometimes appearing below the infantry hero Ashoka.
This was SVN commit r22288.
2019-05-19 08:02:29 +00:00
3477b561a5 New icons for the boar, the camel, the horse, the walrus and the wildebeest by @wowgetoffyourcellphone
Reviewed by: @Stan
This was SVN commit r22287.
2019-05-18 09:29:02 +00:00
621bb1367a [CChart] Add a percentage format and round displayed integers
Reviewed by: bb
Approved by: Vladislav
Differential Revision: https://code.wildfiregames.com/D1878
This was SVN commit r22282.
2019-05-13 21:23:26 +00:00