Commit Graph

18260 Commits

Author SHA1 Message Date
Stan e05135d5e0 New cavalry icons by Wowgetoffyourcellphone for iberians, last was carthaginians.
Reviewed by : Stan

This was SVN commit r20927.
2018-01-19 23:02:58 +00:00
Stan e17ca101ab New cavalry icons by Wowgetoffyourcellphone for Iberians
Reviewed by : Stan

This was SVN commit r20926.
2018-01-19 23:00:49 +00:00
Stan ca4a3d55a4 New cavalry icons by Wowgetoffyourcellphone for gauls
Reviewed by : Stan

This was SVN commit r20925.
2018-01-19 22:49:14 +00:00
Stan 5576d5c78b New cavalry icons by Wowgetoffyourcellphone for brits
Reviewed by : Stan

This was SVN commit r20924.
2018-01-19 22:37:36 +00:00
Stan fd7100ddd1 New cavalry icons by Wowgetoffyourcellphone for spartiates
Reviewed by : Stan

This was SVN commit r20923.
2018-01-19 22:33:32 +00:00
Stan e5aa7285a0 Move unused icons files to the art source
This was SVN commit r20922.
2018-01-19 22:29:33 +00:00
Stan abb8aaed16 New cavalry icons by Wowgetoffyourcellphone for seleucids
Reviewed by : Stan

This was SVN commit r20921.
2018-01-19 22:17:00 +00:00
Stan 49dcd1c886 New cavalry icons by Wowgetoffyourcellphone for ptolemies
Reviewed by : Stan

This was SVN commit r20920.
2018-01-19 22:02:07 +00:00
Stan 5786bc03f4 New cavalry icons by Wowgetoffyourcellphone for persians
Reviewed by : Stan

This was SVN commit r20919.
2018-01-19 21:54:06 +00:00
Stan 5323baaa50 New cavalry icons by Wowgetoffyourcellphone for mauryans
Reviewed by : Stan

This was SVN commit r20918.
2018-01-19 21:52:36 +00:00
Stan 39fa3f5ecd New cavalry icons by Wowgetoffyourcellphone for macedonians
Reviewed by : Stan

This was SVN commit r20917.
2018-01-19 21:47:19 +00:00
Stan 616f33d34c New cavalry icons by Wowgetoffyourcellphone for romans
Reviewed by : Stan

This was SVN commit r20916.
2018-01-19 21:42:42 +00:00
elexis 4cd1161c2d Allow calling fractionToTiles and scaleByMapSize before RandomMap initialization, used by e084885ce9 already.
This was SVN commit r20915.
2018-01-19 21:24:04 +00:00
elexis e084885ce9 Pyrenean Sierra sigmoid-based Mountainrange cleanup, refs a796800bb1.
Use vector algebra and remove duplication, refs #4845, #4805.
Unify the first createTerrain call with InitMap.
Move mountain constants and the information which height receives which
texture to the top.

This was SVN commit r20914.
2018-01-19 20:24:36 +00:00
elexis 3361ff0997 Fix variable naming in Botswanan Haven in c5b7ecefa1 reported by mimo.
This was SVN commit r20913.
2018-01-19 19:11:53 +00:00
elexis cb82a9a84f Move BaseTerrain from the random map JSON files to all other terrain names used by the script.
The gamesetup will never be able to do something useful with it,
especially change it as an option, so it shouldn't be in the JSON file.
Fixes #4973.

This was SVN commit r20912.
2018-01-19 02:21:32 +00:00
elexis 5764ab9021 Cleanup volcano sizes, refs #4939.
This was SVN commit r20911.
2018-01-19 01:23:18 +00:00
elexis 78c2988e88 Randomize map orientation on most river maps, Gulf Of Bothnia and Migration to remove hardcoded magic numbers and add more variation for the player.
Refs #4855, #4845.

