diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 1927a0c5cd..b14b7fc1bc 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -209,7 +209,6 @@ NotifyAll: true ScaredyCat: RenderInfantryPanic: - AttackMove: CrushableInfantry: ^DINO: @@ -274,6 +273,7 @@ CombatDebugOverlay: BodyOrientation: Huntable: + AttackMove: LuaScriptEvents: ^Ship: diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index a091925c0b..734c133f3d 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -171,7 +171,6 @@ E6: Captures: CaptureTypes: building, husk -AutoTarget: - AttackMove: RenderInfantryProne: IdleAnimations: idle1,idle2 StandAnimations: stand, stand2 diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index 9c4e8508c9..0260edc9b7 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -66,6 +66,5 @@ LST: Types: Infantry, Vehicle MaxWeight: 5 PipCount: 5 - AttackMove: RejectsOrders: diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 0ff42a7f72..0a8b0fea33 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -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 diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 54ae72fe02..8795dea3f1 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -197,6 +197,7 @@ BodyOrientation: UpdatesPlayerStatistics: Huntable: + AttackMove: LuaScriptEvents: ^Helicopter: diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 3bdb08e43d..1cb6a0d7c1 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -49,7 +49,6 @@ ENGINEER: EngineerRepair: ExternalCaptures: -AutoTarget: - AttackMove: BAZOOKA: Inherits: ^Infantry @@ -107,5 +106,3 @@ MEDIC: Passenger: PipType: Blue -AutoTarget: - AttackMove: - diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index 328e0583a7..bbb52efa73 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -293,5 +293,3 @@ SABOTEUR: C4Demolition: C4Delay: 45 -AutoTarget: - AttackMove: - diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 59044db758..04fac42051 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -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: diff --git a/mods/ra/maps/Fort-Lonestar/map.yaml b/mods/ra/maps/Fort-Lonestar/map.yaml index 2bc23def29..a9a854afcb 100644 --- a/mods/ra/maps/Fort-Lonestar/map.yaml +++ b/mods/ra/maps/Fort-Lonestar/map.yaml @@ -848,7 +848,6 @@ Rules: TakeCover: Spy: -AutoTarget: - AttackMove: -RenderInfantry: RenderSpy: IdleAnimations: idle1,idle2 diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index 3d570a79c9..fc87f1c71f 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -832,7 +832,6 @@ Rules: Range: 40 RenderUnit: Image: MNLY - AttackMove: MustBeDestroyed: Transforms: IntoActor: ftur diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 94daf16230..fd6766c6c1 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -196,6 +196,7 @@ TargetTypes: Air GroundedTargetTypes: Ground HiddenUnderFog: + AttackMove: GainsExperience: GivesExperience: DrawLineToTarget: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 29c37f95e2..f32c560042 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -174,7 +174,6 @@ E6: ExternalCaptures: TakeCover: -AutoTarget: - AttackMove: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 @@ -209,7 +208,6 @@ SPY: Infiltrates: Types: Cash, SupportPower, Exploration -AutoTarget: - AttackMove: -RenderInfantry: RenderSpy: IdleAnimations: idle1,idle2 @@ -286,7 +284,6 @@ MEDI: Cursor: heal TakeCover: -AutoTarget: - AttackMove: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 @@ -322,7 +319,6 @@ MECH: Cursor: repair TakeCover: -AutoTarget: - AttackMove: -RenderInfantry: RenderInfantryProne: IdleAnimations: idle1,idle2 @@ -343,7 +339,6 @@ EINSTEIN: RevealsShroud: Range: 2 -AutoTarget: - AttackMove: ProximityCaptor: Types: CivilianInfantry -RenderInfantry: @@ -366,7 +361,6 @@ DELPHI: RevealsShroud: Range: 2 -AutoTarget: - AttackMove: ProximityCaptor: Types: CivilianInfantry -RenderInfantry: @@ -407,7 +401,6 @@ THF: InfiltrateTypes: Cash TakeCover: -AutoTarget: - AttackMove: SHOK: Inherits: ^Infantry diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 880fdab0c2..8ebb62260f 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -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 diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index d5746aa46d..ad6097c4dc 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -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: @@ -552,7 +546,6 @@ MRJ: WithIdleOverlay@SPINNER: Sequence: spinner Offset: -256,0,256 - AttackMove: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall @@ -713,7 +706,6 @@ DTRK: RevealsShroud: Range: 3 RenderUnit: - AttackMove: Explodes: Weapon: MiniNuke EmptyWeapon: MiniNuke @@ -784,11 +776,9 @@ QTNK: Selectable: Bounds: 44,38,0,-4 RenderUnit: - AttackMove: Explodes: Weapon: UnitExplodeSmall MadTank: -EjectOnDeath: TargetableUnit: TargetTypes: Ground, MADTank - diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 0965cb5697..fd432c7e93 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -195,6 +195,7 @@ Buildable: Queue: Aircraft HiddenUnderFog: + AttackMove: GainsExperience: GivesExperience: DrawLineToTarget: diff --git a/mods/ts/rules/infantry.yaml b/mods/ts/rules/infantry.yaml index 64abf53b7b..020dcd3bbf 100644 --- a/mods/ts/rules/infantry.yaml +++ b/mods/ts/rules/infantry.yaml @@ -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: diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml index 6020f5cead..7162439f2e 100644 --- a/mods/ts/rules/vehicles.yaml +++ b/mods/ts/rules/vehicles.yaml @@ -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: