diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 78d15e151a..04ff1262c6 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -31,8 +31,6 @@ DPOD: PipType: Ammo PipTypeEmpty: AmmoEmpty AutoTarget: - RenderVoxels: - WithVoxelBody: DSHP: Inherits: ^Helicopter @@ -57,8 +55,6 @@ DSHP: MaxWeight: 5 PipCount: 5 UnloadVoice: Move - RenderVoxels: - WithVoxelBody: Hovers: ORCA: @@ -96,11 +92,7 @@ ORCA: PipTypeEmpty: AmmoEmpty AutoTarget: RenderSprites: - RenderVoxels: - WithVoxelBody: Hovers: - SelectionDecorations: - VisualBounds: 30,24 ORCAB: Inherits: ^Plane @@ -140,11 +132,7 @@ ORCAB: PipTypeEmpty: AmmoEmpty AutoTarget: RenderSprites: - RenderVoxels: - WithVoxelBody: Hovers: - SelectionDecorations: - VisualBounds: 30,24 ORCATRAN: Inherits: ^Helicopter @@ -169,8 +157,6 @@ ORCATRAN: MaxWeight: 5 PipCount: 5 UnloadVoice: Move - RenderVoxels: - WithVoxelBody: Hovers: TRNSPORT: @@ -197,8 +183,6 @@ TRNSPORT: RevealsShroud: Range: 2c0 RenderSprites: - RenderVoxels: - WithVoxelBody: Hovers: SCRIN: @@ -239,10 +223,6 @@ SCRIN: PipTypeEmpty: AmmoEmpty AutoTarget: RenderSprites: - RenderVoxels: - WithVoxelBody: - SelectionDecorations: - VisualBounds: 30,24 APACHE: Inherits: ^Helicopter @@ -281,9 +261,5 @@ APACHE: WithRotor: Offset: 85,0,384 RenderSprites: - RenderVoxels: - WithVoxelBody: Hovers: - SelectionDecorations: - VisualBounds: 30,24 diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index d00f51ed02..e3f51f9ea3 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -1,5 +1,5 @@ WEEDGUY: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 300 Tooltip: @@ -17,11 +17,9 @@ WEEDGUY: LocalOffset: 85,0,384 AttackFrontal: Voice: Attack - WithInfantryBody: - TakeCover: UMAGON: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 400 Tooltip: @@ -41,13 +39,11 @@ UMAGON: Weapon: Sniper AttackFrontal: Voice: Attack - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 CHAMSPY: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 700 DisguiseToolTip: @@ -61,7 +57,6 @@ CHAMSPY: RevealsShroud: Range: 9c0 Passenger: - TakeCover: Disguise: Infiltrates: Types: SpyInfiltrate @@ -71,7 +66,7 @@ CHAMSPY: IdleSequences: idle1,idle2 MUTANT: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 100 Tooltip: @@ -90,13 +85,11 @@ MUTANT: Weapon: Vulcan AttackFrontal: Voice: Attack - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 MWMN: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 100 Tooltip: @@ -115,13 +108,11 @@ MWMN: Weapon: Vulcan AttackFrontal: Voice: Attack - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 MUTANT3: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 100 Tooltip: @@ -140,13 +131,11 @@ MUTANT3: Weapon: Vulcan AttackFrontal: Voice: Attack - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 TRATOS: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 100 Tooltip: @@ -161,14 +150,12 @@ TRATOS: Speed: 71 RevealsShroud: Range: 4c0 - TakeCover: -AutoTarget: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 OXANNA: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 100 Tooltip: @@ -181,14 +168,12 @@ OXANNA: Speed: 56 RevealsShroud: Range: 4c0 - TakeCover: -AutoTarget: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 SLAV: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 100 Tooltip: @@ -201,11 +186,9 @@ SLAV: Speed: 56 RevealsShroud: Range: 4c0 - TakeCover: -AutoTarget: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 DOGGIE: Inherits: ^Infantry @@ -235,7 +218,6 @@ DOGGIE: WanderMoveRadius: 2 MinMoveDelayInTicks: 25 MaxMoveDelayInTicks: 45 - -TakeCover: VISSML: Inherits: ^Viceroid @@ -247,8 +229,6 @@ VISSML: WanderMoveRadius: 2 MinMoveDelayInTicks: 30 MaxMoveDelayInTicks: 60 - WithFacingSpriteBody: - AutoSelectionSize: VISLRG: Inherits: ^Viceroid @@ -267,8 +247,6 @@ VISLRG: MaxMoveDelayInTicks: 45 Mobile: Crushes: crate, infantry - WithFacingSpriteBody: - AutoSelectionSize: CIV1: Inherits: ^CivilianInfantry diff --git a/mods/ts/rules/civilian-vehicles.yaml b/mods/ts/rules/civilian-vehicles.yaml index 701b46c949..43ca543ed3 100644 --- a/mods/ts/rules/civilian-vehicles.yaml +++ b/mods/ts/rules/civilian-vehicles.yaml @@ -1,5 +1,5 @@ 4TNK: - Inherits: ^Tank + Inherits: ^VoxelTank Valued: Cost: 1700 Tooltip: @@ -30,32 +30,27 @@ Ticks: 10 HealIfBelow: 50% DamageCooldown: 200 - RenderSprites: - RenderVoxels: - WithVoxelBody: WithVoxelTurret: WithVoxelBarrel: WithMuzzleFlash: TRUCKB: - Inherits: ^Vehicle + Inherits: ^CivilianVoxelVehicle Valued: Cost: 500 Tooltip: Name: Truck Health: - HP: 2000 + HP: 200 Armor: Type: Light Mobile: Speed: 56 RevealsShroud: Range: 5c0 - RenderVoxels: - WithVoxelBody: ICBM: - Inherits: ^Vehicle + Inherits: ^CivilianVoxelVehicle Valued: Cost: 1400 Tooltip: @@ -69,8 +64,6 @@ ICBM: ROT: 5 RevealsShroud: Range: 7c0 - RenderVoxels: - WithVoxelBody: Transforms: IntoActor: gaicbm Offset: -1,-1 @@ -80,7 +73,7 @@ ICBM: Voice: Move BUS: - Inherits: ^Vehicle + Inherits: ^CivilianVoxelVehicle Valued: Cost: 800 Tooltip: @@ -99,11 +92,9 @@ BUS: MaxWeight: 20 PipCount: 5 UnloadVoice: Unload - RenderVoxels: - WithVoxelBody: PICK: - Inherits: ^Vehicle + Inherits: ^CivilianVoxelVehicle Valued: Cost: 800 Tooltip: @@ -122,11 +113,9 @@ PICK: MaxWeight: 2 PipCount: 5 UnloadVoice: Unload - RenderVoxels: - WithVoxelBody: CAR: - Inherits: ^Vehicle + Inherits: ^CivilianVoxelVehicle Valued: Cost: 800 Tooltip: @@ -145,11 +134,9 @@ CAR: MaxWeight: 4 PipCount: 5 UnloadVoice: Unload - RenderVoxels: - WithVoxelBody: WINI: - Inherits: ^Vehicle + Inherits: ^CivilianVoxelVehicle Valued: Cost: 800 Tooltip: @@ -168,6 +155,4 @@ WINI: MaxWeight: 5 PipCount: 5 UnloadVoice: Unload - RenderVoxels: - WithVoxelBody: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 1433d845e7..9e005dacf5 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -1,3 +1,14 @@ +^ExistsInWorld: + AppearsOnRadar: + UpdatesPlayerStatistics: + CombatDebugOverlay: + DrawLineToTarget: + GivesExperience: + BodyOrientation: + ScriptTriggers: + UpgradeManager: + Huntable: + ^GainsExperience: GainsExperience: Upgrades: @@ -26,8 +37,8 @@ UpgradeMinEnabledLevel: 1 UpgradeMaxAcceptedLevel: 2 -^Building: - AppearsOnRadar: +^BasicBuilding: + Inherits: ^ExistsInWorld SelectionDecorations: Palette: pips Selectable: @@ -41,18 +52,33 @@ TerrainTypes: Clear, Road, DirtRoad, Rough Adjacent: 4 FrozenUnderFog: - GivesBuildableArea: - Capturable: SoundOnDamageTransition: DamagedSounds: expnew01.aud DestroyedSounds: crmble2.aud RenderBuilding: WithBuildingExplosion: + RepairableBuilding: + IndicatorPalette: mouse + ShakeOnDeath: + ProximityCaptor: + Types: Building + AcceptsSupplies: + Guardable: + Range: 3 + Demolishable: + Cloak@CLOAKGENERATOR: + UpgradeTypes: cloakgenerator + UpgradeMinEnabledLevel: 1 + InitialDelay: 0 + CloakDelay: 90 + +^Building: + Inherits: ^BasicBuilding + GivesBuildableArea: + Capturable: WithDeathAnimation: DeathSequence: dead UseDeathTypeSuffix: false - RepairableBuilding: - IndicatorPalette: mouse EngineerRepairable: EmitInfantryOnSell@gdi: ActorTypes: e1, e1, e2, medic @@ -62,45 +88,15 @@ Races: nod MustBeDestroyed: RequiredForShortGame: true - GivesExperience: CaptureNotification: - ShakeOnDeath: - ProximityCaptor: - Types: Building Sellable: SellSounds: cashturn.aud - AcceptsSupplies: GivesBounty: - UpdatesPlayerStatistics: - CombatDebugOverlay: - Guardable: - Range: 3 - BodyOrientation: - Huntable: - Demolishable: - ScriptTriggers: WithMakeAnimation: - UpgradeManager: - Cloak@CLOAKGENERATOR: - UpgradeTypes: cloakgenerator - UpgradeMinEnabledLevel: 1 - InitialDelay: 0 - CloakDelay: 90 ^CivBuilding: - Inherits: ^Building - -GivesBuildableArea: - -Capturable: - -EngineerRepairable: - -MustBeDestroyed: - -GivesExperience: - -CaptureNotification: - -Sellable: - -GivesBounty: + Inherits: ^BasicBuilding -UpdatesPlayerStatistics: - -CombatDebugOverlay: - -WithMakeAnimation: - -WithDeathAnimation: Health: HP: 900 Armor: @@ -189,27 +185,31 @@ RenderSprites: ^Infantry: - Inherits: ^GainsExperience - AppearsOnRadar: + Inherits@1: ^GainsExperience + Inherits@2: ^ExistsInWorld Health: Radius: 128 + HP: 50 Armor: Type: None + Valued: + Cost: 10 RevealsShroud: - Range: 4c0 + Range: 2c0 Mobile: + Voice: Move + Speed: 71 Crushes: crate - SharesCell: yes + SharesCell: true TerrainSpeeds: Clear: 90 Road: 100 - Rail: 80 - DirtRoad: 90 - Rough: 70 - Tiberium: 80 - BlueTiberium: 80 - Veins: 80 - Voice: Move + Rail: 90 + DirtRoad: 100 + Rough: 80 + Tiberium: 90 + BlueTiberium: 90 + Veins: 50 SelectionDecorations: Palette: pips Selectable: @@ -218,14 +218,6 @@ VoiceSet: Infantry TargetableUnit: TargetTypes: Ground, Infantry - TakeCover: - DamageModifiers: - Prone50Percent: 50 - Prone60Percent: 60 - Prone70Percent: 70 - Prone100Percent: 100 - Prone350Percent: 350 - DamageTriggers: TriggerProne RenderSprites: WithInfantryBody: WithDeathAnimation: @@ -243,8 +235,6 @@ CargoType: Infantry Voice: Move HiddenUnderFog: - GivesExperience: - DrawLineToTarget: ActorLostNotification: ProximityCaptor: Types: Infantry @@ -255,14 +245,9 @@ SpawnViceroid: ViceroidActor: vissml DeathType: EnergyDeath # TODO: FIX ME! (Tiberium currently uses the wrong damage type!) - UpdatesPlayerStatistics: - CombatDebugOverlay: Guard: Voice: Move Guardable: - BodyOrientation: - Huntable: - ScriptTriggers: DeathSounds@NORMAL: DeathTypes: BulletDeath, SmallExplosionDeath, ExplosionDeath DeathSounds@BURNED: @@ -271,54 +256,73 @@ DeathSounds@ZAPPED: Voice: Zapped DeathTypes: EnergyDeath - UpgradeManager: Cloak@CLOAKGENERATOR: UpgradeTypes: cloakgenerator UpgradeMinEnabledLevel: 1 InitialDelay: 0 CloakDelay: 90 + +^Soldier: + Inherits: ^Infantry + RevealsShroud: + Range: 4c0 MustBeDestroyed: + TakeCover: + DamageModifiers: + Prone50Percent: 50 + Prone60Percent: 60 + Prone70Percent: 70 + Prone100Percent: 100 + Prone350Percent: 350 + DamageTriggers: TriggerProne + WithInfantryBody: + IdleSequences: idle1,idle2 + WithDeathAnimation: + CrushedSequence: die-crushed + +^Cyborg: + Inherits: ^Infantry + RevealsShroud: + Range: 4c0 + MustBeDestroyed: + -Crushable: + PoisonedByTiberium: + Weapon: TiberiumHeal + WithPermanentInjury: + WithInfantryBody: + AttackSequence: shoot + IdleSequences: idle1,idle2 ^CivilianInfantry: Inherits: ^Infantry Voiced: VoiceSet: Civilian - Valued: - Cost: 10 Tooltip: Name: Civilian - Health: - HP: 50 - Mobile: - Speed: 71 - RevealsShroud: - Range: 2c0 ProximityCaptor: Types: CivilianInfantry - -TakeCover: - WithInfantryBody: + ScaredyCat: WithDeathAnimation: CrushedSequence: die-crushed - ScaredyCat: - -MustBeDestroyed: ^Vehicle: - Inherits: ^GainsExperience - AppearsOnRadar: + Inherits@1: ^GainsExperience + Inherits@2: ^ExistsInWorld Mobile: Crushes: crate TerrainSpeeds: - Clear: 90 + Clear: 70 Road: 100 - Rail: 80 + Rail: 50 DirtRoad: 90 - Rough: 70 - Tiberium: 80 - BlueTiberium: 80 - Veins: 80 + Rough: 40 + Tiberium: 50 + BlueTiberium: 50 + Veins: 50 ROT: 5 Voice: Move Selectable: + Bounds: 40,24 SelectionDecorations: Palette: pips Voiced: @@ -334,8 +338,6 @@ AttackMove: Voice: Move HiddenUnderFog: - GivesExperience: - DrawLineToTarget: ActorLostNotification: ProximityCaptor: Types: Vehicle @@ -344,19 +346,14 @@ CaptureThreshold: 1 CancelActivity: True GivesBounty: - UpdatesPlayerStatistics: - CombatDebugOverlay: Guard: Voice: Move Guardable: BodyOrientation: CameraPitch: 90 - Huntable: - ScriptTriggers: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall - UpgradeManager: UpgradeOverlay@EMPDISABLE: UpgradeTypes: empdisable UpgradeMinEnabledLevel: 1 @@ -376,84 +373,40 @@ InitialDelay: 0 CloakDelay: 90 MustBeDestroyed: + RenderSprites: ^Tank: - Inherits: ^GainsExperience - AppearsOnRadar: + Inherits: ^Vehicle Mobile: - Crushes: wall, crate + Crushes: wall, crate, infantry TerrainSpeeds: - Clear: 90 + Clear: 70 Road: 100 - Rail: 80 + Rail: 100 DirtRoad: 90 - Rough: 70 - Tiberium: 80 - BlueTiberium: 80 - Veins: 80 - ROT: 5 - Voice: Move - Selectable: - SelectionDecorations: - Palette: pips - Voiced: - VoiceSet: Vehicle - TargetableUnit: - TargetTypes: Ground, Vehicle - Repairable: - RepairBuildings: gadept - Voice: Move - Passenger: - CargoType: Vehicle - Voice: Move - AttackMove: - Voice: Move - HiddenUnderFog: - GivesExperience: - DrawLineToTarget: - ActorLostNotification: - ProximityCaptor: - Types: Vehicle - Capturable: - Type: Vehicle - CaptureThreshold: 1 - CancelActivity: True - GivesBounty: - UpdatesPlayerStatistics: - CombatDebugOverlay: - Guard: - Voice: Move - Guardable: - BodyOrientation: - CameraPitch: 90 - Huntable: - ScriptTriggers: - Explodes: - Weapon: UnitExplodeSmall - EmptyWeapon: UnitExplodeSmall - UpgradeManager: - UpgradeOverlay@EMPDISABLE: - UpgradeTypes: empdisable - UpgradeMinEnabledLevel: 1 - UpgradeMaxAcceptedLevel: 2 - Palette: disabled - DisableUpgrade@EMPDISABLE: - UpgradeTypes: empdisable - UpgradeMinEnabledLevel: 1 - UpgradeMaxAcceptedLevel: 2 - TimedUpgradeBar@EMPDISABLE: - Upgrade: empdisable - Color: 255,255,255 - Cloak@CLOAKGENERATOR: - UpgradeTypes: cloakgenerator - UpgradeMinEnabledLevel: 1 - UpgradeMaxAcceptedLevel: 2 - InitialDelay: 0 - CloakDelay: 90 - MustBeDestroyed: + Rough: 60 + Tiberium: 70 + BlueTiberium: 70 + Veins: 70 + +^VoxelVehicle: + Inherits: ^Vehicle + RenderVoxels: + WithVoxelBody: + +^VoxelTank: + Inherits: ^Tank + RenderVoxels: + WithVoxelBody: + +^CivilianVoxelVehicle: + Inherits: ^VoxelVehicle + -RenderSprites: # They don't have icons so this is needed to satisfy --check-yaml + -MustBeDestroyed: ^Helicopter: - Inherits: ^GainsExperience + Inherits@1: ^GainsExperience + Inherits@2: ^ExistsInWorld AppearsOnRadar: UseLocation: yes TargetableAircraft: @@ -473,19 +426,15 @@ HiddenUnderFog: AttackMove: Voice: Move - GivesExperience: - DrawLineToTarget: ActorLostNotification: - CombatDebugOverlay: BodyOrientation: CameraPitch: 90 - Huntable: - ScriptTriggers: Guard: Voice: Move Guardable: - UpgradeManager: MustBeDestroyed: + RenderVoxels: + WithVoxelBody: ^Plane: Inherits: ^Helicopter @@ -499,8 +448,8 @@ ReturnOnIdle: ^Viceroid: + Inherits: ^ExistsInWorld RenderUnit: - AppearsOnRadar: Health: Radius: 256 Armor: @@ -527,14 +476,12 @@ TargetTypes: Ground AttackMove: HiddenUnderFog: - DrawLineToTarget: PoisonedByTiberium: Weapon: TiberiumHeal - CombatDebugOverlay: Guardable: - BodyOrientation: - Huntable: - ScriptTriggers: + RenderSprites: + WithSpriteBody: + AutoSelectionSize: ^BlossomTree: Tooltip: diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index 8349380f0b..9f6e144b79 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -1,5 +1,5 @@ E2: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildPaletteOrder: 20 @@ -19,12 +19,11 @@ E2: FireDelay: 5 AttackFrontal: Voice: Attack - TakeCover: WithInfantryBody: - IdleSequences: idle1,idle2 + AttackSequence: throw MEDIC: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 600 Tooltip: @@ -45,16 +44,14 @@ MEDIC: Armament: Weapon: Heal AttackMedic: - TakeCover: WithInfantryBody: - IdleSequences: idle1,idle2 AttackSequence: heal SelfHealing: Passenger: PipType: Red JUMPJET: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 600 Tooltip: @@ -81,12 +78,12 @@ JUMPJET: -Crushable: AttackFrontal: Voice: Attack - TakeCover: WithInfantryBody: AttackSequence: shoot + -TakeCover: GHOST: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 1750 Tooltip: @@ -118,8 +115,6 @@ GHOST: C4Demolition: C4Delay: 45 Voice: Attack - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index bb3a8d0378..86de4d24d9 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -1,5 +1,5 @@ APC: - Inherits: ^Vehicle + Inherits: ^VoxelVehicle Valued: Cost: 600 Tooltip: @@ -27,8 +27,7 @@ APC: MaxWeight: 5 PipCount: 5 UnloadVoice: Unload - RenderSprites: - RenderVoxels: + -WithVoxelBody: WithVoxelWaterBody: LeavesTrails: Image: wake @@ -36,7 +35,7 @@ APC: TerrainTypes: Water HVR: - Inherits: ^Vehicle + Inherits: ^VoxelVehicle Valued: Cost: 900 Tooltip: @@ -73,9 +72,6 @@ HVR: AttackTurreted: Voice: Attack AutoTarget: - RenderSprites: - RenderVoxels: - WithVoxelBody: WithVoxelTurret: Hovers: LeavesTrails: @@ -108,7 +104,6 @@ SMECH: AutoTarget: Armament: Weapon: AssaultCannon - RenderSprites: Voiced: VoiceSet: Mech WithFacingSpriteBody: @@ -143,7 +138,6 @@ MMCH: Type: Heavy RevealsShroud: Range: 8c0 - RenderSprites: WithInfantryBody: Turreted: ROT: 5 @@ -165,7 +159,7 @@ MMCH: VisualBounds: 30, 42, 0, -8 HMEC: - Inherits: ^Tank + Inherits: ^VoxelTank Valued: Cost: 3000 Tooltip: @@ -187,7 +181,6 @@ HMEC: Type: Heavy RevealsShroud: Range: 8c0 - RenderSprites: AttackFrontal: Voice: Attack AutoTarget: @@ -197,12 +190,12 @@ HMEC: Armament@RAILGUN: Weapon: MechRailgun LocalOffset: 640,-384,980, 640,384,980 - RenderVoxels: + -WithVoxelBody: WithVoxelWalkerBody: TickRate: 1 SONIC: - Inherits: ^Tank + Inherits: ^VoxelTank Valued: Cost: 1300 Tooltip: @@ -231,8 +224,5 @@ SONIC: ROT: 5 Offset: -170,0,0 AutoTarget: - RenderSprites: - RenderVoxels: - WithVoxelBody: WithVoxelTurret: diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index 67fee77475..1ef3eafbb3 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -1,5 +1,5 @@ E3: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildPaletteOrder: 20 @@ -20,13 +20,11 @@ E3: LocalOffset: 128,0,640 AttackFrontal: Voice: Attack - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 CYBORG: - Inherits: ^Infantry + Inherits: ^Cyborg Armor: Type: Light Valued: @@ -38,7 +36,6 @@ CYBORG: Queue: Infantry BuildPaletteOrder: 40 Prerequisites: ~nahand - -Crushable: Selectable: Bounds: 16,31,0,-10 Voiced: @@ -47,8 +44,6 @@ CYBORG: Speed: 56 Health: HP: 300 - PoisonedByTiberium: - Weapon: TiberiumHeal Passenger: RevealsShroud: Range: 5c0 @@ -56,16 +51,11 @@ CYBORG: Weapon: Vulcan3 AttackFrontal: Voice: Attack - WithInfantryBody: - AttackSequence: shoot - IdleSequences: idle1,idle2 - WithPermanentInjury: SelectionDecorations: VisualBounds: 16,31,0,-10 - -TakeCover: CYC2: - Inherits: ^Infantry + Inherits: ^Cyborg Armor: Type: Heavy Valued: @@ -78,7 +68,6 @@ CYC2: BuildPaletteOrder: 50 Prerequisites: ~nahand, natech BuildLimit: 1 - -Crushable: Selectable: Bounds: 16,32,-1,-12 Voiced: @@ -86,9 +75,7 @@ CYC2: Mobile: Speed: 56 Health: - HP: 500 - PoisonedByTiberium: - Weapon: TiberiumHeal + HP: 500 Passenger: RevealsShroud: Range: 7c0 @@ -97,16 +84,11 @@ CYC2: LocalOffset: 170,85,683 AttackFrontal: Voice: Attack - WithInfantryBody: - AttackSequence: shoot - IdleSequences: idle1,idle2 - WithPermanentInjury: SelectionDecorations: VisualBounds: 16,32,-1,-12 - -TakeCover: MHIJACK: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildPaletteOrder: 60 @@ -129,8 +111,6 @@ MHIJACK: RevealsShroud: Range: 6c0 -AutoTarget: - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 46efaed365..dcb0028c56 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -1,5 +1,5 @@ BGGY: - Inherits: ^Vehicle + Inherits: ^VoxelVehicle Valued: Cost: 500 Tooltip: @@ -26,13 +26,10 @@ BGGY: AttackFrontal: Voice: Attack AutoTarget: - RenderSprites: - RenderVoxels: - WithVoxelBody: WithMuzzleFlash: BIKE: - Inherits: ^Vehicle + Inherits: ^VoxelVehicle Valued: Cost: 600 Tooltip: @@ -65,12 +62,9 @@ BIKE: AttackFrontal: Voice: Attack AutoTarget: - RenderSprites: - RenderVoxels: - WithVoxelBody: TTNK: - Inherits: ^Tank + Inherits: ^VoxelTank Valued: Cost: 800 Tooltip: @@ -106,9 +100,6 @@ TTNK: WithMuzzleFlash: RevealsShroud: Range: 5c0 - RenderSprites: - RenderVoxels: - WithVoxelBody: Transforms: IntoActor: gatick Facing: 159 @@ -117,7 +108,7 @@ TTNK: Voice: Move ART2: - Inherits: ^Tank + Inherits: ^VoxelTank Valued: Cost: 975 Tooltip: @@ -136,10 +127,8 @@ ART2: ROT: 2 RevealsShroud: Range: 9c0 - RenderSprites: RenderVoxels: LightAmbientColor: 0.4, 0.4, 0.4 - WithVoxelBody: Transforms: IntoActor: gaarty Facing: 96 @@ -148,7 +137,7 @@ ART2: Voice: Move REPAIR: - Inherits: ^Tank + Inherits: ^VoxelTank Buildable: Queue: Vehicle BuildPaletteOrder: 70 @@ -171,12 +160,9 @@ REPAIR: Cursor: repair OutsideRangeCursor: repair Voice: Attack - RenderSprites: - RenderVoxels: - WithVoxelBody: WEED: - Inherits: ^Vehicle + Inherits: ^VoxelVehicle Valued: Cost: 1400 Tooltip: @@ -196,12 +182,9 @@ WEED: RevealsShroud: Range: 4c0 -GainsExperience: - RenderSprites: - RenderVoxels: - WithVoxelBody: SAPC: - Inherits: ^Tank + Inherits: ^VoxelTank Valued: Cost: 800 Tooltip: @@ -225,12 +208,9 @@ SAPC: MaxWeight: 5 PipCount: 5 UnloadVoice: Unload - RenderSprites: - RenderVoxels: - WithVoxelBody: SUBTANK: - Inherits: ^Tank + Inherits: ^VoxelTank Valued: Cost: 750 Tooltip: @@ -255,12 +235,9 @@ SUBTANK: AttackFrontal: Voice: Attack AutoTarget: - RenderSprites: - RenderVoxels: - WithVoxelBody: STNK: - Inherits: ^Tank + Inherits: ^VoxelTank Valued: Cost: 1100 Tooltip: @@ -292,8 +269,5 @@ STNK: Voice: Attack AutoTarget: InitialStance: HoldFire - RenderSprites: - RenderVoxels: - WithVoxelBody: -MustBeDestroyed: diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index af286f2e41..303fa6878d 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -1,5 +1,5 @@ E1: - Inherits: ^Infantry + Inherits: ^Soldier Buildable: Queue: Infantry BuildPaletteOrder: 10 @@ -24,13 +24,11 @@ E1: UpgradeMinEnabledLevel: 1 AttackFrontal: Voice: Attack - TakeCover: WithInfantryBody: AttackSequence: shoot - IdleSequences: idle1,idle2 ENGINEER: - Inherits: ^Infantry + Inherits: ^Soldier Valued: Cost: 500 Tooltip: @@ -53,8 +51,5 @@ ENGINEER: Captures: CaptureTypes: building -AutoTarget: - TakeCover: - WithInfantryBody: - IdleSequences: idle1,idle2 -GainsExperience: diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index 89c0dca5b9..5bd05555a5 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -1,5 +1,5 @@ MCV: - Inherits: ^Vehicle + Inherits: ^VoxelVehicle Buildable: Queue: Vehicle BuildPaletteOrder: 110 @@ -11,7 +11,6 @@ MCV: Description: Deploys into another Construction Yard.\n Unarmed Selectable: Priority: 3 - Bounds: 42,42 Health: HP: 600 Armor: @@ -31,14 +30,11 @@ MCV: TransformSounds: facbld1.aud NoTransformSounds: Voice: Move - RenderSprites: - RenderVoxels: - WithVoxelBody: SelectionDecorations: VisualBounds: 42,42 HARV: - Inherits: ^Vehicle + Inherits: ^VoxelTank Valued: Cost: 1400 Tooltip: @@ -82,8 +78,7 @@ HARV: RevealsShroud: Range: 4c0 -GainsExperience: - RenderSprites: - RenderVoxels: + -WithVoxelBody: WithVoxelUnloadBody: Explodes: Weapon: TiberiumExplosion @@ -94,7 +89,7 @@ HARV: VisualBounds: 36,36 LPST: - Inherits: ^Vehicle + Inherits: ^VoxelVehicle Valued: Cost: 950 Tooltip: @@ -113,9 +108,6 @@ LPST: ROT: 5 RevealsShroud: Range: 10c0 - RenderSprites: - RenderVoxels: - WithVoxelBody: Transforms: IntoActor: gadpsa Facing: 159 @@ -145,5 +137,4 @@ GGHUNT: Weapon: SuicideBomb EmptyWeapon: SuicideBomb AutoSelectionSize: - RenderSprites: