Adapt TS to removal of IsDisabled checks from Attack* traits

This commit is contained in:
reaperrr
2017-10-17 16:51:35 +02:00
committed by Pavel Penev
parent 456d32f3eb
commit 6e59fe3bc2
7 changed files with 35 additions and 3 deletions

View File

@@ -66,6 +66,7 @@ ORCA:
Inherits: ^Helicopter
Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Inherits@EMPDISABLE: ^EmpDisable
Valued:
Cost: 1000
Tooltip:
@@ -97,6 +98,7 @@ ORCA:
AttackHeli:
FacingTolerance: 20
Voice: Attack
PauseOnCondition: empdisable
AmmoPool:
Ammo: 5
PipCount: 5
@@ -111,6 +113,7 @@ ORCAB:
Inherits: ^Aircraft
Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Inherits@EMPDISABLE: ^EmpDisable
Valued:
Cost: 1600
Tooltip:
@@ -146,6 +149,7 @@ ORCAB:
AttackPlane:
Voice: Attack
FacingTolerance: 20
PauseOnCondition: empdisable
AmmoPool:
Ammo: 10
PipCount: 2
@@ -237,6 +241,7 @@ SCRIN:
Inherits: ^Aircraft
Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Inherits@EMPDISABLE: ^EmpDisable
Valued:
Cost: 1500
Tooltip:
@@ -274,6 +279,7 @@ SCRIN:
AttackPlane:
Voice: Attack
FacingTolerance: 20
PauseOnCondition: empdisable
AmmoPool:
Ammo: 15
PipCount: 3
@@ -290,6 +296,7 @@ APACHE:
Inherits: ^Helicopter
Inherits@EXPERIENCE: ^GainsExperience
Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Inherits@EMPDISABLE: ^EmpDisable
Valued:
Cost: 1000
Tooltip:
@@ -319,6 +326,7 @@ APACHE:
AttackHeli:
FacingTolerance: 20
Voice: Attack
PauseOnCondition: empdisable
AmmoPool:
Ammo: 12
PipCount: 4

View File

@@ -31,6 +31,7 @@
LocalOffset: 0,283,580, 0,-283,580
AttackTurreted:
Voice: Attack
PauseOnCondition: empdisable
SelfHealing:
Delay: 10
HealIfBelow: 50

View File

@@ -63,12 +63,13 @@ GACTWR:
BodyOrientation:
QuantizedFacings: 32
DetectCloaked:
RequiresCondition: tower.vulcan || tower.rocket || tower.sam
RequiresCondition: !empdisable && (tower.vulcan || tower.rocket || tower.sam)
Turreted:
TurnSpeed: 10
InitialFacing: 224
AttackTurreted:
RequiresCondition: tower.vulcan || tower.rocket || tower.sam
PauseOnCondition: empdisable
WithSpriteTurret@VULC:
RequiresCondition: tower.vulcan
Recoils: false

View File

@@ -90,6 +90,7 @@ HVR:
Offset: -128,0,85
AttackTurreted:
Voice: Attack
PauseOnCondition: empdisable
WithVoxelTurret:
Hovers:
LeavesTrails:
@@ -129,6 +130,7 @@ SMECH:
MaxHeightDelta: 3
AttackFrontal:
Voice: Attack
PauseOnCondition: empdisable
Armament:
Weapon: AssaultCannon
Voiced:
@@ -182,6 +184,7 @@ MMCH:
TurnSpeed: 5
AttackTurreted:
Voice: Attack
PauseOnCondition: empdisable
WithSpriteTurret:
Recoils: false
Armament:
@@ -234,6 +237,7 @@ HMEC:
MaxHeightDelta: 3
AttackFrontal:
Voice: Attack
PauseOnCondition: empdisable
Armament@MISSILES:
Weapon: MammothTusk
LocalOffset: -243,-368,1208, -243,368,1208
@@ -281,6 +285,7 @@ SONIC:
LocalOffset: -71,0,580
AttackTurreted:
Voice: Attack
PauseOnCondition: empdisable
Turreted:
TurnSpeed: 5
Offset: -170,0,0
@@ -364,7 +369,9 @@ JUGG:
AttackTurreted@deployed:
Voice: Attack
Armaments: deployed
Turrets: deployed
RequiresCondition: deployed
PauseOnCondition: empdisable
Armament@deployed:
Name: deployed
Turret: deployed

