share/hedgewars/Data/Missions/Training/Basic_Training_-_Flying_Saucer.lua
changeset 13643 690cc84e9fd6
parent 13630 fe7d2bbf5f3f
child 13664 85506d95977d
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Flying_Saucer.lua	Wed Aug 08 14:38:54 2018 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Flying_Saucer.lua	Wed Aug 08 15:22:34 2018 +0200
@@ -184,7 +184,7 @@
 	InfFuel = true, }
 TargetPos[12] = { Modifier = true, Func = function()
 	Objective = true
-	AddCaption(loc("Training complete!"), 0xFFFFFFFF, capgrpGameState)
+	AddCaption(loc("Training complete!"), capcolDefault, capgrpGameState)
 	Info(loc("Training complete!"), loc("Good bye!"), 4, 5000)
 
 	if SaucerGear ~= nil then
@@ -292,7 +292,7 @@
 	SpawnTargets()
 
 	if TargetNumber > 1 then
-		AddCaption(loc("Next target is ready!"), 0xFFFFFFFF, capgrpMessage2)
+		AddCaption(loc("Next target is ready!"), capcolDefault, capgrpMessage2)
 	end
 end
 
@@ -460,7 +460,7 @@
 		if TargetsRemaining <= 0 then
 			if TargetNumber == BoomTarget or not HasHedgehogLandedYet() then
 				if SaucerGear then
-					AddCaption(loc("Objective completed! Now land safely."), 0xFFFFFFFF, capgrpMessage2)
+					AddCaption(loc("Objective completed! Now land safely."), capcolDefault, capgrpMessage2)
 				end
 				Check = true
 				CheckTimer = 500
@@ -490,7 +490,7 @@
 	end
 	if Gear == Barrels[2] then
 		Barrels[2] = nil
-		AddCaption(loc("Kaboom!"), 0xFFFFFFFF, capgrpMessage)
+		AddCaption(loc("Kaboom!"), capcolDefault, capgrpMessage)
 	end
 end
 
@@ -516,7 +516,7 @@
 			end
 		end
 	end
-	if GrenadeExploded and TargetNumber == BoomTarget then
+	if GrenadeExploded and TargetNumber == BoomTarget and GetHealth(Player) then
 		GrenadeTimer = GrenadeTimer + 20
 		if GrenadeTimer > 1500 then
 			GrenadeTimer = 0
@@ -524,7 +524,7 @@
 			GrenadeExploded = false
 			if SaucerGear and TargetNumber == BoomTarget and TargetsRemaining > 0 then
 				PlaySound(sndShotgunReload)
-				AddCaption(loc("+1 Grenade"), 0xDDDD00FF, capgrpAmmoinfo)
+				AddCaption(loc("+1 Grenade"), GetClanColor(GetHogClan(Player)), capgrpAmmoinfo)
 				AddAmmo(Player, amGrenade, 1)
 			end
 		end
@@ -551,7 +551,7 @@
 
 function onGearResurrect(Gear, VGear)
 	if Gear == Player then
-		AddCaption(loc("Oh no! You have died. Try again!"), 0xFFFFFFFF, capgrpMessage2)
+		AddCaption(loc("Oh no! You have died. Try again!"), capcolDefault, capgrpMessage2)
 		ResetCurrentTarget()
 		if VGear then
 			SetVisualGearValues(VGear, GetX(Gear), GetY(Gear))
@@ -560,6 +560,6 @@
 end
 
 function onSkipTurn()
-	AddCaption(loc("Try again!"), 0xFFFFFFFF, capgrpMessage2)
+	AddCaption(loc("Try again!"), capcolDefault, capgrpMessage2)
 	ResetCurrentTarget()
 end