# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1590564205 -7200
# Node ID 96a02e385d54f4875ba98415f021a4bc1b06a276
# Parent 61f2ffcd565262d44ddd82a7bf02f84a6e4154dd
Add taunt chat command: /bubble (hog holds breath)
This is based on the "bubble" hat by chujoii
diff -r 61f2ffcd5652 -r 96a02e385d54 ChangeLog.txt
--- a/ChangeLog.txt Wed May 27 06:52:13 2020 +0200
+++ b/ChangeLog.txt Wed May 27 09:23:25 2020 +0200
@@ -9,6 +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)
* 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 61f2ffcd5652 -r 96a02e385d54 hedgewars/uChat.pas
--- a/hedgewars/uChat.pas Wed May 27 06:52:13 2020 +0200
+++ b/hedgewars/uChat.pas Wed May 27 09:23:25 2020 +0200
@@ -595,6 +595,7 @@
AddChatString(#3 + shortstring(trcmd[sidCmdRollup]));
AddChatString(#3 + shortstring(trcmd[sidCmdShrug]));
AddChatString(#3 + shortstring(trcmd[sidCmdWave]));
+ AddChatString(#3 + shortstring(trcmd[sidCmdBubble]));
exit
end;
diff -r 61f2ffcd5652 -r 96a02e385d54 hedgewars/uTypes.pas
--- a/hedgewars/uTypes.pas Wed May 27 06:52:13 2020 +0200
+++ b/hedgewars/uTypes.pas Wed May 27 09:23:25 2020 +0200
@@ -95,7 +95,7 @@
sprSliderInverted, sprFingerBack, sprFingerBackInv, sprTargetPBack, sprTargetPBackInv,
sprHealthHud, sprHealthPoisonHud, sprVampHud, sprKarmaHud, sprMedicHud, sprMedicPoisonHud,
sprHaloHud, sprInvulnHUD, sprAmPiano, sprHandLandGun, sprFirePunch, sprThroughWrap,
- sprDynamiteDefused);
+ sprDynamiteDefused, sprHogBubble);
// 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,7 @@
siPointType, siTeamRank, siEverAfter);
// Various 'emote' animations a hedgehog can do
- TWave = (waveRollup, waveSad, waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle);
+ TWave = (waveRollup, waveSad, waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle, waveBubble);
TRenderMode = (rmDefault, rmLeftEye, rmRightEye);
TStereoMode = (smNone, smRedCyan, smCyanRed, smRedBlue, smBlueRed, smRedGreen, smGreenRed, smHorizontal, smVertical);
@@ -528,7 +528,7 @@
sidCmdSpeechNumberHint, sidCmdHsa, sidCmdHta, sidCmdHya,
sidCmdHurrah, sidCmdIlovelotsoflemonade, sidCmdJuggle,
sidCmdRollup, sidCmdShrug, sidCmdWave, sidCmdUnknown,
- sidCmdHelpRoom, sidCmdHelpRoomFail);
+ sidCmdHelpRoom, sidCmdHelpRoomFail, sidCmdBubble);
// 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 61f2ffcd5652 -r 96a02e385d54 hedgewars/uVariables.pas
--- a/hedgewars/uVariables.pas Wed May 27 06:52:13 2020 +0200
+++ b/hedgewars/uVariables.pas Wed May 27 09:23:25 2020 +0200
@@ -854,8 +854,9 @@
(FileName: 'throughWrap'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
Width: 16; Height: 13; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprTroughWrap
(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
-
+ 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
);
@@ -874,7 +875,8 @@
(Sprite: sprHurrah; FramesCount: 14; Interval: 125; cmd: '/hurrah'; Voice: sndNone; VoiceDelay: 0),
(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: sprJuggle; FramesCount: 49; Interval: 38; cmd: '/juggle'; Voice: sndNone; VoiceDelay: 0),
+ (Sprite:sprHogBubble; FramesCount: 19; Interval: 125; cmd: '/bubble'; Voice: sndNone; VoiceDelay: 0)
);
type
diff -r 61f2ffcd5652 -r 96a02e385d54 share/hedgewars/Data/Graphics/Hedgehog/Bubble.png
Binary file share/hedgewars/Data/Graphics/Hedgehog/Bubble.png has changed
diff -r 61f2ffcd5652 -r 96a02e385d54 share/hedgewars/Data/Locale/de.txt
--- a/share/hedgewars/Data/Locale/de.txt Wed May 27 06:52:13 2020 +0200
+++ b/share/hedgewars/Data/Locale/de.txt Wed May 27 09:23:25 2020 +0200
@@ -1422,3 +1422,4 @@
06:26=Unbekannter Befehl oder ungültige Parameter. Sag »/help« im Chat für eine Liste an Befehlen.
06:27=/help room: Raum-Chatbefehle auflisten
06:28=Du bist nicht online!
+06:29=/bubble: Igel die Luft anhalten lassen
diff -r 61f2ffcd5652 -r 96a02e385d54 share/hedgewars/Data/Locale/en.txt
--- a/share/hedgewars/Data/Locale/en.txt Wed May 27 06:52:13 2020 +0200
+++ b/share/hedgewars/Data/Locale/en.txt Wed May 27 09:23:25 2020 +0200
@@ -1334,3 +1334,4 @@
06:26=Unknown command or invalid parameters. Say “/help” in chat for a list of commands.
06:27=/help room: List room chat commands
06:28=You're not online!
+06:29=/bubble: Make hedgehog hold its breath