View File

@@ -161,6 +161,7 @@ NALASR:
InitialFacing: 224
Offset: 298,-171,288
AttackTurreted:
PauseOnCondition: empdisable
Armament:
Weapon: TurretLaserFire
LocalOffset: 498,0,317
@@ -203,7 +204,7 @@ NAOBEL:
Weapon: ObeliskLaserFire
LocalOffset: 1980,297,1131
AttackCharges:
RequiresCondition: !disabled
PauseOnCondition: empdisable || disabled
ChargeLevel: 65
ChargingCondition: charging
AmbientSound:
@@ -249,7 +250,7 @@ NASAM:
TurnSpeed: 10
InitialFacing: 224
AttackTurreted:
RequiresCondition: !disabled
PauseOnCondition: empdisable || disabled
WithSpriteTurret:
Recoils: false
Armament:

View File

@@ -31,6 +31,7 @@ BGGY:
MuzzleSplitFacings: 8
AttackFrontal:
Voice: Attack
PauseOnCondition: empdisable
WithMuzzleOverlay:
-DamagedByTerrain@VEINS:
-LeavesTrails@VEINS:
@@ -70,6 +71,7 @@ BIKE:
LocalOffset: -153,-204,509, -153,204,509
AttackFrontal:
Voice: Attack
PauseOnCondition: empdisable
DamagedByTerrain@VEINS:
RequiresCondition: !inside-tunnel && !rank-elite
LeavesTrails@VEINS:
@@ -139,6 +141,7 @@ TTNK:
AttackFrontal:
Voice: Attack
RequiresCondition: undeployed
PauseOnCondition: empdisable
Turreted:
TurnSpeed: 6
Turret: deployed
@@ -155,7 +158,9 @@ TTNK:
AttackTurreted@deployed:
Voice: Attack
Armaments: deployed
Turrets: deployed
RequiresCondition: deployed
PauseOnCondition: empdisable
Armament@deployed:
Name: deployed
Turret: deployed
@@ -251,7 +256,9 @@ ART2:
AttackTurreted@deployed:
Voice: Attack
Armaments: deployed
Turrets: deployed
RequiresCondition: deployed
PauseOnCondition: empdisable
Armament@deployed:
Name: deployed
Turret: deployed
@@ -295,6 +302,7 @@ REPAIR:
ForceTargetStances: None
AttackFrontal:
Voice: Attack
PauseOnCondition: empdisable
AutoTarget:
AutoTargetPriority@DEFAULT:
ValidTargets: Vehicles
@@ -425,6 +433,7 @@ SUBTANK:
Weapon: FireballLauncher
AttackFrontal:
Voice: Attack
PauseOnCondition: empdisable
WithVoxelBody:
RequiresCondition: !submerged
Targetable:
@@ -472,6 +481,7 @@ STNK:
LocalOffset: 301,61,421, 301,-61,421
AttackFrontal:
Voice: Attack
PauseOnCondition: empdisable
AutoTarget:
InitialStance: HoldFire
InitialStanceAI: ReturnFire

View File

@@ -1,16 +1,20 @@
orca:
Inherits: ^VehicleOverlays
icon: orcaicon
orcab:
Inherits: ^VehicleOverlays
icon: obmbicon
trnsport:
icon: otrnicon
scrin:
Inherits: ^VehicleOverlays
icon: proicon
apache:
Inherits: ^VehicleOverlays
icon: apchicon
rotor: lrotor
Length: 4