--- a/hedgewars/uGearsHandlersMess.pas	Sat Oct 27 15:21:10 2018 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Sat Oct 27 15:55:19 2018 +0200
@@ -216,7 +216,10 @@
             if (d > 1) and (gi^.Hedgehog^.Effects[heInvulnerable] = 0) and (GetRandom(2) = 0) then
                 begin
                 if (CurrentHedgehog^.Gear = gi) then
-                    PlaySoundV(sndOops, gi^.Hedgehog^.Team^.voicepack)
+                    if random(4) = 0 then
+                        PlaySoundV(sndWhatThe, gi^.Hedgehog^.Team^.voicepack)
+                    else
+                        PlaySoundV(sndOops, gi^.Hedgehog^.Team^.voicepack)
 
                 else
                     begin
@@ -234,7 +237,10 @@
                         PlaySoundV(sndGrenade, gi^.Hedgehog^.Team^.voicepack)
                     else
                         if d > r div 2 then
-                            PlaySoundV(sndNooo, gi^.Hedgehog^.Team^.voicepack)
+                            if random(3) = 0 then
+                                PlaySoundV(sndWhatThe, gi^.Hedgehog^.Team^.voicepack)
+                            else
+                                PlaySoundV(sndNooo, gi^.Hedgehog^.Team^.voicepack)
                         else
                             PlaySoundV(sndUhOh, gi^.Hedgehog^.Team^.voicepack);
 

--- a/hedgewars/uGearsHedgehog.pas	Sat Oct 27 15:21:10 2018 +0200
+++ b/hedgewars/uGearsHedgehog.pas	Sat Oct 27 15:55:19 2018 +0200
@@ -700,7 +700,11 @@
     Gear^.Z:= cCurrHHZ;
     RemoveGearFromList(Gear);
     InsertGearToList(Gear);
-    PlaySoundV(sndByeBye, Gear^.Hedgehog^.Team^.voicepack);
+    case random(3) of
+    0: PlaySoundV(sndByeBye, Gear^.Hedgehog^.Team^.voicepack);
+    1: PlaySoundV(sndSoLong, Gear^.Hedgehog^.Team^.voicepack);
+    2: PlaySoundV(sndOhDear, Gear^.Hedgehog^.Team^.voicepack);
+    end;
     Gear^.Pos:= 0;
     Gear^.Timer:= timertime
     end

--- a/hedgewars/uGearsUtils.pas	Sat Oct 27 15:21:10 2018 +0200
+++ b/hedgewars/uGearsUtils.pas	Sat Oct 27 15:55:19 2018 +0200
@@ -1622,7 +1622,11 @@
     FindPlace(FollowGear, true, 0, LAND_WIDTH);
 
     if (FollowGear <> nil) then
-        AddVoice(sndReinforce, CurrentTeam^.voicepack)
+        if random(3) = 0 then
+            // TODO: Play this when a crate drops close to a hog, not randomly
+            AddVoice(sndThisOneIsMine, CurrentTeam^.voicepack)
+        else
+            AddVoice(sndReinforce, CurrentTeam^.voicepack);
     end
 end;
 

--- a/hedgewars/uSound.pas	Sat Oct 27 15:21:10 2018 +0200
+++ b/hedgewars/uSound.pas	Sat Oct 27 15:55:19 2018 +0200
@@ -306,7 +306,14 @@
             // TODO: New Extra Damage sound
             (FileName:             'hell_ugh.ogg'; Path: ptSounds; AltPath: ptNone),// sndExtraDamage
             (FileName:        'firepunch_hit.ogg'; Path: ptSounds; AltPath: ptNone),// sndFirePunchHit
-            (FileName:              'Grenade.ogg'; Path: ptVoices; AltPath: ptNone) // sndGrenade
+            (FileName:              'Grenade.ogg'; Path: ptVoices; AltPath: ptNone),// sndGrenade
+            (FileName:        'Thisoneismine.ogg'; Path: ptVoices; AltPath: ptNone),// sndThisOneIsMine
+            (FileName:              'Whatthe.ogg'; Path: ptVoices; AltPath: ptNone),// sndWhatThe
+            (FileName:               'Solong.ogg'; Path: ptVoices; AltPath: ptNone),// sndSoLong
+            (FileName:               'Ohdear.ogg'; Path: ptVoices; AltPath: ptNone),// sndOhDear
+            (FileName:          'Gonnagetyou.ogg'; Path: ptVoices; AltPath: ptNone),// sndGonnaGetYou
+            (FileName:                 'Drat.ogg'; Path: ptVoices; AltPath: ptNone),// sndDrat
+            (FileName:               'Bugger.ogg'; Path: ptVoices; AltPath: ptNone) // sndBugger
             );
 
 
@@ -512,11 +519,23 @@
                     snd := sndOw1
                 else if (snd in [sndOoff2, sndOoff3]) then
                     snd := sndOoff1
+                // Other fallback sounds
                 else if (snd = sndGrenade) then
                     if random(2) = 0 then
                         snd := sndNooo
                     else
-                        snd := sndUhOh;
+                        snd := sndUhOh
+                else if (snd in [sndDrat, sndBugger]) then
+                    snd := sndStupid
+                else if (snd = sndGonnaGetYou) then
+                    snd := sndRegret
+                else if (snd in [sndOhDear, sndSoLong]) then
+                    snd := sndByeBye
+                else if (snd = sndWhatThe) then
+                    snd := sndNooo
+                else if (snd = sndThisOneIsMine) then
+                    snd := sndReinforce;
+
                 s:= cPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
                 end;
             WriteToConsole(msgLoading + s + ' ');

--- a/hedgewars/uStats.pas	Sat Oct 27 15:21:10 2018 +0200
+++ b/hedgewars/uStats.pas	Sat Oct 27 15:55:19 2018 +0200
@@ -217,12 +217,21 @@
 
     // Hog hurts, poisons or kills itself (except sacrifice)
     else if (CurrentHedgehog^.stats.Sacrificed = false) and ((CurrentHedgehog^.stats.StepDamageRecv > 0) or (CurrentHedgehog^.stats.StepPoisoned) or (CurrentHedgehog^.stats.StepDied)) then
-        begin
-        AddVoice(sndStupid, PreviousTeam^.voicepack);
-        // Message for hurting itself only (not drowning)
+        // Hurting itself only (not drowning)
         if (CurrentHedgehog^.stats.StepDamageGiven = CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) then
+            begin
+            // Announcer message + random taunt
             AddCaption(FormatA(GetEventString(eidHurtSelf), s), capcolDefault, capgrpMessage);
-        end
+            if (CurrentHedgehog^.stats.StepDamageGiven <= CurrentHedgehog^.stats.StepDamageRecv) and (CurrentHedgehog^.stats.StepDamageRecv >= 1) then
+                case random(3) of
+                0: AddVoice(sndStupid, PreviousTeam^.voicepack);
+                1: AddVoice(sndBugger, CurrentTeam^.voicepack);
+                2: AddVoice(sndDrat, CurrentTeam^.voicepack);
+                end;
+            end
+        // Hurt itself and others
+        else
+            AddVoice(sndStupid, PreviousTeam^.voicepack)
 
     // Hog hurts, poisons or kills own team/clan member. Sacrifice is taken into account
     else if (DamageClan <> 0) or (KillsClan > killsCheck) or (PoisonClan <> 0) then
@@ -242,7 +251,10 @@
         if Kills > killsCheck then
             AddVoice(sndEnemyDown, CurrentTeam^.voicepack)
         else
-            AddVoice(sndRegret, vpHurtEnemy)
+            if random(2) = 0 then
+                AddVoice(sndRegret, vpHurtEnemy)
+            else
+                AddVoice(sndGonnaGetYou, vpHurtEnemy)
 
     // Missed shot
     // A miss is defined as a shot with a damaging weapon with 0 kills, 0 damage, 0 hogs poisoned and 0 targets hit

--- a/hedgewars/uTypes.pas	Sat Oct 27 15:21:10 2018 +0200
+++ b/hedgewars/uTypes.pas	Sat Oct 27 15:55:19 2018 +0200
@@ -152,7 +152,8 @@
             sndPortalOpen, sndBlowTorch, sndCountdown1, sndCountdown2, sndCountdown3, sndCountdown4,
             sndCreeperDrop, sndCreeperWater, sndCreeperDie, sndCustom1, sndCustom2, sndCustom3, sndCustom4,
             sndCustom5, sndCustom6, sndCustom7, sndCustom8, sndMinigun, sndFlamethrower, sndIceBeamIdle,
-            sndLandGun, sndCaseImpact, sndExtraDamage, sndFirePunchHit, sndGrenade);
+            sndLandGun, sndCaseImpact, sndExtraDamage, sndFirePunchHit, sndGrenade, sndThisOneIsMine,
+            sndWhatThe, sndSoLong, sndOhDear, sndGonnaGetYou, sndDrat, sndBugger);
 
     // Available ammo types to be used by hedgehogs
     TAmmoType  = (amNothing, amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amPickHammer, // 6

--- a/share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,15 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
+Thisoneismine.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )

--- a/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,15 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
+Thisoneismine.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )

--- a/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,15 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
+Thisoneismine.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )

--- a/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,15 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
+Thisoneismine.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )

--- a/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,15 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
+Thisoneismine.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )

--- a/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,15 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
+Thisoneismine.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )

--- a/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,14 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )

--- a/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,15 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
+Thisoneismine.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )

--- a/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,15 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
+Thisoneismine.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )

--- a/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt	Sat Oct 27 15:21:10 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
@@ -1,12 +1,15 @@
 file(GLOB VoiceSounds
 Boring.ogg
+Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
+Drat.ogg
 Enemydown.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
+Gonnagetyou.ogg
 Grenade.ogg
 Hello.ogg
 Hurry.ogg
@@ -20,6 +23,7 @@
 Missed.ogg
 Nooo.ogg
 Nutter.ogg
+Ohdear.ogg
 Ooff*.ogg
 Oops.ogg
 Ow*.ogg
@@ -27,12 +31,15 @@
 PoisonMoan.ogg
 Reinforcements.ogg
 Sameteam.ogg
+Solong.ogg
 Stupid.ogg
 Takecover.ogg
+Thisoneismine.ogg
 Traitor.ogg
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
 )