From 7147ffc8120afc18721cfa49f2610f8816a35e6a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 15 May 2015 02:04:13 +0200 Subject: [PATCH] Replace RenderUnit in RA mod with WithFacingSpriteBody +RenderSprites + AutoSelectionSize. Change MadTank dependency from RenderUnit to WithFacingSpriteBody. --- OpenRA.Mods.RA/Traits/MadTank.cs | 8 +- mods/ra/maps/allies-01/map.yaml | 12 ++- mods/ra/maps/allies-03b/map.yaml | 6 +- mods/ra/maps/allies-05a/map.yaml | 6 +- mods/ra/maps/bomber-john/map.yaml | 6 +- mods/ra/maps/fort-lonestar/map.yaml | 6 +- mods/ra/maps/monster-tank-madness/map.yaml | 24 +++-- mods/ra/rules/aircraft.yaml | 38 +++++--- mods/ra/rules/defaults.yaml | 4 +- mods/ra/rules/husks.yaml | 106 ++++++++++++++------- mods/ra/rules/ships.yaml | 20 +++- mods/ra/rules/vehicles.yaml | 80 ++++++++++++---- 12 files changed, 218 insertions(+), 98 deletions(-) diff --git a/OpenRA.Mods.RA/Traits/MadTank.cs b/OpenRA.Mods.RA/Traits/MadTank.cs index 7082bb6052..c11e7098ae 100644 --- a/OpenRA.Mods.RA/Traits/MadTank.cs +++ b/OpenRA.Mods.RA/Traits/MadTank.cs @@ -22,7 +22,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.RA.Traits { - class MadTankInfo : ITraitInfo, Requires, Requires + class MadTankInfo : ITraitInfo, Requires, Requires { public readonly string ThumpSequence = "piston"; public readonly int ThumpInterval = 8; @@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA.Traits { readonly Actor self; readonly MadTankInfo info; - readonly RenderUnit renderUnit; + readonly WithFacingSpriteBody wfsb; readonly ScreenShaker screenShaker; bool deployed; int tick; @@ -61,7 +61,7 @@ namespace OpenRA.Mods.RA.Traits { this.self = self; this.info = info; - renderUnit = self.Trait(); + wfsb = self.Trait(); screenShaker = self.World.WorldActor.Trait(); } @@ -147,7 +147,7 @@ namespace OpenRA.Mods.RA.Traits self.World.AddFrameEndTask(w => EjectDriver()); if (info.ThumpSequence != null) - renderUnit.PlayCustomAnimationRepeating(self, info.ThumpSequence); + wfsb.PlayCustomAnimationRepeating(self, info.ThumpSequence); deployed = true; self.QueueActivity(new Wait(info.ChargeDelay, false)); self.QueueActivity(new CallFunc(() => Sound.Play(info.ChargeSound, self.CenterPosition))); diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml index 7d6a547f66..5b8f562102 100644 --- a/mods/ra/maps/allies-01/map.yaml +++ b/mods/ra/maps/allies-01/map.yaml @@ -480,8 +480,7 @@ Rules: PanelName: MISSION_OBJECTIVES TRAN.Extraction: Inherits: TRAN - RenderUnit: - Image: tran + WithFacingSpriteBody: RevealsShroud: Range: 0c0 RejectsOrders: @@ -489,12 +488,17 @@ Rules: Cargo: Types: Einstein MaxWeight: 1 + AutoSelectionSize: + RenderSprites: + Image: tran TRAN.Insertion: Inherits: TRAN.Extraction - RenderUnit: - Image: tran + WithFacingSpriteBody: Cargo: MaxWeight: 0 + AutoSelectionSize: + RenderSprites: + Image: tran EINSTEIN: Passenger: CargoType: Einstein diff --git a/mods/ra/maps/allies-03b/map.yaml b/mods/ra/maps/allies-03b/map.yaml index 1216778cde..17128701b1 100644 --- a/mods/ra/maps/allies-03b/map.yaml +++ b/mods/ra/maps/allies-03b/map.yaml @@ -1377,8 +1377,7 @@ Rules: ShowOwnerRow: false JEEP.mission: Inherits: JEEP - RenderUnit: - Image: JEEP + WithFacingSpriteBody: -Selectable: -Demolishable: -Huntable: @@ -1389,6 +1388,9 @@ Rules: Types: ~disabled RevealsShroud: Range: 0c0 + AutoSelectionSize: + RenderSprites: + Image: JEEP E3: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/allies-05a/map.yaml b/mods/ra/maps/allies-05a/map.yaml index 9eb7d0e522..cc20ce373b 100644 --- a/mods/ra/maps/allies-05a/map.yaml +++ b/mods/ra/maps/allies-05a/map.yaml @@ -1656,10 +1656,12 @@ Rules: Inherits: TRUK Buildable: Prerequisites: ~disabled - RenderUnit: - Image: TRUK + WithFacingSpriteBody: -LeavesHusk: -EjectOnDeath: + AutoSelectionSize: + RenderSprites: + Image: TRUK SPY: Infiltrates: Types: Mission Objectives diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index a5b5e9d072..e1aa8eeaf1 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -829,8 +829,7 @@ Rules: ROT: 900 RevealsShroud: Range: 40c0 - RenderUnit: - Image: MNLY + WithFacingSpriteBody: MustBeDestroyed: RequiredForShortGame: true Transforms: @@ -840,6 +839,9 @@ Rules: CashTrickler: Period: 150 Amount: 20 + AutoSelectionSize: + RenderSprites: + Image: MNLY FTUR: Health: HP: 1000 diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index a742fb703c..175e16a0ee 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -684,14 +684,16 @@ Rules: Speed: 280 AmmoPool: Ammo: 30 - RenderUnit: - Image: mig + WithFacingSpriteBody: WithShadow: -Selectable: -GainsExperience: Tooltip: Name: Mig Bomber -EjectOnDeath: + AutoSelectionSize: + RenderSprites: + Image: mig BRIK: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index c31e309ae6..e196f57b93 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2210,8 +2210,7 @@ Rules: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - RenderUnit: - Image: 4TNK + WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -2227,16 +2226,21 @@ Rules: Selectable: Bounds: 44,38,0,-4 -EjectOnDeath: + AutoSelectionSize: + RenderSprites: + Image: 4TNK 5TNK.Husk: Inherits: ^Husk Tooltip: Name: Husk (Super Tank) - RenderUnit: - Image: 4TNK + WithFacingSpriteBody: ThrowsParticle@turret: Anim: turret Health: HP: 2000 + AutoSelectionSize: + RenderSprites: + Image: 4TNK DOME.NoInfiltrate: Inherits: DOME Buildable: @@ -2253,16 +2257,20 @@ Rules: Inherits: 3TNK Buildable: Prerequisites: ~disabled - RenderUnit: - Image: 3TNK + WithFacingSpriteBody: -EjectOnDeath: + AutoSelectionSize: + RenderSprites: + Image: 3TNK BADTRUK: Inherits: TRUK Buildable: Prerequisites: ~disabled - RenderUnit: - Image: TRUK + WithFacingSpriteBody: -EjectOnDeath: + AutoSelectionSize: + RenderSprites: + Image: TRUK SS: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 8b844040db..d5e01b21bd 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -10,7 +10,7 @@ BADR: ROT: 5 Speed: 149 Repulsable: False - RenderUnit: + WithFacingSpriteBody: Cargo: MaxWeight: 10 -Selectable: @@ -33,6 +33,8 @@ BADR: -GpsDot: RejectsOrders: -AnnounceOnSeen: + AutoSelectionSize: + RenderSprites: BADR.Bomber: Inherits: ^Plane @@ -49,8 +51,7 @@ BADR.Bomber: Repulsable: False AmmoPool: Ammo: 7 - RenderUnit: - Image: badr + WithFacingSpriteBody: -Selectable: -GainsExperience: Tooltip: @@ -70,6 +71,9 @@ BADR.Bomber: -EjectOnDeath: -GpsDot: RejectsOrders: + AutoSelectionSize: + RenderSprites: + Image: badr MIG: Inherits: ^Plane @@ -105,8 +109,7 @@ MIG: TargetWhenIdle: false TargetWhenDamaged: false EnableStances: false - RenderUnit: - CameraPitch: 99 + WithFacingSpriteBody: AmmoPool: Ammo: 8 ReturnOnIdle: @@ -121,6 +124,9 @@ MIG: SmokeTrailWhenDamaged: Offset: -853,0,171 Interval: 2 + AutoSelectionSize: + RenderSprites: + CameraPitch: 99 YAK: Inherits: ^Plane @@ -161,8 +167,7 @@ YAK: TargetWhenIdle: false TargetWhenDamaged: false EnableStances: false - RenderUnit: - CameraPitch: 99 + WithFacingSpriteBody: AmmoPool: Ammo: 18 PipCount: 6 @@ -178,6 +183,9 @@ YAK: SmokeTrailWhenDamaged: Offset: -853,0,0 Interval: 2 + AutoSelectionSize: + RenderSprites: + CameraPitch: 99 TRAN: Inherits: ^Helicopter @@ -205,7 +213,7 @@ TRAN: Speed: 112 LandableTerrainTypes: Clear,Rough,Road,Ore,Beach AltitudeVelocity: 0c100 - RenderUnit: + WithFacingSpriteBody: WithRotor@PRIMARY: Offset: -597,0,341 Sequence: rotor2 @@ -218,6 +226,8 @@ TRAN: PipCount: 8 LeavesHusk: HuskActor: TRAN.Husk + AutoSelectionSize: + RenderSprites: HELI: Inherits: ^Helicopter @@ -254,7 +264,7 @@ HELI: Speed: 149 AutoTarget: InitialStance: HoldFire - RenderUnit: + WithFacingSpriteBody: WithRotor: Offset: 0,0,85 AmmoPool: @@ -265,6 +275,8 @@ HELI: HuskActor: HELI.Husk SmokeTrailWhenDamaged: Offset: -427,0,0 + AutoSelectionSize: + RenderSprites: HIND: Inherits: ^Helicopter @@ -304,7 +316,7 @@ HIND: Speed: 112 AutoTarget: InitialStance: HoldFire - RenderUnit: + WithFacingSpriteBody: WithRotor: AmmoPool: Ammo: 24 @@ -317,6 +329,8 @@ HIND: HuskActor: HIND.Husk SmokeTrailWhenDamaged: Offset: -427,0,0 + AutoSelectionSize: + RenderSprites: U2: Inherits: ^Plane @@ -329,7 +343,7 @@ U2: Speed: 373 Repulsable: False MaximumPitch: 56 - RenderUnit: + WithFacingSpriteBody: AttackBomber: -Selectable: -TargetableAircraft: @@ -345,4 +359,6 @@ U2: Interval: 2 RejectsOrders: -AnnounceOnSeen: + AutoSelectionSize: + RenderSprites: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index d42732d996..79a9940f5e 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -536,7 +536,7 @@ ^Husk: Husk: AllowedTerrain: Clear, Rough, Road, Ore, Gems, Beach - RenderUnit: + WithFacingSpriteBody: Health: HP: 280 Armor: @@ -562,6 +562,8 @@ ForceHealthPercentage: 25 DisabledOverlay: ScriptTriggers: + AutoSelectionSize: + RenderSprites: ^HelicopterHusk: Inherits: ^Husk diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml index ba6e3fadf8..75c2cb5e41 100644 --- a/mods/ra/rules/husks.yaml +++ b/mods/ra/rules/husks.yaml @@ -2,91 +2,106 @@ Inherits: ^Husk Tooltip: Name: Husk (Light Tank) - RenderUnit: - Image: 1tnk.destroyed + WithFacingSpriteBody: ThrowsParticle@turret: Anim: turret TransformOnCapture: IntoActor: 1tnk + AutoSelectionSize: + RenderSprites: + Image: 1tnk.destroyed 2TNK.Husk: Inherits: ^Husk Tooltip: Name: Husk (Medium Tank) - RenderUnit: - Image: 2tnk.destroyed + WithFacingSpriteBody: ThrowsParticle@turret: Anim: turret TransformOnCapture: IntoActor: 2tnk + AutoSelectionSize: + RenderSprites: + Image: 2tnk.destroyed 3TNK.Husk: Inherits: ^Husk Tooltip: Name: Husk (Heavy Tank) - RenderUnit: - Image: 3tnk.destroyed + WithFacingSpriteBody: ThrowsParticle@turret: Anim: turret TransformOnCapture: IntoActor: 3tnk + AutoSelectionSize: + RenderSprites: + Image: 3tnk.destroyed 4TNK.Husk: Inherits: ^Husk Tooltip: Name: Husk (Mammoth Tank) - RenderUnit: - Image: 4tnk.destroyed + WithFacingSpriteBody: ThrowsParticle@turret: Anim: turret TransformOnCapture: IntoActor: 4tnk + AutoSelectionSize: + RenderSprites: + Image: 4tnk.destroyed HARV.FullHusk: Inherits: ^Husk Tooltip: Name: Husk (Harvester) - RenderUnit: - Image: hhusk + WithFacingSpriteBody: TransformOnCapture: IntoActor: harv + AutoSelectionSize: + RenderSprites: + Image: hhusk HARV.EmptyHusk: Inherits: ^Husk Tooltip: Name: Husk (Harvester) - RenderUnit: - Image: hhusk2 + WithFacingSpriteBody: TransformOnCapture: IntoActor: harv + AutoSelectionSize: + RenderSprites: + Image: hhusk2 MCV.Husk: Inherits: ^Husk Tooltip: Name: Husk (MCV) - RenderUnit: - Image: mcvhusk + WithFacingSpriteBody: TransformOnCapture: IntoActor: mcv + AutoSelectionSize: + RenderSprites: + Image: mcvhusk MGG.Husk: Inherits: ^Husk Tooltip: Name: Husk (Mobile Gap Generator) - RenderUnit: - Image: mgg.destroyed + WithFacingSpriteBody: ThrowsParticle@spinner: Anim: spinner-idle Offset: -299,0,171 TransformOnCapture: IntoActor: mgg + AutoSelectionSize: + RenderSprites: + Image: mgg.destroyed TRAN.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Transport Helicopter - RenderUnit: - Image: tran + WithFacingSpriteBody: WithShadow: Helicopter: ROT: 4 @@ -97,33 +112,39 @@ TRAN.Husk: Offset: 597,0,213 RevealsShroud: Range: 12c0 + AutoSelectionSize: + RenderSprites: + Image: tran TRAN.Husk1: Inherits: ^Husk Tooltip: Name: Husk (Transport Helicopter) - RenderUnit: - Image: tran1husk + WithFacingSpriteBody: -TargetableUnit: -Capturable: -TransformOnCapture: + AutoSelectionSize: + RenderSprites: + Image: tran1husk TRAN.Husk2: Inherits: ^Husk Tooltip: Name: Husk (Transport Helicopter) - RenderUnit: - Image: tran2husk + WithFacingSpriteBody: -TargetableUnit: -Capturable: -TransformOnCapture: + AutoSelectionSize: + RenderSprites: + Image: tran2husk BADR.Husk: Inherits: ^PlaneHusk Tooltip: Name: Badger - RenderUnit: - Image: badr + WithFacingSpriteBody: WithShadow: Plane: ROT: 5 @@ -136,14 +157,15 @@ BADR.Husk: Offset: -432,-560,0 Interval: 2 MinDamage: Undamaged + AutoSelectionSize: + RenderSprites: + Image: badr MIG.Husk: Inherits: ^PlaneHusk Tooltip: Name: Mig Attack Plane - RenderUnit: - CameraPitch: 99 - Image: mig + WithFacingSpriteBody: WithShadow: Contrail@1: Offset: -598,-683,0 @@ -158,14 +180,16 @@ MIG.Husk: MinDamage: Undamaged RevealsShroud: Range: 12c0 + AutoSelectionSize: + RenderSprites: + CameraPitch: 99 + Image: mig YAK.Husk: Inherits: ^PlaneHusk Tooltip: Name: Yak Attack Plane - RenderUnit: - CameraPitch: 99 - Image: yak + WithFacingSpriteBody: WithShadow: Contrail: Offset: -853,0,0 @@ -178,13 +202,16 @@ YAK.Husk: MinDamage: Undamaged RevealsShroud: Range: 10c0 + AutoSelectionSize: + RenderSprites: + CameraPitch: 99 + Image: yak HELI.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Longbow - RenderUnit: - Image: heli + WithFacingSpriteBody: WithShadow: Helicopter: ROT: 4 @@ -196,13 +223,15 @@ HELI.Husk: MinDamage: Undamaged RevealsShroud: Range: 12c0 + AutoSelectionSize: + RenderSprites: + Image: heli HIND.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Hind - RenderUnit: - Image: hind + WithFacingSpriteBody: WithShadow: Helicopter: ROT: 4 @@ -213,11 +242,13 @@ HIND.Husk: MinDamage: Undamaged RevealsShroud: Range: 10c0 + AutoSelectionSize: + RenderSprites: + Image: hind U2.Husk: Inherits: ^PlaneHusk - RenderUnit: - Image: u2 + WithFacingSpriteBody: WithShadow: Plane: ROT: 7 @@ -230,4 +261,7 @@ U2.Husk: Offset: -1c43,0,0 Interval: 2 MinDamage: Undamaged + AutoSelectionSize: + RenderSprites: + Image: u2 diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index c7d0d07a9a..eac2f92c86 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -23,7 +23,7 @@ SS: TargetableSubmarine: TargetTypes: Ground, Water, Repair CloakedTargetTypes: Underwater, Repair - RenderUnit: + WithFacingSpriteBody: Cloak: CloakTypes: Underwater InitialDelay: 0 @@ -49,6 +49,8 @@ SS: Weapon: UnitExplodeSubmarine EmptyWeapon: UnitExplodeSubmarine -MustBeDestroyed: + AutoSelectionSize: + RenderSprites: MSUB: Inherits: ^Ship @@ -71,7 +73,7 @@ MSUB: Speed: 42 RevealsShroud: Range: 6c0 - RenderUnit: + WithFacingSpriteBody: -TargetableUnit: TargetableSubmarine: TargetTypes: Ground, Water, Repair @@ -101,6 +103,8 @@ MSUB: Weapon: UnitExplodeSubmarine EmptyWeapon: UnitExplodeSubmarine -MustBeDestroyed: + AutoSelectionSize: + RenderSprites: DD: Inherits: ^Ship @@ -141,7 +145,7 @@ DD: AttackTurreted: Selectable: Bounds: 38,38 - RenderUnit: + WithFacingSpriteBody: WithTurret: AutoTarget: Chronoshiftable: @@ -153,6 +157,8 @@ DD: Explodes: Weapon: UnitExplodeShip EmptyWeapon: UnitExplodeShip + AutoSelectionSize: + RenderSprites: CA: Inherits: ^Ship @@ -202,7 +208,7 @@ CA: WithMuzzleFlash: Selectable: Bounds: 44,44 - RenderUnit: + WithFacingSpriteBody: WithTurret@PRIMARY: Turret: primary WithTurret@SECONDARY: @@ -213,6 +219,8 @@ CA: Explodes: Weapon: UnitExplodeShip EmptyWeapon: UnitExplodeShip + AutoSelectionSize: + RenderSprites: LST: Inherits: ^Ship @@ -282,7 +290,7 @@ PT: WithMuzzleFlash: Selectable: Bounds: 32,32 - RenderUnit: + WithFacingSpriteBody: WithTurret: AutoTarget: Chronoshiftable: @@ -294,4 +302,6 @@ PT: Explodes: Weapon: UnitExplodeShip EmptyWeapon: UnitExplodeShip + AutoSelectionSize: + RenderSprites: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 6667b33e64..580c894ac7 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -62,7 +62,7 @@ V2RL: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - RenderUnit: + WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -70,6 +70,8 @@ V2RL: EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: 1TNK.Husk + AutoSelectionSize: + RenderSprites: 2TNK: Inherits: ^Tank @@ -101,7 +103,7 @@ V2RL: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - RenderUnit: + WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -111,6 +113,8 @@ V2RL: HuskActor: 2TNK.Husk Selectable: Bounds: 30,30 + AutoSelectionSize: + RenderSprites: 3TNK: Inherits: ^Tank @@ -142,7 +146,7 @@ V2RL: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - RenderUnit: + WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -152,6 +156,8 @@ V2RL: HuskActor: 3TNK.Husk Selectable: Bounds: 30,30 + AutoSelectionSize: + RenderSprites: 4TNK: Inherits: ^Tank @@ -192,7 +198,7 @@ V2RL: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - RenderUnit: + WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -207,6 +213,8 @@ V2RL: DamageCooldown: 150 Selectable: Bounds: 44,38,0,-4 + AutoSelectionSize: + RenderSprites: ARTY: Inherits: ^Tank @@ -234,11 +242,13 @@ ARTY: MuzzleSequence: muzzle AttackFrontal: WithMuzzleFlash: - RenderUnit: + WithFacingSpriteBody: Explodes: Weapon: UnitExplode Chance: 75 AutoTarget: + AutoSelectionSize: + RenderSprites: HARV: Inherits: ^Vehicle @@ -315,7 +325,7 @@ MCV: Facing: 96 TransformSounds: placbldg.aud, build5.aud NoTransformNotification: BuildingCannotPlaceAudio - RenderUnit: + WithFacingSpriteBody: MustBeDestroyed: RequiredForShortGame: true BaseBuilding: @@ -324,6 +334,8 @@ MCV: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall + AutoSelectionSize: + RenderSprites: JEEP: Inherits: ^Vehicle @@ -353,7 +365,7 @@ JEEP: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - RenderUnit: + WithFacingSpriteBody: WithTurret: AutoTarget: Cargo: @@ -363,6 +375,8 @@ JEEP: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall + AutoSelectionSize: + RenderSprites: APC: Inherits: ^Tank @@ -389,7 +403,7 @@ APC: LocalOffset: 0,0,171 MuzzleSequence: muzzle AttackFrontal: - RenderUnit: + WithFacingSpriteBody: WithMuzzleFlash: AutoTarget: Cargo: @@ -399,6 +413,8 @@ APC: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall + AutoSelectionSize: + RenderSprites: MNLY.AP: Inherits: ^Tank @@ -420,8 +436,7 @@ MNLY.AP: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 5c0 - RenderUnit: - Image: MNLY + WithFacingSpriteBody: Minelayer: Mine: MINP MineImmune: @@ -434,6 +449,9 @@ MNLY.AP: RenderDetectionCircle: Explodes: Weapon: APMine + AutoSelectionSize: + RenderSprites: + Image: MNLY MNLY.AT: Inherits: ^Tank @@ -455,8 +473,7 @@ MNLY.AT: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 5c0 - RenderUnit: - Image: MNLY + WithFacingSpriteBody: Minelayer: Mine: MINV MineImmune: @@ -469,6 +486,9 @@ MNLY.AT: RenderDetectionCircle: Explodes: Weapon: ATMine + AutoSelectionSize: + RenderSprites: + Image: MNLY TRUK: Inherits: ^Vehicle @@ -489,7 +509,7 @@ TRUK: Speed: 128 RevealsShroud: Range: 3c0 - RenderUnit: + WithFacingSpriteBody: SupplyTruck: Payload: 500 Explodes: @@ -497,6 +517,8 @@ TRUK: EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: moneycrate + AutoSelectionSize: + RenderSprites: MGG: Inherits: ^Vehicle @@ -515,7 +537,7 @@ MGG: Type: Heavy Mobile: Speed: 85 - RenderUnit: + WithFacingSpriteBody: WithIdleOverlay@SPINNER: Offset: -299,0,171 Sequence: spinner @@ -529,6 +551,8 @@ MGG: EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: MGG.Husk + AutoSelectionSize: + RenderSprites: MRJ: Inherits: ^Vehicle @@ -549,7 +573,7 @@ MRJ: Speed: 85 RevealsShroud: Range: 6c0 - RenderUnit: + WithFacingSpriteBody: WithIdleOverlay@SPINNER: Sequence: spinner Offset: -256,0,256 @@ -564,6 +588,8 @@ MRJ: RenderJammerCircle: DetectCloaked: Range: 6 + AutoSelectionSize: + RenderSprites: TTNK: Inherits: ^Tank @@ -589,7 +615,7 @@ TTNK: Weapon: TTankZap LocalOffset: 0,0,213 AttackFrontal: - RenderUnit: + WithFacingSpriteBody: WithIdleOverlay@SPINNER: Sequence: spinner Selectable: @@ -598,6 +624,8 @@ TTNK: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall + AutoSelectionSize: + RenderSprites: FTRK: Inherits: ^Vehicle @@ -629,7 +657,7 @@ FTRK: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - RenderUnit: + WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -637,6 +665,8 @@ FTRK: EmptyWeapon: UnitExplodeSmall Selectable: Bounds: 28,28,0,0 + AutoSelectionSize: + RenderSprites: DTRK: Inherits: ^Vehicle @@ -657,7 +687,7 @@ DTRK: Speed: 85 RevealsShroud: Range: 3c0 - RenderUnit: + WithFacingSpriteBody: Explodes: Weapon: MiniNuke EmptyWeapon: MiniNuke @@ -668,6 +698,8 @@ DTRK: UpgradeMinEnabledLevel: 1 Chronoshiftable: ExplodeInstead: yes + AutoSelectionSize: + RenderSprites: CTNK: Inherits: ^Vehicle @@ -691,7 +723,7 @@ CTNK: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 - RenderUnit: + WithFacingSpriteBody: AutoTarget: Armament@PRIMARY: Weapon: APTusk @@ -706,6 +738,8 @@ CTNK: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall + AutoSelectionSize: + RenderSprites: QTNK: Inherits: ^Tank @@ -729,13 +763,15 @@ QTNK: Range: 6c0 Selectable: Bounds: 44,38,0,-4 - RenderUnit: + WithFacingSpriteBody: Explodes: Weapon: UnitExplodeSmall MadTank: -EjectOnDeath: TargetableUnit: TargetTypes: Ground, MADTank, Repair + AutoSelectionSize: + RenderSprites: STNK: Inherits: ^Vehicle @@ -759,7 +795,7 @@ STNK: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 - RenderUnit: + WithFacingSpriteBody: AutoTarget: InitialStance: ReturnFire Armament: @@ -784,4 +820,6 @@ STNK: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall -MustBeDestroyed: + AutoSelectionSize: + RenderSprites: