Upgrade rule for Health.Shape to HitShape.Type

mods/d2k/rules/arrakis.yaml

@@ -20,10 +20,11 @@ spicebloom.spawnpoint:
 		Actor: spicebloom
 	Health:
 		HP: 9999
-		Shape: Circle
-			Radius: 1
 	Immobile:
 		OccupiesSpace: false
+	HitShape:
+		Type: Circle
+			Radius: 1
 
 spicebloom:
 	HiddenUnderShroud:
@@ -48,8 +49,6 @@ spicebloom:
 	Immobile:
 	Health:
 		HP: 1
-		Shape: Circle
-			Radius: 512
 	Targetable:
 		TargetTypes: Ground
 		RequiresForceFire: true
@@ -57,6 +56,9 @@ spicebloom:
 		Type: none
 	SpawnActorOnDeath:
 		Actor: spicebloom.spawnpoint
+	HitShape:
+		Type: Circle
+			Radius: 512
 
 sandworm:
 	Inherits@1: ^SpriteActor
@@ -64,7 +66,9 @@ sandworm:
 		Name: Sandworm
 	Health:
 		HP: 9990
-		Radius: 256
+	HitShape:
+		Type: Circle
+			Radius: 256
 	Armor:
 		Type: heavy
 	Mobile:

mods/d2k/rules/defaults.yaml

@@ -173,6 +173,7 @@
 	RevealOnDeath:
 		Duration: 100
 		Radius: 2c512
+	HitShape:
 
 ^Tank:
 	Inherits: ^Vehicle
@@ -192,6 +193,7 @@
 	AutoTargetIgnore:
 	ScriptTriggers:
 	WithFacingSpriteBody:
+	HitShape:
 
 ^VehicleHusk:
 	Inherits: ^Husk
@@ -229,6 +231,7 @@
 	Tooltip:
 		Name: Destroyed Tower
 	ScriptTriggers:
+	HitShape:
 
 ^Infantry:
 	Inherits@1: ^ExistsInWorld
@@ -236,8 +239,6 @@
 	Inherits@3: ^SpriteActor
 	Huntable:
 	Health:
-		Shape: Circle
-			Radius: 96
 	Armor:
 		Type: none
 	RevealsShroud:
@@ -303,6 +304,9 @@
 	RevealOnFire:
 	RevealOnDeath:
 		Duration: 100
+	HitShape:
+		Type: Circle
+			Radius: 96
 
 ^Plane:
 	Inherits@1: ^ExistsInWorld
@@ -318,6 +322,7 @@
 	DrawLineToTarget:
 	WithFacingSpriteBody:
 	WithShadow:
+	HitShape:
 
 ^Building:
 	Inherits@1: ^ExistsInWorld

mods/d2k/rules/structures.yaml

@@ -633,9 +633,6 @@ wall:
 		TerrainTypes: Rock, Concrete
 	Health:
 		HP: 2000
-		Shape: Rectangle
-			TopLeft: -512, -512
-			BottomRight: 512, 512
 	Armor:
 		Type: wall
 	RevealsShroud:
@@ -663,6 +660,10 @@ wall:
 		Weapons: Debris2, Debris3
 		Pieces: 1, 1
 		Range: 1c512, 2c768
+	HitShape:
+		Type: Rectangle
+			TopLeft: -512, -512
+			BottomRight: 512, 512
 
 medium_gun_turret:
 	Inherits: ^Defense