Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add 3 taunts: Amazing, Brilliant, Excellent
authorWuzzy <Wuzzy2@mail.ru>
Sat, 27 Oct 2018 17:17:01 +0200
changeset 14015 544b32038664
parent 14014 f09276eb0c27
child 14016 09e2e52aa025
Add 3 taunts: Amazing, Brilliant, Excellent Amazing: >= 3 kills Brilliant or Excellent: 2 kills
hedgewars/uSound.pas file | annotate | diff | comparison | revisions
hedgewars/uStats.pas file | annotate | diff | comparison | revisions
hedgewars/uTypes.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- a/hedgewars/uSound.pas	Sat Oct 27 15:55:19 2018 +0200
+++ b/hedgewars/uSound.pas	Sat Oct 27 17:17:01 2018 +0200
@@ -313,7 +313,10 @@
             (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
+            (FileName:               'Bugger.ogg'; Path: ptVoices; AltPath: ptNone),// sndBugger
+            (FileName:              'Amazing.ogg'; Path: ptVoices; AltPath: ptNone),// sndAmazing
+            (FileName:            'Brilliant.ogg'; Path: ptVoices; AltPath: ptNone),// sndBrilliant
+            (FileName:            'Excellent.ogg'; Path: ptVoices; AltPath: ptNone) // sndExcellent
             );
 
 
@@ -534,7 +537,9 @@
                 else if (snd = sndWhatThe) then
                     snd := sndNooo
                 else if (snd = sndThisOneIsMine) then
-                    snd := sndReinforce;
+                    snd := sndReinforce
+                else if (snd in [sndAmazing, sndBrilliant, sndExcellent]) then
+                    snd := sndEnemyDown;
 
                 s:= cPathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
                 end;
--- a/hedgewars/uStats.pas	Sat Oct 27 15:55:19 2018 +0200
+++ b/hedgewars/uStats.pas	Sat Oct 27 17:17:01 2018 +0200
@@ -248,9 +248,22 @@
 
     // Hog hurts, kills or poisons enemy
     else if (CurrentHedgehog^.stats.StepDamageGiven <> 0) or (CurrentHedgehog^.stats.StepKills > killsCheck) or (PoisonTurn <> 0) then
-        if Kills > killsCheck then
+        // 3 kills or more
+        if Kills > killsCheck + 2 then
+            AddVoice(sndAmazing, CurrentTeam^.voicepack)
+        // 2 kills
+        else if Kills = (killsCheck + 2) then
+            if random(2) = 0 then
+                AddVoice(sndBrilliant, CurrentTeam^.voicepack)
+            else
+                AddVoice(sndExcellent, CurrentTeam^.voicepack)
+        // 1 kill
+        else if Kills = (killsCheck + 1) then
             AddVoice(sndEnemyDown, CurrentTeam^.voicepack)
+        // 0 kills, only damage or poison
         else
+            // TODO: Play sndExcellent for a high damage shot.
+            // Not done yet because the fallback is sndEnemyDown.
             if random(2) = 0 then
                 AddVoice(sndRegret, vpHurtEnemy)
             else
--- a/hedgewars/uTypes.pas	Sat Oct 27 15:55:19 2018 +0200
+++ b/hedgewars/uTypes.pas	Sat Oct 27 17:17:01 2018 +0200
@@ -153,7 +153,8 @@
             sndCreeperDrop, sndCreeperWater, sndCreeperDie, sndCustom1, sndCustom2, sndCustom3, sndCustom4,
             sndCustom5, sndCustom6, sndCustom7, sndCustom8, sndMinigun, sndFlamethrower, sndIceBeamIdle,
             sndLandGun, sndCaseImpact, sndExtraDamage, sndFirePunchHit, sndGrenade, sndThisOneIsMine,
-            sndWhatThe, sndSoLong, sndOhDear, sndGonnaGetYou, sndDrat, sndBugger);
+            sndWhatThe, sndSoLong, sndOhDear, sndGonnaGetYou, sndDrat, sndBugger, sndAmazing,
+            sndBrilliant, sndExcellent);
 
     // 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:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
--- a/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
--- a/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
--- a/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
--- a/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
--- a/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
--- a/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
--- a/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
--- a/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
--- a/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt	Sat Oct 27 15:55:19 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
@@ -1,11 +1,14 @@
 file(GLOB VoiceSounds
+Amazing.ogg
 Boring.ogg
+Brilliant.ogg
 Bugger.ogg
 Byebye.ogg
 Comeonthen.ogg
 Coward.ogg
 Drat.ogg
 Enemydown.ogg
+Excellent.ogg
 Firstblood.ogg
 Firepunch*.ogg
 Flawless.ogg
hedgewars