From f9fc60a3be6bd6ab183f076c2e94f58f69133d83 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 20 Jun 2015 01:03:56 +0200 Subject: [PATCH] Cleaned RA yaml rules. Sanitized defaults. --- mods/ra/rules/aircraft.yaml | 25 ---- mods/ra/rules/civilian.yaml | 15 +-- mods/ra/rules/defaults.yaml | 251 ++++++++++++++++-------------------- mods/ra/rules/husks.yaml | 49 ------- mods/ra/rules/infantry.yaml | 138 +++++--------------- mods/ra/rules/misc.yaml | 1 - mods/ra/rules/ships.yaml | 50 +------ mods/ra/rules/vehicles.yaml | 93 +------------ 8 files changed, 160 insertions(+), 462 deletions(-) diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index c1b8fe752a..574e4bd83e 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -10,7 +10,6 @@ BADR: ROT: 5 Speed: 149 Repulsable: False - WithFacingSpriteBody: Cargo: MaxWeight: 10 -Selectable: @@ -33,8 +32,6 @@ BADR: -EjectOnDeath: -GpsDot: RejectsOrders: - AutoSelectionSize: - RenderSprites: BADR.Bomber: Inherits: ^Plane @@ -51,7 +48,6 @@ BADR.Bomber: Repulsable: False AmmoPool: Ammo: 7 - WithFacingSpriteBody: -Selectable: -Voiced: -GainsExperience: @@ -72,7 +68,6 @@ BADR.Bomber: -EjectOnDeath: -GpsDot: RejectsOrders: - AutoSelectionSize: RenderSprites: Image: badr @@ -110,7 +105,6 @@ MIG: TargetWhenIdle: false TargetWhenDamaged: false EnableStances: false - WithFacingSpriteBody: AmmoPool: Ammo: 8 ReturnOnIdle: @@ -127,9 +121,6 @@ MIG: SmokeTrailWhenDamaged: Offset: -853,0,171 Interval: 2 - AutoSelectionSize: - RenderSprites: - CameraPitch: 99 YAK: Inherits: ^Plane @@ -170,7 +161,6 @@ YAK: TargetWhenIdle: false TargetWhenDamaged: false EnableStances: false - WithFacingSpriteBody: AmmoPool: Ammo: 18 PipCount: 6 @@ -186,9 +176,6 @@ YAK: SmokeTrailWhenDamaged: Offset: -853,0,0 Interval: 2 - AutoSelectionSize: - RenderSprites: - CameraPitch: 99 TRAN: Inherits: ^Helicopter @@ -216,7 +203,6 @@ TRAN: Speed: 112 LandableTerrainTypes: Clear,Rough,Road,Ore,Beach AltitudeVelocity: 0c100 - WithFacingSpriteBody: WithRotor@PRIMARY: Offset: -597,0,341 Sequence: rotor2 @@ -229,8 +215,6 @@ TRAN: PipCount: 8 LeavesHusk: HuskActor: TRAN.Husk - AutoSelectionSize: - RenderSprites: HELI: Inherits: ^Helicopter @@ -267,7 +251,6 @@ HELI: Speed: 149 AutoTarget: InitialStance: HoldFire - WithFacingSpriteBody: WithRotor: Offset: 0,0,85 AmmoPool: @@ -278,8 +261,6 @@ HELI: HuskActor: HELI.Husk SmokeTrailWhenDamaged: Offset: -427,0,0 - AutoSelectionSize: - RenderSprites: HIND: Inherits: ^Helicopter @@ -319,7 +300,6 @@ HIND: Speed: 112 AutoTarget: InitialStance: HoldFire - WithFacingSpriteBody: WithRotor: AmmoPool: Ammo: 24 @@ -332,8 +312,6 @@ HIND: HuskActor: HIND.Husk SmokeTrailWhenDamaged: Offset: -427,0,0 - AutoSelectionSize: - RenderSprites: U2: Inherits: ^Plane @@ -346,7 +324,6 @@ U2: Speed: 373 Repulsable: False MaximumPitch: 56 - WithFacingSpriteBody: AttackBomber: -Selectable: -Voiced: @@ -362,6 +339,4 @@ U2: Offset: -1c43,0,0 Interval: 2 RejectsOrders: - AutoSelectionSize: - RenderSprites: diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index d82541291c..d8ea37eff9 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -1,5 +1,7 @@ C1: - Inherits: ^CivInfantry + Inherits@1: ^CivInfantry + Inherits@2: ^ArmedCivilian + AutoTarget: C2: Inherits: ^CivInfantry @@ -11,7 +13,6 @@ C3: C4: Inherits: ^CivInfantry - WithInfantryBody: RenderSprites: Image: C2 Voiced: @@ -19,27 +20,25 @@ C4: C5: Inherits: ^CivInfantry - WithInfantryBody: RenderSprites: Image: C1 C6: Inherits: ^CivInfantry - WithInfantryBody: RenderSprites: Image: C2 Voiced: VoiceSet: CivilianFemaleVoice C7: - Inherits: ^CivInfantry - WithInfantryBody: + Inherits@1: ^CivInfantry + Inherits@2: ^ArmedCivilian + AutoTarget: RenderSprites: Image: C1 C8: Inherits: ^CivInfantry - WithInfantryBody: RenderSprites: Image: C2 Voiced: @@ -47,13 +46,11 @@ C8: C9: Inherits: ^CivInfantry - WithInfantryBody: RenderSprites: Image: C1 C10: Inherits: ^CivInfantry - WithInfantryBody: RenderSprites: Image: C2 Voiced: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 713f2ac557..94f56fe324 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -93,11 +93,24 @@ MustBeDestroyed: Voiced: VoiceSet: VehicleVoice + Parachutable: + ParachuteOffset: 0,0,200 + KilledOnImpassableTerrain: true + ParachuteSequence: parach + ShadowSequence: + GroundCorpseSequence: + GroundCorpsePalette: + WaterCorpseSequence: + WaterCorpsePalette: + Explodes: + Weapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall + WithFacingSpriteBody: + AutoSelectionSize: + RenderSprites: ^Tank: - Inherits@1: ^ExistsInWorld - Inherits@2: ^GainsExperience - Inherits@3: ^IronCurtainable + Inherits: ^Vehicle Mobile: Crushes: wall, mine, crate TerrainSpeeds: @@ -108,66 +121,25 @@ Ore: 70 Gems: 70 Beach: 70 - ROT: 5 - SelectionDecorations: - Selectable: - Bounds: 24, 24 TargetableUnit: TargetTypes: Ground, C4, Repair, Tank - Repairable: - Chronoshiftable: - Passenger: - CargoType: Vehicle - AttackMove: - HiddenUnderFog: - ActorLostNotification: ProximityCaptor: Types: Tank - GivesBounty: - GpsDot: - String: Vehicle - WithSmoke: - Guard: - Guardable: Tooltip: GenericName: Tank - EjectOnDeath: - PilotActor: e1 - SuccessRate: 20 - EjectOnGround: true - EjectInAir: false - AllowUnsuitableCell: false - Capturable: - Type: vehicle - CaptureThreshold: 1 - CancelActivity: True - CaptureNotification: - Notification: UnitStolen - MustBeDestroyed: - Parachutable: - ParachuteOffset: 0,0,200 - KilledOnImpassableTerrain: true - ParachuteSequence: parach - ParachuteOpenSequence: open - ParachuteIdleSequence: idle - ShadowSequence: - GroundCorpseSequence: - GroundCorpsePalette: - WaterCorpseSequence: - WaterCorpsePalette: - Voiced: - VoiceSet: VehicleVoice ^Infantry: Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience Health: Radius: 128 + HP: 25 Armor: Type: None RevealsShroud: Range: 4c0 Mobile: + Speed: 56 Crushes: mine, crate SharesCell: true TerrainSpeeds: @@ -183,10 +155,6 @@ Bounds: 12,18,0,-8 TargetableUnit: TargetTypes: Ground, Infantry, Disguise - TakeCover: - DamageModifiers: - Prone50Percent: 50 - DamageTriggers: TriggerProne RenderSprites: WithInfantryBody: WithDeathAnimation: @@ -198,14 +166,11 @@ FireDeath: 5 ElectricityDeath: 6 CrushedSequence: die-crushed - AutoTarget: AttackMove: Passenger: CargoType: Infantry HiddenUnderFog: ActorLostNotification: - ProximityCaptor: - Types: Infantry GivesBounty: GpsDot: String: Infantry @@ -245,10 +210,45 @@ WaterCorpseSequence: small_splash Cloneable: Types: Infantry - MustBeDestroyed: Voiced: VoiceSet: GenericVoice +^Soldier: + Inherits: ^Infantry + MustBeDestroyed: + AutoTarget: + ProximityCaptor: + Types: Infantry + TakeCover: + DamageModifiers: + Prone50Percent: 50 + DamageTriggers: TriggerProne + WithInfantryBody: + IdleSequences: idle1,idle2 + StandSequences: stand,stand2 + +^CivInfantry: + Inherits: ^Infantry + Selectable: + Class: CivInfantry + Valued: + Cost: 10 + Tooltip: + Name: Civilian + GenericVisibility: None + RevealsShroud: + Range: 2c0 + ProximityCaptor: + Types: CivilianInfantry + ScaredyCat: + Voiced: + VoiceSet: CivilianMaleVoice + +^ArmedCivilian: + Armament: + Weapon: Pistol + AttackFrontal: + ^Ship: Inherits@1: ^ExistsInWorld Inherits@2: ^GainsExperience @@ -269,9 +269,14 @@ ProximityCaptor: Types: Ship GivesBounty: + Chronoshiftable: + RepairableNear: GpsDot: String: Ship WithSmoke: + Explodes: + Weapon: UnitExplodeShip + EmptyWeapon: UnitExplodeShip Guard: Guardable: Tooltip: @@ -281,6 +286,9 @@ ExcludeTilesets: INTERIOR Voiced: VoiceSet: VehicleVoice + AutoSelectionSize: + RenderSprites: + WithFacingSpriteBody: ^Plane: Inherits@1: ^ExistsInWorld @@ -314,6 +322,9 @@ Tooltip: GenericName: Plane WithShadow: + RenderSprites: + WithFacingSpriteBody: + AutoSelectionSize: MustBeDestroyed: Voiced: VoiceSet: GenericVoice @@ -326,7 +337,7 @@ String: Helicopter Hovers: -^Building: +^BasicBuilding: Inherits@1: ^ExistsInWorld Inherits@2: ^IronCurtainable SelectionDecorations: @@ -339,37 +350,40 @@ Footprint: x TerrainTypes: Clear,Road RequiresBaseProvider: True - GivesBuildableArea: - ExternalCapturable: - ExternalCapturableBar: SoundOnDamageTransition: DamagedSounds: kaboom1.aud DestroyedSounds: kaboom22.aud RenderBuilding: - WithMakeAnimation: WithBuildingExplosion: - RepairableBuilding: - EngineerRepairable: - EmitInfantryOnSell: - ActorTypes: e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,e6,e6,e6,e6,e6 - MustBeDestroyed: - RequiredForShortGame: true CaptureNotification: ShakeOnDeath: ProximityCaptor: Types: Building - Sellable: - SellSounds: cashturn.aud - AcceptsSupplies: GivesBounty: Guardable: Range: 3 FrozenUnderFog: Tooltip: GenericName: Structure + Demolishable: + +^Building: + Inherits: ^BasicBuilding + GivesBuildableArea: + RepairableBuilding: + EngineerRepairable: + AcceptsSupplies: + WithMakeAnimation: + ExternalCapturable: + ExternalCapturableBar: + EmitInfantryOnSell: + ActorTypes: e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,e6,e6,e6,e6,e6 + MustBeDestroyed: + RequiredForShortGame: true GpsDot: String: Structure - Demolishable: + Sellable: + SellSounds: cashturn.aud ^Defense: Inherits: ^Building @@ -413,9 +427,7 @@ ScriptTriggers: ^TechBuilding: - Inherits: ^Building - -RepairableBuilding: - -EngineerRepairable: + Inherits: ^BasicBuilding Health: HP: 400 Armor: @@ -425,16 +437,8 @@ GenericVisibility: None ProximityCaptor: Types: CivilianBuilding - -WithMakeAnimation: - -AcceptsSupplies: - -GivesBuildableArea: - -Sellable: - -ExternalCapturable: - -ExternalCapturableBar: FrozenUnderFog: StartsRevealed: true - -GpsDot: - -MustBeDestroyed: ^FakeBuilding: Inherits: ^Building @@ -463,32 +467,6 @@ TargetableBuilding: TargetTypes: Ground, DetonateAttack -^CivInfantry: - Inherits: ^Infantry - Selectable: - Class: CivInfantry - Valued: - Cost: 70 - Tooltip: - Name: Civilian - GenericVisibility: None - Health: - HP: 20 - Mobile: - Speed: 56 - RevealsShroud: - Range: 2c0 - Armament: - Weapon: Pistol - AttackFrontal: - ProximityCaptor: - Types: CivilianInfantry - WithInfantryBody: - ScaredyCat: - Voiced: - VoiceSet: CivilianMaleVoice - -TakeCover: - ^CivBuilding: Inherits: ^TechBuilding RenderBuilding: @@ -533,27 +511,27 @@ EditorTilesetFilter: ExcludeTilesets: INTERIOR -^Husk: - Husk: - AllowedTerrain: Clear, Rough, Road, Ore, Gems, Beach - WithFacingSpriteBody: +^BasicHusk: Health: HP: 280 Armor: Type: Heavy HiddenUnderFog: + BodyOrientation: + AutoTargetIgnore: + ScriptTriggers: + RenderSprites: + WithFacingSpriteBody: + AutoSelectionSize: + +^Husk: + Inherits: ^BasicHusk + Husk: + AllowedTerrain: Clear, Rough, Road, Ore, Gems, Beach Burns: Damage: 2 ProximityCaptor: Types: Husk - BodyOrientation: - Chronoshiftable: - TargetableUnit: - TargetTypes: Ground - RequiresForceFire: true - Tooltip: - GenericName: Destroyed Vehicle - AutoTargetIgnore: Capturable: Type: husk AllowAllies: true @@ -561,31 +539,28 @@ TransformOnCapture: ForceHealthPercentage: 25 DisabledOverlay: - ScriptTriggers: - AutoSelectionSize: - RenderSprites: - -^HelicopterHusk: - Inherits: ^Husk - -Husk: - -Burns: - FallsToEarth: - Spins: True - Moves: False - -TargetableUnit: - -Capturable: - -TransformOnCapture: + TargetableUnit: + TargetTypes: Ground + RequiresForceFire: true + Chronoshiftable: + Tooltip: + GenericName: Destroyed Vehicle ^PlaneHusk: - Inherits: ^Husk - -Husk: - -Burns: + Inherits: ^BasicHusk + WithShadow: + Tooltip: + GenericName: Destroyed Plane FallsToEarth: Spins: False Moves: True - -TargetableUnit: - -Capturable: - -TransformOnCapture: + +^HelicopterHusk: + Inherits: ^BasicHusk + WithShadow: + Tooltip: + GenericName: Destroyed Helicopter + FallsToEarth: ^Bridge: HiddenUnderShroud: diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml index 75c2cb5e41..146d617f86 100644 --- a/mods/ra/rules/husks.yaml +++ b/mods/ra/rules/husks.yaml @@ -2,12 +2,10 @@ Inherits: ^Husk Tooltip: Name: Husk (Light Tank) - WithFacingSpriteBody: ThrowsParticle@turret: Anim: turret TransformOnCapture: IntoActor: 1tnk - AutoSelectionSize: RenderSprites: Image: 1tnk.destroyed @@ -15,12 +13,10 @@ Inherits: ^Husk Tooltip: Name: Husk (Medium Tank) - WithFacingSpriteBody: ThrowsParticle@turret: Anim: turret TransformOnCapture: IntoActor: 2tnk - AutoSelectionSize: RenderSprites: Image: 2tnk.destroyed @@ -28,12 +24,10 @@ Inherits: ^Husk Tooltip: Name: Husk (Heavy Tank) - WithFacingSpriteBody: ThrowsParticle@turret: Anim: turret TransformOnCapture: IntoActor: 3tnk - AutoSelectionSize: RenderSprites: Image: 3tnk.destroyed @@ -41,12 +35,10 @@ Inherits: ^Husk Tooltip: Name: Husk (Mammoth Tank) - WithFacingSpriteBody: ThrowsParticle@turret: Anim: turret TransformOnCapture: IntoActor: 4tnk - AutoSelectionSize: RenderSprites: Image: 4tnk.destroyed @@ -54,10 +46,8 @@ HARV.FullHusk: Inherits: ^Husk Tooltip: Name: Husk (Harvester) - WithFacingSpriteBody: TransformOnCapture: IntoActor: harv - AutoSelectionSize: RenderSprites: Image: hhusk @@ -65,10 +55,8 @@ HARV.EmptyHusk: Inherits: ^Husk Tooltip: Name: Husk (Harvester) - WithFacingSpriteBody: TransformOnCapture: IntoActor: harv - AutoSelectionSize: RenderSprites: Image: hhusk2 @@ -76,10 +64,8 @@ MCV.Husk: Inherits: ^Husk Tooltip: Name: Husk (MCV) - WithFacingSpriteBody: TransformOnCapture: IntoActor: mcv - AutoSelectionSize: RenderSprites: Image: mcvhusk @@ -87,13 +73,11 @@ MGG.Husk: Inherits: ^Husk Tooltip: Name: Husk (Mobile Gap Generator) - WithFacingSpriteBody: ThrowsParticle@spinner: Anim: spinner-idle Offset: -299,0,171 TransformOnCapture: IntoActor: mgg - AutoSelectionSize: RenderSprites: Image: mgg.destroyed @@ -101,8 +85,6 @@ TRAN.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Transport Helicopter - WithFacingSpriteBody: - WithShadow: Helicopter: ROT: 4 Speed: 149 @@ -112,7 +94,6 @@ TRAN.Husk: Offset: 597,0,213 RevealsShroud: Range: 12c0 - AutoSelectionSize: RenderSprites: Image: tran @@ -120,11 +101,6 @@ TRAN.Husk1: Inherits: ^Husk Tooltip: Name: Husk (Transport Helicopter) - WithFacingSpriteBody: - -TargetableUnit: - -Capturable: - -TransformOnCapture: - AutoSelectionSize: RenderSprites: Image: tran1husk @@ -132,11 +108,6 @@ TRAN.Husk2: Inherits: ^Husk Tooltip: Name: Husk (Transport Helicopter) - WithFacingSpriteBody: - -TargetableUnit: - -Capturable: - -TransformOnCapture: - AutoSelectionSize: RenderSprites: Image: tran2husk @@ -144,8 +115,6 @@ BADR.Husk: Inherits: ^PlaneHusk Tooltip: Name: Badger - WithFacingSpriteBody: - WithShadow: Plane: ROT: 5 Speed: 149 @@ -157,7 +126,6 @@ BADR.Husk: Offset: -432,-560,0 Interval: 2 MinDamage: Undamaged - AutoSelectionSize: RenderSprites: Image: badr @@ -165,8 +133,6 @@ MIG.Husk: Inherits: ^PlaneHusk Tooltip: Name: Mig Attack Plane - WithFacingSpriteBody: - WithShadow: Contrail@1: Offset: -598,-683,0 Contrail@2: @@ -180,17 +146,13 @@ MIG.Husk: MinDamage: Undamaged RevealsShroud: Range: 12c0 - AutoSelectionSize: RenderSprites: - CameraPitch: 99 Image: mig YAK.Husk: Inherits: ^PlaneHusk Tooltip: Name: Yak Attack Plane - WithFacingSpriteBody: - WithShadow: Contrail: Offset: -853,0,0 Plane: @@ -202,17 +164,13 @@ YAK.Husk: MinDamage: Undamaged RevealsShroud: Range: 10c0 - AutoSelectionSize: RenderSprites: - CameraPitch: 99 Image: yak HELI.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Longbow - WithFacingSpriteBody: - WithShadow: Helicopter: ROT: 4 Speed: 149 @@ -223,7 +181,6 @@ HELI.Husk: MinDamage: Undamaged RevealsShroud: Range: 12c0 - AutoSelectionSize: RenderSprites: Image: heli @@ -231,8 +188,6 @@ HIND.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Hind - WithFacingSpriteBody: - WithShadow: Helicopter: ROT: 4 Speed: 112 @@ -242,14 +197,11 @@ HIND.Husk: MinDamage: Undamaged RevealsShroud: Range: 10c0 - AutoSelectionSize: RenderSprites: Image: hind U2.Husk: Inherits: ^PlaneHusk - WithFacingSpriteBody: - WithShadow: Plane: ROT: 7 Speed: 373 @@ -261,7 +213,6 @@ U2.Husk: Offset: -1c43,0,0 Interval: 2 MinDamage: Undamaged - AutoSelectionSize: RenderSprites: Image: u2 diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index ef9ff4b653..88f2796956 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -1,5 +1,5 @@ DOG: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Dog @@ -36,7 +36,7 @@ DOG: TargetTypes: Ground, Infantry WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 + StandSequences: stand IgnoresDisguise: DetectCloaked: Range: 5 @@ -45,7 +45,7 @@ DOG: -TakeCover: E1: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -58,8 +58,6 @@ E1: Description: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles, Aircraft Health: HP: 50 - Mobile: - Speed: 56 Armament@PRIMARY: Weapon: M1Carbine Armament@GARRISONED: @@ -67,14 +65,11 @@ E1: Weapon: Vulcan MuzzleSequence: garrison-muzzle AttackFrontal: - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 - StandSequences: stand,stand2 E2: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -98,17 +93,14 @@ E2: Weapon: Grenade FireDelay: 15 AttackFrontal: - TakeCover: WithInfantryBody: AttackSequence: throw - IdleSequences: idle1,idle2 - StandSequences: stand,stand2 Explodes: Weapon: UnitExplodeSmall Chance: 50 E3: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -121,8 +113,6 @@ E3: Description: Anti-tank/Anti-aircraft infantry.\n Strong vs Vehicles, Aircraft\n Weak vs Infantry Health: HP: 45 - Mobile: - Speed: 56 Armament@PRIMARY: Weapon: RedEye LocalOffset: 0,0,555 @@ -133,14 +123,11 @@ E3: Name: garrisoned Weapon: Dragon AttackFrontal: - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 - StandSequences: stand,stand2 E4: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -153,8 +140,6 @@ E4: Description: Advanced anti-structure unit.\n Strong vs Infantry, Buildings\n Weak vs Vehicles, Aircraft Health: HP: 40 - Mobile: - Speed: 56 Armament@PRIMARY: Weapon: Flamer LocalOffset: 427,0,341 @@ -163,14 +148,11 @@ E4: Name: garrisoned Weapon: Flamer AttackFrontal: - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 - StandSequences: stand,stand2 E6: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -181,10 +163,6 @@ E6: Tooltip: Name: Engineer Description: Infiltrates and captures\nenemy structures.\n Unarmed - Health: - HP: 25 - Mobile: - Speed: 56 Passenger: PipType: Yellow EngineerRepair: @@ -192,15 +170,11 @@ E6: ExternalCaptures: Type: building -AutoTarget: - TakeCover: - WithInfantryBody: - IdleSequences: idle1,idle2 - StandSequences: stand,stand2 Voiced: VoiceSet: EngineerVoice SPY: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -213,18 +187,12 @@ SPY: Name: Spy GenericName: Soldier Description: Infiltrates enemy structures for intel or\nsabotage. Exact effect depends on the\nbuilding infiltrated.\nLoses disguise when attacking.\n Strong vs Infantry\n Weak vs Vehicles, Aircraft\n Special Ability: Disguised - Health: - HP: 25 - Mobile: - Speed: 56 - Voice: Move -Guard: RevealsShroud: Range: 5c0 Passenger: PipType: Yellow Voice: Move - TakeCover: Disguise: Voice: Move Infiltrates: @@ -254,8 +222,6 @@ SPY: SPY.England: Inherits: SPY - TakeCover: - WithDisguisingInfantryBody: Buildable: Prerequisites: ~infantry.england, dome, ~tent, ~techlevel.medium Valued: @@ -266,7 +232,7 @@ SPY.England: Image: spy E7: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -302,17 +268,16 @@ E7: Weapon: Colt45 MuzzleSequence: garrison-muzzle AttackFrontal: - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 + StandSequences: stand AnnounceOnBuild: AnnounceOnKill: Voiced: VoiceSet: TanyaVoice MEDI: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -325,8 +290,6 @@ MEDI: Description: Heals nearby infantry.\n Unarmed Health: HP: 80 - Mobile: - Speed: 56 RevealsShroud: Range: 3c0 Passenger: @@ -337,16 +300,15 @@ MEDI: AttackMedic: Cursor: heal OutsideRangeCursor: heal - TakeCover: -AutoTarget: WithInfantryBody: - IdleSequences: idle1,idle2 + StandSequences: stand AttackSequence: heal Voiced: VoiceSet: MedicVoice MECH: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -360,7 +322,6 @@ MECH: Health: HP: 80 Mobile: - Speed: 56 Voice: Move RevealsShroud: Range: 3c0 @@ -376,55 +337,29 @@ MECH: Voice: Move Captures: CaptureTypes: husk - TakeCover: -AutoTarget: WithInfantryBody: - IdleSequences: idle1,idle2 AttackSequence: repair + StandSequences: stand Voiced: VoiceSet: MechanicVoice EINSTEIN: - Inherits: ^Infantry - Valued: - Cost: 10 + Inherits: ^CivInfantry Tooltip: Name: Prof. Einstein - Health: - HP: 25 Mobile: Speed: 71 - RevealsShroud: - Range: 2c0 - -AutoTarget: - -TakeCover: - ProximityCaptor: - Types: CivilianInfantry - WithInfantryBody: - ScaredyCat: Voiced: VoiceSet: EinsteinVoice DELPHI: - Inherits: ^Infantry - Valued: - Cost: 10 + Inherits@1: ^CivInfantry + Inherits@2: ^ArmedCivilian Tooltip: Name: Agent Delphi - Health: - HP: 25 Mobile: Speed: 71 - RevealsShroud: - Range: 2c0 - -AutoTarget: - -TakeCover: - ProximityCaptor: - Types: CivilianInfantry - WithInfantryBody: - ScaredyCat: - Voiced: - VoiceSet: CivilianMaleVoice CHAN: Inherits: ^CivInfantry @@ -434,7 +369,8 @@ CHAN: Name: Agent Chan GNRL: - Inherits: ^CivInfantry + Inherits@1: ^CivInfantry + Inherits@2: ^ArmedCivilian Tooltip: Name: General Selectable: @@ -452,31 +388,31 @@ GNRL: Voiced: VoiceSet: StavrosVoice -ScaredyCat: + WithInfantryBody: + IdleSequences: idle1 THF: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 400 Tooltip: Name: Thief Description: Steals enemy credits.\n Unarmed - Health: - HP: 25 - Mobile: - Speed: 56 RevealsShroud: Range: 5c0 Passenger: PipType: Yellow Infiltrates: InfiltrateTypes: Cash - TakeCover: -AutoTarget: Voiced: VoiceSet: ThiefVoice + WithInfantryBody: + -IdleSequences: + StandSequences: stand HIJACKER: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -489,8 +425,6 @@ HIJACKER: Description: Hijacks enemy vehicles.\n Unarmed Health: HP: 50 - Mobile: - Speed: 56 RevealsShroud: Range: 5c0 Passenger: @@ -501,9 +435,12 @@ HIJACKER: Voiced: VoiceSet: ThiefVoice -TakeCover: + WithInfantryBody: + -IdleSequences: + StandSequences: stand SHOK: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier @@ -517,7 +454,6 @@ SHOK: Health: HP: 100 Mobile: - Speed: 56 Voice: Move RevealsShroud: Range: 5c0 @@ -535,16 +471,13 @@ SHOK: Voice: Move Guard: Voice: Move - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 - StandSequences: stand,stand2 Voiced: VoiceSet: ShokVoice SNIPER: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 700 Tooltip: @@ -555,8 +488,6 @@ SNIPER: BuildAtProductionType: Soldier BuildPaletteOrder: 80 Prerequisites: ~disabled - Mobile: - Speed: 56 Health: HP: 80 Passenger: @@ -572,11 +503,8 @@ SNIPER: Weapon: Sniper MuzzleSequence: garrison-muzzle AttackFrontal: - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 - StandSequences: stand,stand2 Cloak: InitialDelay: 250 CloakDelay: 120 @@ -588,7 +516,7 @@ SNIPER: -MustBeDestroyed: Zombie: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 100 Tooltip: @@ -607,6 +535,7 @@ Zombie: AttackFrontal: WithInfantryBody: AttackSequence: bite + IdleSequences: idle1 Armament: Weapon: claw Voiced: @@ -648,5 +577,4 @@ Ant: UseDeathTypeSuffix: false Voiced: VoiceSet: AntVoice - -TakeCover: diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index 435ced3b52..fda155b240 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -153,7 +153,6 @@ MONEYCRATE: Amount: 500 SelectionShares: 1 UseCashTick: true - WithCrateBody: RenderSprites: Image: wcrate diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 8386cc1bb4..3508758e6e 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -23,7 +23,6 @@ SS: TargetableSubmarine: TargetTypes: Ground, Water, Repair CloakedTargetTypes: Underwater, Repair - WithFacingSpriteBody: Cloak: CloakTypes: Underwater InitialDelay: 0 @@ -37,8 +36,6 @@ SS: AttackFrontal: SelectionDecorations: VisualBounds: 38,38 - Chronoshiftable: - RepairableNear: AutoTarget: InitialStance: ReturnFire DetectCloaked: @@ -49,8 +46,6 @@ SS: Weapon: UnitExplodeSubmarine EmptyWeapon: UnitExplodeSubmarine -MustBeDestroyed: - AutoSelectionSize: - RenderSprites: MSUB: Inherits: ^Ship @@ -73,7 +68,6 @@ MSUB: Speed: 42 RevealsShroud: Range: 6c0 - WithFacingSpriteBody: -TargetableUnit: TargetableSubmarine: TargetTypes: Ground, Water, Repair @@ -91,8 +85,6 @@ MSUB: AttackFrontal: SelectionDecorations: VisualBounds: 44,44 - Chronoshiftable: - RepairableNear: AutoTarget: InitialStance: ReturnFire DetectCloaked: @@ -103,8 +95,6 @@ MSUB: Weapon: UnitExplodeSubmarine EmptyWeapon: UnitExplodeSubmarine -MustBeDestroyed: - AutoSelectionSize: - RenderSprites: DD: Inherits: ^Ship @@ -143,24 +133,14 @@ DD: LocalOffset: 0,-100,0, 0,100,0 LocalYaw: 64, -64 AttackTurreted: - Selectable: - Bounds: 38,38 SelectionDecorations: VisualBounds: 38,38 - WithFacingSpriteBody: WithTurret: AutoTarget: - Chronoshiftable: - RepairableNear: DetectCloaked: CloakTypes: Underwater Range: 4 RenderDetectionCircle: - Explodes: - Weapon: UnitExplodeShip - EmptyWeapon: UnitExplodeShip - AutoSelectionSize: - RenderSprites: CA: Inherits: ^Ship @@ -208,23 +188,13 @@ CA: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - Selectable: - Bounds: 44,44 SelectionDecorations: VisualBounds: 44,44 - WithFacingSpriteBody: WithTurret@PRIMARY: Turret: primary WithTurret@SECONDARY: Turret: secondary AutoTarget: - Chronoshiftable: - RepairableNear: - Explodes: - Weapon: UnitExplodeShip - EmptyWeapon: UnitExplodeShip - AutoSelectionSize: - RenderSprites: LST: Inherits: ^Ship @@ -248,6 +218,9 @@ LST: Range: 6c0 SelectionDecorations: VisualBounds: 36,36 + -AutoSelectionSize: + -RenderSprites: + -WithFacingSpriteBody: RenderLandingCraft: OpenTerrainTypes: Clear, Rough, Road, Ore, Gems, Beach Cargo: @@ -255,10 +228,7 @@ LST: MaxWeight: 5 PipCount: 5 PassengerFacing: 0 - RepairableNear: - Explodes: - Weapon: UnitExplodeShip - EmptyWeapon: UnitExplodeShip + -Chronoshiftable: PT: Inherits: ^Ship @@ -294,22 +264,12 @@ PT: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - Selectable: - Bounds: 32,32 SelectionDecorations: - VisualBounds: 32,32 - WithFacingSpriteBody: + VisualBounds: 36,36 WithTurret: AutoTarget: - Chronoshiftable: - RepairableNear: DetectCloaked: CloakTypes: Underwater Range: 4 RenderDetectionCircle: - Explodes: - Weapon: UnitExplodeShip - EmptyWeapon: UnitExplodeShip - AutoSelectionSize: - RenderSprites: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index b6f342a3f1..e2f193502e 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -22,14 +22,10 @@ V2RL: AttackFrontal: SelectionDecorations: VisualBounds: 28,28 - RenderSprites: AutoTarget: Explodes: Weapon: SCUD EmptyWeapon: UnitExplodeSmall - AutoSelectionSize: - WithFacingSpriteBody: - Sequence: idle WithAttackAnimation: AimSequence: aim ReloadPrefix: empty- @@ -64,7 +60,6 @@ V2RL: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -72,8 +67,6 @@ V2RL: EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: 1TNK.Husk - AutoSelectionSize: - RenderSprites: 2TNK: Inherits: ^Tank @@ -105,7 +98,6 @@ V2RL: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -113,8 +105,6 @@ V2RL: EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: 2TNK.Husk - AutoSelectionSize: - RenderSprites: SelectionDecorations: VisualBounds: 28,28 @@ -148,7 +138,6 @@ V2RL: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -156,8 +145,6 @@ V2RL: EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: 3TNK.Husk - AutoSelectionSize: - RenderSprites: SelectionDecorations: VisualBounds: 28,28 @@ -200,7 +187,6 @@ V2RL: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - WithFacingSpriteBody: WithTurret: AutoTarget: Explodes: @@ -213,8 +199,6 @@ V2RL: Ticks: 3 HealIfBelow: 50% DamageCooldown: 150 - AutoSelectionSize: - RenderSprites: SelectionDecorations: VisualBounds: 44,38,0,-4 @@ -244,13 +228,10 @@ ARTY: MuzzleSequence: muzzle AttackFrontal: WithMuzzleFlash: - WithFacingSpriteBody: Explodes: Weapon: UnitExplode Chance: 75 AutoTarget: - AutoSelectionSize: - RenderSprites: HARV: Inherits: ^Vehicle @@ -284,6 +265,9 @@ HARV: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 4c0 + -WithFacingSpriteBody: + -AutoSelectionSize: + -RenderSprites: RenderHarvester: ImagesByFullness: harvempty, harvhalf, harv GpsDot: @@ -329,7 +313,6 @@ MCV: Facing: 96 TransformSounds: placbldg.aud, build5.aud NoTransformNotification: BuildingCannotPlaceAudio - WithFacingSpriteBody: MustBeDestroyed: RequiredForShortGame: true BaseBuilding: @@ -338,8 +321,6 @@ MCV: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall - AutoSelectionSize: - RenderSprites: JEEP: Inherits: ^Vehicle @@ -369,18 +350,12 @@ JEEP: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - WithFacingSpriteBody: WithTurret: AutoTarget: Cargo: Types: Infantry MaxWeight: 1 PipCount: 1 - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall - AutoSelectionSize: - RenderSprites: APC: Inherits: ^Tank @@ -407,18 +382,12 @@ APC: LocalOffset: 0,0,171 MuzzleSequence: muzzle AttackFrontal: - WithFacingSpriteBody: WithMuzzleFlash: AutoTarget: Cargo: Types: Infantry MaxWeight: 5 PipCount: 5 - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall - AutoSelectionSize: - RenderSprites: MNLY.AP: Inherits: ^Tank @@ -440,7 +409,6 @@ MNLY.AP: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 5c0 - WithFacingSpriteBody: Minelayer: Mine: MINP MineImmune: @@ -453,7 +421,6 @@ MNLY.AP: RenderDetectionCircle: Explodes: Weapon: APMine - AutoSelectionSize: RenderSprites: Image: MNLY @@ -477,7 +444,6 @@ MNLY.AT: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 5c0 - WithFacingSpriteBody: Minelayer: Mine: MINV MineImmune: @@ -490,7 +456,6 @@ MNLY.AT: RenderDetectionCircle: Explodes: Weapon: ATMine - AutoSelectionSize: RenderSprites: Image: MNLY @@ -513,16 +478,10 @@ TRUK: Speed: 128 RevealsShroud: Range: 3c0 - WithFacingSpriteBody: SupplyTruck: Payload: 500 - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: moneycrate - AutoSelectionSize: - RenderSprites: MGG: Inherits: ^Vehicle @@ -541,7 +500,6 @@ MGG: Type: Heavy Mobile: Speed: 85 - WithFacingSpriteBody: WithIdleOverlay@SPINNER: Offset: -299,0,171 Sequence: spinner @@ -550,13 +508,8 @@ MGG: CreatesShroud: Range: 6c0 RenderShroudCircle: - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall LeavesHusk: HuskActor: MGG.Husk - AutoSelectionSize: - RenderSprites: MRJ: Inherits: ^Vehicle @@ -577,13 +530,9 @@ MRJ: Speed: 85 RevealsShroud: Range: 6c0 - WithFacingSpriteBody: WithIdleOverlay@SPINNER: Sequence: spinner Offset: -256,0,256 - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall JamsRadar: Range: 15 JamsMissiles: @@ -592,8 +541,6 @@ MRJ: RenderJammerCircle: DetectCloaked: Range: 6 - AutoSelectionSize: - RenderSprites: TTNK: Inherits: ^Tank @@ -619,17 +566,11 @@ TTNK: Weapon: TTankZap LocalOffset: 0,0,213 AttackFrontal: - WithFacingSpriteBody: WithIdleOverlay@SPINNER: Sequence: spinner SelectionDecorations: VisualBounds: 30,30 AutoTarget: - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall - AutoSelectionSize: - RenderSprites: FTRK: Inherits: ^Vehicle @@ -661,14 +602,8 @@ FTRK: MuzzleSequence: muzzle AttackTurreted: WithMuzzleFlash: - WithFacingSpriteBody: WithTurret: AutoTarget: - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall - AutoSelectionSize: - RenderSprites: SelectionDecorations: VisualBounds: 28,28 @@ -691,7 +626,6 @@ DTRK: Speed: 85 RevealsShroud: Range: 3c0 - WithFacingSpriteBody: Explodes: Weapon: MiniNuke EmptyWeapon: MiniNuke @@ -702,8 +636,6 @@ DTRK: UpgradeMinEnabledLevel: 1 Chronoshiftable: ExplodeInstead: yes - AutoSelectionSize: - RenderSprites: CTNK: Inherits: ^Vehicle @@ -727,7 +659,6 @@ CTNK: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 - WithFacingSpriteBody: AutoTarget: Armament@PRIMARY: Weapon: APTusk @@ -739,11 +670,6 @@ CTNK: LocalYaw: -100 AttackFrontal: PortableChrono: - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall - AutoSelectionSize: - RenderSprites: QTNK: Inherits: ^Tank @@ -765,17 +691,12 @@ QTNK: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 - WithFacingSpriteBody: SelectionDecorations: VisualBounds: 44,38,0,-4 - Explodes: - Weapon: UnitExplodeSmall MadTank: -EjectOnDeath: TargetableUnit: TargetTypes: Ground, MADTank, Repair - AutoSelectionSize: - RenderSprites: STNK: Inherits: ^Vehicle @@ -788,8 +709,6 @@ STNK: Tooltip: Name: Phase Transport Description: Lightly armored infantry transport\nwhich can cloak. Can detect cloaked units.\n Strong vs Light armor\n Weak vs Infantry, Tanks, Aircraft - SelectionDecorations: - VisualBounds: 26,26 Health: HP: 300 Armor: @@ -799,7 +718,6 @@ STNK: Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 - WithFacingSpriteBody: AutoTarget: InitialStance: ReturnFire Armament: @@ -820,10 +738,5 @@ STNK: UncloakSound: appear1.aud DetectCloaked: Range: 6 - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall -MustBeDestroyed: - AutoSelectionSize: - RenderSprites: