# HG changeset patch # User Wuzzy # Date 1540992823 -3600 # Node ID 006f97a6f6a7e513182de788dcbef6b1f2f1f319 # Parent 44f20c9e6861763916fe4b93c7f6d1e4ed6d5d96 Enemy/AI hogs now say “Hmm” on turn start. Use IllGetYou/JustYouWait for hit after attack diff -r 44f20c9e6861 -r 006f97a6f6a7 ChangeLog.txt --- a/ChangeLog.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/ChangeLog.txt Wed Oct 31 14:33:43 2018 +0100 @@ -7,7 +7,7 @@ + Rework team rankings + Tied teams now rank equally + Help button in main menu - + 18 new hedgehog taunts + + 19 new hedgehog taunts + Many new Lua API features * Functionality of controllers restored * Fix at least 2 crashes @@ -55,7 +55,9 @@ + Allow to change volume during pause + Add sounds: flamethrower, landspray, idle freezer, shorykuen hit + Add taunts: Amazing, Brilliant, Bugger, Cutitout, Drat, Excellent, Fire, Gonnagetyou, Grenade, - Leavemealone, Ohdear, Ouch, Revenge, Runaway, Solong, Thisoneismine, Whatthe, Watchthis + Hmm, Leavemealone, Ohdear, Ouch, Revenge, Runaway, Solong, Thisoneismine, Whatthe, + Watchthis + * Enemy/AI hogs now say “Hmm” on turn start instead of vowing for revenge (at least in most voice packs) * Fix extreme amounts of droplets when shooting with minigun into ocean world edge * Fix some flakes disappearing in world wrap worlds while moving camera * Fix invisible projectile timer, attack bar, target on other side of wrap world edge diff -r 44f20c9e6861 -r 006f97a6f6a7 hedgewars/uSound.pas --- a/hedgewars/uSound.pas Wed Oct 31 13:35:53 2018 +0100 +++ b/hedgewars/uSound.pas Wed Oct 31 14:33:43 2018 +0100 @@ -328,7 +328,8 @@ (FileName: 'Revenge.ogg'; Path: ptVoices; AltPath: ptNone),// sndRevenge (FileName: 'Cutitout.ogg'; Path: ptVoices; AltPath: ptNone),// sndCutItOut (FileName: 'Leavemealone.ogg'; Path: ptVoices; AltPath: ptNone),// sndLeaveMeAlone - (FileName: 'Ouch.ogg'; Path: ptVoices; AltPath: ptNone) // sndOuch + (FileName: 'Ouch.ogg'; Path: ptVoices; AltPath: ptNone),// sndOuch + (FileName: 'Hmm.ogg'; Path: ptVoices; AltPath: ptNone) // sndHmm ); @@ -501,6 +502,14 @@ GetFallbackV := sndReinforce else if (snd in [sndAmazing, sndBrilliant, sndExcellent]) then GetFallbackV := sndEnemyDown + // Hmm is for enemy turn start + else if snd = sndHmm then + // these are not ideal fallbacks, but those were the voices which were used in older versions + // for enemy turn start + if random(2) = 0 then + GetFallbackV := sndIllGetYou + else + GetFallbackV := sndJustYouWait else GetFallbackV := sndNone; end; diff -r 44f20c9e6861 -r 006f97a6f6a7 hedgewars/uStats.pas --- a/hedgewars/uStats.pas Wed Oct 31 13:35:53 2018 +0100 +++ b/hedgewars/uStats.pas Wed Oct 31 14:33:43 2018 +0100 @@ -315,10 +315,12 @@ AddVoice(sndRevenge, CurrentHedgehog^.Team^.voicepack); // If revenge taunt was added, one of the following voices is // added as fallback (4th param), in case of a missing Revenge sound file. - if random(2) = 0 then - AddVoice(sndRegret, vpHurtEnemy, false, true) - else - AddVoice(sndGonnaGetYou, vpHurtEnemy, false, true); + case random(4) of + 0: AddVoice(sndRegret, vpHurtEnemy, false, true); + 1: AddVoice(sndGonnaGetYou, vpHurtEnemy, false, true); + 2: AddVoice(sndIllGetYou, vpHurtEnemy, false, true); + 3: AddVoice(sndJustYouWait, vpHurtEnemy, false, true); + end; end else if LeaveMeAlone then @@ -327,10 +329,12 @@ else AddVoice(sndLeaveMeAlone, vpHurtEnemy) else - if random(2) = 0 then - AddVoice(sndRegret, vpHurtEnemy) - else - AddVoice(sndGonnaGetYou, vpHurtEnemy) + case random(4) of + 0: AddVoice(sndRegret, vpHurtEnemy); + 1: AddVoice(sndGonnaGetYou, vpHurtEnemy); + 2: AddVoice(sndIllGetYou, vpHurtEnemy); + 3: AddVoice(sndJustYouWait, vpHurtEnemy); + end // 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 diff -r 44f20c9e6861 -r 006f97a6f6a7 hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Wed Oct 31 13:35:53 2018 +0100 +++ b/hedgewars/uTeams.pas Wed Oct 31 14:33:43 2018 +0100 @@ -446,13 +446,12 @@ end; IsGetAwayTime:= false; +// turn start taunt: sndYesSir for own team, sndHmm for enemy or computer team if (TurnTimeLeft > 0) and (CurrentHedgehog^.BotLevel = 0) then begin if CurrentTeam^.ExtDriven then begin - if GetRandom(2) = 0 then - AddVoice(sndIllGetYou, CurrentTeam^.voicepack) - else AddVoice(sndJustYouWait, CurrentTeam^.voicepack) + AddVoice(sndHmm, CurrentTeam^.voicepack) end else begin @@ -468,9 +467,7 @@ begin if TurnTimeLeft > 0 then begin - if GetRandom(2) = 0 then - AddVoice(sndIllGetYou, CurrentTeam^.voicepack) - else AddVoice(sndJustYouWait, CurrentTeam^.voicepack) + AddVoice(sndHmm, CurrentTeam^.voicepack) end; ReadyTimeLeft:= 0 end; diff -r 44f20c9e6861 -r 006f97a6f6a7 hedgewars/uTypes.pas --- a/hedgewars/uTypes.pas Wed Oct 31 13:35:53 2018 +0100 +++ b/hedgewars/uTypes.pas Wed Oct 31 14:33:43 2018 +0100 @@ -155,7 +155,7 @@ sndLandGun, sndCaseImpact, sndExtraDamage, sndFirePunchHit, sndGrenade, sndThisOneIsMine, sndWhatThe, sndSoLong, sndOhDear, sndGonnaGetYou, sndDrat, sndBugger, sndAmazing, sndBrilliant, sndExcellent, sndFire, sndWatchThis, sndRunAway, sndRevenge, sndCutItOut, - sndLeaveMeAlone, sndOuch); + sndLeaveMeAlone, sndOuch, sndHmm); // Available ammo types to be used by hedgehogs TAmmoType = (amNothing, amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amPickHammer, // 6 diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg diff -r 44f20c9e6861 -r 006f97a6f6a7 share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt --- a/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt Wed Oct 31 13:35:53 2018 +0100 +++ b/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt Wed Oct 31 14:33:43 2018 +0100 @@ -17,6 +17,7 @@ Gonnagetyou.ogg Grenade.ogg Hello.ogg +Hmm.ogg Hurry.ogg Illgetyou.ogg Incoming.ogg