epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename WithDockingOverlay to WithDockedOverlay

Browse Source
This commit is contained in:
Matthias Mailänder
2016-01-01 22:07:04 +01:00
parent 77b0bd6067
commit f3210755c0
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -433,7 +433,7 @@
<Compile Include="Traits\Render\WithDeathAnimation.cs" /> <Compile Include="Traits\Render\WithDeathAnimation.cs" />
<Compile Include="Traits\Render\WithDecoration.cs" /> <Compile Include="Traits\Render\WithDecoration.cs" />
<Compile Include="Traits\Render\WithDockingAnimation.cs" /> <Compile Include="Traits\Render\WithDockingAnimation.cs" />
<Compile Include="Traits\Render\WithDockingOverlay.cs" /> <Compile Include="Traits\Render\WithDockedOverlay.cs" />
<Compile Include="Traits\Render\WithHarvestAnimation.cs" /> <Compile Include="Traits\Render\WithHarvestAnimation.cs" />
<Compile Include="Traits\Render\WithHarvestOverlay.cs" /> <Compile Include="Traits\Render\WithHarvestOverlay.cs" />
<Compile Include="Traits\Render\WithIdleOverlay.cs" /> <Compile Include="Traits\Render\WithIdleOverlay.cs" />

10
OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs → OpenRA.Mods.Common/Traits/Render/WithDockedOverlay.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Rendered when a harvester is docked.")] [Desc("Rendered when a harvester is docked.")]
public class WithDockingOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<BodyOrientationInfo> public class WithDockedOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<BodyOrientationInfo>
{ {
[Desc("Sequence name to use")] [Desc("Sequence name to use")]
[SequenceReference] public readonly string Sequence = "docking-overlay"; [SequenceReference] public readonly string Sequence = "docking-overlay";
@@ -29,17 +29,17 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Custom palette is a player palette BaseName")] [Desc("Custom palette is a player palette BaseName")]
public readonly bool IsPlayerPalette = false; public readonly bool IsPlayerPalette = false;
public object Create(ActorInitializer init) { return new WithDockingOverlay(init.Self, this); } public object Create(ActorInitializer init) { return new WithDockedOverlay(init.Self, this); }
} }
public class WithDockingOverlay : INotifyDocking, INotifyBuildComplete, INotifySold public class WithDockedOverlay : INotifyDocking, INotifyBuildComplete, INotifySold
{ {
readonly WithDockingOverlayInfo info; readonly WithDockedOverlayInfo info;
readonly AnimationWithOffset anim; readonly AnimationWithOffset anim;
bool buildComplete; bool buildComplete;
bool docked; bool docked;
public WithDockingOverlay(Actor self, WithDockingOverlayInfo info) public WithDockedOverlay(Actor self, WithDockedOverlayInfo info)
{ {
this.info = info; this.info = info;

7
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -2876,6 +2876,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
} }
// Rename WithDockingOverlay to WithDockedOverlay
if (engineVersion < 20160116)
{
if (node.Key.StartsWith("WithDockingOverlay"))
node.Key = "WithDockedOverlay" + node.Key.Substring(18);
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
} }
} }

2
mods/d2k/rules/structures.yaml
View File

@@ -260,7 +260,7 @@ refinery:
FactionImages: FactionImages:
atreides: refinery.atreides atreides: refinery.atreides
ordos: refinery.ordos ordos: refinery.ordos
WithDockingOverlay@SMOKE: WithDockedOverlay@SMOKE:
Sequence: smoke Sequence: smoke
Power: Power:
Amount: -75 Amount: -75

2
mods/ts/rules/shared-structures.yaml
View File

@@ -91,7 +91,7 @@ PROC:
Sequence: idle-redlights Sequence: idle-redlights
WithIdleOverlay@BIB: WithIdleOverlay@BIB:
Sequence: bib Sequence: bib
WithDockingOverlay@flame: WithDockedOverlay@FLAME:
Sequence: flame Sequence: flame
Palette: effect Palette: effect
Power: Power: