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

Merge pull request #7998 from Mailaender/ts-proc-dock

Browse Source 
Added the Tiberian Sun docking overlays
This commit is contained in:
Oliver Brakmann
2015-05-03 22:50:16 +02:00
parent 622685c8f4 d999617a3c
commit 62b3592bd4
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,6 +391,7 @@
<Compile Include="Traits\Render\WithMakeAnimation.cs" /> <Compile Include="Traits\Render\WithMakeAnimation.cs" />
<Compile Include="Traits\Render\WithCrateBody.cs" /> <Compile Include="Traits\Render\WithCrateBody.cs" />
<Compile Include="Traits\Render\WithDeathAnimation.cs" /> <Compile Include="Traits\Render\WithDeathAnimation.cs" />
<Compile Include="Traits\Render\WithDockingOverlay.cs" />
<Compile Include="Traits\Render\WithHarvestAnimation.cs" /> <Compile Include="Traits\Render\WithHarvestAnimation.cs" />
<Compile Include="Traits\Render\WithIdleOverlay.cs" /> <Compile Include="Traits\Render\WithIdleOverlay.cs" />
<Compile Include="Traits\Render\WithMuzzleFlash.cs" /> <Compile Include="Traits\Render\WithMuzzleFlash.cs" />

3
OpenRA.Mods.D2k/Traits/Render/WithDockingOverlay.cs → OpenRA.Mods.Common/Traits/Render/WithDockingOverlay.cs
View File

@@ -10,10 +10,9 @@
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.D2k.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<IBodyOrientationInfo> public class WithDockingOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>

1
OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
View File

@@ -81,7 +81,6 @@
<Compile Include="Traits\Carryable.cs" /> <Compile Include="Traits\Carryable.cs" />
<Compile Include="Traits\Player\HarvesterInsurance.cs" /> <Compile Include="Traits\Player\HarvesterInsurance.cs" />
<Compile Include="Traits\Render\WithCrumbleOverlay.cs" /> <Compile Include="Traits\Render\WithCrumbleOverlay.cs" />
<Compile Include="Traits\Render\WithDockingOverlay.cs" />
<Compile Include="Traits\Render\WithDeliveryOverlay.cs" /> <Compile Include="Traits\Render\WithDeliveryOverlay.cs" />
<Compile Include="Traits\Sandworm.cs" /> <Compile Include="Traits\Sandworm.cs" />
<Compile Include="Traits\TemporaryOwnerManager.cs" /> <Compile Include="Traits\TemporaryOwnerManager.cs" />

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

@@ -88,6 +88,9 @@ PROC:
Sequence: idle-redlights Sequence: idle-redlights
WithIdleOverlay@BIB: WithIdleOverlay@BIB:
Sequence: bib Sequence: bib
WithDockingOverlay@flame:
Sequence: flame
Palette: effect
Power: Power:
Amount: -30 Amount: -30

6
mods/ts/sequences/structures.yaml
View File

@@ -846,7 +846,7 @@ nahpad:
Offset: 0, 0 Offset: 0, 0
UseTilesetCode: false UseTilesetCode: false
proc: # TODO: unused narefn_a, narefn_b proc: # TODO: unused narefn_a
Defaults: Defaults:
Offset: -12, -42 Offset: -12, -42
UseTilesetCode: true UseTilesetCode: true
@@ -862,6 +862,8 @@ proc: # TODO: unused narefn_a, narefn_b
make: ntrefnmk make: ntrefnmk
Length: 20 Length: 20
ShadowStart: 20 ShadowStart: 20
flame: ntrefn_b
Length: *
idle-redlights: ntrefn_c idle-redlights: ntrefn_c
Length: 16 Length: 16
Tick: 120 Tick: 120
@@ -869,8 +871,10 @@ proc: # TODO: unused narefn_a, narefn_b
Length: 16 Length: 16
Tick: 120 Tick: 120
bib: ntrefnbb bib: ntrefnbb
ZOffset: -1024
damaged-bib: ntrefnbb damaged-bib: ntrefnbb
Start: 1 Start: 1
ZOffset: -1024
icon: reficon icon: reficon
Offset: 0, 0 Offset: 0, 0
UseTilesetCode: false UseTilesetCode: false