Remove TiberianSunRefinery
Also add IDockClientBody interface, move WithDockingOverlay cnc -> common, remove HarvesterDockSequence implementing classes
This commit is contained in:
Gustas
committed by
Matthias Mailänder
Matthias Mailänder
parent
3f0c3a8b9c
commit
049d0283f9
@@ -1,70 +0,0 @@
|
||||
#region Copyright & License Information
|
||||
/*
|
||||
* Copyright (c) The OpenRA Developers and Contributors
|
||||
* This file is part of OpenRA, which is free software. It is made
|
||||
* available to you under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version. For more
|
||||
* information, see COPYING.
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using OpenRA.Mods.Cnc.Traits.Render;
|
||||
using OpenRA.Mods.Common.Activities;
|
||||
using OpenRA.Mods.Common.Traits;
|
||||
|
||||
namespace OpenRA.Mods.Cnc.Activities
|
||||
{
|
||||
public class VoxelHarvesterDockSequence : HarvesterDockSequence
|
||||
{
|
||||
readonly WithVoxelUnloadBody body;
|
||||
readonly WithDockingOverlay spriteOverlay;
|
||||
|
||||
public VoxelHarvesterDockSequence(Actor self, Actor refineryActor, Refinery refinery)
|
||||
: base(self, refineryActor, refinery)
|
||||
{
|
||||
body = self.Trait<WithVoxelUnloadBody>();
|
||||
spriteOverlay = RefineryActor.TraitOrDefault<WithDockingOverlay>();
|
||||
}
|
||||
|
||||
public override void OnStateDock(Actor self)
|
||||
{
|
||||
body.Docked = true;
|
||||
|
||||
if (spriteOverlay != null && !spriteOverlay.Visible)
|
||||
{
|
||||
spriteOverlay.Visible = true;
|
||||
spriteOverlay.WithOffset.Animation.PlayThen(spriteOverlay.Info.Sequence, () =>
|
||||
{
|
||||
dockingState = DockingState.Loop;
|
||||
spriteOverlay.Visible = false;
|
||||
});
|
||||
}
|
||||
else
|
||||
dockingState = DockingState.Loop;
|
||||
}
|
||||
|
||||
public override void OnStateUndock(Actor self)
|
||||
{
|
||||
// If body.Docked wasn't set, we didn't actually dock and have to skip the undock overlay
|
||||
if (!body.Docked)
|
||||
dockingState = DockingState.Complete;
|
||||
else if (RefineryActor.IsInWorld && !RefineryActor.IsDead && spriteOverlay != null && !spriteOverlay.Visible)
|
||||
{
|
||||
dockingState = DockingState.Wait;
|
||||
spriteOverlay.Visible = true;
|
||||
spriteOverlay.WithOffset.Animation.PlayBackwardsThen(spriteOverlay.Info.Sequence, () =>
|
||||
{
|
||||
dockingState = DockingState.Complete;
|
||||
body.Docked = false;
|
||||
spriteOverlay.Visible = false;
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
dockingState = DockingState.Complete;
|
||||
body.Docked = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
#region Copyright & License Information
|
||||
/*
|
||||
* Copyright (c) The OpenRA Developers and Contributors
|
||||
* This file is part of OpenRA, which is free software. It is made
|
||||
* available to you under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version. For more
|
||||
* information, see COPYING.
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using OpenRA.Activities;
|
||||
using OpenRA.Mods.Cnc.Activities;
|
||||
using OpenRA.Mods.Common.Traits;
|
||||
|
||||
namespace OpenRA.Mods.Cnc.Traits
|
||||
{
|
||||
public class TiberianSunRefineryInfo : RefineryInfo
|
||||
{
|
||||
public override object Create(ActorInitializer init) { return new TiberianSunRefinery(init.Self, this); }
|
||||
}
|
||||
|
||||
public class TiberianSunRefinery : Refinery
|
||||
{
|
||||
public TiberianSunRefinery(Actor self, RefineryInfo info)
|
||||
: base(self, info) { }
|
||||
|
||||
public override Activity DockSequence(Actor harv, Actor self)
|
||||
{
|
||||
return new VoxelHarvesterDockSequence(harv, self, this);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
#region Copyright & License Information
|
||||
/*
|
||||
* Copyright (c) The OpenRA Developers and Contributors
|
||||
* This file is part of OpenRA, which is free software. It is made
|
||||
* available to you under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version. For more
|
||||
* information, see COPYING.
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using OpenRA.Graphics;
|
||||
using OpenRA.Mods.Common.Traits;
|
||||
using OpenRA.Mods.Common.Traits.Render;
|
||||
using OpenRA.Traits;
|
||||
|
||||
namespace OpenRA.Mods.Cnc.Traits.Render
|
||||
{
|
||||
[Desc("Rendered on the refinery when a voxel harvester is docking and undocking.")]
|
||||
public class WithDockingOverlayInfo : PausableConditionalTraitInfo, Requires<RenderSpritesInfo>, Requires<BodyOrientationInfo>
|
||||
{
|
||||
[SequenceReference]
|
||||
[Desc("Sequence name to use")]
|
||||
public readonly string Sequence = "unload-overlay";
|
||||
|
||||
[Desc("Position relative to body")]
|
||||
public readonly WVec Offset = WVec.Zero;
|
||||
|
||||
[PaletteReference(nameof(IsPlayerPalette))]
|
||||
[Desc("Custom palette name")]
|
||||
public readonly string Palette = null;
|
||||
|
||||
[Desc("Custom palette is a player palette BaseName")]
|
||||
public readonly bool IsPlayerPalette = false;
|
||||
|
||||
public override object Create(ActorInitializer init) { return new WithDockingOverlay(init.Self, this); }
|
||||
}
|
||||
|
||||
public class WithDockingOverlay : PausableConditionalTrait<WithDockingOverlayInfo>
|
||||
{
|
||||
public readonly AnimationWithOffset WithOffset;
|
||||
|
||||
public bool Visible;
|
||||
|
||||
public WithDockingOverlay(Actor self, WithDockingOverlayInfo info)
|
||||
: base(info)
|
||||
{
|
||||
var rs = self.Trait<RenderSprites>();
|
||||
var body = self.Trait<BodyOrientation>();
|
||||
|
||||
var overlay = new Animation(self.World, rs.GetImage(self), () => IsTraitPaused);
|
||||
overlay.Play(info.Sequence);
|
||||
|
||||
WithOffset = new AnimationWithOffset(overlay,
|
||||
() => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self.Orientation))),
|
||||
() => !Visible || IsTraitDisabled);
|
||||
|
||||
rs.Add(WithOffset, info.Palette, info.IsPlayerPalette);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -45,9 +45,9 @@ namespace OpenRA.Mods.Cnc.Traits.Render
|
||||
}
|
||||
}
|
||||
|
||||
public class WithVoxelUnloadBody : IAutoMouseBounds
|
||||
public class WithVoxelUnloadBody : IAutoMouseBounds, IDockClientBody
|
||||
{
|
||||
public bool Docked;
|
||||
bool docked;
|
||||
|
||||
readonly ModelAnimation modelAnimation;
|
||||
readonly RenderVoxels rv;
|
||||
@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
|
||||
var idleModel = self.World.ModelCache.GetModelSequence(rv.Image, info.IdleSequence);
|
||||
modelAnimation = new ModelAnimation(idleModel, () => WVec.Zero,
|
||||
() => body.QuantizeOrientation(self.Orientation),
|
||||
() => Docked,
|
||||
() => docked,
|
||||
() => 0, info.ShowShadow);
|
||||
|
||||
rv.Add(modelAnimation);
|
||||
@@ -68,10 +68,22 @@ namespace OpenRA.Mods.Cnc.Traits.Render
|
||||
var unloadModel = self.World.ModelCache.GetModelSequence(rv.Image, info.UnloadSequence);
|
||||
rv.Add(new ModelAnimation(unloadModel, () => WVec.Zero,
|
||||
() => body.QuantizeOrientation(self.Orientation),
|
||||
() => !Docked,
|
||||
() => !docked,
|
||||
() => 0, info.ShowShadow));
|
||||
}
|
||||
|
||||
void IDockClientBody.PlayDockAnimation(Actor self, Action after)
|
||||
{
|
||||
docked = true;
|
||||
after();
|
||||
}
|
||||
|
||||
void IDockClientBody.PlayReverseDockAnimation(Actor self, Action after)
|
||||
{
|
||||
docked = false;
|
||||
after();
|
||||
}
|
||||
|
||||
Rectangle IAutoMouseBounds.AutoMouseoverBounds(Actor self, WorldRenderer wr)
|
||||
{
|
||||
return modelAnimation.ScreenBounds(self.CenterPosition, wr, rv.Info.Scale);
|
||||
|
||||
Reference in New Issue
Block a user