Commit Graph

55 Commits

Author SHA1 Message Date
639b583d31 Fix scatter formation
This was SVN commit r14700.
2014-01-29 14:01:21 +00:00
c751500907 Refactor some formation code to let it make use of the prototypes
This was SVN commit r14693.
2014-01-27 12:34:59 +00:00
09a2729503 fix a fix
This was SVN commit r14682.
2014-01-26 09:40:54 +00:00
f1ab9b8e57 Check isInWorld before asking position
This was SVN commit r14681.
2014-01-26 09:24:32 +00:00
1fedf11e9e Use a filter to pick a new attack target in the same turn, while still avoiding an infinite loop
This was SVN commit r14638.
2014-01-22 18:38:15 +00:00
04aba0e41a Let certain formations stay in formation while attacking
This was SVN commit r14633.
2014-01-22 13:20:55 +00:00
e466565c35 Let formations attack other formations (still without keeping their formation position though)
This was SVN commit r14628.
2014-01-21 16:50:58 +00:00
96448bfa4e * add a (currently useless) attack state to formations
* add a formation attack component that will be used in the future to
coordinate formation attacks
* clean up some related methods, and move some to more appropriate
places

This was SVN commit r14569.
2014-01-11 12:19:43 +00:00
f9b950aa96 improve rearrange of idle formation when units are tasked away from the formation + fix formation-settable idle animations
This was SVN commit r14544.
2014-01-08 10:55:44 +00:00
e8c4031bea Don't disband idle formations anymore, but give the formations a decent idle state. Formationmembers still need to leave the formation to anything other than walking, but this is a small step towards attacking formations.
This was SVN commit r14543.
2014-01-08 09:47:27 +00:00
4585f7322c Make the tooltips and the required members part of the formation template + fix allowing the wedge formation only for cavalry
This was SVN commit r14542.
2014-01-08 08:02:15 +00:00
aadd297cce Implement the ability to switch animations based on the formation position
This was SVN commit r14537.
2014-01-07 20:21:55 +00:00
b1e0f1b62a Clean up the mess of different ways to note the formations (capitalised, with spaces, with underscores, concatenated ...) by always referring to the template name.
This was SVN commit r14534.
2014-01-07 13:33:08 +00:00
94907897a7 Fix tests + fix classes Ashoka. Fixes #2362
This was SVN commit r14533.
2014-01-07 09:23:59 +00:00
f19a8d6b41 Take the box formation out of the special case formations
This was SVN commit r14524.
2014-01-06 13:32:48 +00:00
9989359c46 Small code cleanup + fixed default formation orientation
This was SVN commit r14522.
2014-01-06 10:16:28 +00:00
2f077fd9e1 Remove wedge formation from being a special case in the formation code
This was SVN commit r14521.
2014-01-06 09:10:46 +00:00
92ed27e3c5 Treat the flank formation as a regular formation, rather than a special implementation.
This was SVN commit r14518.
2014-01-05 18:50:31 +00:00
b8ee766cd3 Remove some hardcoded formation shapes. Some special formations still have a special treatment though. Also implement speed modifiers for formations, so we can have faster and slower formations.
This was SVN commit r14516.
2014-01-05 17:13:22 +00:00
d0497c83f1 Split the formation template in different templates. This can be used later to remove hard-coded formation statistics and forms to attributes in those templates
This was SVN commit r14510.
2014-01-05 10:09:42 +00:00
8269f0cfd4 Group units in clusters of separate formations when they're too far apart.
This was SVN commit r14483.
2014-01-02 20:04:50 +00:00
953e44d9f8 try using footprint instead of obstruction for separation space between formation members + Fix some footprint sizes of siege units
This was SVN commit r14393.
2013-12-26 12:24:52 +00:00
bcba922893 fix switching between column and other formations
This was SVN commit r14358.
2013-12-15 09:51:13 +00:00
c6cf074e7a Fix unitAI warning when member left the formation
This was SVN commit r14327.
2013-12-11 15:17:43 +00:00
208200db28 fix querying unitAI of non-existing members
This was SVN commit r14312.
2013-12-08 19:57:34 +00:00
783907264f cache the offset positions for formations, and only recalculate if the rotation towards a new target is big enough
This was SVN commit r14300.
2013-12-06 10:21:07 +00:00
d3f7da1e27 Let formation attack from the moment the first unit is in range
This was SVN commit r14297.
2013-12-05 19:26:55 +00:00
7b82fba8d0 remove distance sorting for formation place assignment, as it made the center of the formation run + remove debug warning in AI code
This was SVN commit r14292.
2013-12-05 12:31:04 +00:00
03d9db0bb7 fix comment
This was SVN commit r14291.
2013-12-05 10:44:39 +00:00
cf88da5829 improve formations a bit more
* Take obstruction size into account, so bigger units have more space in
formations
* Minimize the maximum walk distance to get in formation by letting the
units far away from the centre pick their positions first

