- Reordered levels and added new levels

- Moved world/level calculation into shared.c
2008-10-16 03:16:47 +00:00 · 2008-10-16 03:16:47 +00:00 · 99b9d99d73
parent 24d538758c
commit 99b9d99d73
7 changed files with 182 additions and 14 deletions
--- a/data/levels.dat
+++ b/data/levels.dat
@ -7,16 +7,16 @@
 8,level9.dat,The Garden
 9,level10.dat,Planks
 11,level5.5.dat,Spike Pit
-12,level7.5.dat,Snake Holes
-13,level11.5.dat,Underground Lakes
+12,level7.5.dat,Slithering Cliffs 
+13,level11.5.dat,Underground Lake
 17,level8.dat,Smile!
 7,level7.dat,Platforms and Ladders
-19,theisland.dat,Island
-15,level13.dat,Dual Hives
+19,theisland.dat,The Island
+15,level13.dat,Bee Caverns
 10,level11.dat,The Hive
-16,level14.dat,The Chimney
+107,level107.dat,Mountaineering
+108,level108.dat,Backyard One
 14,level12.dat,Bee Pods
-18,level8.5.dat,Look out above...
 20,level20.dat,King Rat
 105,level105.dat,The Beach
 21,level21.dat,Beach Complex
@ -25,7 +25,9 @@
 103,level103.dat,Fishbowls
 22,level22.dat,Platforms in the Sand
 106,level106.dat,Bunkers
+16,level14.dat,The Chimney
 23,level23.dat,Twisty Little Passages
 101,level101.dat,Sand Castle
 102,level102.dat,Diving Pool
+18,level8.5.dat,Look out above...
 99,level99.dat,TEST LEVEL
--- a/data/world1/level107.dat
+++ b/data/world1/level107.dat
@ -0,0 +1,74 @@
+bgfile forest.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+0 2 22
+23 20 17
+12 9 12
+1 27 4
+1 4 8
+18 28 27
+7 10 1
+6 17 3
+16 22 17
+16 18 17
+16 30 15
+16 26 15
+16 14 19
+15 35 7
+15 30 7
+15 25 7
+15 16 7
+17 30 4
+17 10 4
+17 11 8
+17 1 8
+15 11 12
+15 28 15
+15 12 19
+15 20 17
+17 33 8
+17 32 8
+17 22 8
+17 19 8
+16 6 8
+16 6 12
+16 18 4
+16 23 4
+18 20 8
+18 32 8
+endmonsters
+exitdir 1
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,35,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,34,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,41,0,0,0,0,0,0,0,0,41,0,0,0,0,41,0,0,0,0,41,0,0,0,4,
+4,1,20,20,20,20,20,20,20,20,20,34,0,0,0,0,42,1,1,1,1,1,1,1,1,43,0,0,0,0,42,1,1,1,1,43,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,1,1,1,1,1,1,1,1,1,1,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,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,35,20,20,20,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,1,9,9,9,1,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,4,4,4,4,4,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,1,9,9,9,1,0,0,0,4,4,4,4,4,11,11,11,11,0,0,0,0,4,
+4,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,4,4,4,4,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,2,9,9,9,1,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,4,4,4,4,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,4,4,4,4,0,0,0,0,4,
+4,0,0,0,0,0,0,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,4,4,4,4,0,0,0,0,4,
+4,1,1,1,1,1,1,1,1,1,4,4,4,4,4,0,0,0,4,4,4,4,4,0,0,0,4,4,4,4,4,4,4,4,4,0,0,0,0,4,
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,43,0,0,0,42,4,4,4,43,0,0,0,42,4,4,4,4,4,4,4,43,0,0,0,0,4,
+4,12,0,0,0,0,0,0,0,0,0,0,0,0,0,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,13,0,0,0,0,0,0,0,0,0,0,0,0,0,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,34,0,0,0,0,0,0,0,0,0,0,0,0,0,11,11,11,0,0,0,0,0,11,11,11,0,0,0,0,0,0,0,0,0,0,0,0,0,4,
+4,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,4,
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+layer2
--- a/data/world1/level108.dat
+++ b/data/world1/level108.dat
@ -0,0 +1,76 @@
+bgfile forest.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+0 19 8
+23 11 8
+1 5 28
+1 29 20
+1 15 12
+18 30 8
+1 13 24
+12 26 28
+12 9 20
+12 31 12
+6 25 1
+7 35 1
+18 4 16
+18 33 24
+17 29 12
+17 27 12
+16 28 12
+16 12 12
+16 10 12
+15 11 12
+15 28 24
+17 27 24
+17 29 24
+17 11 24
+15 10 24
+15 12 24
+15 15 28
+15 22 28
+16 15 16
+16 20 20
+16 32 20
+16 4 24
+16 26 8
+17 23 8
+17 23 16
+17 13 20
+16 18 28
+endmonsters
+exitdir 1
+4,4,4,4,4,4,4,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,4,4,4,4,4,4,4,
+4,0,0,0,0,0,0,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,0,0,0,0,0,0,4,
+4,0,0,0,0,0,0,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,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,12,0,0,0,0,0,0,0,0,0,0,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,13,0,0,0,0,0,0,0,0,0,0,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,28,28,28,28,35,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,34,28,28,28,28,28,28,35,1,1,34,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,35,1,1,1,1,1,1,1,1,1,1,34,28,28,28,28,28,28,28,35,1,1,1,1,1,1,1,1,1,34,28,28,28,28,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,17,0,0,0,0,0,0,0,0,0,0,0,0,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,28,28,28,28,35,1,1,1,1,1,1,1,1,1,34,9,9,9,9,9,9,35,1,1,1,1,1,1,1,1,1,1,1,34,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,17,0,4,
+4,0,0,0,0,35,1,1,1,1,1,34,28,28,28,28,28,28,35,1,1,1,1,1,1,34,10,10,10,10,10,10,35,1,34,28,28,28,28,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,17,0,0,0,0,0,0,0,0,0,0,0,0,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,28,28,28,28,35,1,1,1,1,1,1,1,1,1,1,1,1,1,34,28,28,28,28,28,28,35,1,1,1,1,1,1,1,34,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,14,0,0,17,0,4,
+4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,4,
+layer2
--- a/edit.c
+++ b/edit.c
@ -45,7 +45,9 @@ SDL_Color white = {255, 255, 255, 0};
 SDL_Color grey = {210, 210, 210, 0};
 SDL_Color grey2 = {70, 70, 70, 0};
 SDL_Color green = {0, 255, 0, 0};
+SDL_Color green1 = {0, 100, 0, 0};
 SDL_Color yellow = {255, 255, 0, 0};
+SDL_Color yellow1 = {100, 100, 0, 0};

 int state;

@ -1204,10 +1206,14 @@ void drawlevellist(void) {
 	for (i =1; i < numlevels; i++) {
 		if (i == curlevelnum) {
 			col = &green;
+		} else if (i <= 20) {
+			col = &green1;
+		} else if (i <= 40) {
+			col = &yellow1;
 		} else {
 			col = &white;
 		}
-		sprintf(temps, "%d. %s (%s)",levelentry[i].id, levelentry[i].desc, levelentry[i].filename);
+		sprintf(temps, "%d-%d. %s (id=%d, %s)",getworld(i),getlevel(i),levelentry[i].desc, levelentry[i].id, levelentry[i].filename);
 		writetext(screen, area.x, area.y, temps, EDITTEXT, col);
 		area.y += (EDITTEXT + LLISTPADY);
 	}
--- a/rc.c
+++ b/rc.c
@ -5442,16 +5442,11 @@ void checkwrap(sprite_t *s) {


 int getcurworld(void) {
-	int wnum;
-	wnum = ((curlevelnum-1)/20)+1;
-	return wnum;
+	return getworld(curlevelnum);
 }

 int getcurlevel(void) {
-	int wnum;
-	wnum = (curlevelnum%20);
-	if (wnum == 0) return 20;
-	return wnum;
+	return getlevel(curlevelnum);
 }

 // returns how high a given monster will jump
--- a/shared.c
+++ b/shared.c
@ -2993,3 +2993,16 @@ void shufflecards(void) {
        curcard = 0;
 }

+int getworld(int lev) {
+        int wnum;
+        wnum = ((lev-1)/20)+1;
+        return wnum;
+}
+
+int getlevel(int lev) {
+        int wnum;
+        wnum = (lev%20);
+        if (wnum == 0) return 20;
+        return wnum;
+}
+
--- a/shared.h
+++ b/shared.h
@ -56,6 +56,8 @@ char *getcardletter(int num);
 int getrandomcard(void);
 char *getcardname(int id);
 void shufflecards(void);
+int getworld(int lev);
+int getlevel(int lev);
 // for doco
 void setfruitinfo(void);
 void setinfo(int id, char *name, char *desc, char *file);