Commit Graph

18435 Commits

Author SHA1 Message Date
mimo 232d1d9503 petra: fixes/cleanup for regicide
This was SVN commit r21114.
2018-02-05 17:59:00 +00:00
elexis 204b04f2d4 Allow random map scripts to load heightmap image files, fixes #5018.
Move the atlas heightmap import code to MapIO.cpp and reuse it.
Implements what 33e3e6c2ab and 69b7f39bf1 wanted to be.

This was SVN commit r21113.
2018-02-05 16:02:00 +00:00
elexis c95901515e Stop claiming that JPEG files are supported for heightmap import following c9cecab0be, refs #2828.
This was SVN commit r21112.
2018-02-05 14:22:16 +00:00
elexis 98ebb3bb77 When importing a heightmap image in atlas, don't omit the last vertex of each side of the heightmap! Fixes #5021, refs c9abf6f68c.
(Since there are 4 vertices per tile, there is one more vertex per side
than there are tiles / pixels per side.)

This was SVN commit r21111.
2018-02-05 14:08:46 +00:00
mimo 22903b09a6 Set victory conditions for autostart games.
Reviewed By: elexis
Trac Tickets: #5016

Differential Revision: https://code.wildfiregames.com/D1278
This was SVN commit r21108.
2018-02-03 19:39:33 +00:00
temple 7819ea434e Diplomacy Colors
Add a button to toggle between normal and "diplomacy" colors.
Reviewed by: elexis
Comments by: leper, ffffffff, Stan
Fixes: #4747

This was SVN commit r21107.
2018-02-03 14:17:31 +00:00
elexis 23820c5713 Static equality test for vectors.
This was SVN commit r21106.
2018-02-02 20:13:31 +00:00
mimo 47ba6b9a84 petra: some fixes for relic game mode
This was SVN commit r21105.
2018-02-02 18:37:29 +00:00
elexis f92405aa25 Simplify unused and bad-practice, but potentially useful AvoidTextureConstraint.
Implement StayTextureConstraint for the same reason.
getTexture should function on the entire square tilegrid, even on
circular maps.

This was SVN commit r21104.
2018-02-02 17:44:53 +00:00
s0600204 db1ec0f7f7 Add a couple of string manipulation functions to globalscripts.
(And use them where appropriate.)

This was SVN commit r21101.
2018-02-02 01:37:39 +00:00
Stan 36e42fedbf Remove dae file from actor folder.
This was SVN commit r21100.
2018-02-02 00:57:50 +00:00
Stan dccbfe0fcd New mushrooms for maps;
Discussed with : elexis, Imarok, fpre
Request by : FeXoR

This was SVN commit r21099.
2018-02-01 23:48:03 +00:00
elexis fe424f03ca Fix wrong biome JS function name following 626d89a726, refs #4954.
Based on patch by: (-_-)
This was SVN commit r21098.
2018-02-01 22:41:09 +00:00
Itms 4fe59c141d Fix crash at start in snd_detect(), fixes #4786.
Reviewed By: s0600204, echotangoecho
Differential Revision: https://code.wildfiregames.com/D1254
This was SVN commit r21097.
2018-02-01 18:12:53 +00:00
elexis b695945c59 Move other/special_treasure_* to gaia/treasure/.
Differential Revision: https://code.wildfiregames.com/D992
Refs #4770, D989
Patch By: Nescio
Comments By: fatherbushido, leper
This was SVN commit r21096.
2018-01-31 23:42:43 +00:00
elexis 7d451f1611 Move gaia/special_treasure_* to gaia/treasure/.
Rename metal_persian_bigl to metal_persian_big.

Differential Revision: https://code.wildfiregames.com/D989
Refs #4770
Patch By: Nescio
Comments By: fatherbushido, leper
This was SVN commit r21095.
2018-01-31 23:23:51 +00:00
elexis 2739c41c70 Move ruins templates from other/ to gaia/ruins/.
Differential Revision: https://code.wildfiregames.com/D991
Based on patch by: Nescio
Refs #4770, D989
Comments By: fatherbushido, leper
This was SVN commit r21094.
2018-01-31 22:04:17 +00:00
elexis efc50e9046 Move ruins templates to a new gaia/ruins/ subfolder.
Remove the "special" prefix since they are not special in any way.
Delete special_ruins.xml from 40b9fc8c1e as it is identical to
special_ruins_column_doric.xml from ff3c7b46f4.

Differential Revision: https://code.wildfiregames.com/D990
Based on patch by: Nescio
Refs #4770, D989
Comments By: fatherbushido, leper
This was SVN commit r21093.
2018-01-31 21:50:50 +00:00
elexis 9a2bf1ebfb Performance improvement on Kerala, refs #5011.
This was SVN commit r21092.
2018-01-31 20:46:43 +00:00
elexis f1b6aaeabc Don't place trees inside civic centers on tiny Corsica vs Sardinia.
This was SVN commit r21091.
2018-01-31 19:54:40 +00:00
elexis a6e4c5142a On Persian Highlands, allow players to chose the summer or spring variant in the gamesetup, refs #4954.
Add Hannibal_Barca's biome descriptions on Gulf Of Bothnia and Persian
Highlands.

This was SVN commit r21090.
2018-01-31 19:51:23 +00:00
elexis 7723256248 Fix obligatorily broken translation of the new map-specific biome directory structure in 626d89a726, refs #4954.
This was SVN commit r21089.
2018-01-31 19:47:45 +00:00
elexis 399e40d8d9 Accelerate Danubius map generation performance, from 90 seconds to 15 seconds, refs #5011.
Use the non-deprecated createObjectGroups variants, so that one doesn't
have to do 10 million placement attempts...
Mark the area (land, water, island) and only chose random locations from
these areas using createObjectGroupsByAreas.
Don't ignore the map border for siege engine patrol points, because
AvoidClassesConstraint is very slow for large radiuses.

This was SVN commit r21088.
2018-01-31 18:31:11 +00:00
mimo 5f8148e1dd petra: improve capture of gaia relics
This was SVN commit r21087.
2018-01-31 18:22:59 +00:00
elexis d7d9539f2d Allow passing no painters to createArea and MultiPainter, similar to 495f83663e for Constraints.
This was SVN commit r21086.
2018-01-31 18:20:40 +00:00
elexis 24388f781e Implement rmgen SlopeConstraint which is met if the elevation difference is within the given range, fixes #5004.
Add NearTileClassesConstraint that is satisfied when there is a tile
marked with the given class in the given range.
Use it for the grass and mountain terrain painting on Pyrenean Sierra.

This was SVN commit r21085.
2018-01-31 16:42:19 +00:00
elexis 906c23c54b Implement a ConvexPolygonPlacer that returns all points in the convex hull of some given points.
Implements the Gift-Wrapping algorithm to compute the convex hull.

Replace the latter half of the pathplacer with this new placer, refs
#892.
Improves the performance a bit, refs #5011.

Use the new placer on Kerala and Hyrcanian Shores to replace the
workaround from 903e094f62, refs #4855
(the area is not supposed to be parallel to the meandering river).

This was SVN commit r21082.
2018-01-31 04:20:32 +00:00
elexis bb5fe743ec Rename some variables of the pathplacer and use JSdoc, refs #892, #4831.
This was SVN commit r21081.
2018-01-31 04:02:59 +00:00
elexis 57f8e04e58 Implement getBoundingBox and getPointsInBoundingBox rmgen helper.
Removes the according duplication in placers and makes the loops over
these points onedimensional, refs #4805.
JSdoc for centric placers, refs #4831.

This was SVN commit r21080.
2018-01-31 03:58:33 +00:00
elexis 2059117ed9 Scythian Rivulet random map script by Hannibal Barca, fixes #4956.
Differential Revision: https://code.wildfiregames.com/D1233
This was SVN commit r21079.
2018-01-30 23:16:21 +00:00
elexis 7cc3091c65 On DeepForest and Schwarzwald, don't abuse the RectPlacer (nor formally ClumpPlacer) to just paint on a single tile, refs 83422923aa, 49194819f6.
This was SVN commit r21078.
2018-01-30 22:12:54 +00:00
mimo 9be3fd2bf4 petra: fix target choice in some attacks
This was SVN commit r21077.
2018-01-30 18:07:53 +00:00
Imarok 776899c254 Show rank icon above status bars
Reviewed by: bb
Fixes: #5005
Differential Revision: https://code.wildfiregames.com/D717
This was SVN commit r21076.
2018-01-30 15:10:20 +00:00
Itms 2bfb580415 Fix non-PCH build by adding an explicit include.
This used to build so the include of CStr.h disappeared from the include
chain at some point. PCH builds kept working because this file is
included in precompiled.h for the engine project.

Differential Revision: https://code.wildfiregames.com/D1273
Reviewed By: Imarok
This was SVN commit r21075.
2018-01-30 07:20:49 +00:00
temple 37d317e01a Remove the alert status on units
Differential Revision: https://code.wildfiregames.com/D681
Reviewed by: causative
Fixes: #4185, #4656

