--- a/hedgewars/uSound.pas	Mon Nov 05 22:20:20 2012 -0500
+++ b/hedgewars/uSound.pas	Tue Nov 06 08:38:37 2012 -0500
@@ -270,6 +270,8 @@
             s:= UserPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
             if not FileExists(s) then
                 s:= Pathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
+            if not FileExists(s) and (snd in [sndFirePunch2, sndFirePunch3, sndFirePunch4, sndFirePunch5, sndFirePunch6]) then
+                s:= Pathz[Soundz[sndFirePunch1].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
             WriteToConsole(msgLoading + s + ' ');
             voicepack^.chunks[snd]:= Mix_LoadWAV_RW(SDL_RWFromFile(Str2PChar(s), _P'rb'), 1);
             if voicepack^.chunks[snd] = nil then

--- a/hedgewars/uTeams.pas	Mon Nov 05 22:20:20 2012 -0500
+++ b/hedgewars/uTeams.pas	Tue Nov 06 08:38:37 2012 -0500
@@ -292,10 +292,15 @@
     TagTurnTimeLeft:= 0;
     NextClan:= false;
     end;
+
 if (TurnTimeLeft > 0) and (CurrentHedgehog^.BotLevel = 0) then
     begin
     if CurrentTeam^.ExtDriven then
-        AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
+        begin
+        if GetRandom(2) = 0 then
+             AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
+        else AddVoice(sndJustYouWait, CurrentTeam^.voicepack)
+        end
     else
         AddVoice(sndYesSir, CurrentTeam^.voicepack);
     if cHedgehogTurnTime < 1000000 then
@@ -305,7 +310,11 @@
 else
     begin
     if TurnTimeLeft > 0 then
-        AddVoice(sndIllGetYou, CurrentTeam^.voicepack);
+        begin
+        if GetRandom(2) = 0 then
+             AddVoice(sndIllGetYou, CurrentTeam^.voicepack)
+        else AddVoice(sndJustYouWait, CurrentTeam^.voicepack)
+        end;
     ReadyTimeLeft:= 0
     end;
 

--- a/hedgewars/uTypes.pas	Mon Nov 05 22:20:20 2012 -0500
+++ b/hedgewars/uTypes.pas	Tue Nov 06 08:38:37 2012 -0500
@@ -123,7 +123,7 @@
             sndSplash, sndShotgunReload, sndShotgunFire, sndGraveImpact,
             sndMineImpact, sndMineTick, sndMudballImpact,
             sndPickhammer, sndGun, sndBee, sndJump1, sndJump2,
-            sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndIncoming,
+            sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndJustYouWait, sndIncoming,
             sndMissed, sndStupid, sndFirstBlood, sndBoring, sndByeBye,
             sndSameTeam, sndNutter, sndReinforce, sndTraitor, sndRegret,
             sndEnemyDown, sndCoward, sndHurry, sndWatchIt, sndKamikaze,

--- a/hedgewars/uVariables.pas	Mon Nov 05 22:20:20 2012 -0500
+++ b/hedgewars/uVariables.pas	Tue Nov 06 08:38:37 2012 -0500
@@ -720,6 +720,7 @@
             (FileName:               'Yessir.ogg'; Path: ptVoices),// sndYesSir
             (FileName:                'Laugh.ogg'; Path: ptVoices),// sndLaugh
             (FileName:            'Illgetyou.ogg'; Path: ptVoices),// sndIllGetYou
+            (FileName:          'JustYouWait.ogg'; Path: ptVoices),// sndJustYouWait
             (FileName:             'Incoming.ogg'; Path: ptVoices),// sndIncoming
             (FileName:               'Missed.ogg'; Path: ptVoices),// sndMissed
             (FileName:               'Stupid.ogg'; Path: ptVoices),// sndStupid

Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch2.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch3.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch4.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch5.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch6.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch2.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch3.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch4.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch5.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch6.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch2.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch3.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch4.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch5.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch6.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch2.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch3.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch4.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch5.ogg has changed

Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch6.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch2.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch3.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch4.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch5.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch6.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch2.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch3.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch4.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch5.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch6.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch2.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch3.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch4.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch5.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch6.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch2.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch3.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch4.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch5.ogg has changed

Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch6.ogg has changed