1
0
forked from 0ad/0ad
Commit Graph

17882 Commits

Author SHA1 Message Date
7a17a3152c Pass the size in meters of a terrain grid tile from Terrain.h to the rmgen JS code to avoid hardcoding thereof.
Refs #4034, D900
Differential Revision: https://code.wildfiregames.com/D1059
Reviewed By: s0600204
This was SVN commit r20504.
2017-11-23 20:54:48 +00:00
4734997098 Always generate the island on Phoenician Levant (by using 100 intead of 10 retries).
Fix resource collisions on that island.
Incrase the radius, not the area of the island proportionally to the map
radius.
Prevent the island from becoming passable without ships.
Use the non-deprecated createObjectGroups variant.

This was SVN commit r20503.
2017-11-23 10:18:05 +00:00
bb
e6dff349bd Fix scrollbare edgy-case and off by 1's in dropdown
Reviewed By: Imarok
Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D1030
This was SVN commit r20500.
2017-11-21 20:07:23 +00:00
bb
2fa4457453 Allow walls to have rally-points
While at it also nuking some duplicate template entries

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1038
This was SVN commit r20498.
2017-11-21 17:06:48 +00:00
235f452765 Let units face away from the building they were trained or ungarrisoned from.
Uses the vector functions from 8ee2a8aca2 and fixes the TODO from
08db7ebe13 / 0aaddf62aa.

Differential Revision: https://code.wildfiregames.com/D1037
Patch By: temple
This was SVN commit r20497.
2017-11-21 16:22:09 +00:00
8ee2a8aca2 Add Vector2D angleTo and Vector3D horizAngleTo function.
Use it to illustrate the building placement preview rotation and
focusing of attacked units.

Split from D1037
Patch By: temple
This was SVN commit r20496.
2017-11-21 16:17:30 +00:00
7e8849366b Remove useless ungiven specific names, add drop props for the briton workshop, and fixed a broken drop prop in the elephant stable that caused warnings. convert files from utf-8 with bom, to without. fixes 8ee600b979
This was SVN commit r20495.
2017-11-21 14:47:11 +00:00
70e7c5e806 Fix broken (as with wrong parent) template. noticed by Imarok
fixes c6356b41b4

This was SVN commit r20494.
2017-11-21 14:42:39 +00:00
c6356b41b4 mauryan range and workshop
This was SVN commit r20492.
2017-11-21 13:22:04 +00:00
4e8eac9857 Change onager footprint to better reflect its shape add player color and icon (Textures edited by WowGetOffYourCellPhone)
And change its specific name to onager

This was SVN commit r20491.
2017-11-21 09:23:32 +00:00
19c123b213 New tools made by Alexandermb + fix for the berry basket uv (UV was out of bounds, and since texture do not tile, it appeared stretched)
reviewed by Lordgood

This was SVN commit r20488.
2017-11-20 22:51:08 +00:00
f737bc4be0 put back a line removed unintentionally in 1af6ccbd41
This was SVN commit r20487.
2017-11-20 18:32:55 +00:00
2bde5874a7 fix an inconsistency in 3b6c612975, noticed by leper
This was SVN commit r20486.
2017-11-20 18:30:21 +00:00
9cdf20f123 New goat mesh, reviewed by Lordgood and Wowgetoffyourcellphone.
Made on fatherbushido's request.

This was SVN commit r20485.
2017-11-20 17:14:47 +00:00
b244e5db78 Fix broken fireraiser actor, and unify them. Use Alexandermb's units as placeholders for the time being.
This was SVN commit r20484.
2017-11-20 16:29:47 +00:00
23e750ac88 New siege fire animations for units, made by AlexanderMb and some cleanup in those files done by myself.
Reviewed by Lordgood

This was SVN commit r20483.
2017-11-20 16:28:45 +00:00
f132e1ca66 Add new textures for Pureon's onager, so it can be used as a unit, or as a prop.
This was SVN commit r20482.
2017-11-20 16:08:11 +00:00
3b6c612975 allow the ai to run without loading all templates at startup (not yet enabled).
This was SVN commit r20480.
2017-11-19 19:05:54 +00:00
1af6ccbd41 petra: a few tunings and add a protection in tradeRoute serialization in case a market was destroyed in the last few turns between AI running and serialization
This was SVN commit r20479.
2017-11-19 14:56:22 +00:00
cfa3f4a993 petra: cleanup of a142dfa2df (treat all events of hq and baseManager in a same place)
This was SVN commit r20478.
2017-11-19 14:43:41 +00:00
4aa1632365 Rename oWood to oWoodTreasure et cetera on random maps to prevent confusion with resource templates.
This was SVN commit r20477.
2017-11-18 15:43:24 +00:00
8f4363f146 Split uncommon random map playerbase terrain code from the common playerbase starting entities code.
This allows replacing the common code with a library call in only one or
two hunks each.

On Archipelago move the random resources closer to the playerbase to
make the map more enjoyable.
Use default/skirmish templates for the docks on Islands/Migration and
the market on Polar Sea while at it.
Abort map generation if the dock placement failed.
Remove clForest dummy variable on Polar Sea following the removal of
references to map defined tileclasses in the library following
822e37f70c.

This was SVN commit r20476.
2017-11-18 15:35:29 +00:00
46979b52a9 Fix units getting wet feet on Corinthian Isthmus due to an unrightful right angle in b0bd645fbb until rubber boots are implemented.
This was SVN commit r20475.
2017-11-18 15:25:59 +00:00
a142dfa2df petra: some tweaks for playing on nomad maps (mainly delaying some strategic choices after the cc is built)
This was SVN commit r20474.
2017-11-17 19:20:18 +00:00
b10f2b5a62 Move all units (which only is the Mustang plane) from the templates/other/ directory to the templates/units/ directory, refs #4770.
Differential Revision: https://code.wildfiregames.com/D1007
Patch By: Nescio
Comments By: fatherbushido, leper
This was SVN commit r20473.
2017-11-17 17:15:11 +00:00
74b83e9634 On both Deep Forest (83422923aa) and Schwarzwald (49194819f6) random maps, replace the copy of the magic number approximating the engine constant specifying the impassable map border tiles with a passability check from the library. Refs #4814, #4805.
Remove the duplication of the subsequent createArea call as in
376d8b3d1e.

This was SVN commit r20472.
2017-11-17 16:09:31 +00:00
bb
722578fdcd Cleanup the conquest code
Stop listening to OnTrainingFinished and OnStructureBuild messages but
use OnOwnershipChanged messages. This fixes the defeat when only
promoted/upgrades/regi-hero units remain.
Add foundations to the conquest lists and make them visible on the
minimap.

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1022
This was SVN commit r20471.
2017-11-17 11:38:51 +00:00
b0bd645fbb Unify the other axis of the 8 remaining playerPlacementRiver calls following f1e352927c, refs #4805.
Use the rotateAround function from eb96b61954, refs #4845.
Freely randomize the river angle on Corinthian Isthmus following
4256744e26 and eb96b61954, refs #4855.

This was SVN commit r20469.
2017-11-17 03:11:12 +00:00
eb96b61954 Add rotateAround Vector2D function.
Remove the rmgen rotateCoordinates helper function from 4256744e26 and
clean the implementation of that commit, refs #4845, #4804.
Deepfreeze mapCenter vector from 5256d8497e used here to prevent
accidental overwrites with the mutating Vector2D functions, refs #4854.

This was SVN commit r20468.
2017-11-17 00:10:29 +00:00
a2f7dba96c Move simulation test for approximate equality from e18598cd62 to the test setup, so that it can be reused.
Remove unneeded helper variable from e18598cd62 as intended by
7778a7b436 by using the set method.

This was SVN commit r20467.
2017-11-16 23:54:38 +00:00
05ea4c84d8 Unify 7 variants of the rmgen player line-positioning code, refs #4805.
Drop the negligible per-player location randomization on Latium.

This was SVN commit r20466.
2017-11-16 17:54:38 +00:00
db9a52b94a Fix some unintended obliteration in efd9b3e212.
In the Edge Seas variant, fix a wrong horizontal/vertical negation and
the direction of the riversize randomization.
Fix the wrong river location translation in that variant in e596ef6011,
refs #4851.
Prevent resource collisions on Unknown maps by adding back the large
territory marking (after the small territory marking prior to the
terrain generation).
Slightly improve river painting performance by not generating the
meandering of the second shoreline if that is outside of the map
boundary.

This was SVN commit r20465.
2017-11-16 17:33:59 +00:00
5cfd4382dd Delete unused "blank" random map script from 0e0ed94926 which doesn't have an accompanying json file either.
This was SVN commit r20464.
2017-11-16 13:51:58 +00:00
5256d8497e Survival Of The Fittest cleanup:
Replace complicated starting unit code with a call to
placeStartingEntities equal to df14c914e6.
Use distributePointsOnCircle to remove sin/cos/distance computations.
Add map center getter for rmgen code, refs #4854.

