FlxTween: add .wait(), and .then() for chaining, closes #1064

flixel/tweens/FlxTween.hx

@@ -4,6 +4,9 @@ import flixel.FlxG;
 import flixel.FlxObject;
 import flixel.FlxSprite;
 import flixel.tweens.FlxEase.EaseFunction;
+import flixel.tweens.FlxTween.ThenCommand;
+import flixel.tweens.FlxTween.TweenOptions;
+import flixel.tweens.FlxTween.TweenMethod;
 import flixel.tweens.misc.AngleTween;
 import flixel.tweens.misc.ColorTween;
 import flixel.tweens.misc.NumTween;
@@ -373,7 +376,8 @@ class FlxTween implements IFlxDestroyable
 	private var _delayToUse:Float = 0;
 	private var _running:Bool = false;
 	private var _waitingForRestart:Bool = false;
-
+	private var _thens:Array<ThenCommand>;
+
 	/**
 	 * This function is called when tween is created, or recycled.
 	 */
@@ -406,8 +410,61 @@ class FlxTween implements IFlxDestroyable
 		onUpdate = null;
 		onComplete = null;
 		ease = null;
+		_thens = null;
 	}
-
+
+	/**
+	 * After this tween has finished, do this tween next
+	 * @param	method
+	 * @param	params
+	 * @return
+	 */
+
+	public function then(Tween:FlxTween):FlxTween
+	{
+		Tween.cancelSoft();
+		if (_thens == null)
+		{
+			_thens = [];
+		}
+		_thens.push(new ThenCommand(0, Tween));
+		return this;
+	}
+
+	/**
+	 * After this tween has finished, wait this many seconds, then do the next chained "then" command
+	 * @param	Delay The number of seconds to wait
+	 * @return
+	 */
+	public function wait(Delay:Float):FlxTween
+	{
+		if (_thens == null)
+		{
+			_thens = [];
+		}
+		_thens.push(new ThenCommand(Delay, null));
+		return this;
+	}
+
+	/**
+	 * Add a delay and a chained tween in the same command
+	 * @param	Delay
+	 * @param	method
+	 * @param	params
+	 * @return
+	 */
+	public function waitThen(Delay:Float, Tween:FlxTween):FlxTween
+	{
+		if (_thens == null)
+		{
+			_thens = [];
+		}
+
+		_thens.push(new ThenCommand(Delay, null));
+		_thens.push(new ThenCommand(0    , Tween));
+		return this;
+	}
+
 	private function update(elapsed:Float):Void
 	{
 		_secondsSinceStart += elapsed;
@@ -472,6 +529,14 @@ class FlxTween implements IFlxDestroyable
 		manager.remove(this);
 	}
 
+	private function cancelSoft():Void
+	{
+		active = false;
+		_running = false;
+		finished = true;
+		manager.removeSoft(this);
+	}
+
 	private function finish():Void
 	{
 		executions++;
@@ -523,6 +588,39 @@ class FlxTween implements IFlxDestroyable
 		active = false;
 		_running = false;
 		finished = true;
+
+		if (_thens != null && _thens.length > 0)
+		{
+			var then = _thens[0];
+
+			_thens.splice(0, 1);
+
+			if (then.delay <= 0)
+			{
+				if (then.tween != null)
+				{
+					doNextTween(then.tween, _thens);
+				}
+			}
+			else
+			{
+				doNextTween(FlxTween.num(0,0,then.delay), _thens);
+			}
+			_thens = null;
+		}
+	}
+
+	private function doNextTween(tween:FlxTween, thens:Array<ThenCommand>):Void
+	{
+		if (!tween.active)
+		{
+			tween.start();
+			manager.add(tween);
+		}
+		if (thens != null)
+		{
+			tween._thens = _thens;
+		}
 	}
 
 	/**
@@ -621,7 +719,7 @@ typedef TweenOptions = {
 	?onUpdate:TweenCallback,
 	?onComplete:TweenCallback,
 	?startDelay:Null<Float>,
-	?loopDelay:Null<Float>,
+	?loopDelay:Null<Float>
 }
 
 @:access(flixel.tweens.FlxTween)
@@ -705,7 +803,6 @@ class FlxTweenManager extends FlxBasic
 	 * Remove a FlxTween.
 	 * 
 	 * @param	Tween		The FlxTween to remove.
-	 * @param	Destroy		Whether you want to destroy the FlxTween.
 	 * @return	The added FlxTween object.
 	 */
 	@:allow(flixel.tweens.FlxTween)
@@ -723,6 +820,28 @@ class FlxTweenManager extends FlxBasic
 
 		return Tween;
 	}
+
+	/**
+	 * Remove a FlxTween without destroying it
+	 * 
+	 * @param	Tween		The FlxTween to remove.
+	 * @param	Destroy		Whether you want to destroy the FlxTween.
+	 * @return	The added FlxTween object.
+	 */
+	@:allow(flixel.tweens.FlxTween)
+	private function removeSoft(Tween:FlxTween):FlxTween
+	{
+		if (Tween == null)
+		{
+			return null;
+		}
+
+		Tween.active = false;
+
+		FlxArrayUtil.fastSplice(_tweens, Tween);
+
+		return Tween;
+	}
 
 	/**
 	 * Removes all FlxTweens.
@@ -735,3 +854,15 @@ class FlxTweenManager extends FlxBasic
 		}
 	}
 }
+
+class ThenCommand
+{
+	public var delay:Float;
+	public var tween:FlxTween;
+
+	public function new(Delay:Float, Tween:FlxTween)
+	{
+		delay = Delay;
+		tween = Tween;
+	}
+}

flixel/tweens/misc/VarTween.hx

@@ -2,6 +2,7 @@ package flixel.tweens.misc;
 
 import flixel.tweens.FlxTween;
 import flixel.util.FlxArrayUtil;
+import flixel.util.FlxTimer;
 
 /**
  * Tweens multiple numeric public properties of an Object simultaneously.
@@ -60,6 +61,12 @@ class VarTween extends FlxTween
 		return this;
 	}
 
+	@:access(flixel.tweens.FlxTween)
+	override function onEnd():Void 
+	{
+		super.onEnd();
+	}
+
 	override private function update(elapsed:Float):Void
 	{
 		var delay:Float = (executions > 0) ? loopDelay : startDelay;