diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 5dd66158eb..46531ae3a7 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -595,3 +595,40 @@ Inherits: ^Decoration Tooltip: Name: Palette + +^Defense: + Inherits: ^Building + -GivesBuildableArea: + AutoTarget: + RenderRangeCircle: + RenderDetectionCircle: + RevealsShroud: + Range: 6c0 + DetectCloaked: + Range: 5 + +^DeployedVehicle: + Inherits@1: ^GainsExperience + Inherits@2: ^ExistsInWorld + Voiced: + VoiceSet: Vehicle + AttackTurreted: + Voice: Attack + AutoTarget: + RenderRangeCircle: + DrawLineToTarget: + Building: + Dimensions: 1,1 + Footprint: x + TerrainTypes: Clear, Road, DirtRoad, Rough + RenderBuilding: + WithMakeAnimation: + SelectionDecorations: + Palette: pips + Selectable: + TargetableBuilding: + TargetTypes: Ground, Repair + Guardable: + HiddenUnderFog: + ActorLostNotification: + diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index 056367f901..46e34401e5 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -24,7 +24,7 @@ GAWALL: NodeTypes: wall, turret GACTWR: - Inherits: ^Building + Inherits: ^Defense Valued: Cost: 600 Tooltip: @@ -38,22 +38,15 @@ GACTWR: Selectable: Bounds: 48, 36, 0, -6 DisabledOverlay: - -GivesBuildableArea: Health: HP: 500 Armor: Type: Light - RevealsShroud: - Range: 6c0 BodyOrientation: QuantizedFacings: 32 - RenderRangeCircle: - RenderDetectionCircle: DetectCloaked: UpgradeTypes: tower UpgradeMinEnabledLevel: 1 - Range: 5 - AutoTarget: Turreted: ROT: 10 InitialFacing: 50 diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index 99b0e830a7..9aa73c9b87 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -24,7 +24,7 @@ NAWALL: NodeTypes: wall, turret NALASR: - Inherits: ^Building + Inherits: ^Defense Valued: Cost: 500 Tooltip: @@ -39,15 +39,12 @@ NALASR: Bounds: 40, 30, -8, -6 RequiresPower: DisabledOverlay: - -GivesBuildableArea: Health: HP: 400 Armor: Type: Light RevealsShroud: Range: 5c0 - RenderRangeCircle: - RenderDetectionCircle: DetectCloaked: Range: 3 Turreted: @@ -59,14 +56,13 @@ NALASR: Weapon: LaserFire2 RenderVoxels: WithVoxelTurret: - AutoTarget: Power: Amount: -40 SelectionDecorations: VisualBounds: 40, 36, -8, -8 NAOBEL: - Inherits: ^Building + Inherits: ^Defense Valued: Cost: 1500 Tooltip: @@ -83,7 +79,6 @@ NAOBEL: Bounds: 88, 42, 0, -6 RequiresPower: DisabledOverlay: - -GivesBuildableArea: Health: HP: 600 Armor: @@ -101,11 +96,6 @@ NAOBEL: Sequence: active Palette: player IsPlayerPalette: true - AutoTarget: - RenderRangeCircle: - RenderDetectionCircle: - DetectCloaked: - Range: 5 WithIdleOverlay@LIGHTS: Sequence: idle-lights Power: @@ -114,7 +104,7 @@ NAOBEL: VisualBounds: 88, 72, 0, -12 NASAM: - Inherits: ^Building + Inherits: ^Defense Valued: Cost: 600 Tooltip: @@ -129,20 +119,14 @@ NASAM: Bounds: 40, 30, -3, -8 RequiresPower: DisabledOverlay: - -GivesBuildableArea: Health: HP: 500 Armor: Type: Light - RevealsShroud: - Range: 6c0 BodyOrientation: QuantizedFacings: 32 RenderRangeCircle: - RenderDetectionCircle: - DetectCloaked: - Range: 5 - AutoTarget: + RangeCircleType: aa Turreted: ROT: 10 InitialFacing: 50 @@ -158,8 +142,7 @@ NASAM: VisualBounds: 40, 36, -3, -8 GATICK: - Inherits@1: ^GainsExperience - Inherits@2: ^ExistsInWorld + Inherits: ^DeployedVehicle Valued: Cost: 800 Tooltip: @@ -170,8 +153,6 @@ GATICK: Type: Concrete RevealsShroud: Range: 5c0 - Voiced: - VoiceSet: Vehicle Turreted: ROT: 6 InitialFacing: 128 @@ -189,18 +170,8 @@ GATICK: UpgradeTypes: eliteweapon UpgradeMinEnabledLevel: 1 MuzzleSequence: muzzle - AttackTurreted: - Voice: Attack BodyOrientation: QuantizedFacings: 32 - AutoTarget: - RenderRangeCircle: - DrawLineToTarget: - Building: - Dimensions: 1,1 - Footprint: x - TerrainTypes: Clear, Road, DirtRoad, Rough - RenderBuilding: RenderVoxels: WithVoxelBarrel: LocalOffset: 170,0,0 @@ -212,19 +183,9 @@ GATICK: NoTransformSounds: Voice: Move WithMuzzleFlash: - WithMakeAnimation: - SelectionDecorations: - Palette: pips - Selectable: - TargetableBuilding: - TargetTypes: Ground, Repair - Guardable: - HiddenUnderFog: - ActorLostNotification: GAARTY: - Inherits@1: ^GainsExperience - Inherits@2: ^ExistsInWorld + Inherits@1: ^DeployedVehicle Valued: Cost: 975 Tooltip: @@ -235,8 +196,6 @@ GAARTY: Type: Light RevealsShroud: Range: 9c0 - Voiced: - VoiceSet: Vehicle Turreted: ROT: 5 InitialFacing: 128 @@ -245,13 +204,8 @@ GAARTY: Weapon: 155mm LocalOffset: 811,0,0 MuzzleSequence: muzzle - AttackTurreted: - Voice: Attack BodyOrientation: QuantizedFacings: 32 - AutoTarget: - RenderRangeCircle: - DrawLineToTarget: RenderBuilding: RenderVoxels: LightAmbientColor: 0.4, 0.4, 0.4 @@ -265,19 +219,6 @@ GAARTY: NoTransformSounds: Voice: Move WithMuzzleFlash: - Building: - Dimensions: 1,1 - Footprint: x - TerrainTypes: Clear, Road, DirtRoad, Rough - WithMakeAnimation: - SelectionDecorations: - Palette: pips - Selectable: - TargetableBuilding: - TargetTypes: Ground, Repair - Guardable: - HiddenUnderFog: - ActorLostNotification: NAMISL: Inherits: ^Building diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml index 270b240a39..acdd128e52 100644 --- a/mods/ts/rules/shared-support.yaml +++ b/mods/ts/rules/shared-support.yaml @@ -1,6 +1,5 @@ GADPSA: - Inherits@1: ^GainsExperience - Inherits@2: ^ExistsInWorld + Inherits: ^DeployedVehicle Valued: Cost: 950 Tooltip: @@ -17,28 +16,16 @@ GADPSA: TransformSounds: place2.aud NoTransformSounds: Voice: Move + -AutoTarget: + -DrawLineToTarget: + -AttackTurreted: + -RenderRangeCircle: RenderDetectionCircle: DetectCloaked: Range: 6 - Building: - Dimensions: 1,1 - Footprint: x - TerrainTypes: Clear, Road, DirtRoad, Rough - RenderBuilding: - Voiced: - VoiceSet: Vehicle - WithMakeAnimation: - SelectionDecorations: - Palette: pips - Selectable: - TargetableBuilding: - TargetTypes: Ground, Repair - Guardable: - HiddenUnderFog: - ActorLostNotification: NAPULS: - Inherits: ^Building + Inherits: ^Defense Valued: Cost: 1000 Tooltip: @@ -55,7 +42,6 @@ NAPULS: Bounds: 78, 54, 0, -12 RequiresPower: DisabledOverlay: - -GivesBuildableArea: Health: HP: 500 Armor: @@ -68,11 +54,6 @@ NAPULS: AttackTurreted: Armament: Weapon: EMPulseCannon - AutoTarget: - RenderRangeCircle: - RenderDetectionCircle: - DetectCloaked: - Range: 5 WithTurret: Sequence: turret Power: