rob/ratcatcher
rob
/
ratcatcher
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- ice bridges are now slippery 

- added l3 tile - sand battlement
This commit is contained in:
Rob Pearce 2009-03-10 21:10:17 +00:00
parent cc4eefca63
commit dcc7d426e3
13 changed files with 111 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
data/levels/level101.dat
View File

@ -85,38 +85,100 @@ exitdir 2
44,0,0,0,0,0,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,0,0,0,0,44, 44,0,0,0,0,0,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,0,0,0,0,44,
44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,44, 44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,44,
layer2 layer2
7,8,96,layer3
8,8,96,layer3
9,8,96,layer3
10,8,96,layer3
11,8,96,layer3
12,8,96,layer3
13,8,96,layer3
14,8,96,layer3
15,8,96,layer3
16,8,96,layer3
17,8,96,layer3
18,8,96,layer3
19,8,96,layer3
20,8,96,layer3
21,8,96,layer3
22,8,96,layer3
23,8,96,layer3
24,8,96,layer3
25,8,96,layer3
26,8,96,layer3
27,8,96,layer3
28,8,96,layer3
29,8,96,layer3
30,8,96,layer3
31,8,96,layer3
32,8,96,layer3
33,8,96,layer3
9,11,18 9,11,18
15,12,96,layer3
16,12,96,layer3
17,12,96,layer3
18,12,96,layer3
19,12,96,layer3
20,12,96,layer3
21,12,96,layer3
22,12,96,layer3
23,12,96,layer3
24,12,96,layer3
25,12,96,layer3
14,13,28 14,13,28
26,13,28 26,13,28
13,14,28 13,14,28
27,14,28 27,14,28
9,15,94,layer3 9,15,96,layer3
10,15,94,layer3 10,15,96,layer3
12,15,28 12,15,28
28,15,28 28,15,28
30,15,94,layer3 30,15,96,layer3
31,15,94,layer3 31,15,96,layer3
11,16,28 11,16,28
29,16,28 29,16,28
1,17,94,layer3 1,17,96,layer3
2,17,94,layer3 2,17,96,layer3
3,17,94,layer3 3,17,96,layer3
4,17,94,layer3 4,17,96,layer3
5,17,94,layer3 5,17,96,layer3
12,17,28 12,17,28
28,17,28 28,17,28
35,17,94,layer3 35,17,96,layer3
36,17,94,layer3 36,17,96,layer3
37,17,94,layer3 37,17,96,layer3
38,17,94,layer3 38,17,96,layer3
13,18,28 13,18,28
27,18,28 27,18,28
14,19,28 14,19,28
26,19,28 26,19,28
6,20,96,layer3
8,20,96,layer3
15,20,28 15,20,28
25,20,28 25,20,28
32,20,96,layer3
34,20,96,layer3
7,21,96,layer3
9,21,96,layer3
11,21,96,layer3
12,21,96,layer3
13,21,96,layer3
14,21,96,layer3
15,21,96,layer3
16,21,28 16,21,28
16,21,96,layer3
17,21,96,layer3
18,21,96,layer3
22,21,96,layer3
23,21,96,layer3
24,21,28 24,21,28
24,21,96,layer3
25,21,96,layer3
26,21,96,layer3
27,21,96,layer3
28,21,96,layer3
29,21,96,layer3
31,21,96,layer3
33,21,96,layer3
9,23,19 9,23,19
31,23,18 31,23,18
7,24,19 7,24,19

4
data/levels/level612.dat
View File

@ -6,11 +6,11 @@ endhelp
monsters monsters
0 1 17 0 1 17
134 38 17 134 38 17
23 19 5
6 12 14 6 12 14
6 24 16 6 24 16
1 15 17 1 15 17
1 29 17 1 29 17
23 19 5
18 13 8 18 13 8
18 27 8 18 27 8
16 3 17 16 3 17
@ -28,7 +28,7 @@ monsters
15 21 17 15 21 17
15 30 17 15 30 17
endmonsters endmonsters
exitdir -1 exitdir -2
33,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33, 33,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33,
33,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33, 33,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33,
33,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33, 33,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33,33,33,

