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

Merge pull request #4478 from pchote/aircraft-follow

Browse Source 
Add Guard and AttackMove to RA and C&C aircraft.
This commit is contained in:
Matthias Mailänder
2014-02-01 00:38:21 -08:00
parent 1d8e785d0d e58053cb69
commit e4effd0125
46 changed files with 243 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mods/cnc/rules/defaults.yaml
View File

@@ -116,6 +116,8 @@
EmptyWeapon: HeliExplode
CombatDebugOverlay:
AttackMove:
Guard:
Guardable:
BodyOrientation:
UpdatesPlayerStatistics:
Huntable:
@@ -209,7 +211,6 @@
NotifyAll: true
ScaredyCat:
RenderInfantryPanic:
AttackMove:
CrushableInfantry:
^DINO:
@@ -274,6 +275,7 @@
CombatDebugOverlay:
BodyOrientation:
Huntable:
AttackMove:
LuaScriptEvents:
^Ship:

1
mods/cnc/rules/infantry.yaml
View File

@@ -171,7 +171,6 @@ E6:
Captures:
CaptureTypes: building, husk
-AutoTarget:
AttackMove:
RenderInfantryProne:
IdleAnimations: idle1,idle2
StandAnimations: stand, stand2

1
mods/cnc/rules/ships.yaml
View File

@@ -66,6 +66,5 @@ LST:
Types: Infantry, Vehicle
MaxWeight: 5
PipCount: 5
AttackMove:
RejectsOrders:

3
mods/cnc/rules/vehicles.yaml
View File

@@ -27,7 +27,6 @@ MCV:
NoTransformSounds: deploy1.aud
RenderUnit:
MustBeDestroyed:
AttackMove:
BaseBuilding:
LeavesHusk:
HuskActor: MCV.Husk
@@ -67,7 +66,6 @@ HARV:
Type: Heavy
RevealsShroud:
Range: 4
AttackMove:
LeavesHusk:
HuskActor: HARV.Husk
-GainsExperience:
@@ -556,7 +554,6 @@ MHQ:
WithIdleOverlay@SPINNER:
Sequence: spinner
Offset: -256,0,256
AttackMove:
Explodes:
Weapon: UnitExplodeSmall
EmptyWeapon: UnitExplodeSmall

4
mods/common/lua/actor.lua
View File

@@ -29,7 +29,7 @@ end
Actor.ScriptedMove = function(actor, location)
if Actor.HasTrait(actor, "Helicopter") then
actor:QueueActivity(OpenRA.New("HeliFly", { location.CenterPosition }))
Internal.HeliFlyToPos(actor, location.CenterPosition)
else
actor:QueueActivity(OpenRA.New("Move", { location }))
end
@@ -52,7 +52,7 @@ Actor.AttackMove = function(actor, location)
end
Actor.HeliFly = function(actor, position)
actor:QueueActivity(OpenRA.New("HeliFly", { position }))
Internal.HeliFlyToPos(actor, position)
end
Actor.HeliLand = function(actor, requireSpace)

1
mods/d2k/rules/defaults.yaml
View File

@@ -207,6 +207,7 @@
BodyOrientation:
UpdatesPlayerStatistics:
Huntable:
AttackMove:
LuaScriptEvents:
^Helicopter:

3
mods/d2k/rules/infantry.yaml
View File

@@ -52,7 +52,6 @@ ENGINEER:
Captures:
CaptureTypes: husk
-AutoTarget:
AttackMove:
BAZOOKA:
Inherits: ^Infantry
@@ -110,5 +109,3 @@ MEDIC:
Passenger:
PipType: Blue
-AutoTarget:
AttackMove:

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

@@ -297,5 +297,3 @@ SABOTEUR:
C4Demolition:
C4Delay: 45
-AutoTarget:
AttackMove:

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

@@ -24,7 +24,6 @@
Range: 8
MustBeDestroyed:
BaseBuilding:
-AttackMove:
Explodes:
Weapon: UnitExplodeScale
EmptyWeapon: UnitExplodeScale
@@ -80,7 +79,6 @@ HARVESTER:
Explodes:
Weapon: UnitExplodeScale
EmptyWeapon: UnitExplodeScale
-AttackMove:
LeavesHusk:
HuskActor: Harvester.Husk
WithHarvestAnimation:

1
mods/ra/maps/Fort-Lonestar/map.yaml
View File

@@ -848,7 +848,6 @@ Rules:
TakeCover:
Spy:
-AutoTarget:
AttackMove:
-RenderInfantry:
RenderSpy:
IdleAnimations: idle1,idle2

1
mods/ra/maps/bomber-john/map.yaml
View File

@@ -832,7 +832,6 @@ Rules:
Range: 40
RenderUnit:
Image: MNLY
AttackMove:
MustBeDestroyed:
Transforms:
IntoActor: ftur

18
mods/ra/rules/aircraft.yaml
View File

@@ -102,6 +102,10 @@ MIG:
ROT: 5
Speed: 186
RearmBuildings: afld
AutoTarget:
TargetWhenIdle: false
TargetWhenDamaged: false
EnableStances: false
RenderUnit:
CameraPitch: 99
WithShadow:
@@ -154,6 +158,10 @@ YAK:
InitialFacing: 192
ROT: 5
Speed: 149
AutoTarget:
TargetWhenIdle: false
TargetWhenDamaged: false
EnableStances: false
RenderUnit:
CameraPitch: 99
WithShadow:
@@ -247,6 +255,10 @@ HELI:
InitialFacing: 20
ROT: 4
Speed: 149
AutoTarget:
TargetWhenIdle: false
TargetWhenDamaged: false
EnableStances: false
RenderUnit:
WithRotor:
Offset: 0,0,85
@@ -293,6 +305,10 @@ HIND:
InitialFacing: 20
ROT: 4
Speed: 112
AutoTarget:
TargetWhenIdle: false
TargetWhenDamaged: false
EnableStances: false
RenderUnit:
WithRotor:
WithShadow:
@@ -334,4 +350,4 @@ U2:
SmokeTrailWhenDamaged:
Offset: -1c43,0,0
Interval: 2
RejectsOrders:
RejectsOrders:

3
mods/ra/rules/defaults.yaml
View File

@@ -196,6 +196,9 @@
TargetTypes: Air
GroundedTargetTypes: Ground
HiddenUnderFog:
AttackMove:
Guard:
Guardable:
GainsExperience:
GivesExperience:
DrawLineToTarget:

7
mods/ra/rules/infantry.yaml
View File

@@ -177,7 +177,6 @@ E6:
CaptureTypes: husk
TakeCover:
-AutoTarget:
AttackMove:
-RenderInfantry:
RenderInfantryProne:
IdleAnimations: idle1,idle2
@@ -212,7 +211,6 @@ SPY:
Infiltrates:
Types: Cash, SupportPower, Exploration
-AutoTarget:
AttackMove:
-RenderInfantry:
RenderSpy:
IdleAnimations: idle1,idle2
@@ -289,7 +287,6 @@ MEDI:
Cursor: heal
TakeCover:
-AutoTarget:
AttackMove:
-RenderInfantry:
RenderInfantryProne:
IdleAnimations: idle1,idle2
@@ -325,7 +322,6 @@ MECH:
Cursor: repair
TakeCover:
-AutoTarget:
AttackMove:
-RenderInfantry:
RenderInfantryProne:
IdleAnimations: idle1,idle2
@@ -346,7 +342,6 @@ EINSTEIN:
RevealsShroud:
Range: 2
-AutoTarget:
AttackMove:
ProximityCaptor:
Types: CivilianInfantry
-RenderInfantry:
@@ -369,7 +364,6 @@ DELPHI:
RevealsShroud:
Range: 2
-AutoTarget:
AttackMove:
ProximityCaptor:
Types: CivilianInfantry
-RenderInfantry:
@@ -410,7 +404,6 @@ THF:
InfiltrateTypes: Cash
TakeCover:
-AutoTarget:
AttackMove:
SHOK:
Inherits: ^Infantry

