From 6ad1a56f2364746aa5365be5bde7e080a6826da1 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Thu, 28 Apr 2016 11:50:37 +0100
Subject: [PATCH] Trophy tweaks.

---
 data/trophies/trophies.json | 15 +++++++++------
 src/battle/bullets.c        |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/data/trophies/trophies.json b/data/trophies/trophies.json
index e1a69d7..addf45d 100644
--- a/data/trophies/trophies.json
+++ b/data/trophies/trophies.json
@@ -1,6 +1,6 @@
 [
 	{
-		"id" : "PLATINUM",
+		"id" : "_PLATINUM",
 		"title" : "One of the seven",
 		"description" : "Earn all other trophies",
 		"value" : "TROPHY_PLATINUM"
@@ -122,7 +122,7 @@
 	},
 	{
 		"id" : "ATAF",
-		"title" : "Man, I gotta get me one of these!",
+		"title" : "Oh man, I gotta get me one of these!",
 		"description" : "Pilot an ATAF during the campaign",
 		"value" : "TROPHY_BRONZE"
 	},
@@ -142,13 +142,15 @@
 		"id" : "TEAM_PLAYER",
 		"title" : "Taking one for the team",
 		"description" : "Be killed by a missile that was meant for someone else",
-		"value" : "TROPHY_SILVER"
+		"value" : "TROPHY_BRONZE",
+		"hidden" : 1
 	},
 	{
 		"id" : "BODYGUARD",
 		"title" : "The bodyguard",
-		"description" : "Kill an enemy with a missile intended for another",
-		"value" : "TROPHY_BRONZE"
+		"description" : "Kill an enemy with a missile intended for their wing leader",
+		"value" : "TROPHY_BRONZE",
+		"hidden" : 1
 	},
 	{
 		"id" : "_CHALLENGE_25",
@@ -255,7 +257,8 @@
 		"description" : "Destroy 13 or more enemies in an epic battle, without being killed",
 		"value" : "TROPHY_SILVER",
 		"stat" : "STAT_EPIC_KILL_STREAK",
-		"statValue" : 13
+		"statValue" : 13,
+		"hidden" : 1
 	},
 	{
 		"id" : "ATAF_DESTROYED",
diff --git a/src/battle/bullets.c b/src/battle/bullets.c
index cc47f04..93302b7 100644
--- a/src/battle/bullets.c
+++ b/src/battle/bullets.c
@@ -218,7 +218,7 @@ static void checkCollisions(Bullet *b)
 						{
 							awardTrophy("TEAM_PLAYER");
 						}
-						else if (b->owner == player)
+						else if (b->owner == player && (e->aiFlags & AIF_MOVES_TO_LEADER) && (b->target->flags & EF_AI_LEADER))
 						{
 							awardTrophy("BODYGUARD");
 						}