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.
Two new wavez - Juggle requires a different frame rate. using 38 instead of 125
authornemo
Fri, 15 May 2009 00:38:49 +0000
changeset 2056 ed8c83f1e4b0
parent 2055 2099307d3071
child 2057 cf0d84479251
Two new wavez - Juggle requires a different frame rate. using 38 instead of 125
hedgewars/HHHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/Hedgehog/Juggle.png file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/Hedgehog/Shrug.png file | annotate | diff | comparison | revisions 
--- a/hedgewars/HHHandlers.inc	Thu May 14 14:55:38 2009 +0000
+++ b/hedgewars/HHHandlers.inc	Fri May 15 00:38:49 2009 +0000
@@ -554,7 +554,7 @@
 	begin
 	Gear^.Message:= 0;
 	inc(Gear^.Timer);
-	if Gear^.Timer = 125 then
+	if Gear^.Timer = Wavez[TWave(Gear^.Tag)].Interval then
 		begin
 		Gear^.Timer:= 0;
 		inc(Gear^.Pos);
--- a/hedgewars/uConsts.pas	Thu May 14 14:55:38 2009 +0000
+++ b/hedgewars/uConsts.pas	Fri May 15 00:38:49 2009 +0000
@@ -55,7 +55,7 @@
 			sprHandBlowTorch, sprBlowTorch, sprTeleport, sprHHDeath,
 			sprShotgun, sprDEagle, sprHHIdle, sprMortar, sprTurnsLeft,
 			sprKamikaze, sprWhip, sprKowtow, sprSad, sprWave,
-			sprHurrah, sprLemonade, sprExplPart, sprExplPart2,
+			sprHurrah, sprLemonade, sprShrug, sprJuggle, sprExplPart, sprExplPart2,
 			sprCakeWalk, sprCakeDown, sprAMAmmosBW, sprWatermelon,
 			sprEvilTrace, sprHellishBomb, sprSeduction, sprDress,
 			sprCensored, sprDrill, sprHandDrill, sprHandBallgun, sprBalls,
@@ -107,7 +107,7 @@
 	TStatInfoType = (siGameResult, siMaxStepDamage, siMaxStepKills, siKilledHHs,
 			siClanHealth);
 
-	TWave = (waveRollup, waveSad,waveWave, waveHurrah, waveLemonade);
+	TWave = (waveRollup, waveSad,waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle);
 
 	THHFont = record
 			Handle: PTTF_Font;
@@ -467,6 +467,10 @@
 			Width:  32; Height: 32; saveSurf: false),// sprHurrah
 			(FileName:'ILoveLemonade';Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
 			Width: 128; Height: 32; saveSurf: false),// sprLemonade
+			(FileName:'Shrug';Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+			Width: 32;  Height: 32; saveSurf: false),// sprShrug
+			(FileName:'Juggle';Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+			Width: 32;  Height: 32; saveSurf: false),// sprJuggle
 			(FileName:   'ExplPart'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 			Width:  32; Height: 32; saveSurf: false),// sprExplPart
 			(FileName:  'ExplPart2'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
@@ -534,13 +538,16 @@
 	Wavez: array [TWave] of record
 			Sprite: TSprite;
 			FramesCount: Longword;
+			Interval: Longword;
 			cmd: String[20];
 			end = (
-			(Sprite:   sprKowtow; FramesCount: 12; cmd: '/rollup'),
-			(Sprite:      sprSad; FramesCount: 14; cmd: '/sad'),
-			(Sprite:     sprWave; FramesCount: 16; cmd: '/wave'),
-			(Sprite:   sprHurrah; FramesCount: 14; cmd: '/hurrah'),
-			(Sprite: sprLemonade; FramesCount: 24; cmd: '/ilovelotsoflemonade')
+			(Sprite:   sprKowtow; FramesCount: 12; Interval: 125; cmd: '/rollup'),
+			(Sprite:      sprSad; FramesCount: 14; Interval: 125; cmd: '/sad'),
+			(Sprite:     sprWave; FramesCount: 16; Interval: 125; cmd: '/wave'),
+			(Sprite:   sprHurrah; FramesCount: 14; Interval: 125; cmd: '/hurrah'),
+			(Sprite: sprLemonade; FramesCount: 24; Interval: 125; cmd: '/ilovelotsoflemonade'),
+			(Sprite:    sprShrug; FramesCount: 24; Interval: 125; cmd: '/shrug'),
+			(Sprite:   sprJuggle; FramesCount: 49; Interval: 38; cmd: '/juggle')
 			);
 
 	Soundz: array[TSound] of record
Binary file share/hedgewars/Data/Graphics/Hedgehog/Juggle.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/Shrug.png has changed
hedgewars