# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1533069623 -7200
# Node ID 9c8749bb0d064f4afe7c0e77dd9d345712d3709d
# Parent  dc4ce9f486b0243a76f20feb7659bc1904b07b26
Clean up Tumbler captions a bit

diff -r dc4ce9f486b0 -r 9c8749bb0d06 ChangeLog.txt
--- a/ChangeLog.txt	Tue Jul 31 22:26:53 2018 +0200
+++ b/ChangeLog.txt	Tue Jul 31 22:40:23 2018 +0200
@@ -53,6 +53,7 @@
  + Keep round score displayed after round ends, remove round score announcer message
  * Fix rare Lua error message spam at end of game
  * Fix round score and other info numbers messing up after screen resize
+ * Fix kamikaze bonus not being shown
 
 A Classic Fairytale:
  * Fix clan membership of princess in some missions
diff -r dc4ce9f486b0 -r 9c8749bb0d06 share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua	Tue Jul 31 22:26:53 2018 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Tumbler.lua	Tue Jul 31 22:40:23 2018 +0200
@@ -72,8 +72,6 @@
 local barrelSpawn
 
 local roundKills = 0
-local barrelsEaten = 0
-local minesEaten = 0
 
 local moveTimer = 0
 local fireTimer = 0
@@ -354,11 +352,6 @@
 			AddCaption(loc("+1 barrel!"), wepCol[0], capgrpAmmoinfo )
 			DrawTag(1)
 
-			barrelsEaten = barrelsEaten + 1
-			if barrelsEaten == 5 then
-				AddCaption(string.format(loc("Achievement gotten: %s"), loc("Barrel Eater")),0xffba00ff,capgrpMessage2)
-			end
-
 		elseif (GetGearType(gear) == gtMine) then
 			wepAmmo[1] = wepAmmo[1] + 1
 			PlaySound(sndShotgunReload)
@@ -366,11 +359,6 @@
 			AddCaption(loc("+1 mine!"), wepCol[1], capgrpAmmoinfo )
 			DrawTag(2)
 
-			minesEaten = minesEaten + 1
-			if minesEaten == 5 then
-				AddCaption(string.format(loc("Achievement gotten: %s"), loc("Mine Eater")),0xffba00ff,capgrpMessage2)
-			end
-
 		end
 
 	end
@@ -415,7 +403,7 @@
 			shotsMsg = loc("Ammo: %d")
 		end
 	end
-	AddCaption(string.format(shotsMsg, wepAmmo[wepIndex]), wepCol[wepIndex],capgrpMessage2)
+	AddCaption(string.format(shotsMsg, wepAmmo[wepIndex]), wepCol[wepIndex],capgrpAmmostate)
 end
 
 function ChangeWeapon(newIndex)
@@ -430,11 +418,11 @@
 
 	local selText
 	if wepIndex == 0 then
-		selText = loc("Barrel Launcher selected!")
+		selText = loc("Barrel Launcher")
 	elseif wepIndex == 1 then
-		selText = loc("Mine Deployer selected!")
+		selText = loc("Mine Deployer")
 	else
-		selText = loc("Flamer selected!")
+		selText = loc("Flamer")
 	end
 	AddCaption(selText, wepCol[wepIndex],capgrpAmmoinfo )
 
@@ -724,8 +712,6 @@
 	ChangeWeapon()
 
 	roundKills = 0
-	barrelsEaten = 0
-	minesEaten = 0
 
 	FollowGear(CurrentHedgehog)
 
@@ -930,18 +916,18 @@
 
 			roundKills = roundKills + 1
 			if roundKills == 2 then
-				AddCaption(loc("Double Kill!"),0xffba00ff,capgrpMessage2)
+				AddCaption(loc("Double Kill!"),0xffffffff,capgrpMessage2)
 			elseif roundKills == 3 then
-				AddCaption(loc("Killing spree!"),0xffba00ff,capgrpMessage2)
+				AddCaption(loc("Killing spree!"),0xffffffff,capgrpMessage2)
 			elseif roundKills >= 4 then
-				AddCaption(loc("Unstoppable!"),0xffba00ff,capgrpMessage2)
+				AddCaption(loc("Unstoppable!"),0xffffffff,capgrpMessage2)
 			end
 
 		elseif gear == CurrentHedgehog then
 			DisableTumbler()
 
 		elseif gear ~= CurrentHedgehog then
-			AddCaption(loc("Friendly Fire!"),0xffba00ff,capgrpMessage2)
+			AddCaption(loc("Friendly Fire!"),0xffffffff,capgrpMessage2)
 		end
 
 	end