Skip to content

Commit 4e3ecce

Browse files
davemoore22davemoore22
committed
Version 0.7
1 parent 6deaef3 commit 4e3ecce

File tree

6 files changed

+58
-22
lines changed

6 files changed

+58
-22
lines changed

‎collateral/nibdx.tiled-session‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"selectedLayer": 0,
106106
"viewCenter": {
107107
"x": 160.14326932643522,
108-
"y": 84.05133817530597
108+
"y": 83.7329618943389
109109
}
110110
},
111111
"sprites.tsx": {

‎inc/levels.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ extern const u8 g_game_pf_6[40 * 21];
3131
extern const u8 g_game_pf_7[40 * 21];
3232
extern const u8 g_game_pf_8[40 * 21];
3333
extern const u8 g_game_pf_9[40 * 21];
34+
extern const u8 g_game_pf_10[40 * 21];
3435
extern const u8 g_game_pf_gems[10];
3536
extern const u8 g_game_pf_cols[10];
3637
extern u8 *const g_game_pf[10];

‎nibdx.dsk‎

0 Bytes
Binary file not shown.

‎src/data/levels.c‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,55 @@ const u8 g_game_pf_9[40 * 21] = {21, 21, 21, 21, 6, 11, 11, 11, 11, 11, 11, 11,
479479
11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
480480
11, 9, 21, 21, 21, 21};
481481

482+
const u8 g_game_pf_10[40 * 21] = {6, 11, 11, 11, 7, 21, 21, 21, 21, 21, 21, 21,
483+
21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
484+
21, 21, 21, 21, 21, 6, 11, 11, 11, 7, 10, 21, 21, 21, 10, 21, 21, 21,
485+
21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
486+
21, 21, 21, 21, 21, 21, 21, 21, 21, 10, 21, 21, 21, 10, 10, 21, 21, 21,
487+
8, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 19, 11, 11, 11, 11, 11,
488+
11, 11, 11, 11, 11, 11, 11, 19, 11, 11, 11, 11, 11, 9, 21, 21, 21, 10,
489+
10, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 10, 21,
490+
21, 21, 21, 21, 21, 5, 21, 21, 21, 21, 21, 10, 21, 21, 21, 21, 21, 21,
491+
5, 21, 21, 10, 8, 11, 7, 21, 14, 11, 11, 11, 11, 11, 11, 11, 7, 21, 12,
492+
5, 13, 21, 12, 21, 14, 11, 11, 15, 5, 14, 11, 7, 21, 10, 21, 6, 11, 11,
493+
11, 7, 21, 6, 11, 9, 21, 21, 10, 21, 21, 5, 21, 21, 21, 21, 21, 21, 10,
494+
21, 10, 21, 21, 21, 10, 21, 21, 21, 21, 21, 21, 21, 21, 10, 21, 10, 21,
495+
17, 11, 11, 11, 9, 21, 10, 21, 21, 21, 21, 17, 11, 11, 11, 7, 21, 6, 11,
496+
7, 21, 10, 5, 10, 21, 12, 21, 8, 11, 19, 19, 11, 11, 11, 7, 21, 10, 5,
497+
10, 21, 10, 21, 21, 21, 5, 21, 10, 21, 21, 21, 21, 17, 11, 11, 11, 9,
498+
21, 10, 21, 10, 21, 10, 21, 10, 21, 10, 21, 21, 21, 10, 10, 21, 21, 21,
499+
10, 21, 10, 21, 10, 21, 10, 21, 6, 11, 15, 21, 10, 21, 21, 21, 21, 10,
500+
21, 21, 21, 21, 21, 10, 21, 10, 5, 13, 21, 10, 21, 10, 21, 12, 21, 10,
501+
10, 21, 12, 5, 10, 21, 13, 21, 10, 21, 10, 21, 10, 21, 21, 21, 10, 21,
502+
21, 21, 21, 10, 21, 14, 11, 7, 21, 10, 21, 10, 21, 21, 21, 10, 21, 10,
503+
5, 10, 21, 8, 9, 21, 10, 21, 10, 21, 21, 21, 10, 21, 10, 21, 10, 21, 12,
504+
21, 10, 21, 21, 21, 21, 10, 21, 21, 21, 10, 21, 10, 21, 10, 21, 6, 11,
505+
9, 21, 13, 21, 10, 21, 21, 5, 21, 10, 21, 10, 21, 14, 11, 9, 21, 10, 21,
506+
10, 21, 10, 21, 10, 21, 21, 21, 21, 10, 21, 12, 21, 10, 21, 8, 11, 9,
507+
21, 10, 21, 5, 21, 21, 21, 10, 21, 6, 7, 21, 10, 21, 10, 21, 21, 21, 21,
508+
21, 10, 21, 10, 21, 10, 21, 10, 21, 21, 21, 21, 10, 21, 10, 21, 10, 21,
509+
21, 5, 21, 21, 10, 21, 6, 11, 15, 21, 10, 5, 10, 10, 21, 10, 21, 13, 21,
510+
14, 11, 11, 11, 9, 21, 10, 21, 10, 21, 10, 21, 21, 21, 21, 10, 21, 10,
511+
21, 8, 11, 11, 11, 15, 21, 13, 21, 10, 21, 21, 5, 10, 21, 10, 10, 21,
512+
10, 21, 21, 21, 21, 21, 21, 21, 21, 5, 10, 21, 10, 21, 10, 21, 21, 21,
513+
21, 10, 21, 10, 21, 21, 5, 21, 21, 21, 21, 21, 21, 10, 21, 6, 11, 9, 21,
514+
8, 9, 21, 10, 21, 14, 11, 11, 11, 11, 11, 11, 11, 9, 21, 10, 21, 10, 21,
515+
21, 21, 21, 10, 21, 17, 11, 11, 11, 11, 11, 11, 11, 7, 21, 10, 21, 10,
516+
21, 21, 21, 21, 21, 5, 10, 21, 5, 21, 21, 21, 21, 21, 21, 21, 21, 21,
517+
10, 21, 10, 21, 21, 6, 11, 9, 5, 8, 11, 11, 11, 11, 11, 11, 11, 9, 21,
518+
10, 21, 13, 21, 14, 11, 11, 11, 11, 18, 11, 11, 11, 11, 11, 15, 5, 14,
519+
11, 11, 11, 9, 21, 8, 11, 7, 10, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
520+
21, 21, 21, 10, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
521+
21, 21, 21, 21, 21, 21, 21, 5, 21, 21, 10, 10, 21, 21, 21, 6, 11, 11,
522+
11, 11, 11, 11, 11, 11, 11, 20, 11, 11, 11, 11, 11, 11, 11, 11, 15, 21,
523+
6, 11, 11, 11, 11, 11, 11, 11, 11, 11, 7, 21, 21, 21, 10, 10, 21, 21,
524+
21, 10, 21, 21, 21, 21, 21, 21, 21, 21, 21, 10, 21, 21, 21, 21, 21, 21,
525+
21, 21, 21, 21, 10, 21, 21, 21, 21, 21, 21, 21, 21, 21, 10, 21, 21, 21,
526+
10, 8, 11, 11, 11, 9, 21, 21, 21, 21, 21, 21, 21, 21, 21, 8, 11, 11, 11,
527+
11, 11, 11, 11, 11, 11, 11, 9, 21, 21, 21, 21, 21, 21, 21, 21, 21, 8,
528+
11, 11, 11, 9};
529+
482530
u8 *const g_game_pf[10] = {g_game_pf_1, g_game_pf_2, g_game_pf_3, g_game_pf_4,
483531
g_game_pf_5, g_game_pf_6, g_game_pf_7, g_game_pf_8, g_game_pf_9,
484-
g_game_pf_1};
532+
g_game_pf_10};
485533

‎src/data/strings.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const char *const g_strings[] = {
2424
"A REMAKE BY", "DAVE MOORE (c) 2024", " ORIGINAL BY ",
2525
" CHRISTOPH VON RHEIN & ROMAN MAJER ", " (C) MOSAIK SOFTWARE 1984 ",
2626
"BASED ON NIBBLER BY", "JOSEPH H. ULOWETZ & JOHN M. JAUGILAS ",
27-
"(C) ROCK-OLA MFG CORP 1982", "V0.6: 10/12/2023", "",
27+
"(C) ROCK-OLA MFG CORP 1982", "V0.7: 12/12/2023", "",
2828
/* Title Screen 10-29 */
2929
"1.", "2.", "3.", "4.", "9.", "0.", "DIFFICULTY", "SET CONTROLS",
3030
"MUSIC/SFX ON/OFF", "SHOW INSTRUCTONS", "PLAY GAME", "QUIT",
@@ -46,9 +46,8 @@ const char *const g_strings[] = {
4646
"EAT A GEM! NOM-NOM-NOM! TRY NOT TO", "EAT YOUR OWN TAIL, AS YOU DON'T",
4747
"TASTE VERY NICE!", " ", "EAT ALL THE GEMS IN A MAZE AND",
4848
"YOU CAN GO TO THE NEXT ONE!", " ", "THERE ARE TEN MAZES IN TOTAL!",
49-
" ", "GITHUB.COM/DAVEMOORE22/CPCNIBDX",
50-
"DAVEMOORE22@PROTONMAIL.COM", "WRITTEN WITH CPCTELERA/SDCC",
51-
" ",
49+
" ", "TRY HARD MODE FOR EXTRA-HIGH",
50+
"SCORES IF YOU DARE!", " ", " ",
5251
/* Controls 80 - 89 */
5352
"IN-GAME CONTROLS:", "CHANGE DIRECTION", "CURSOR KEYS/JOYSTICK",
5453
"PAUSE/UNPAUSE", "P", "QUIT TO MAIN MENU", "Q",

‎src/game.c‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ static u8 lives;
3838
/* Current Score */
3939
static u32 score;
4040

41-
/* Game Speed */
42-
static u16 speed;
43-
4441
/* Game Playfield Screen Location */
4542
static const pos_t pf_loc = {.x = 0, .y = 0};
4643
static const dim_t pf_sz = {.w = 40, .h = 21};
@@ -83,11 +80,10 @@ u32 g_start(void) {
8380
bool game_over = false, lvl_complete;
8481
u8 gems_left;
8582

86-
level = 9;
83+
level = 1;
8784
round = 1;
8885
lives = 3;
8986
score = 0;
90-
speed = 500;
9187

9288
/* Keep going until game over! */
9389
while (!game_over) {
@@ -131,17 +127,9 @@ u32 g_start(void) {
131127

132128
/* Level Completed so onto the next! */
133129
++level;
134-
if (level > 9) {
135-
//++round;
136-
//level = 1;
137-
138-
/* For now */
139-
g_stop();
140-
b_scr_start(SCR_CONGRATULATIONS, 0, 0);
141-
b_scr_stop();
142-
h_start(score);
143-
h_stop();
144-
game_over = true;
130+
if (level > 10) {
131+
++round;
132+
level = 1;
145133
}
146134
} else {
147135

0 commit comments

Comments
 (0)