Small improvements
This commit is contained in:
parent
6afcde1f98
commit
38dc6ec4d2
20 changed files with 56 additions and 84 deletions
|
|
@ -19,6 +19,7 @@ public partial class EffectHandler : RefCounted
|
|||
}
|
||||
public void End()
|
||||
{
|
||||
if (HandledEffect == null) return;
|
||||
HandledEffect.Exit(handler);
|
||||
HandledEffect = null;
|
||||
EffectTimer.Stop();
|
||||
|
|
|
|||
|
|
@ -38,42 +38,14 @@ public partial class RedirectEffect : Effect
|
|||
}
|
||||
zombieData.AbleToEat = false;
|
||||
var tween = zombieData.CreateTweenEffect(this);
|
||||
tween.TweenProperty(zombieData, "position:y", zombieData.GlobalPosition.Y + FieldParams.TileHeight * mult, Duration);
|
||||
tween.Parallel().TweenProperty(zombieData, "position:x", zombieData.GlobalPosition.X - FieldParams.TileHeight * tilesWalked, Duration);
|
||||
tween.TweenProperty(zombieData, "global_position:y", zombieData.GlobalPosition.Y + FieldParams.TileHeight * mult, Duration);
|
||||
tween.Parallel().TweenProperty(zombieData, "global_position:x", zombieData.GlobalPosition.X - FieldParams.TileWidth * tilesWalked, Duration);
|
||||
tween.TweenCallback(Callable.From(() => { zombieData.AbleToEat = true; }));
|
||||
}
|
||||
}
|
||||
|
||||
public override void Exit(Entity target)
|
||||
{
|
||||
if (target is RuntimeZombieData zombieData)
|
||||
{
|
||||
int mult;
|
||||
if ((int)zombieData.GlobalPosition.Y / FieldParams.TileHeight <= 2)
|
||||
{
|
||||
mult = 1;
|
||||
}
|
||||
else if ((int)zombieData.GlobalPosition.Y / FieldParams.TileHeight >= 6)
|
||||
{
|
||||
mult = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (down)
|
||||
{
|
||||
mult = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
mult = -1;
|
||||
}
|
||||
}
|
||||
zombieData.AbleToEat = false;
|
||||
var tween = zombieData.CreateTween();
|
||||
tween.TweenProperty(zombieData, "position:y", zombieData.GlobalPosition.Y + FieldParams.TileHeight * mult, Duration);
|
||||
tween.Parallel().TweenProperty(zombieData, "position:x", zombieData.GlobalPosition.X - FieldParams.TileHeight * tilesWalked, Duration);
|
||||
tween.TweenCallback(Callable.From(() => { zombieData.AbleToEat = true; }));
|
||||
}
|
||||
}
|
||||
|
||||
public override void Process(Entity target)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue