Mercurial Mercurial > hedgewars-draft / 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 2 taunts: Fire, WatchThis (attack voice for some weapons)
authorWuzzy <Wuzzy2@mail.ru>
Sat, 27 Oct 2018 18:26:44 +0200
changeset 14037 09e2e52aa025
parent 14036 544b32038664
child 14038 9b5c0e81cec7
Add 2 taunts: Fire, WatchThis (attack voice for some weapons)
hedgewars/uSound.pas file | annotate | diff | comparison | revisions
hedgewars/uTypes.pas file | annotate | diff | comparison | revisions
hedgewars/uVariables.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 17:17:01 2018 +0200
+++ b/hedgewars/uSound.pas	Sat Oct 27 18:26:44 2018 +0200
@@ -316,7 +316,9 @@
             (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
+            (FileName:            'Excellent.ogg'; Path: ptVoices; AltPath: ptNone),// sndExcellent
+            (FileName:                 'Fire.ogg'; Path: ptVoices; AltPath: ptNone),// sndFire
+            (FileName:            'Watchthis.ogg'; Path: ptVoices; AltPath: ptNone) // sndWatchThis
             );
 
 
--- a/hedgewars/uTypes.pas	Sat Oct 27 17:17:01 2018 +0200
+++ b/hedgewars/uTypes.pas	Sat Oct 27 18:26:44 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);
+            sndBrilliant, sndExcellent, sndFire, sndWatchThis);
 
     // Available ammo types to be used by hedgehogs
     TAmmoType  = (amNothing, amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amPickHammer, // 6
--- a/hedgewars/uVariables.pas	Sat Oct 27 17:17:01 2018 +0200
+++ b/hedgewars/uVariables.pas	Sat Oct 27 18:26:44 2018 +0200
@@ -924,7 +924,7 @@
                 Timer: 0;
                 Pos: 0;
                 AmmoType: amBazooka;
-                AttackVoice: sndNone;
+                AttackVoice: sndFire;
                 Bounciness: defaultBounciness);
             Slot: 0;
             TimeAfterTurn: 3000;
@@ -952,7 +952,7 @@
                 Timer: 0;
                 Pos: 0;
                 AmmoType: amBee;
-                AttackVoice: sndNone;
+                AttackVoice: sndFire;
                 Bounciness: defaultBounciness);
             Slot: 0;
             TimeAfterTurn: 3000;
@@ -1573,7 +1573,7 @@
                 Timer: 5000;
                 Pos: 0;
                 AmmoType: amHellishBomb;
-                AttackVoice: sndNone;
+                AttackVoice: sndWatchThis;
                 Bounciness: defaultBounciness);
             Slot: 1;
             TimeAfterTurn: 3000;
@@ -1627,7 +1627,7 @@
                 Timer: 0;
                 Pos: 0;
                 AmmoType: amDrill;
-                AttackVoice: sndNone;
+                AttackVoice: sndFire;
                 Bounciness: defaultBounciness);
             Slot: 0;
             TimeAfterTurn: 3000;
@@ -1938,7 +1938,7 @@
                 Timer: 3000;
                 Pos: 0;
                 AmmoType: amMolotov;
-                AttackVoice: sndNone;
+                AttackVoice: sndFire;
                 Bounciness: defaultBounciness);
             Slot: 1;
             TimeAfterTurn: 3000;
@@ -2368,7 +2368,7 @@
                 Timer: 0;
                 Pos: 0;
                 AmmoType: amKnife;
-                AttackVoice: sndNone;
+                AttackVoice: sndWatchThis;
                 Bounciness: defaultBounciness);
             Slot: 6;
             TimeAfterTurn: 3000;
--- a/share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/British/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -42,6 +43,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
--- a/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Classic/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -42,6 +43,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
--- a/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -42,6 +43,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
--- a/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Default_uk/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -42,6 +43,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
--- a/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -42,6 +43,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
--- a/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -42,6 +43,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
--- a/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -41,6 +42,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
--- a/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -42,6 +43,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
--- a/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -42,6 +43,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
--- a/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt	Sat Oct 27 17:17:01 2018 +0200
+++ b/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt	Sat Oct 27 18:26:44 2018 +0200
@@ -10,6 +10,7 @@
 Enemydown.ogg
 Excellent.ogg
 Firstblood.ogg
+Fire.ogg
 Firepunch*.ogg
 Flawless.ogg
 Gonnagetyou.ogg
@@ -42,6 +43,7 @@
 Uh-oh.ogg
 Victory.ogg
 Watchit.ogg
+Watchthis.ogg
 Whatthe.ogg
 Yessir.ogg
 Youllregretthat.ogg
hedgewars-draft