3
mods/ra/rules/ships.yaml
View File

@@ -43,7 +43,6 @@ SS:
-DetectCloaked:
AutoTarget:
InitialStance: HoldFire
AttackMove:
MSUB:
Inherits: ^Ship
@@ -90,7 +89,6 @@ MSUB:
-DetectCloaked:
AutoTarget:
InitialStance: HoldFire
AttackMove:
DD:
Inherits: ^Ship
@@ -225,7 +223,6 @@ LST:
PipCount: 5
IronCurtainable:
RepairableNear:
AttackMove:
PT:
Inherits: ^Ship

10
mods/ra/rules/vehicles.yaml
View File

@@ -271,7 +271,6 @@ HARV:
Range: 4
RenderHarvester:
ImagesByFullness: harvempty, harvhalf, harv
-AttackMove:
GpsDot:
String: Harvester
LeavesHusk:
@@ -316,7 +315,6 @@ MCV:
RenderUnit:
MustBeDestroyed:
BaseBuilding:
-AttackMove:
LeavesHusk:
HuskActor: MCV.Husk
@@ -418,7 +416,6 @@ MNLY.AP:
MineImmune:
LimitedAmmo:
Ammo: 5
AttackMove:
DetectCloaked:
Range: 5
RenderDetectionCircle:
@@ -451,7 +448,6 @@ MNLY.AT:
MineImmune:
LimitedAmmo:
Ammo: 3
AttackMove:
DetectCloaked:
Range: 5
RenderDetectionCircle:
@@ -480,7 +476,6 @@ TRUK:
RenderUnit:
SupplyTruck:
Payload: 500
AttackMove:
MGG:
Inherits: ^Vehicle
@@ -505,7 +500,6 @@ MGG:
WithIdleOverlay@SPINNER:
Offset: -299,0,171
Sequence: spinner
AttackMove:
RevealsShroud:
Range: 6
CreatesShroud:
@@ -542,7 +536,6 @@ MRJ:
WithIdleOverlay@SPINNER:
Sequence: spinner
Offset: -256,0,256
AttackMove:
Explodes:
Weapon: UnitExplodeSmall
EmptyWeapon: UnitExplodeSmall
@@ -646,7 +639,6 @@ DTRK:
RevealsShroud:
Range: 3
RenderUnit:
AttackMove:
Explodes:
Weapon: MiniNuke
EmptyWeapon: MiniNuke
@@ -717,11 +709,9 @@ QTNK:
Selectable:
Bounds: 44,38,0,-4
RenderUnit:
AttackMove:
Explodes:
Weapon: UnitExplodeSmall
MadTank:
-EjectOnDeath:
TargetableUnit:
TargetTypes: Ground, MADTank

1
mods/ts/rules/defaults.yaml
View File

@@ -195,6 +195,7 @@
Buildable:
Queue: Aircraft
HiddenUnderFog:
AttackMove:
GainsExperience:
GivesExperience:
DrawLineToTarget:

7
mods/ts/rules/infantry.yaml
View File

