Merge pull request #8043 from pchote/exit-delays

Polish TS war factories.
This commit is contained in:
Matthias Mailänder
2015-04-28 22:22:29 +02:00
7 changed files with 27 additions and 2 deletions

View File

@@ -26,6 +26,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("AttackMove to a RallyPoint or stay where you are spawned.")]
public readonly bool MoveIntoWorld = true;
[Desc("Number of ticks to wait before moving into the world.")]
public readonly int ExitDelay = 0;
}
public class Exit { }

View File

@@ -77,6 +77,9 @@ namespace OpenRA.Mods.Common.Traits
{
if (exitinfo.MoveIntoWorld)
{
if (exitinfo.ExitDelay > 0)
newUnit.QueueActivity(new Wait(exitinfo.ExitDelay));
newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit));
newUnit.QueueActivity(new AttackMoveActivity(
newUnit, move.MoveTo(exitLocation, 1)));

View File

@@ -370,6 +370,7 @@ WEAP:
Exit@1:
SpawnOffset: -341,-341,0
ExitCell: 0,2
ExitDelay: 3
Production:
Produces: Vehicle.GDI
ProductionQueue:

View File

@@ -144,9 +144,11 @@ weap:
Tick: 800
build-top: weap2
Length: 10
ZOffset: -1024
damaged-build-top: weap2
Start: 10
Length: 10
ZOffset: -1024
make: weapmake
Length: *
Tick: 80

View File

@@ -126,8 +126,9 @@ GAWEAP:
RallyPoint:
RallyPoint: 6,1
Exit@1:
SpawnOffset: 0,0,0
SpawnOffset: -384,-384,0
ExitCell: 4,1
ExitDelay: 5
Production:
Produces: Vehicle
PrimaryBuilding:

View File

@@ -133,8 +133,9 @@ NAWEAP:
RallyPoint:
RallyPoint: 6,1
Exit@1:
SpawnOffset: 0,0,0
SpawnOffset: -384,-384,0
ExitCell: 4,1
ExitDelay: 5
Production:
Produces: Vehicle
PrimaryBuilding:

View File

@@ -138,9 +138,11 @@ gaweap:
UseTilesetCode: true
idle: gtweap_1
ShadowStart: 2
ZOffset: -1024
damaged-idle: gtweap_1
Start: 1
ShadowStart: 3
ZOffset: -1024
idle-roof: gtweap_2
ShadowStart: 2
damaged-idle-roof: gtweap_2
@@ -188,12 +190,15 @@ gaweap:
ShadowStart: 20
bib: gtweapbb
Length: 1
ZOffset: -1024
damaged-bib: gtweapbb
Start: 1
Length: 1
ZOffset: -1024
dead-bib: gtweapbb
Start: 2
Length: 1
ZOffset: -1024
icon: weapicon
Offset: 0, 0
UseTilesetCode: false
@@ -292,14 +297,18 @@ naweap:
UseTilesetCode: true
idle: ntweap_1
ShadowStart: 2
ZOffset: -1024
damaged-idle: ntweap_1
Start: 1
ShadowStart: 3
ZOffset: -1024
idle-roof: ntweap_2
ShadowStart: 2
ZOffset: 512
damaged-idle-roof: ntweap_2
Start: 1
ShadowStart: 3
ZOffset: 512
dead: ntweap
Start: 2
ShadowStart: 5
@@ -316,19 +325,24 @@ naweap:
build-door: ntweap_b
Length: 10
ShadowStart: 10
ZOffset: 512
damaged-build-door: ntweap_b
Start: 10
Length: 10
ShadowStart: 20
ZOffset: 512
make: ntweapmk
Length: 22
Tick: 80
ShadowStart: 22
bib: ntweapbb
ZOffset: -1024
damaged-bib: ntweapbb
Start: 1
ZOffset: -1024
dead-bib: ntweapbb
Start: 2
ZOffset: -1024
icon: nwepicon
Offset: 0, 0
UseTilesetCode: false