This was SVN commit r14289.
2013-12-05 10:23:49 +00:00
3afd8e9d9e better formation place assignments (units run around less)
This was SVN commit r14281.
2013-12-04 13:14:31 +00:00
8b0f1c3f1f cleaning
This was SVN commit r14234.
2013-11-27 16:30:14 +00:00
ce7c97b79f Improve back to work behaviour (queues taken into account), fix #2206, patch from Itms
This was SVN commit r14063.
2013-11-01 22:00:06 +00:00
379a7b208f Implement the js side of auras. Refs #2048. Patch with the help of Alpha123. Only the temple aura is added as example, all other aura components are removed from the templates to be created from scratch again.
This was SVN commit r13998.
2013-10-14 15:51:21 +00:00
f918c9b074 Prevent formation controllers from showing up in range queries. Fixes #1796.
This was SVN commit r13484.
2013-06-16 23:10:01 +00:00
2004fb5e62 Fix error caused by unit dying while attacking.
This was SVN commit r12919.
2012-12-02 22:02:36 +00:00
5806ed94e1 Fix bug with gather-near-position.
Use the max range for attacking.

This was SVN commit r12915.
2012-12-02 17:25:23 +00:00
5800be1334 Formation order queueing. Fixes #592, #593 and #1716.
Allow changing the formation, while under attack. Fixes #1624. Patch by
Simikolon.

This was SVN commit r12911.
2012-12-02 01:52:27 +00:00
6fd99e34ce Implements siege packing. Closes #1718.
Adds templates for packed and unpacked siege units - needs stat
tweaking.

This was SVN commit r12904.
2012-12-01 00:34:03 +00:00
ef2c9e338d LeaveFoundation should put formation members into a discrete state to avoid prematurely disbanding.
This was SVN commit r12636.
2012-09-04 23:27:06 +00:00
0a0a49eb09 Explicitly store whether whether a unit is moving, as formation members don't finish moving as normal.
This was SVN commit r12624.
2012-09-04 03:57:22 +00:00
9fcb7cc738 Fixed formations so switching formation in-place doesn't leave entities in FORMATIONMEMBER.WALKING and short walk orders bring units into proper formation.
This was SVN commit r12563.
2012-08-31 08:20:36 +00:00
dd40cc023e Resource supply corpses won't have UnitAI and should never be in formations.
This was SVN commit r12541.
2012-08-27 23:14:10 +00:00
4ee4f16793 Stop rearranging formations for orders carried out individually. Fixes #1476.
This was SVN commit r11934.
2012-06-03 23:00:36 +00:00
58836c624a Read formations from civ JSON files. Fixes #1234, #601.
This was SVN commit r11735.
2012-05-03 23:32:10 +00:00
0d385f4112 Make selected stances and formations more obvious. Patch from leper, fixes #1190.
This was SVN commit r11386.
2012-03-21 16:45:02 +00:00
06672f0001 This was SVN commit r11229. 2012-03-03 20:47:49 +00:00
7499b23991 Units promotion. Closes #697.
This was SVN commit r9391.
2011-05-02 15:03:01 +00:00
bfd6614b55 # Add support for many formation shapes, based on patch from Badmadblacksad.
See #13.

This was SVN commit r9385.
2011-05-01 20:40:53 +00:00
ee8d49200a Fix formation movement loop when switching from column
This was SVN commit r8369.
2010-10-15 19:25:17 +00:00