3
data/levels/level613.dat
View File

@ -10,7 +10,6 @@ monsters
158 34 28 158 34 28
158 34 20 158 34 20
158 34 12 158 34 12
158 5 8
158 5 16 158 5 16
158 5 24 158 5 24
17 7 24 17 7 24
@ -105,7 +104,7 @@ monsters
15 5 20 15 5 20
15 5 12 15 5 12
endmonsters endmonsters
exitdir -1 exitdir -2
33,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,33, 33,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,33,
33,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,33, 33,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,33,
33,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,33, 33,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,33,

2
data/levels/level614.dat
View File

@ -32,7 +32,7 @@ monsters
17 4 7 17 4 7
17 35 7 17 35 7
endmonsters endmonsters
exitdir 1 exitdir -2
33,87,87,87,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,87,87,87,32, 33,87,87,87,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,87,87,87,32,
33,87,87,87,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,87,87,87,33, 33,87,87,87,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,87,87,87,33,
33,32,87,87,87,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,87,87,87,32,33, 33,32,87,87,87,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,87,87,87,32,33,

2
data/levels/level615.dat
View File

@ -23,7 +23,7 @@ monsters
124 18 28 124 18 28
124 21 28 124 21 28
endmonsters endmonsters
exitdir 1 exitdir -2
33,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,33, 33,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,33,
33,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,33, 33,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,33,
33,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,33, 33,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,33,

4
data/levels/level618.dat
View File

@ -6,6 +6,7 @@ endhelp
monsters monsters
0 2 28 0 2 28
134 37 28 134 37 28
23 20 18
12 24 28 12 24 28
49 16 28 49 16 28
158 15 4 158 15 4
@ -20,9 +21,8 @@ monsters
15 10 27 15 10 27
15 29 27 15 29 27
6 21 14 6 21 14
23 20 18
endmonsters endmonsters
exitdir 1 exitdir -2
90,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,90, 90,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,0,0,0,0,0,0,0,90,
90,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,90, 90,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,90,
90,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,90, 90,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,90,

8
data/levels/level619.dat
View File

@ -4,6 +4,9 @@ hurryup 30
help help
endhelp endhelp
monsters monsters
0 3 26
134 36 26
23 19 9
6 10 6 6 10 6
6 27 6 6 27 6
12 10 18 12 10 18
@ -15,8 +18,6 @@ monsters
133 22 18 133 22 18
157 20 8 157 20 8
12 20 12 12 20 12
0 3 26
134 36 26
7 35 1 7 35 1
7 4 1 7 4 1
15 7 22 15 7 22
@ -40,10 +41,9 @@ monsters
17 30 10 17 30 10
16 35 14 16 35 14
16 4 14 16 4 14
23 19 9
12 20 22 12 20 22
endmonsters endmonsters
exitdir 1 exitdir -2
90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90, 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,
90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,90,0,0,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,90, 90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,90,0,0,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,90,
90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,90,0,0,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,90, 90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,90,0,0,90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,90,

2
data/levels/level620.dat
View File

@ -8,7 +8,7 @@ monsters
134 37 16 134 37 16
163 7 28 163 7 28
endmonsters endmonsters
exitdir 1 exitdir -2
91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91, 91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,
91,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,91, 91,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,91,
91,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,91, 91,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,91,

BIN
data/newtiles/sandbment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 658 B

8
data/tiledefs.dat
View File

@ -573,7 +573,7 @@ file newtiles/icebg.png
end end
tile icebridge tile icebridge
id 17 id 26
solid 2 solid 2
file newtiles/icebridge.png file newtiles/icebridge.png
end end
@ -619,3 +619,9 @@ id 5
solid 0 solid 0
file newtiles/bars.png file newtiles/bars.png
end end
tile bars
id 5
solid 0
file newtiles/sandbment.png
end

1
defs.h
View File

