Start reorganising TS Inherits.

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