@@ -165,7 +165,6 @@ ENGINEER:
Captures:
CaptureTypes: building
-AutoTarget:
AttackMove:
-RenderInfantry:
RenderInfantryProne:
IdleAnimations: idle1,idle2
@@ -292,7 +291,6 @@ CHAMSPY:
Infiltrates:
Types: Cash, SupportPower, Exploration
-AutoTarget:
AttackMove:
-RenderInfantry:
RenderSpy:
IdleAnimations: idle1,idle2
@@ -468,7 +466,6 @@ MHIJACK:
RevealsShroud:
Range: 6
-AutoTarget:
-AttackMove:
TakeCover:
-RenderInfantry:
RenderInfantryProne:
@@ -495,7 +492,6 @@ TRATOS:
Range: 4
TakeCover:
-AutoTarget:
-AttackMove:
-RenderInfantry:
RenderInfantryProne:
IdleAnimations: idle1,idle2
@@ -521,7 +517,6 @@ OXANNA:
Range: 4
TakeCover:
-AutoTarget:
-AttackMove:
-RenderInfantry:
RenderInfantryProne:
IdleAnimations: idle1,idle2
@@ -547,7 +542,6 @@ SLAV:
Range: 4
TakeCover:
-AutoTarget:
-AttackMove:
-RenderInfantry:
RenderInfantryProne:
IdleAnimations: idle1,idle2
@@ -605,7 +599,6 @@ VISSML:
TargetableUnit:
TargetTypes: Ground
-AutoTarget:
-AttackMove:
-RenderInfantry:
RenderUnit:

16
mods/ts/rules/vehicles.yaml
View File

@@ -24,7 +24,6 @@ MCV:
Range: 4
MustBeDestroyed:
BaseBuilding:
-AttackMove:
Transforms:
IntoActor: gacnst
Offset: -1,-1
@@ -57,7 +56,6 @@ APC:
Range: 5
Turreted:
ROT: 10
-AttackMove:
Cargo:
Types: Infantry
MaxWeight: 5
@@ -93,7 +91,6 @@ HARV:
Type: Heavy
RevealsShroud:
Range: 4
AttackMove:
-GainsExperience:
RenderSprites:
RenderVoxels:
@@ -188,7 +185,6 @@ TRUCKB:
Range: 5
SupplyTruck:
Payload: 500
AttackMove:
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -212,7 +208,6 @@ LPST:
ROT: 5
RevealsShroud:
Range: 10
AttackMove:
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -242,7 +237,6 @@ ICBM:
ROT: 5
RevealsShroud:
Range: 7
AttackMove:
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -275,7 +269,6 @@ REPAIR:
Weapon: Repair
AttackMedic:
Cursor: repair
AttackMove:
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -299,7 +292,6 @@ ART2:
ROT: 2
RevealsShroud:
Range: 9
AttackMove:
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -330,7 +322,6 @@ WEED:
Type: Heavy
RevealsShroud:
Range: 4
AttackMove:
-GainsExperience:
RenderSprites:
RenderVoxels:
@@ -355,7 +346,6 @@ BUS:
Type: Light
RevealsShroud:
Range: 5
-AttackMove:
Cargo:
Types: Infantry
MaxWeight: 20
@@ -384,7 +374,6 @@ PICK:
Type: Light
RevealsShroud:
Range: 5
-AttackMove:
Cargo:
Types: Infantry
MaxWeight: 2
@@ -413,7 +402,6 @@ CAR:
Type: Light
RevealsShroud:
Range: 5
-AttackMove:
Cargo:
Types: Infantry
MaxWeight: 4
@@ -443,7 +431,6 @@ GGHUNT:
RevealsShroud:
Range: 7
RenderUnit:
AttackMove:
DemoTruck:
Explodes:
Weapon: SuicideBomb
@@ -468,7 +455,6 @@ WINI:
Type: Light
RevealsShroud:
Range: 5
-AttackMove:
Cargo:
Types: Infantry
MaxWeight: 5
@@ -648,7 +634,6 @@ SAPC:
Type: Heavy
RevealsShroud:
Range: 5
-AttackMove:
Cargo:
Types: Infantry
MaxWeight: 5
@@ -734,7 +719,6 @@ TTNK:
Type: Light
RevealsShroud:
Range: 5
-AttackMove:
RenderSprites:
RenderVoxels:
WithVoxelBody: