Added jetpack image on website

Added jetpack sound
This commit is contained in:
Rob Pearce 2008-11-24 20:43:46 +00:00
parent c5eff9eab0
commit 3699eb64c8
8 changed files with 35 additions and 13 deletions

BIN
data/sounds/jetpack.wav Normal file

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 822 B

3
defs.h
View File

@ -297,7 +297,7 @@
/* enums */ /* enums */
/* sounds */ /* sounds */
#define MAXFX 57 #define MAXFX 58
#define FX_SHOOT 0 #define FX_SHOOT 0
#define FX_SLAM 1 #define FX_SLAM 1
#define FX_KILL 2 #define FX_KILL 2
@ -355,6 +355,7 @@
#define FX_BIRDS 54 #define FX_BIRDS 54
#define FX_EXTRALIFE 55 #define FX_EXTRALIFE 55
#define FX_WARP 56 #define FX_WARP 56
#define FX_JETPACK 57
// card suits // card suits
#define CS_HEART 1 #define CS_HEART 1

39
rc.c
View File

@ -1412,20 +1412,32 @@ void jump(sprite_t *s, int dir) {
} }
} }
// if on rollers, they add to your inertia if (s->powerup == PW_JETPACK) {
// if you are facing their direction // jetpack makes a blast of fire
tt= gettileat(s->x, s->y, NULL, NULL); addsprite(P_SMASH, s->x, s->y, "jet_smahs");
if ((tt->id == T_RIGHT) && (s->jumpdir > 0)) {
s->jumpdir++; // jetpack always adds speed to sideways jumps
} else if ((tt->id == T_LEFT) && (s->jumpdir < 0)) { if (s->jumpdir > 0) {
s->jumpdir--; s->jumpdir++;
} else if (s->jumpdir < 0) {
s->jumpdir--;
}
} else {
// if on rollers, they add to your inertia
// if you are facing their direction
tt= gettileat(s->x, s->y, NULL, NULL);
if ((tt->id == T_RIGHT) && (s->jumpdir > 0)) {
s->jumpdir++;
} else if ((tt->id == T_LEFT) && (s->jumpdir < 0)) {
s->jumpdir--;
}
} }
s->jumping = 1; s->jumping = 1;
if (s->climbing) { if (s->climbing) {
s->jumpspeed = 3; s->jumpspeed = 3;
} else if (s->powerup == PW_JETPACK) { } else if ((s->powerup == PW_JETPACK) && (s->jumpdir == 0)) {
s->jumpspeed = 7; s->jumpspeed = 7;
} else if (s->ontramp) { } else if (s->ontramp) {
s->jumpspeed = 7; s->jumpspeed = 7;
@ -1469,8 +1481,10 @@ void jump(sprite_t *s, int dir) {
s->recoiling = B_FALSE; s->recoiling = B_FALSE;
} else { } else {
// play sound effect // play sound effect
if ((s->ontramp) || (s->powerup == PW_JETPACK)) { if (s->ontramp) {
playfx(FX_SPRING); playfx(FX_SPRING);
} else if (s->powerup == PW_JETPACK) {
playfx(FX_JETPACK);
} else { } else {
playfx(FX_JUMP); playfx(FX_JUMP);
} }
@ -6231,6 +6245,10 @@ void dogravity(sprite_t *s) {
s->falling = B_TRUE; s->falling = B_TRUE;
s->fallspeed = 0; s->fallspeed = 0;
} }
if (s->powerup == PW_JETPACK) {
puffin(-1, s->x, s->y, "jet_puff", 0);
}
} }
// handle ring // handle ring
@ -7342,7 +7360,7 @@ int dofruiteffect(sprite_t *pp, sprite_t *s) {
return B_TRUE; return B_TRUE;
} else if (s->id == P_JETPACK) { } else if (s->id == P_JETPACK) {
playfx(FX_POWERUP); playfx(FX_POWERUP);
sprintf(tempm, "Kangaroo jumps!"); sprintf(tempm, "Jet pack!");
addoutlinetext(s->x,s->y - s->img->h/2, TEXTSIZE_POINTS, tempm,&white,&black,POINTSDELAY, TT_NORM); addoutlinetext(s->x,s->y - s->img->h/2, TEXTSIZE_POINTS, tempm,&white,&black,POINTSDELAY, TT_NORM);
pp->powerup = PW_JETPACK; pp->powerup = PW_JETPACK;
return B_TRUE; return B_TRUE;
@ -7630,6 +7648,7 @@ int initsound(void) {
loadfx(FX_BIRDS, "birds.wav"); loadfx(FX_BIRDS, "birds.wav");
loadfx(FX_EXTRALIFE, "extralife.wav"); loadfx(FX_EXTRALIFE, "extralife.wav");
loadfx(FX_WARP, "warp.wav"); loadfx(FX_WARP, "warp.wav");
loadfx(FX_JETPACK, "jetpack.wav");
// load sound effects // load sound effects
for (i = 0; i < MAXFX; i++) { for (i = 0; i < MAXFX; i++) {

View File

@ -1560,7 +1560,7 @@ int loadimagesets(void) {
loadspriteimage(P_BADMAGNET,F_WALK1, "sprites/badmagnet.png"); loadspriteimage(P_BADMAGNET,F_WALK1, "sprites/badmagnet.png");
imageset[P_BADMAGNET].numimages = 1; imageset[P_BADMAGNET].numimages = 1;
loadspriteimage(P_JETPACK,F_WALK1, "sprites/kangaroo.png"); loadspriteimage(P_JETPACK,F_WALK1, "sprites/jetpack.png");
imageset[P_JETPACK].numimages = 1; imageset[P_JETPACK].numimages = 1;
loadspriteimage(P_ZAPPOWERUP,F_WALK1, "sprites/zapper.png"); loadspriteimage(P_ZAPPOWERUP,F_WALK1, "sprites/zapper.png");
@ -3104,6 +3104,8 @@ int randompowerup(void) {
int num; int num;
num = rand() % 42; num = rand() % 42;
return P_JETPACK;
switch (num) { switch (num) {
case 0: case 0:
default: default:

BIN
website/img/jetpack.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -80,7 +80,7 @@
</tr><tr><td align=center><img src="img/anchor.png"><br>Anchor</td><td>The extremely heavy anchor will weigh down enemies, preventing them from jumping or flying.</td> </tr><tr><td align=center><img src="img/anchor.png"><br>Anchor</td><td>The extremely heavy anchor will weigh down enemies, preventing them from jumping or flying.</td>
<td align=center><img src="img/magnet.png"><br>Magnet</td><td>Collecting this powerup will align the magnetic forces of the earth in your favour, attracting all nearby fruits towards you.</td> <td align=center><img src="img/magnet.png"><br>Magnet</td><td>Collecting this powerup will align the magnetic forces of the earth in your favour, attracting all nearby fruits towards you.</td>
</tr><tr><td align=center><img src="img/badmagnet.png"><br>Red Skull</td><td>This skull curses you and will repel fruits away from you, denying you access to them!</td> </tr><tr><td align=center><img src="img/badmagnet.png"><br>Red Skull</td><td>This skull curses you and will repel fruits away from you, denying you access to them!</td>
<td align=center><img src="img/kangaroo.png"><br>Kangaroo</td><td>For the remainder of the current level, your jumping ability is increased to that of a kangaroo!</td> <td align=center><img src="img/jetpack.png"><br>Jetpack</td><td>For the remainder of the current level, the jetpack's thrust will add to your jumping ability!</td>
</tr><tr><td align=center><font color="ff00ff"><b><big>?</big></b></font><br>Random</td><td>Gives you a random effect...</td> </tr><tr><td align=center><font color="ff00ff"><b><big>?</big></b></font><br>Random</td><td>Gives you a random effect...</td>
<td colspan=2>&nbsp;</td></tr><tr bgcolor="#ffff00"><th colspan=4>Super Powerups</th></tr> <td colspan=2>&nbsp;</td></tr><tr bgcolor="#ffff00"><th colspan=4>Super Powerups</th></tr>
<tr><td align=center><img src="img/bigspeed.png"><br>Big Speed Up</td><td>Makes you walk faster, permenantly!</td> <tr><td align=center><img src="img/bigspeed.png"><br>Big Speed Up</td><td>Makes you walk faster, permenantly!</td>