From eefaf238854f52b6b25e8ad8cce2146a4fd8e9c8 Mon Sep 17 00:00:00 2001
From: Arular101 <commcc@outlook.com>
Date: Wed, 27 Dec 2017 21:31:21 +0100
Subject: [PATCH] Fix global-bounty warnings

---
 mods/ra/maps/desert-shellmap/rules.yaml | 15 +++------------
 mods/ra/maps/soviet-03/rules.yaml       | 10 ++++------
 mods/ra/maps/soviet-07/rules.yaml       |  6 ++++--
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/mods/ra/maps/desert-shellmap/rules.yaml b/mods/ra/maps/desert-shellmap/rules.yaml
index f0b3483c7f..bd92c23b40 100644
--- a/mods/ra/maps/desert-shellmap/rules.yaml
+++ b/mods/ra/maps/desert-shellmap/rules.yaml
@@ -1,5 +1,8 @@
 Player:
 	-ConquestVictoryConditions:
+	LobbyPrerequisiteCheckbox@GLOBALBOUNTY:
+		Enabled: False
+		Locked: True
 
 World:
 	-CrateSpawner:
@@ -21,8 +24,6 @@ World:
 			Allies: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175
 
 ^Vehicle:
-	GivesBounty:
-		Percentage: 0
 	GainsExperience:
 		Conditions:
 	DamageMultiplier@UNKILLABLE:
@@ -32,8 +33,6 @@ World:
 		Condition: unkillable
 
 ^Tank:
-	GivesBounty:
-		Percentage: 0
 	GainsExperience:
 		Conditions:
 	DamageMultiplier@UNKILLABLE:
@@ -43,8 +42,6 @@ World:
 		Condition: unkillable
 
 ^Infantry:
-	GivesBounty:
-		Percentage: 0
 	GainsExperience:
 		Conditions:
 	DeathSounds@NORMAL:
@@ -60,8 +57,6 @@ World:
 		Condition: unkillable
 
 ^Ship:
-	GivesBounty:
-		Percentage: 0
 	GainsExperience:
 		Conditions:
 	DamageMultiplier@UNKILLABLE:
@@ -71,8 +66,6 @@ World:
 		Condition: unkillable
 
 ^Plane:
-	GivesBounty:
-		Percentage: 0
 	DamageMultiplier@UNKILLABLE:
 		RequiresCondition: unkillable
 		Modifier: 0
@@ -80,8 +73,6 @@ World:
 		Condition: unkillable
 
 ^Building:
-	GivesBounty:
-		Percentage: 0
 	DamageMultiplier@UNKILLABLE:
 		RequiresCondition: unkillable
 		Modifier: 0
diff --git a/mods/ra/maps/soviet-03/rules.yaml b/mods/ra/maps/soviet-03/rules.yaml
index ffd77ec55d..a84338e87c 100644
--- a/mods/ra/maps/soviet-03/rules.yaml
+++ b/mods/ra/maps/soviet-03/rules.yaml
@@ -16,14 +16,12 @@ World:
 			hard: Hard
 		Default: easy
 
-^Infantry:
-	-GivesBounty:
-
-^Ship:
-	-GivesBounty:
+Player:
+	LobbyPrerequisiteCheckbox@GLOBALBOUNTY:
+		Enabled: False
+		Locked: True
 
 ^Helicopter:
-	-GivesBounty:
 	Health:
 		HP: 900000
 
diff --git a/mods/ra/maps/soviet-07/rules.yaml b/mods/ra/maps/soviet-07/rules.yaml
index 43cdb8d520..3978f8459f 100644
--- a/mods/ra/maps/soviet-07/rules.yaml
+++ b/mods/ra/maps/soviet-07/rules.yaml
@@ -16,8 +16,10 @@ World:
 			hard: Hard
 		Default: easy
 
-^Infantry:
-	-GivesBounty:
+Player:
+	LobbyPrerequisiteCheckbox@GLOBALBOUNTY:
+		Enabled: False
+		Locked: True
 
 CAMERA:
 	RevealsShroud: