From c7c6cf864c2bac426d9121921192ef6d97465abd Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Mon, 29 May 2017 16:07:14 +0200
Subject: [PATCH] Fix inconsistent rules in preparation of HitShape refactor

- TD C17 and A10 are not targetable and therefore technically invulnerable, so we should remove Health and Armor
- D2k ^carryall.colorpicker and TS ^mmch.colorpicker shouldn't have Health
- TS crash sites are supposed to be indestructible map deco as per original (they had "Immune=yes")
---
 mods/cnc/rules/aircraft.yaml           | 8 --------
 mods/d2k/rules/misc.yaml               | 1 +
 mods/ts/rules/civilian-structures.yaml | 4 ----
 mods/ts/rules/misc.yaml                | 1 +
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml
index 9a35d34f07..dcd42f780b 100644
--- a/mods/cnc/rules/aircraft.yaml
+++ b/mods/cnc/rules/aircraft.yaml
@@ -170,10 +170,6 @@ C17:
 		Speed: 326
 		Repulsable: False
 		MaximumPitch: 36
-	Health:
-		HP: 25
-	Armor:
-		Type: Heavy
 	HiddenUnderFog:
 		AlwaysVisibleStances: None
 		Type: CenterPosition
@@ -207,10 +203,6 @@ A10:
 		TurnSpeed: 4
 		Speed: 373
 		Repulsable: False
-	Health:
-		HP: 150
-	Armor:
-		Type: Heavy
 	AttackBomber:
 		Armaments: gun, bombs
 		Guns: gun
diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml
index 2cd488db23..092c9b2223 100644
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -161,6 +161,7 @@ waypoint:
 
 ^carryall.colorpicker:
 	Inherits: carryall
+	-Health:
 	Aircraft:
 		InitialFacing: 104
 	RenderSprites:
diff --git a/mods/ts/rules/civilian-structures.yaml b/mods/ts/rules/civilian-structures.yaml
index 0173ad1116..84d5a7d80d 100644
--- a/mods/ts/rules/civilian-structures.yaml
+++ b/mods/ts/rules/civilian-structures.yaml
@@ -681,10 +681,6 @@ CACRSH01:
 	Inherits: ^Decoration
 	Tooltip:
 		Name: Crash Site
-	Armor:
-		Type: concrete
-	Health:
-		HP: 400
 
 CACRSH02:
 	Inherits: CACRSH01
diff --git a/mods/ts/rules/misc.yaml b/mods/ts/rules/misc.yaml
index 3d72f4e558..78de36e5e6 100644
--- a/mods/ts/rules/misc.yaml
+++ b/mods/ts/rules/misc.yaml
@@ -22,6 +22,7 @@ waypoint:
 
 ^mmch.colorpicker:
 	Inherits: MMCH
+	-Health:
 	Mobile:
 		InitialFacing: 160
 	Turreted: