From e47cc68ee241567e473b874199e066bc620bf361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sun, 27 Jan 2013 17:03:28 +0100
Subject: [PATCH] fix RALint cnc-classic errors

---
 mods/cnc-classic/explosions.yaml       |  4 +---
 mods/cnc-classic/mod.yaml              |  4 ++--
 mods/cnc-classic/rules/aircraft.yaml   |  6 ------
 mods/cnc-classic/rules/infantry.yaml   |  1 -
 mods/cnc-classic/rules/structures.yaml | 23 +++++++++++++++++++++--
 mods/cnc-classic/rules/system.yaml     |  3 ---
 mods/cnc-classic/weapons.yaml          |  4 ++--
 7 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/mods/cnc-classic/explosions.yaml b/mods/cnc-classic/explosions.yaml
index 7355fb5c06..61ad239875 100644
--- a/mods/cnc-classic/explosions.yaml
+++ b/mods/cnc-classic/explosions.yaml
@@ -1,6 +1,5 @@
-
 UnitExplodeSmall:
-  Warhead:
+	Warhead:
 #		Damage: 40
 #		Spread: 10
 #		Versus: 
@@ -12,7 +11,6 @@ UnitExplodeSmall:
 		InfDeath: 4
 		ImpactSound: xplobig4
 
-
 UnitExplode:
 	Warhead:
 		Damage: 500
diff --git a/mods/cnc-classic/mod.yaml b/mods/cnc-classic/mod.yaml
index b838d7f75f..fdddba22ce 100644
--- a/mods/cnc-classic/mod.yaml
+++ b/mods/cnc-classic/mod.yaml
@@ -78,8 +78,8 @@ ChromeLayout:
 	mods/ra/chrome/objectives.yaml
 
 Weapons:
-	mods/cnc/weapons.yaml
-	mods/cnc/explosions.yaml
+	mods/cnc-classic/weapons.yaml
+	mods/cnc-classic/explosions.yaml
 
 Movies:
 	mods/cnc/movies-gdi.yaml
diff --git a/mods/cnc-classic/rules/aircraft.yaml b/mods/cnc-classic/rules/aircraft.yaml
index 06254fc00d..d58059b059 100644
--- a/mods/cnc-classic/rules/aircraft.yaml
+++ b/mods/cnc-classic/rules/aircraft.yaml
@@ -66,9 +66,6 @@ HELI:
 		PrimaryWeapon: HeliAGGun
 		PrimaryOffset: 0,-3,0,2
 		PrimaryLocalOffset: -5,0,0,0,0, 5,0,0,0,0
-		SecondaryWeapon: HeliAAGun
-		SecondaryOffset: 0,-3,0,2
-		SecondaryLocalOffset: -5,0,0,0,0, 5,0,0,0,0
 		FacingTolerance: 20
 	LimitedAmmo:
 		Ammo: 10
@@ -112,9 +109,6 @@ ORCA:
 		PrimaryWeapon: OrcaAGMissiles
 		PrimaryOffset: 0,-10,0,5
 		PrimaryLocalOffset: -4,0,0,0,0, 4,0,0,0,0
-		SecondaryWeapon: OrcaAAMissiles
-		SecondaryOffset: 0,-10,0,5
-		SecondaryLocalOffset: -4,0,0,0,0, 4,0,0,0,0
 		FacingTolerance: 20
 	LimitedAmmo:
 		Ammo: 10
diff --git a/mods/cnc-classic/rules/infantry.yaml b/mods/cnc-classic/rules/infantry.yaml
index ec87c49417..7d0006d510 100644
--- a/mods/cnc-classic/rules/infantry.yaml
+++ b/mods/cnc-classic/rules/infantry.yaml
@@ -173,7 +173,6 @@ E6:
 		JustMove: true
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-	-GainsExperience:
 
 RMBO:
 	Inherits: ^Infantry
diff --git a/mods/cnc-classic/rules/structures.yaml b/mods/cnc-classic/rules/structures.yaml
index 9ade80a36e..25d3e4d805 100644
--- a/mods/cnc-classic/rules/structures.yaml
+++ b/mods/cnc-classic/rules/structures.yaml
@@ -801,7 +801,26 @@ ATWR:
 		ROT:255
 	AutoTarget:
 	-AutoTargetIgnore:
-#	RenderDetectionCircle:
 	DetectCloaked:
 		Range: 4
-	RenderRangeCircle:
+
+# custom prerequisites:
+BARRACKS:
+	Tooltip:
+		Name: Infantry Production
+		Description: Infantry Production
+
+VEHICLEPRODUCTION:
+	Tooltip:
+		Name: Vehicle Production
+		Description: Vehicle Production
+
+ANYPOWER:
+	Tooltip:
+		Name: Power Plant
+		Description: Power Plant
+
+HPAD:
+	Tooltip:
+		Name: Helipad
+		Description: Helipad
diff --git a/mods/cnc-classic/rules/system.yaml b/mods/cnc-classic/rules/system.yaml
index 4cd0eb0399..f4530a37b9 100644
--- a/mods/cnc-classic/rules/system.yaml
+++ b/mods/cnc-classic/rules/system.yaml
@@ -207,9 +207,6 @@ CRATE:
 		Effect: reveal-map
 	LevelUpCrateAction:
 		SelectionShares: 20
-	ExplodeCrateAction@fire:
-		Weapon: Napalm.Crate
-		SelectionShares: 5
 	CloakCrateAction:
 		SelectionShares: 5
 		InitialDelay: 15
diff --git a/mods/cnc-classic/weapons.yaml b/mods/cnc-classic/weapons.yaml
index c7ae0cf382..a26f25f030 100644
--- a/mods/cnc-classic/weapons.yaml
+++ b/mods/cnc-classic/weapons.yaml
@@ -2,14 +2,14 @@
 # is in order from simple to advanced: infantry, vehicles, tanks, air, sea, buildings, superweapons, misc.
 
 Pistol:
-  ROF: 7
+	ROF: 7
 	Range: 1.75
 	Report: GUN18
 	Projectile: Bullet
 		Speed: 100
 	Warhead:
 		Spread: 3
-		Versus: 
+		Versus:
 			None: 100%
 			Wood: 50%
 			Light: 50%