This was SVN commit r20910.
2018-01-19 01:09:36 +00:00
elexis 7656cc2eb7 Fix lobby registration of AIBehavior missed in 9c180f660f and 3319c69d97. Fixes #4959.
This was SVN commit r20909.
2018-01-18 21:22:34 +00:00
Stan c56a2381a1 Fix incorrect horse variant noticed by Alexandermb.
This was SVN commit r20908.
2018-01-18 19:24:48 +00:00
elexis e4d5e781d7 Fix fish on mountains on Harbor in a68881dd0f and a wrong negation in c5b7ecefa1. Fixes #4575.
This was SVN commit r20907.
2018-01-18 18:16:06 +00:00
elexis 32210bc6cb Fix pigs and chicken inside the CC and mines on Deep Forest by not using the terrain-painting based approach of placing entities which is free of any collision checks.
Fixes #4830.

This was SVN commit r20906.
2018-01-18 17:59:07 +00:00
elexis bd7ce79966 Delete getMapArea, fractionToSize, sizeToFraction.
Areas proportional to the map radius are easier to comprehend than areas
proportional to the square with the map diameter for sides.

This was SVN commit r20905.
2018-01-18 17:10:57 +00:00
elexis c5b7ecefa1 Delete BaseHeight property from random map JSON files and rmgen library, refs #6, #4973, 9ee44bd9b8, 0e0ed94926.
The height is only a concern to the random map script, not the rmgen
library, nor the gamesetup, nor the simulation.

Reveals the actual initial elevation to the random map script author
without looking up the JSON file.
Group and rename all height constants of random maps below the template
names.
Rename waterHeight to heightSeaGround to prevent confusion with the
actual waterlevel.
Remove useless paintTerrainBasedOnHeight calls on African Plains and
Polar Sea.

This was SVN commit r20904.
2018-01-18 13:57:11 +00:00
elexis d40616c68e Fix Wild Lake in 442c9848b8.
This was SVN commit r20903.
2018-01-18 13:36:59 +00:00
elexis 6462653351 Delete placeTerrain which is just a proxy of createTerrain.
This was SVN commit r20902.
2018-01-17 23:51:28 +00:00
elexis a6c7b4de98 Simplify and inline createSimpleTerrain.
This was SVN commit r20901.
2018-01-17 23:36:11 +00:00
elexis 1ad10e5999 Merge InitMap, initTerrain and resetTerrain successors from 6d33c2eab7.
Lets the random map script decide which baseTerrain and baseHeight it
wants to use before initializing the map,
rather than painting what is in the JSON file, then changing ones mind
and painting something else on top of it.
This cleaner heightmap initialization incidentally addresses the
uninitialized border of the heightmap in that commit (excluding the
Unknown).

This was SVN commit r20900.
2018-01-17 23:27:06 +00:00
mimo 583873103f petra: add a protection for mods without the expected metadata
This was SVN commit r20899.
2018-01-17 22:06:27 +00:00
elexis dfa618903b Rename random map Map to RandomMap, so that it doesn't overwrite the native JS Map object, fixes #4961.
This was SVN commit r20898.
2018-01-17 19:19:21 +00:00
elexis c21ca495f8 Fix a forgotton line in e9e983c2d4 and mess with a 1-tile workaround.
This was SVN commit r20897.
2018-01-17 19:12:22 +00:00
Gallaecio 4e96980d5a Build with the "read-only relocation" hardening linker flag
Summary: Improve binary security by enabling a hardening linker flag.

Test Plan:
Patch already used on Debian.

Tested locally by @Gallaecio as well.

Reviewed By: LudovicRousseau
Trac Tickets: #4894

Differential Revision: https://code.wildfiregames.com/D1123
This was SVN commit r20896.
2018-01-17 18:01:58 +00:00
elexis d9f5b2a40e Remove mysterious lake area factor "lSize" from random map scripts in a9b963c3a5 and copies. Fixes #4958.
Just use diskArea of a ratio of the map diameter everywhere, so numbers
remain proportional and directly comparable.

This was SVN commit r20895.
2018-01-17 17:18:43 +00:00
elexis 6d33c2eab7 Implement MapBoundsPlacer that returns all points on the tilemap.
Use it to replace the hacky resetTerrain rmgen2 function from 6d52a71d4a
and initHeight from 280a797620.

Highlights that createArea is the primary tool of rmgen, rather than
nested for-loops over the mapsize.
Neglect that the heightmap grid is one tile larger than the tilemap grid
for now.

