- added hiss sound when snake shoots
- pill now makes you constantly animate
This commit is contained in:
parent
6a51fe8b34
commit
8d6a075fd4
|
@ -6,8 +6,9 @@ endhelp
|
||||||
monsters
|
monsters
|
||||||
0 5 23
|
0 5 23
|
||||||
134 35 22
|
134 35 22
|
||||||
|
23 12 19
|
||||||
6 20 10
|
6 20 10
|
||||||
23 12 23
|
12 24 19
|
||||||
endmonsters
|
endmonsters
|
||||||
exitdir 1
|
exitdir 1
|
||||||
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
||||||
|
@ -30,7 +31,7 @@ exitdir 1
|
||||||
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
||||||
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
||||||
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
||||||
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
4,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,4,
|
||||||
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
||||||
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
|
||||||
4,0,0,0,0,0,0,0,17,0,0,0,0,0,17,0,0,0,0,0,17,0,0,0,0,0,17,0,0,0,0,17,0,0,0,0,0,0,0,4,
|
4,0,0,0,0,0,0,0,17,0,0,0,0,0,17,0,0,0,0,0,17,0,0,0,0,0,17,0,0,0,0,17,0,0,0,0,0,0,0,4,
|
||||||
|
|
Binary file not shown.
3
defs.h
3
defs.h
|
@ -321,7 +321,7 @@
|
||||||
/* enums */
|
/* enums */
|
||||||
|
|
||||||
/* sounds */
|
/* sounds */
|
||||||
#define MAXFX 60
|
#define MAXFX 61
|
||||||
#define FX_SHOOT 0
|
#define FX_SHOOT 0
|
||||||
#define FX_SLAM 1
|
#define FX_SLAM 1
|
||||||
#define FX_KILL 2
|
#define FX_KILL 2
|
||||||
|
@ -382,6 +382,7 @@
|
||||||
#define FX_JETPACK 57
|
#define FX_JETPACK 57
|
||||||
#define FX_CAMERA 58
|
#define FX_CAMERA 58
|
||||||
#define FX_LASER 59
|
#define FX_LASER 59
|
||||||
|
#define FX_HISS 60
|
||||||
|
|
||||||
// card suits
|
// card suits
|
||||||
#define CS_HEART 1
|
#define CS_HEART 1
|
||||||
|
|
2
rc.c
2
rc.c
|
@ -4087,6 +4087,7 @@ printf("setting target to y = %d\n",ss->timer2);
|
||||||
if (shoot) {
|
if (shoot) {
|
||||||
// if our shooting timer is okay
|
// if our shooting timer is okay
|
||||||
if (s->timer1 == 0) {
|
if (s->timer1 == 0) {
|
||||||
|
playfx(FX_HISS);
|
||||||
ss = addsprite(P_SPIT,s->x,s->y - s->img->h/2,"spit" );
|
ss = addsprite(P_SPIT,s->x,s->y - s->img->h/2,"spit" );
|
||||||
ss->ys = 0;
|
ss->ys = 0;
|
||||||
ss->xs = s->dir * (getspeed(s)*2);
|
ss->xs = s->dir * (getspeed(s)*2);
|
||||||
|
@ -8305,6 +8306,7 @@ int initsound(void) {
|
||||||
loadfx(FX_JETPACK, "jetpack.wav");
|
loadfx(FX_JETPACK, "jetpack.wav");
|
||||||
loadfx(FX_CAMERA, "camera.wav");
|
loadfx(FX_CAMERA, "camera.wav");
|
||||||
loadfx(FX_LASER, "laser.wav");
|
loadfx(FX_LASER, "laser.wav");
|
||||||
|
loadfx(FX_HISS, "hiss.wav");
|
||||||
|
|
||||||
// load sound effects
|
// load sound effects
|
||||||
for (i = 0; i < MAXFX; i++) {
|
for (i = 0; i < MAXFX; i++) {
|
||||||
|
|
46
shared.c
46
shared.c
|
@ -2064,6 +2064,13 @@ void drawsprite(sprite_t *s) {
|
||||||
frame = F_DEAD;
|
frame = F_DEAD;
|
||||||
} else if (s->id == P_SLUG) {
|
} else if (s->id == P_SLUG) {
|
||||||
frame = F_FALL;
|
frame = F_FALL;
|
||||||
|
} else if (s->powerup == PW_PILL) {
|
||||||
|
// toggle between walking frames FAST
|
||||||
|
if ((timer/3) % 2 == 0) {
|
||||||
|
frame = F_WALK1;
|
||||||
|
} else {
|
||||||
|
frame = F_JUMP;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
frame = F_JUMP;
|
frame = F_JUMP;
|
||||||
}
|
}
|
||||||
|
@ -2079,6 +2086,13 @@ void drawsprite(sprite_t *s) {
|
||||||
} else {
|
} else {
|
||||||
frame = F_FALL;
|
frame = F_FALL;
|
||||||
}
|
}
|
||||||
|
} else if (s->powerup == PW_PILL) {
|
||||||
|
// toggle between walking frames FAST
|
||||||
|
if ((timer/3) % 2 == 0) {
|
||||||
|
frame = F_WALK1;
|
||||||
|
} else {
|
||||||
|
frame = F_JUMP;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
frame = F_FALL;
|
frame = F_FALL;
|
||||||
}
|
}
|
||||||
|
@ -2102,11 +2116,20 @@ void drawsprite(sprite_t *s) {
|
||||||
// DEFAULT FOR EVERYTHING
|
// DEFAULT FOR EVERYTHING
|
||||||
// walking / sliding
|
// walking / sliding
|
||||||
if (s->moved == MV_WALK) {
|
if (s->moved == MV_WALK) {
|
||||||
// toggle between walking frames
|
if (s->powerup == PW_PILL) {
|
||||||
if ((timer/12) % 2 == 0) {
|
// toggle between walking frames FAST
|
||||||
frame = F_WALK1;
|
if ((timer/3) % 2 == 0) {
|
||||||
|
frame = F_WALK1;
|
||||||
|
} else {
|
||||||
|
frame = F_JUMP;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
frame = F_JUMP;
|
// toggle between walking frames
|
||||||
|
if ((timer/12) % 2 == 0) {
|
||||||
|
frame = F_WALK1;
|
||||||
|
} else {
|
||||||
|
frame = F_JUMP;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (s->moved == MV_FLY) {
|
} else if (s->moved == MV_FLY) {
|
||||||
int animspeed;
|
int animspeed;
|
||||||
|
@ -2127,10 +2150,19 @@ void drawsprite(sprite_t *s) {
|
||||||
frame = F_FALL;
|
frame = F_FALL;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (s->moved == MV_ICE) {
|
} else if (s->moved == MV_ICE) { // sliding
|
||||||
frame = F_FALL;
|
frame = F_FALL;
|
||||||
} else {
|
} else { // standing still
|
||||||
frame = F_WALK1;
|
if (s->powerup == PW_PILL) {
|
||||||
|
// toggle between walking frames FAST
|
||||||
|
if ((timer/3) % 2 == 0) {
|
||||||
|
frame = F_WALK1;
|
||||||
|
} else {
|
||||||
|
frame = F_JUMP;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
frame = F_WALK1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue