Upgrade rule for Health.Shape to HitShape.Type

mods/ts/rules/aircraft.yaml

@@ -365,3 +365,4 @@ HUNTER:
 	SelectionDecorations:
 		Palette: pips
 	ActorLostNotification:
+	HitShape:

mods/ts/rules/bridges.yaml

@@ -40,6 +40,7 @@ CABHUT:
 		HP: 500
 	Armor:
 		Type: Concrete
+	HitShape:
 
 LOBRDG_A:
 	Inherits: ^LowBridge

mods/ts/rules/critters.yaml

@@ -6,8 +6,6 @@ DOGGIE:
 		Name: Tiberian Fiend
 	Health:
 		HP: 250
-		Shape: Circle
-			Radius: 213
 	Selectable:
 		Bounds: 24,24
 	Valued:
@@ -35,6 +33,9 @@ DOGGIE:
 		DeathSequence: die-
 		DeathTypes:
 			FireDeath: burning
+	HitShape:
+		Type: Circle
+			Radius: 213
 
 VISC_SML:
 	Inherits: ^Visceroid
@@ -85,9 +86,6 @@ JFISH:
 		Name: Tiberium Floater
 	Health:
 		HP: 500
-		Shape: Circle
-			Radius: 363
-			VerticalTopOffset: 768
 	RevealsShroud:
 		Range: 5c0
 	Mobile:
@@ -119,3 +117,7 @@ JFISH:
 		SoundFiles: floatmov.aud, flotmov2.aud, flotmov3.aud, flotmov4.aud
 		Delay: 150, 450
 		Interval: 300, 800
+	HitShape:
+		Type: Circle
+			Radius: 363
+			VerticalTopOffset: 768

mods/ts/rules/defaults.yaml

@@ -283,7 +283,8 @@
 	ScriptTriggers:
 	ConditionManager:
 	Health:
-		Shape: Rectangle
+	HitShape:
+		Type: Rectangle
 			LocalYaw: 128
 			TopLeft: -512, -512
 			BottomRight: 512, 512
@@ -306,8 +307,6 @@
 	DrawLineToTarget:
 	Health:
 		HP: 50
-		Shape: Circle
-			Radius: 128
 	Armor:
 		Type: None
 	Valued:
@@ -382,6 +381,9 @@
 	RevealOnFire:
 	EntersTunnels:
 		Voice: Move
+	HitShape:
+		Type: Circle
+			Radius: 128
 
 ^RegularInfantryDeath:
 	WithDeathAnimation@normal:
@@ -568,6 +570,7 @@
 	RevealOnFire:
 	EntersTunnels:
 		Voice: Move
+	HitShape:
 
 ^Tank:
 	Inherits: ^Vehicle
@@ -641,6 +644,7 @@
 	RenderVoxels:
 	WithVoxelBody:
 	RevealOnFire:
+	HitShape:
 
 ^Helicopter:
 	Inherits: ^Aircraft
@@ -673,6 +677,7 @@
 		Spins: true
 		Moves: true
 		Velocity: 86
+	HitShape:
 
 ^Visceroid:
 	Inherits@1: ^ExistsInWorld
@@ -681,9 +686,6 @@
 	Huntable:
 	DrawLineToTarget:
 	Health:
-		Shape: Circle
-			Radius: 256
-			VerticalTopOffset: 512
 	Armor:
 		Type: Light
 	Mobile:
@@ -715,6 +717,10 @@
 	RevealOnFire:
 	EntersTunnels:
 		Voice: Move
+	HitShape:
+		Type: Circle
+			Radius: 256
+			VerticalTopOffset: 512
 
 ^BlossomTree:
 	Inherits@1: ^SpriteActor
@@ -854,6 +860,7 @@
 		Weapons: SmallDebris
 		Pieces: 3, 7
 		Range: 2c0, 5c0
+	HitShape:
 
 ^TerrainOverlay:
 	AlwaysVisible:
@@ -898,11 +905,6 @@
 		Cost: 250
 	Health:
 		HP: 350
-		Shape: Rectangle
-			LocalYaw: 128
-			TopLeft: -512, -512
-			BottomRight: 512, 512
-			VerticalTopOffset: 768
 	Armor:
 		Type: Heavy
 	LineBuildNode:
@@ -924,13 +926,16 @@
 		BlocksProjectilesHeight: 768
 	Buildable:
 		Description: Automated barrier that opens for allied units.
+	HitShape:
+		Type: Rectangle
+			LocalYaw: 128
+			TopLeft: -512, -512
+			BottomRight: 512, 512
+			VerticalTopOffset: 768
 
 ^Gate_A:
 	Inherits: ^Gate
 	Health:
-		Shape: Rectangle
-			TopLeft: -512, -1536
-			BottomRight: 512, 1536
 	Gate:
 		Dimensions: 3,1
 		Footprint: xxx
@@ -938,13 +943,14 @@
 		WallConnections: -1,0, 3,0
 	LineBuildNode:
 		Connections: -1,0, 1,0
+	HitShape:
+		Type: Rectangle
+			TopLeft: -512, -1536
+			BottomRight: 512, 1536
 
 ^Gate_B:
 	Inherits: ^Gate
 	Health:
-		Shape: Rectangle
-			TopLeft: -1536, -512
-			BottomRight: 1536, 512
 	Gate:
 		Dimensions: 1,3
 		Footprint: x x x
@@ -952,6 +958,10 @@
 		WallConnections: 0,-1, 0,3
 	LineBuildNode:
 		Connections: 0,-1, 0,1
+	HitShape:
+		Type: Rectangle
+			TopLeft: -1536, -512
+			BottomRight: 1536, 512
 
 ^HealsOnTiberium:
 	DamagedByTerrain:

mods/ts/rules/gdi-infantry.yaml

@@ -168,6 +168,7 @@ JUMPJET.Husk:
 	WithSpriteBody:
 		Sequence: die-falling
 	Health:
+	HitShape:
 	ConditionManager:
 	GrantConditionOnTerrain:
 		TerrainTypes: Water

mods/ts/rules/shared-infantry.yaml

@@ -97,3 +97,4 @@ FLAMEGUY:
 	WithDeathAnimation:
 		FallbackSequence: die
 		UseDeathTypeSuffix: false
+	HitShape: