diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 394ffaba84..a2b559a14a 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -64,6 +64,7 @@ DSHP: ORCA: Inherits: ^Helicopter + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 1000 Tooltip: @@ -104,7 +105,8 @@ ORCA: Actor: ORCA.Husk ORCAB: - Inherits: ^Plane + Inherits: ^Aircraft + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 1600 Tooltip: @@ -125,6 +127,7 @@ ORCAB: MoveIntoShroud: false TakeoffSound: orcaup1.aud LandingSound: orcadwn1.aud + ReturnOnIdle: Health: HP: 260 Armor: @@ -225,7 +228,8 @@ TRNSPORT: Actor: TRNSPORT.Husk SCRIN: - Inherits: ^Plane + Inherits: ^Aircraft + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 1500 Tooltip: @@ -240,6 +244,7 @@ SCRIN: Voiced: VoiceSet: Scrin Aircraft: + CruiseAltitude: 2560 MaximumPitch: 90 TurnSpeed: 3 Speed: 168 @@ -247,6 +252,7 @@ SCRIN: MoveIntoShroud: false TakeoffSound: dropup1.aud LandingSound: dropdwn1.aud + ReturnOnIdle: Health: HP: 280 Armor: @@ -273,6 +279,7 @@ SCRIN: APACHE: Inherits: ^Helicopter + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 1000 Tooltip: @@ -319,7 +326,6 @@ APACHE: Actor: APACHE.Husk HUNTER: - Inherits@1: ^GainsExperience Inherits@2: ^ExistsInWorld Valued: Cost: 1000 diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 8b5ce6436e..442f1605ab 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -26,6 +26,7 @@ WEEDGUY: UMAGON: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 400 Tooltip: @@ -82,6 +83,7 @@ CHAMSPY: MUTANT: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 100 Tooltip: @@ -106,6 +108,7 @@ MUTANT: MWMN: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 100 Tooltip: @@ -130,6 +133,7 @@ MWMN: MUTANT3: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 100 Tooltip: @@ -210,6 +214,7 @@ DOGGIE: Inherits@1: ^Infantry Inherits@2: ^RegularInfantryDeath Inherits@3: ^HealsOnTiberium + Inherits@EXPERIENCE: ^GainsExperience Tooltip: Name: Tiberian Fiend Health: diff --git a/mods/ts/rules/civilian-vehicles.yaml b/mods/ts/rules/civilian-vehicles.yaml index 470a3f2e34..d2e66cec8b 100644 --- a/mods/ts/rules/civilian-vehicles.yaml +++ b/mods/ts/rules/civilian-vehicles.yaml @@ -1,5 +1,7 @@ 4TNK: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 1700 Tooltip: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index ee0ce1d94f..5f44e689fb 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -252,7 +252,6 @@ RenderSprites: ^Infantry: - Inherits@1: ^GainsExperience Inherits@2: ^ExistsInWorld Inherits@3: ^SpriteActor Inherits@4: ^Cloakable @@ -436,7 +435,6 @@ MaxMoveDelay: 750 ^Vehicle: - Inherits@1: ^GainsExperience Inherits@2: ^ExistsInWorld Inherits@3: ^EmpDisable Inherits@4: ^Cloakable @@ -525,22 +523,15 @@ BlueTiberium: 70 Veins: 70 -^VoxelVehicle: - Inherits: ^Vehicle - BodyOrientation: - QuantizedFacings: 0 - RenderVoxels: - WithVoxelBody: - -^VoxelTank: - Inherits: ^Tank +^VoxelActor: BodyOrientation: QuantizedFacings: 0 RenderVoxels: WithVoxelBody: ^CivilianVoxelVehicle: - Inherits: ^VoxelVehicle + Inherits: ^Vehicle + Inherits: ^VoxelActor -MustBeDestroyed: ^CivilianVoxelCrusher: @@ -549,7 +540,6 @@ Crushes: wall, crate, infantry ^Aircraft: - Inherits@1: ^GainsExperience Inherits@2: ^ExistsInWorld Inherits@3: ^Cloakable Huntable: @@ -599,12 +589,6 @@ Hovers@CRUISING: RequiresCondition: cruising -^Plane: - Inherits: ^Aircraft - Aircraft: - CruiseAltitude: 2560 - ReturnOnIdle: - ^AircraftHusk: RenderVoxels: RenderSprites: @@ -751,34 +735,6 @@ DetectCloaked: Range: 5c0 -^DeployedVehicle: - Inherits@1: ^GainsExperience - Inherits@2: ^ExistsInWorld - Inherits@3: ^SpriteActor - Huntable: - Voiced: - VoiceSet: Vehicle - AttackTurreted: - Voice: Attack - AutoTarget: - RenderRangeCircle: - DrawLineToTarget: - Building: - Dimensions: 1,1 - Footprint: x - TerrainTypes: Clear, Road, DirtRoad, Rough - WithSpriteBody: - WithMakeAnimation: - WithTextControlGroupDecoration: - SelectionDecorations: - Palette: pips - Selectable: - Targetable: - TargetTypes: Ground, Building, Repair - Guardable: - HiddenUnderFog: - ActorLostNotification: - ^Train: Inherits@1: ^EmpDisable Inherits@2: ^ExistsInWorld diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index 9d57b86ad7..0c3eb63c06 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -1,5 +1,6 @@ E2: Inherits: ^Soldier + Inherits@EXPERIENCE: ^GainsExperience Buildable: Queue: Infantry BuildPaletteOrder: 20 @@ -26,6 +27,7 @@ E2: MEDIC: Inherits: ^Soldier + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 600 Tooltip: @@ -61,6 +63,7 @@ MEDIC: JUMPJET: Inherits: ^Soldier + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 600 Tooltip: @@ -95,6 +98,7 @@ JUMPJET: GHOST: Inherits: ^Soldier + Inherits@EXPERIENCE: ^GainsExperience Inherits@2: ^HealsOnTiberium Valued: Cost: 1750 diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index db49ca0418..a13cde5c02 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -1,5 +1,6 @@ APC: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor Valued: Cost: 800 Tooltip: @@ -47,7 +48,9 @@ APC: MovingInterval: 6 HVR: - Inherits: ^VoxelVehicle + Inherits: ^Vehicle + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 900 Tooltip: @@ -101,6 +104,7 @@ HVR: SMECH: Inherits: ^Vehicle + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 500 Tooltip: @@ -143,6 +147,7 @@ SMECH: MMCH: Inherits: ^Tank + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 800 Tooltip: @@ -190,7 +195,9 @@ MMCH: LocalOffset: 0, 0, 408 HMEC: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 3000 Tooltip: @@ -231,7 +238,9 @@ HMEC: LocalOffset: 0, 0, 360 SONIC: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 1300 Tooltip: diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index c070811f68..482128e2d2 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -1,5 +1,6 @@ E3: Inherits: ^Soldier + Inherits@EXPERIENCE: ^GainsExperience Buildable: Queue: Infantry BuildPaletteOrder: 20 @@ -27,6 +28,7 @@ E3: CYBORG: Inherits: ^Cyborg + Inherits@EXPERIENCE: ^GainsExperience Armor: Type: Light Valued: @@ -60,6 +62,7 @@ CYBORG: CYC2: Inherits: ^Cyborg + Inherits@EXPERIENCE: ^GainsExperience Armor: Type: Heavy Valued: diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index d2ee181bcf..62606a522c 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -160,7 +160,32 @@ NASAM: VisualBounds: 40, 36, -3, -8 GAARTY: - Inherits@1: ^DeployedVehicle + Inherits@1: ^GainsExperience + Inherits@2: ^ExistsInWorld + Inherits@3: ^SpriteActor + Huntable: + Voiced: + VoiceSet: Vehicle + AttackTurreted: + Voice: Attack + AutoTarget: + RenderRangeCircle: + DrawLineToTarget: + Building: + Dimensions: 1,1 + Footprint: x + TerrainTypes: Clear, Road, DirtRoad, Rough + WithSpriteBody: + WithMakeAnimation: + WithTextControlGroupDecoration: + SelectionDecorations: + Palette: pips + Selectable: + Targetable: + TargetTypes: Ground, Building, Repair + Guardable: + HiddenUnderFog: + ActorLostNotification: Valued: Cost: 975 Tooltip: diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 00cfbe8f45..bdf5be7144 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -1,5 +1,7 @@ BGGY: - Inherits: ^VoxelVehicle + Inherits: ^Vehicle + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 500 Tooltip: @@ -33,7 +35,9 @@ BGGY: -WithIdleOverlay@VEINS: BIKE: - Inherits: ^VoxelVehicle + Inherits: ^Vehicle + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 600 Tooltip: @@ -66,7 +70,9 @@ BIKE: AutoTarget: TTNK: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 800 Tooltip: @@ -161,7 +167,9 @@ TTNK: RequiresCondition: undeployed ART2: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 975 Tooltip: @@ -191,7 +199,8 @@ ART2: Voice: Move REPAIR: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor Buildable: Queue: Vehicle BuildPaletteOrder: 70 @@ -219,7 +228,8 @@ REPAIR: Voice: Attack WEED: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor Valued: Cost: 1400 Tooltip: @@ -255,13 +265,13 @@ WEED: MaxHeightDelta: 3 -WithVoxelBody: WithVoxelUnloadBody: - -GainsExperience: -DamagedByTerrain@VEINS: -GrantConditionOnTerrain@VEINS: -WithIdleOverlay@VEINS: SAPC: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor Valued: Cost: 800 Tooltip: @@ -291,7 +301,9 @@ SAPC: EjectOnDeath: true SUBTANK: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 750 Tooltip: @@ -319,7 +331,9 @@ SUBTANK: AutoTarget: STNK: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor + Inherits@EXPERIENCE: ^GainsExperience Valued: Cost: 1100 Tooltip: diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index 6855a769f3..fbd310fadc 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -1,5 +1,6 @@ E1: Inherits: ^Soldier + Inherits@EXPERIENCE: ^GainsExperience Buildable: Queue: Infantry BuildPaletteOrder: 10 @@ -57,7 +58,6 @@ ENGINEER: CaptureTypes: building PlayerExperience: 50 -AutoTarget: - -GainsExperience: RenderSprites: Image: engineer.gdi FactionImages: diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index ee516ad5b6..1724dbae33 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -1,5 +1,6 @@ MCV: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor Buildable: Queue: Vehicle BuildPaletteOrder: 110 @@ -39,7 +40,8 @@ MCV: nod: mcv.nod HARV: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor Valued: Cost: 1400 Tooltip: @@ -84,7 +86,6 @@ HARV: RevealsShroud: Range: 4c0 MaxHeightDelta: 3 - -GainsExperience: -WithVoxelBody: WithVoxelUnloadBody: Explodes: @@ -104,9 +105,9 @@ HARV: -WithIdleOverlay@VEINS: LPST: - Inherits: ^VoxelTank + Inherits: ^Tank + Inherits@VOXELS: ^VoxelActor -AppearsOnRadar: - -GainsExperience: Buildable: Queue: Vehicle BuildPaletteOrder: 100