@ -783,6 +783,7 @@
#define T_WATERLEFT 23 #define T_WATERLEFT 23
#define T_WATERDOWN 24 #define T_WATERDOWN 24
#define T_WARP 25 // hidden warp point - jump to reveal #define T_WARP 25 // hidden warp point - jump to reveal
#define T_ICEBRIDGE 26 // like land but you can drop down through it
// death states // death states
#define D_INITIAL (1) // Need to trigger death sequence #define D_INITIAL (1) // Need to trigger death sequence

19
rc.c
View File

@ -5409,7 +5409,7 @@ printf("setting target to y = %d\n",ss->timer2);
// melt any ice bridges it touches // melt any ice bridges it touches
for (yyy = s->y - s->img->h ; yyy < s->y ; yyy += 4) { for (yyy = s->y - s->img->h ; yyy < s->y ; yyy += 4) {
tt = gettileat(s->x + (s->img->w/2),yyy, &tx,&ty); tt = gettileat(s->x + (s->img->w/2),yyy, &tx,&ty);
if (tt->id == T_BRIDGE) { if (isbridge(tt->id)) {
melttile(tx,ty,REGROWTIMER_SHORT); melttile(tx,ty,REGROWTIMER_SHORT);
} }
} }
@ -7272,7 +7272,7 @@ void removesprite(sprite_t *s) {
int isonbridge(sprite_t *s) { int isonbridge(sprite_t *s) {
tiletype_t *tthere; tiletype_t *tthere;
tthere = gettileat(s->x,s->y, NULL,NULL); tthere = gettileat(s->x,s->y, NULL,NULL);
if (tthere->id == T_BRIDGE) { if (isbridge(tthere->id)) {
return B_TRUE; return B_TRUE;
} }
@ -7698,7 +7698,7 @@ void dogravity(sprite_t *s) {
// melt roof // melt roof
for (xxx = s->x - (s->img->w/2) ; xxx < s->x + (s->img->w/2) ; xxx += TILEW) { for (xxx = s->x - (s->img->w/2) ; xxx < s->x + (s->img->w/2) ; xxx += TILEW) {
tt = gettileat(xxx, s->y - s->img->h,&tx,&ty); tt = gettileat(xxx, s->y - s->img->h,&tx,&ty);
if (tt->id == T_BRIDGE) { if (isbridge(tt->id)) {
// melt it! // melt it!
melttile(tx,ty,REGROWTIMER_LONG); melttile(tx,ty,REGROWTIMER_LONG);
} }
@ -7792,7 +7792,7 @@ void dogravity(sprite_t *s) {
// king ant melts ground // king ant melts ground
for (xxx = s->x - (s->img->w/2) ; xxx < s->x + (s->img->w/2) ; xxx += TILEW) { for (xxx = s->x - (s->img->w/2) ; xxx < s->x + (s->img->w/2) ; xxx += TILEW) {
tt = gettileat(xxx, s->y + 2 ,&tx,&ty); tt = gettileat(xxx, s->y + 2 ,&tx,&ty);
if (tt->id == T_BRIDGE) { if (isbridge(tt->id)) {
melttile(tx,ty,REGROWTIMER_LONG); melttile(tx,ty,REGROWTIMER_LONG);
} }
} }
@ -13638,9 +13638,20 @@ int countbabies(sprite_t *s, int babytype) {
return numbabies; return numbabies;
} }
int isbridge(int id) {
switch (id) {
case T_BRIDGE:
case T_ICEBRIDGE:
return B_TRUE;
}
return B_FALSE;
}
int isice(int id) { int isice(int id) {
switch (id) { switch (id) {
case T_ICE: case T_ICE:
case T_ICEBRIDGE:
case T_ICETOP: case T_ICETOP:
return B_TRUE; return B_TRUE;
} }

1
rc.h
View File

@ -128,5 +128,6 @@ int getpnum(sprite_t *s);
int isonplatform(double x, double y); int isonplatform(double x, double y);
int countbabies(sprite_t *s, int babytype); int countbabies(sprite_t *s, int babytype);
int isice(int id); int isice(int id);
int isbridge(int id);
int savebmp(SDL_Surface *which); int savebmp(SDL_Surface *which);
void melttile(int tx,int ty, int howlong); void melttile(int tx,int ty, int howlong);