This was SVN commit r21074.
2018-01-30 01:47:12 +00:00
elexis b5b384da48 Implement rmgen JS logger that measures the time for each procedure and prints logmessages to stdout, fixes #4950.
Allows to identify performance bottlenecks quickly and provides a better
sense of progress when viewing stdout.

This was SVN commit r21073.
2018-01-30 00:11:11 +00:00
temple 1ba1e86c5e Use a countdown rather than a tooltip for displaying construction progress
Change the time to completion to a countdown and remove the tooltip on
the health bar.
Move the number of builders to the time speed-up tooltip.
Remove the build rate tooltip.

Differential Revision: https://code.wildfiregames.com/D572
Early review by: wraitii
Comments by: bb
This was SVN commit r21072.
2018-01-30 00:02:10 +00:00
bb 7e14a33411 Make the resource/pop tooltips sortable
Patch By: ffffffff
Differential Revision: https://code.wildfiregames.com/D1113
This was SVN commit r21071.
2018-01-29 23:12:12 +00:00
mimo 99dc7c8f1c petra cleanup
This was SVN commit r21070.
2018-01-29 18:36:06 +00:00
elexis 78ce731fc5 rmgen random placement and Entity instantiation refactoring, fixes #4992.
ChainPlacer, ClumpPlacer, SimpleObject receive the vectors that are in
place everywhere already, refs #4845.
Add public setCenterPosition to CenteredPlacer and Group rather than
writing private properties of the prototypes.
ChainPlacer and ClumpPlacer simplifications, deduplication and renames,
refs #4805.

Replace placeObject global with RandomMap placeEntity members, refs
#4804.
Split to placeEntityPassable / placeEntityAnywhere, as well as
validTilePassable / validTileAnywhere to more cleanly distinguish actor
and casual entity placement.
No more does SimpleObject create Entity instances and register entityIDs
if they are never placed.
Removes the map global reference from the Entity constructor, refs
#4964.
By definition of what is passed to the engine, an Entity has an ID and
position, so keep it impossible to create Entities without IDs.

Implement randomPositionOnTile so that there aren't different
implementations thereof, including unintented ones as in
ardennes_forest.js in 2f7610160f.
On Caledonian Meadows, remove unused pathplacing code, to be superseded
by #4368.
On Schwarzwald, delete unused startLocations following b180ad3e5d.
On Latium, replace complicated duplicated hardcoded fish location
computation with a simple HeightConstraint, refs #4960.

This was SVN commit r21069.
2018-01-29 16:20:14 +00:00
Stan f3d1d3120c Fix sounds path broken in previous commit
This was SVN commit r21068.
2018-01-29 13:23:09 +00:00
Stan edbaec24a1 Delete camel sound file that is not death and is unused.
Move goat death sounds to the death folder, and use every one of them.

This was SVN commit r21067.
2018-01-29 12:54:55 +00:00
Stan 3da24fbb89 Remove some progress bar duplication
This was SVN commit r21066.
2018-01-29 12:38:49 +00:00
Stan b55096853e Use the icon for the 300 version of Leonidas.
This was SVN commit r21065.
2018-01-29 12:24:55 +00:00
elexis e185820e10 Implement TS_ASSERT_NUMBER as a future precaution of the integer epsilon slip in 30fe33bb0b.
Add another vector rotation test.

This was SVN commit r21064.
2018-01-29 11:55:43 +00:00
elexis 65c62c0862 Fix inclusionCount reference in the heightmap library / Wild Lake map following 2ac7d4fd32.
Delete clPath there altogether because it's never written to, nor
terrain textures painted.
Replace other inclusionCount references with common avoidClasses
constraints.
Remove now unneeded undefined checks.
Make nomad units on Wild Lake avoid gaia camps.

This was SVN commit r21063.
2018-01-29 10:47:23 +00:00
elexis 30fe33bb0b Add another Vector2D rotation test (illustrating the most common rmgen rotation transformation).
TS_ASSERT_EQUALS_APPROX must not silently pass if epsilon wasn't given.
Sort Vector2D.rotate summands by component rather than saving one
character.

This was SVN commit r21062.
2018-01-29 09:51:20 +00:00
Stan 2fa34e129d New celt hero icon by wowgetoffyourcellphone
Reviewed by : Stan.

This was SVN commit r21059.
2018-01-29 03:20:50 +00:00
Stan eb9b7e21e6 Move some unused icons as they are only used in DE, or will be used for part II;
This was SVN commit r21058.
2018-01-29 03:17:13 +00:00
Stan 68e66681be Move an ancient placeholder siege tower to the public old folder.
This was SVN commit r21057.
2018-01-29 02:52:59 +00:00