# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1591309874 -7200
# Node ID 147d0561bebc0fc64e964b33bb062656c391c937
# Parent  c259073a805212ba6a048b57ead6d30ae56b3767
Add taunt command: /happy

diff -r c259073a8052 -r 147d0561bebc ChangeLog.txt
--- a/ChangeLog.txt	Thu Jun 04 12:33:24 2020 +0200
+++ b/ChangeLog.txt	Fri Jun 05 00:31:14 2020 +0200
@@ -9,7 +9,7 @@
  + New flags: serbia, montenegro
  + Themes: Add fade-in and fade-out effects
  + Themes: Make Sudden Death flakes in Underwater theme rise
- + New taunt chat command: /bubble (hedgehog holds breath)
+ + New taunt chat commands: /bubble, /happy
  * Racer: Resize waypoints in custom-sized drawn maps
  * Mutant: Fix impossible to become mutant after mutant is gone
  * A Classic Fairytale: Mission 1: Fix possibility of getting stuck in “Leap of Faith” section
diff -r c259073a8052 -r 147d0561bebc hedgewars/uChat.pas
--- a/hedgewars/uChat.pas	Thu Jun 04 12:33:24 2020 +0200
+++ b/hedgewars/uChat.pas	Fri Jun 05 00:31:14 2020 +0200
@@ -596,6 +596,7 @@
         AddChatString(#3 + shortstring(trcmd[sidCmdShrug]));
         AddChatString(#3 + shortstring(trcmd[sidCmdWave]));
         AddChatString(#3 + shortstring(trcmd[sidCmdBubble]));
+        AddChatString(#3 + shortstring(trcmd[sidCmdHappy]));
         exit
         end;
 
diff -r c259073a8052 -r 147d0561bebc hedgewars/uTypes.pas
--- a/hedgewars/uTypes.pas	Thu Jun 04 12:33:24 2020 +0200
+++ b/hedgewars/uTypes.pas	Fri Jun 05 00:31:14 2020 +0200
@@ -95,7 +95,7 @@
             sprSliderInverted, sprFingerBack, sprFingerBackInv, sprTargetPBack, sprTargetPBackInv,
             sprHealthHud, sprHealthPoisonHud, sprVampHud, sprKarmaHud, sprMedicHud, sprMedicPoisonHud,
             sprHaloHud, sprInvulnHUD, sprAmPiano, sprHandLandGun, sprFirePunch, sprThroughWrap,
-            sprDynamiteDefused, sprHogBubble);
+            sprDynamiteDefused, sprHogBubble, sprHappy);
 
     // Gears that interact with other Gears and/or Land
     // first row of gears (<gtExplosives) should be avoided when searching a spawn place
@@ -189,7 +189,8 @@
             siPointType, siTeamRank, siEverAfter);
 
     // Various 'emote' animations a hedgehog can do
-    TWave = (waveRollup, waveSad, waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle, waveBubble);
+    TWave = (waveRollup, waveSad, waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle, waveBubble,
+             waveHappy);
 
     TRenderMode = (rmDefault, rmLeftEye, rmRightEye);
     TStereoMode = (smNone, smRedCyan, smCyanRed, smRedBlue, smBlueRed, smRedGreen, smGreenRed, smHorizontal, smVertical);
@@ -528,7 +529,7 @@
             sidCmdSpeechNumberHint, sidCmdHsa, sidCmdHta, sidCmdHya,
             sidCmdHurrah, sidCmdIlovelotsoflemonade, sidCmdJuggle,
             sidCmdRollup, sidCmdShrug, sidCmdWave, sidCmdUnknown,
-            sidCmdHelpRoom, sidCmdHelpRoomFail, sidCmdBubble);
+            sidCmdHelpRoom, sidCmdHelpRoomFail, sidCmdBubble, sidCmdHappy);
 
     // Events that are important for the course of the game or at least interesting for other reasons
     TEventId = (eidDied, eidDrowned, eidRoundStart, eidRoundWin, eidRoundDraw,
diff -r c259073a8052 -r 147d0561bebc hedgewars/uVariables.pas
--- a/hedgewars/uVariables.pas	Thu Jun 04 12:33:24 2020 +0200
+++ b/hedgewars/uVariables.pas	Fri Jun 05 00:31:14 2020 +0200
@@ -856,7 +856,9 @@
             (FileName: 'dynamiteDefused'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
             Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprDynamiteDefused
             (FileName:     'Bubble'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
-            Width:  32; Height: 38; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpLowest; getDimensions: false; getImageDimensions: true)// sprHogBubble
+            Width:  32; Height: 38; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpLowest; getDimensions: false; getImageDimensions: true),// sprHogBubble
+            (FileName: 'Happy'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpLowest; getDimensions: false; getImageDimensions: true)// sprHappy
             );
 
 
@@ -876,7 +878,8 @@
             (Sprite: sprLemonade; FramesCount: 24; Interval: 125; cmd: '/ilovelotsoflemonade'; Voice: sndNone; VoiceDelay: 0),
             (Sprite:    sprShrug; FramesCount: 24; Interval: 125; cmd: '/shrug'; Voice: sndNone; VoiceDelay: 0),
             (Sprite:   sprJuggle; FramesCount: 49; Interval:  38; cmd: '/juggle'; Voice: sndNone; VoiceDelay: 0),
-            (Sprite:sprHogBubble; FramesCount: 19; Interval: 125; cmd: '/bubble'; Voice: sndNone; VoiceDelay: 0)
+            (Sprite:sprHogBubble; FramesCount: 19; Interval: 125; cmd: '/bubble'; Voice: sndNone; VoiceDelay: 0),
+            (Sprite:    sprHappy; FramesCount: 14; Interval: 125; cmd: '/happy'; Voice: sndNone; VoiceDelay: 0)
             );
 
 type
diff -r c259073a8052 -r 147d0561bebc share/hedgewars/Data/Graphics/Hedgehog/Happy.png
Binary file share/hedgewars/Data/Graphics/Hedgehog/Happy.png has changed
diff -r c259073a8052 -r 147d0561bebc share/hedgewars/Data/Locale/de.txt
--- a/share/hedgewars/Data/Locale/de.txt	Thu Jun 04 12:33:24 2020 +0200
+++ b/share/hedgewars/Data/Locale/de.txt	Fri Jun 05 00:31:14 2020 +0200
@@ -1423,3 +1423,4 @@
 06:27=/help room: Raum-Chatbefehle auflisten
 06:28=Du bist nicht online!
 06:29=/bubble: Igel die Luft anhalten lassen
+06:30=/happy: Igel glücklich aussehen lassen
diff -r c259073a8052 -r 147d0561bebc share/hedgewars/Data/Locale/en.txt
--- a/share/hedgewars/Data/Locale/en.txt	Thu Jun 04 12:33:24 2020 +0200
+++ b/share/hedgewars/Data/Locale/en.txt	Fri Jun 05 00:31:14 2020 +0200
@@ -1335,3 +1335,4 @@
 06:27=/help room: List room chat commands
 06:28=You're not online!
 06:29=/bubble: Make hedgehog hold its breath
+06:30=/happy: Make hedgehog look happy