This was SVN commit r20894.
2018-01-17 03:34:09 +00:00
elexis 46564c6a8e Remove remaining unneeded null constraints that could have been noticed in 376d8b3d1e.
This was SVN commit r20893.
2018-01-17 03:09:23 +00:00
elexis 4263fae6c2 Don't call it centerOfMap, center, mid, centerX, centerZ, fractionToTiles(0.5), Math.round(fractionToTiles(0.5)), mapSize / 2, mapSize * 0.5, but just mapCenter everywhere and get it from the library.
Fixes #4854, refs #4845.

This was SVN commit r20892.
2018-01-17 01:55:45 +00:00
elexis 1f7913a93f Cleanup Island Stronghold starting resources code using vector algebra, mapcenter getter, distributePointsOnCircle, refs #4845, #4854.
Since it is the only map with stronghold placement where the mines are
placed facing away from the team center, this code should be moved to a
library eventually, refs #3851.

This was SVN commit r20891.
2018-01-17 00:51:25 +00:00
Stan cf79693860 Fix incorrect variants showing up as death and run shouldn't have any frequency.
Noticed by Alexandermb

This was SVN commit r20890.
2018-01-17 00:25:58 +00:00
elexis 448a560350 Move map specific biome constants to the scope setting that biome in that map, refs #4954.
Only Gulf of Bothnia didn't have it grouped yet.

This was SVN commit r20889.
2018-01-16 20:55:00 +00:00
elexis 713d816855 Use paintRiver on Latium, refs #4805, 7d0cc59136.
This was SVN commit r20888.
2018-01-16 17:38:03 +00:00
elexis 31e412b94e Remove redundant no-map-preview sprite found in D817.
This was SVN commit r20887.
2018-01-16 15:18:15 +00:00
elexis 960f2d7c31 Enable players to open the lobby as a dialog in the gamesetup, running games and the summary screen.
Differential Revision: https://code.wildfiregames.com/D817
Patch By: fpre / ffffffff
Fixes #4106

This was SVN commit r20886.
2018-01-16 15:05:16 +00:00
mimo 2d04f3d1e9 fix 30f0e80dae
This was SVN commit r20885.
2018-01-16 08:29:10 +00:00
elexis 28ff1c053e Via Augusta skirmish map by Bigtiger, fixes #4934.
This was SVN commit r20883.
2018-01-16 05:36:05 +00:00
elexis 442c9848b8 Merge all playerX and playerZ arrays into one array of Vector2D items.
This way random map scripts can do vector math and pass the result to
library functions that do further vector math on them and leave shorter
code, refs #4845.
Pass tilegrid coordinates rather than percent numbers to the playerbase
functions too, refs #4939.
Some more mapCenter calls, refs #4854.

This was SVN commit r20882.
2018-01-16 04:39:31 +00:00
elexis f8eae16390 Fix two wrong tileclasses c74bd3425f and adapt Fortress floor area to D900.
This was SVN commit r20881.
2018-01-16 04:29:06 +00:00
elexis 463f7f1ee3 Remove unused function following f5375cbcb9. Implement it using vectors if used again (#4845).
This was SVN commit r20880.
2018-01-16 04:17:06 +00:00
elexis cbcbd19e0b Extract a RandomPathPlacer prototype from Deep Forest (83422923aa) and Schwarzwald (49194819f6) duplication, refs #4805, #4804.
This allows creation of paths that are not linear nor sine-shaped like
the PathPlacer, refs #892.
To mimic the per-tile path elevation randomization on Deep Forest, use a
SmoothElevationPainter and it's randomization argument from 77f28c5a56.
Use vector algebra and the mapCenter getter, refs #4845, #4854.

This was SVN commit r20879.
2018-01-16 04:12:23 +00:00
temple 7d172a9b1d Consider that the point could be inside the goal area in some PathGoal functions
Reviewed By: wraitii
Comments By: mimo
Differential Revision: https://code.wildfiregames.com/D1089
This was SVN commit r20878.
2018-01-16 02:15:04 +00:00
temple 033489480a Stop formation when ordered to stop
Differential Revision: https://code.wildfiregames.com/D999
Reviewed By: wraitii
Fixes #3565

This was SVN commit r20877.
2018-01-16 00:55:58 +00:00