# HG changeset patch # User Wuzzy # Date 1540662601 -7200 # Node ID 1effb8b72b111812a98dab7939d64800cdb31cb4 # Parent 039a9a6d68ebf8a6716725f7c978e158d4db4264 New taunt: Runaway, when something is about to blow up near current hog diff -r 039a9a6d68eb -r 1effb8b72b11 hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Sat Oct 27 19:07:37 2018 +0200 +++ b/hedgewars/uGearsHandlersMess.pas Sat Oct 27 19:50:01 2018 +0200 @@ -216,10 +216,18 @@ if (d > 1) and (gi^.Hedgehog^.Effects[heInvulnerable] = 0) and (GetRandom(2) = 0) then begin if (CurrentHedgehog^.Gear = gi) then - if random(4) = 0 then - PlaySoundV(sndWhatThe, gi^.Hedgehog^.Team^.voicepack) + if (CurrentHedgehog^.Gear^.FlightTime = 0) then + case random(4) of + 0: PlaySoundV(sndWhatThe, gi^.Hedgehog^.Team^.voicepack); + 1: PlaySoundV(sndOops, gi^.Hedgehog^.Team^.voicepack); + 2: PlaySoundV(sndRunAway, gi^.Hedgehog^.Team^.voicepack); + 3: PlaySoundV(sndRunAway, gi^.Hedgehog^.Team^.voicepack); + end else - 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 diff -r 039a9a6d68eb -r 1effb8b72b11 hedgewars/uSound.pas --- a/hedgewars/uSound.pas Sat Oct 27 19:07:37 2018 +0200 +++ b/hedgewars/uSound.pas Sat Oct 27 19:50:01 2018 +0200 @@ -318,7 +318,8 @@ (FileName: 'Brilliant.ogg'; Path: ptVoices; AltPath: ptNone),// sndBrilliant (FileName: 'Excellent.ogg'; Path: ptVoices; AltPath: ptNone),// sndExcellent (FileName: 'Fire.ogg'; Path: ptVoices; AltPath: ptNone),// sndFire - (FileName: 'Watchthis.ogg'; Path: ptVoices; AltPath: ptNone) // sndWatchThis + (FileName: 'Watchthis.ogg'; Path: ptVoices; AltPath: ptNone),// sndWatchThis + (FileName: 'Runaway.ogg'; Path: ptVoices; AltPath: ptNone) // sndRunAway ); @@ -538,6 +539,8 @@ snd := sndByeBye else if (snd = sndWhatThe) then snd := sndNooo + else if (snd = sndRunAway) then + snd := sndOops else if (snd = sndThisOneIsMine) then snd := sndReinforce else if (snd in [sndAmazing, sndBrilliant, sndExcellent]) then diff -r 039a9a6d68eb -r 1effb8b72b11 hedgewars/uTypes.pas --- a/hedgewars/uTypes.pas Sat Oct 27 19:07:37 2018 +0200 +++ b/hedgewars/uTypes.pas Sat Oct 27 19:50:01 2018 +0200 @@ -154,7 +154,7 @@ sndCustom5, sndCustom6, sndCustom7, sndCustom8, sndMinigun, sndFlamethrower, sndIceBeamIdle, sndLandGun, sndCaseImpact, sndExtraDamage, sndFirePunchHit, sndGrenade, sndThisOneIsMine, sndWhatThe, sndSoLong, sndOhDear, sndGonnaGetYou, sndDrat, sndBugger, sndAmazing, - sndBrilliant, sndExcellent, sndFire, sndWatchThis); + sndBrilliant, sndExcellent, sndFire, sndWatchThis, sndRunAway); // Available ammo types to be used by hedgehogs TAmmoType = (amNothing, amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amPickHammer, // 6 diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg diff -r 039a9a6d68eb -r 1effb8b72b11 share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt Sat Oct 27 19:07:37 2018 +0200 +++ b/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt Sat Oct 27 19:50:01 2018 +0200 @@ -34,6 +34,7 @@ PoisonCough.ogg PoisonMoan.ogg Reinforcements.ogg +Runaway.ogg Sameteam.ogg Solong.ogg Stupid.ogg