# HG changeset patch
# User nemo
# Date 1352209117 18000
# Node ID 7f8df51553a77ec3dc5d0676ddac2d9ab556609e
# Parent 2ce76d1f594b14c00b020088dd04643b2d4e5746
Remove duplicate files from voices (add a fallback check in uSound). Add JustYouWait as an alternate to IllGetYou. Note that IllGetYou being called every turn seems awkward. IMO they probably should be reserved for significant enemy action. Maybe played by team of heavily damaged or killed hog.
diff -r 2ce76d1f594b -r 7f8df51553a7 hedgewars/uSound.pas
--- 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
diff -r 2ce76d1f594b -r 7f8df51553a7 hedgewars/uTeams.pas
--- 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;
diff -r 2ce76d1f594b -r 7f8df51553a7 hedgewars/uTypes.pas
--- 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,
diff -r 2ce76d1f594b -r 7f8df51553a7 hedgewars/uVariables.pas
--- 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
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Pirate/Firepunch2.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch2.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Pirate/Firepunch3.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch3.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Pirate/Firepunch4.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch4.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Pirate/Firepunch5.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch5.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Pirate/Firepunch6.ogg
Binary file project_files/AudioMono/Sounds/voices/Pirate/Firepunch6.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Robot/Firepunch2.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch2.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Robot/Firepunch3.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch3.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Robot/Firepunch4.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch4.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Robot/Firepunch5.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch5.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Robot/Firepunch6.ogg
Binary file project_files/AudioMono/Sounds/voices/Robot/Firepunch6.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Singer/Firepunch2.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch2.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Singer/Firepunch3.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch3.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Singer/Firepunch4.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch4.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Singer/Firepunch5.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch5.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Singer/Firepunch6.ogg
Binary file project_files/AudioMono/Sounds/voices/Singer/Firepunch6.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Surfer/Firepunch2.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch2.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Surfer/Firepunch3.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch3.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Surfer/Firepunch4.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch4.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Surfer/Firepunch5.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch5.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 project_files/AudioMono/Sounds/voices/Surfer/Firepunch6.ogg
Binary file project_files/AudioMono/Sounds/voices/Surfer/Firepunch6.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch2.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch2.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch3.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch3.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch4.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch4.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch5.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch5.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Pirate/Firepunch6.ogg
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Firepunch6.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Robot/Firepunch2.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch2.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Robot/Firepunch3.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch3.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Robot/Firepunch4.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch4.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Robot/Firepunch5.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch5.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Robot/Firepunch6.ogg
Binary file share/hedgewars/Data/Sounds/voices/Robot/Firepunch6.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Singer/Firepunch2.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch2.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Singer/Firepunch3.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch3.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Singer/Firepunch4.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch4.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Singer/Firepunch5.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch5.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Singer/Firepunch6.ogg
Binary file share/hedgewars/Data/Sounds/voices/Singer/Firepunch6.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch2.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch2.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch3.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch3.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch4.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch4.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch5.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch5.ogg has changed
diff -r 2ce76d1f594b -r 7f8df51553a7 share/hedgewars/Data/Sounds/voices/Surfer/Firepunch6.ogg
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Firepunch6.ogg has changed