This was SVN commit r20463.
2017-11-16 13:11:03 +00:00
bb
0a6d78ddd5 Allow loot to be modified by technologies and auras
Patch By: Grugnas
Commented on By: fatherbushido, elexis
Differential Revision: https://code.wildfiregames.com/D408
This was SVN commit r20462.
2017-11-15 22:56:04 +00:00
446889bc52 workshop repair aura
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1043
This was SVN commit r20461.
2017-11-15 22:33:27 +00:00
34d7477b5b petra cleanup following 77a2f484a2
This was SVN commit r20460.
2017-11-15 22:31:25 +00:00
bb
77a2f484a2 Rearrange tower templates
Rename tower techs to tower_{tech}
Remove duplication in tower templates
Create tower parent, with sentry, stone and outpost as childs
Move all outpost as child of tower
Add a sentry tower default building

refs #4849

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D914
This was SVN commit r20459.
2017-11-15 21:16:17 +00:00
013a93293b New bows and arrows for every civ ! Blendfiles are in the repo.
Reviewed by LordGood and partially WGOYCP
Thread :
https://wildfiregames.com/forum/index.php?/topic/21546-enhancement-macedonian-helmets/&page=2

This was SVN commit r20458.
2017-11-15 20:56:56 +00:00
1447bfbd7c Workshop templates reorganization
Discussed with elexis and Nescio

Differential Revision: https://code.wildfiregames.com/D1031
This was SVN commit r20457.
2017-11-15 18:44:23 +00:00
f5f094602f Fix typo in e596ef6011, fixes #4851.
This was SVN commit r20456.
2017-11-15 18:38:18 +00:00
93be4091cc petra: look for initial treasures at start game, sometimes needed on nomad maps to build the first cc
This was SVN commit r20455.
2017-11-15 18:27:50 +00:00
57e547bd32 Split vector test scopes to make it easier to add tests in between, refs 99494251a1.
This was SVN commit r20454.
2017-11-15 12:47:48 +00:00
260c78cc1a Fix an issue with the woman basket having a hole at the bottom. Use a different actor for gathering, as the previous basket was tilted on the wrong side. Slightly tweak the tip of the basket to look like there is a hole in it. Fix indent in the file.
This was SVN commit r20452.
2017-11-14 20:31:25 +00:00
bb
62c8403eab Fix some SelectionGroupNames
Change wrong civs in ptol and sele walls
Let Persian trireme units depend on there land counterparts
Make the buildtime consistent with the land counterparts by decreasing
with 3
Nuke duplication for rome infantry champ

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1033
This was SVN commit r20451.
2017-11-14 19:21:58 +00:00
72e2d0440e Remove ram from fortress to let people in charge of balancing make the call on whether it should be added to the civ or not.
Add Alexandermb to the list of 3D contributors.
Thanks elexis for raising concerns

This was SVN commit r20450.
2017-11-14 18:48:13 +00:00
6b4d73f6df ai cleanup: move some functions from Entity to template where they should have been
This was SVN commit r20449.
2017-11-14 17:38:05 +00:00
15ff2f0ca9 unitActions is a global variable (unitActions --> g_UnitActions)
Reviewed By: O8 JS GUI, elexis
Differential Revision: https://code.wildfiregames.com/D1012
This was SVN commit r20448.
2017-11-14 13:43:14 +00:00
fb8aa3ef19 Not so small input.js (originally been batch training) cleanup
* Move selection_panels.js helper functions into a separate file
 * Move unit_action helper functions from input.js into unit_actions.js
 * Rearrange some functions, to better represent the execution flow
 * Make batch training use `g_NumberOfBatches` instead of
`g_BatchTrainingCount` so remember the number of batches instead of the
number of units to train (needed for finishing P60)
 * Simplify the batch training code a bit
 * Also cleanup the moved functions a bit

Reviewed by: bb, Commented by elexis
Differential Revision: https://code.wildfiregames.com/D753
This was SVN commit r20447.
2017-11-14 13:30:01 +00:00
3e9b7fa5fa New ram for Mauryans, by AlexanderMB, with a new icon. This mechanical unit is now trainable in the fortress.
Blend file + Icon xcf committed to the art repository

This was SVN commit r20446.
2017-11-14 12:53:45 +00:00