From 2e801a55cea3444eb9b5742a0a41e6e9a7985153 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 28 May 2017 21:09:48 +0100 Subject: [PATCH] Update ts AutoTarget definitions. --- mods/ts/rules/aircraft.yaml | 10 +++++----- mods/ts/rules/civilian-infantry.yaml | 11 ++++++----- mods/ts/rules/civilian-vehicles.yaml | 2 +- mods/ts/rules/critters.yaml | 2 ++ mods/ts/rules/defaults.yaml | 22 ++++++++++++++++++---- mods/ts/rules/gdi-infantry.yaml | 7 ++++++- mods/ts/rules/gdi-support.yaml | 1 + mods/ts/rules/gdi-vehicles.yaml | 12 ++++++------ mods/ts/rules/nod-infantry.yaml | 4 +++- mods/ts/rules/nod-support.yaml | 3 +++ mods/ts/rules/nod-vehicles.yaml | 14 +++++++++----- mods/ts/rules/shared-infantry.yaml | 2 +- mods/ts/rules/shared-support.yaml | 1 - 13 files changed, 61 insertions(+), 30 deletions(-) diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 5e55e1eb08..038fee1a55 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -1,5 +1,6 @@ DPOD: Inherits: ^Helicopter + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 10 Tooltip: @@ -29,7 +30,6 @@ DPOD: PipCount: 5 PipType: Ammo PipTypeEmpty: AmmoEmpty - AutoTarget: DSHP: Inherits: ^Helicopter @@ -65,6 +65,7 @@ DSHP: ORCA: Inherits: ^Helicopter Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 1000 Tooltip: @@ -99,7 +100,6 @@ ORCA: PipCount: 5 PipType: Ammo PipTypeEmpty: AmmoEmpty - AutoTarget: RenderSprites: SpawnActorOnDeath: Actor: ORCA.Husk @@ -107,6 +107,7 @@ ORCA: ORCAB: Inherits: ^Aircraft Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 1600 Tooltip: @@ -147,7 +148,6 @@ ORCAB: ReloadDelay: 200 PipType: Ammo PipTypeEmpty: AmmoEmpty - AutoTarget: RenderSprites: Hovers@CRUISING: RequiresCondition: cruising @@ -230,6 +230,7 @@ TRNSPORT: SCRIN: Inherits: ^Aircraft Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 1500 Tooltip: @@ -271,7 +272,6 @@ SCRIN: ReloadCount: 5 PipType: Ammo PipTypeEmpty: AmmoEmpty - AutoTarget: RenderSprites: DeathSounds: SpawnActorOnDeath: @@ -280,6 +280,7 @@ SCRIN: APACHE: Inherits: ^Helicopter Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 1000 Tooltip: @@ -312,7 +313,6 @@ APACHE: PipCount: 4 PipType: Ammo PipTypeEmpty: AmmoEmpty - AutoTarget: WithIdleOverlay@ROTORAIR: Offset: 85,0,384 Sequence: rotor diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index a81a9d781e..0e5d1bd473 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -29,6 +29,7 @@ UMAGON: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 400 Tooltip: @@ -77,7 +78,6 @@ CHAMSPY: RequiresCondition: disguise Infiltrates: Types: SpyInfiltrate - -AutoTarget: -WithInfantryBody: WithDisguisingInfantryBody: IdleSequences: idle1,idle2 @@ -86,6 +86,7 @@ MUTANT: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 100 Tooltip: @@ -111,6 +112,7 @@ MWMN: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 100 Tooltip: @@ -136,6 +138,7 @@ MUTANT3: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 100 Tooltip: @@ -172,7 +175,6 @@ TRATOS: Speed: 71 RevealsShroud: Range: 4c0 - -AutoTarget: WithInfantryBody: DefaultAttackSequence: @@ -190,7 +192,6 @@ OXANNA: Speed: 56 RevealsShroud: Range: 4c0 - -AutoTarget: WithInfantryBody: DefaultAttackSequence: attack @@ -208,12 +209,12 @@ SLAV: Speed: 56 RevealsShroud: Range: 4c0 - -AutoTarget: WithInfantryBody: DefaultAttackSequence: attack CIV1: Inherits: ^CivilianInfantry + Inherits@AUTOTARGET: ^AutoTargetGround WithInfantryBody: DefaultAttackSequence: attack Armament: @@ -223,10 +224,10 @@ CIV1: CIV2: Inherits: ^CivilianInfantry - -AutoTarget: CIV3: Inherits: ^CivilianInfantry + Inherits@AUTOTARGET: ^AutoTargetGround WithInfantryBody: DefaultAttackSequence: attack Armament: diff --git a/mods/ts/rules/civilian-vehicles.yaml b/mods/ts/rules/civilian-vehicles.yaml index 04ea369403..3fb1cd1bf5 100644 --- a/mods/ts/rules/civilian-vehicles.yaml +++ b/mods/ts/rules/civilian-vehicles.yaml @@ -2,6 +2,7 @@ Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetAll Valued: Cost: 1700 Tooltip: @@ -30,7 +31,6 @@ LocalOffset: 0,283,580, 0,-283,580 AttackTurreted: Voice: Attack - AutoTarget: SelfHealing: Delay: 10 HealIfBelow: 50 diff --git a/mods/ts/rules/critters.yaml b/mods/ts/rules/critters.yaml index 037372815d..ea308deeee 100644 --- a/mods/ts/rules/critters.yaml +++ b/mods/ts/rules/critters.yaml @@ -53,6 +53,7 @@ VISC_SML: VISC_LRG: Inherits: ^Visceroid Inherits@CRATESTATS: ^CrateStatModifiers + Inherits@AUTOTARGET: ^AutoTargetGround Tooltip: Name: Adult Visceroid Health: @@ -82,6 +83,7 @@ VISC_LRG: JFISH: Inherits: ^Visceroid Inherits@CRATESTATS: ^CrateStatModifiers + Inherits@AUTOTARGET: ^AutoTargetGround Tooltip: Name: Tiberium Floater Health: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 0c14989af8..d37cea7f75 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -123,6 +123,24 @@ ExternalCondition@CRATE-CLOAK: Condition: crate-cloak +^AutoTargetGround: + AutoTarget: + AutoTargetPriority@DEFAULT: + ValidTargets: Infantry, Vehicle, Water, Structure, Defense + InvalidTargets: NoAutoTarget + +^AutoTargetAir: + AutoTarget: + AutoTargetPriority@DEFAULT: + ValidTargets: Air + InvalidTargets: NoAutoTarget + +^AutoTargetAll: + AutoTarget: + AutoTargetPriority@DEFAULT: + ValidTargets: Infantry, Vehicle, Water, Air, Structure, Defense + InvalidTargets: NoAutoTarget + ^BasicBuilding: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor @@ -278,7 +296,6 @@ TargetTypes: Ground, Wall, C4 WithWallSpriteBody: Type: wall - AutoTargetIgnore: Sellable: SellSounds: cashturn.aud Demolishable: @@ -348,7 +365,6 @@ QuantizeFacingsFromSequence: Sequence: stand WithInfantryBody: - AutoTarget: AttackMove: Voice: Move Passenger: @@ -671,7 +687,6 @@ Type: Heavy HiddenUnderFog: Type: GroundPosition - AutoTargetIgnore: ScriptTriggers: Tooltip: GenericName: Destroyed Aircraft @@ -801,7 +816,6 @@ ^Defense: Inherits: ^Building -GivesBuildableArea: - AutoTarget: RenderRangeCircle: RenderDetectionCircle: RevealsShroud: diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index 4822b4e17a..453f4f6091 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -1,6 +1,7 @@ E2: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Buildable: Queue: Infantry BuildPaletteOrder: 20 @@ -57,6 +58,9 @@ MEDIC: ForceTargetStances: None Cursor: heal OutsideRangeCursor: heal + AutoTarget: + AutoTargetPriority@DEFAULT: + ValidTargets: Infantry AttackFrontal: WithInfantryBody: DefaultAttackSequence: heal @@ -68,6 +72,7 @@ MEDIC: JUMPJET: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 600 Tooltip: @@ -152,7 +157,6 @@ JUMPJET.Husk: Aircraft: HiddenUnderFog: Type: GroundPosition - AutoTargetIgnore: ScriptTriggers: Tooltip: Name: Jumpjet Infantry @@ -184,6 +188,7 @@ GHOST: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience Inherits@2: ^HealsOnTiberium + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 1750 Tooltip: diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index 825d8f5a67..3ad773e652 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -44,6 +44,7 @@ GAGATE_B: GACTWR: Inherits: ^Defense Inherits@IDISABLE: ^DisabledOverlay + Inherits@AUTOTARGET: ^AutoTargetAll -WithSpriteBody: WithWallSpriteBody: Type: wall diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index 5ea39e8e49..4b87b0eebb 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -51,6 +51,7 @@ HVR: Inherits: ^Vehicle Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetAll Valued: Cost: 900 Tooltip: @@ -89,7 +90,6 @@ HVR: Offset: -128,0,85 AttackTurreted: Voice: Attack - AutoTarget: WithVoxelTurret: Hovers: LeavesTrails: @@ -106,6 +106,7 @@ HVR: SMECH: Inherits: ^Vehicle Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 500 Tooltip: @@ -128,7 +129,6 @@ SMECH: MaxHeightDelta: 3 AttackFrontal: Voice: Attack - AutoTarget: Armament: Weapon: AssaultCannon Voiced: @@ -149,6 +149,7 @@ SMECH: MMCH: Inherits: ^Tank Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 800 Tooltip: @@ -191,7 +192,6 @@ MMCH: RenderVoxels: WithVoxelBarrel: LocalOffset: -91,91,362 - AutoTarget: Selectable: Bounds: 30, 42, 0, -8 Carryable: @@ -201,6 +201,7 @@ HMEC: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetAll Valued: Cost: 3000 Tooltip: @@ -226,7 +227,6 @@ HMEC: MaxHeightDelta: 3 AttackFrontal: Voice: Attack - AutoTarget: Armament@MISSILES: Weapon: MammothTusk LocalOffset: -243,-368,1208, -243,368,1208 @@ -245,6 +245,7 @@ SONIC: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 1300 Tooltip: @@ -276,13 +277,13 @@ SONIC: Turreted: TurnSpeed: 5 Offset: -170,0,0 - AutoTarget: WithVoxelTurret: JUGG: Inherits: ^Tank Inherits@SPRITES: ^SpriteActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 950 Tooltip: @@ -361,7 +362,6 @@ JUGG: MuzzleSequence: muzzle MuzzlePalette: effect-ignore-lighting WithMuzzleOverlay: - AutoTarget: Carryable: RequiresCondition: undeployed RevealOnFire: diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index 55e7bdf64a..57bb632cef 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -1,6 +1,7 @@ E3: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetAll Buildable: Queue: Infantry BuildPaletteOrder: 30 @@ -33,6 +34,7 @@ E3: CYBORG: Inherits: ^Cyborg Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Armor: Type: Light Valued: @@ -67,6 +69,7 @@ CYBORG: CYC2: Inherits: ^Cyborg Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Armor: Type: Heavy Valued: @@ -125,4 +128,3 @@ MHIJACK: PlayerExperience: 50 RevealsShroud: Range: 6c0 - -AutoTarget: diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index 4610601d48..f2e1fc07ee 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -148,6 +148,7 @@ NAFNCE: NALASR: Inherits: ^Defense Inherits@IDISABLE: ^DisabledOverlay + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 300 Tooltip: @@ -188,6 +189,7 @@ NALASR: NAOBEL: Inherits: ^Defense Inherits@IDISABLE: ^DisabledOverlay + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 1500 Tooltip: @@ -233,6 +235,7 @@ NAOBEL: NASAM: Inherits: ^Defense Inherits@IDISABLE: ^DisabledOverlay + Inherits@AUTOTARGET: ^AutoTargetAir Valued: Cost: 500 Tooltip: diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 94c830481e..56e5508d04 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -2,6 +2,7 @@ BGGY: Inherits: ^Vehicle Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 500 Tooltip: @@ -30,7 +31,6 @@ BGGY: MuzzleSplitFacings: 8 AttackFrontal: Voice: Attack - AutoTarget: WithMuzzleOverlay: -DamagedByTerrain@VEINS: -LeavesTrails@VEINS: @@ -39,6 +39,7 @@ BIKE: Inherits: ^Vehicle Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetAll Valued: Cost: 600 Tooltip: @@ -69,12 +70,12 @@ BIKE: LocalOffset: -153,-204,509, -153,204,509 AttackFrontal: Voice: Attack - AutoTarget: TTNK: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 800 Tooltip: @@ -170,7 +171,6 @@ TTNK: Armor@deployed: Type: Concrete RequiresCondition: deployed - AutoTarget: Carryable: RequiresCondition: undeployed RevealOnFire: @@ -182,6 +182,7 @@ ART2: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 975 Tooltip: @@ -252,7 +253,6 @@ ART2: MuzzleSequence: muzzle MuzzlePalette: effect-ignore-lighting WithMuzzleOverlay: - AutoTarget: Carryable: RequiresCondition: undeployed RevealOnFire: @@ -287,6 +287,9 @@ REPAIR: ForceTargetStances: None AttackFrontal: Voice: Attack + AutoTarget: + AutoTargetPriority@DEFAULT: + ValidTargets: Vehicles WEED: Inherits: ^Tank @@ -379,6 +382,7 @@ SUBTANK: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Valued: Cost: 750 Tooltip: @@ -413,7 +417,6 @@ SUBTANK: Weapon: FireballLauncher AttackFrontal: Voice: Attack - AutoTarget: WithVoxelBody: RequiresCondition: !submerged Targetable: @@ -423,6 +426,7 @@ STNK: Inherits: ^Tank Inherits@VOXELS: ^VoxelActor Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetAll Valued: Cost: 1100 Tooltip: diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index a421388810..c62402351e 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -1,6 +1,7 @@ E1: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@AUTOTARGET: ^AutoTargetGround Buildable: Queue: Infantry BuildPaletteOrder: 10 @@ -59,7 +60,6 @@ ENGINEER: Captures: CaptureTypes: building PlayerExperience: 50 - -AutoTarget: RenderSprites: Image: engineer.gdi FactionImages: diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml index a95813c54e..89b1c43fa6 100644 --- a/mods/ts/rules/shared-support.yaml +++ b/mods/ts/rules/shared-support.yaml @@ -22,7 +22,6 @@ NAPULS: Type: Heavy RevealsShroud: Range: 8c0 - -AutoTarget: Turreted: TurnSpeed: 10 InitialFacing: 224