Skip to content

Commit

Permalink
game: worm render fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@city41
city41 committed Nov 26, 2018
1 parent bc1c48f commit e62d1bf
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 10 deletions.
Binary file added maskPngs/boatOar_13x8.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed maskPngs/boatOar_14x8.png
View file
Binary file not shown.
Binary file added nonMaskPngs/logo_85x32.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed nonMaskPngs/logo_86x32.png
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion src/game.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,9 @@ void Game::renderPlay(uint8_t frame) {
renderer.translateY = translateY;

for (uint8_t w = 0; w < MAX_WORMS; ++w) {
worms[w].render(frame);
if (abs(worms[w].y - player.y) < HEIGHT) {
worms[w].render(frame);
}
}

for (uint8_t s = 0; s < MAX_SIGNS; ++s) {
Expand Down
6 changes: 3 additions & 3 deletions src/maskBitmaps.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ const uint8_t PROGMEM arrow_plus_mask[] = {

const uint8_t PROGMEM boatOar_plus_mask[] = {
// width, height,
14, 8,
13, 8,
// frame 0
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
// mask 0
0x1c,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x1c,0x1c,0x1c,0x1c,0x1c,0x08,
0x1c,0x08,0x08,0x08,0x08,0x08,0x08,0x1c,0x1c,0x1c,0x1c,0x1c,0x08,
};

const uint8_t PROGMEM boat_plus_mask[] = {
Expand Down
4 changes: 2 additions & 2 deletions src/nonMaskBitmaps.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ const uint8_t PROGMEM fishingGuyDialog_tiles[] = {

const uint8_t PROGMEM logo_tiles[] = {
// width, height,
86, 32,
85, 32,
// frame 0
0x00,0x00,0x1c,0xe2,0x02,0x02,0x02,0x02,0x3c,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0xc4,0x04,0x04,0x04,0x18,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x01,0x01,0x01,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x10,0x10,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xc0,0xa0,0x20,0x20,0xa0,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x90,0x08,0x08,0x07,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x82,0x42,0x22,0x3c,0x20,0x20,0x20,0x20,0x20,0x40,0x80,0x00,0x80,0x40,0x41,0x46,0x78,0x40,0x80,0x00,0x0f,0x30,0x10,0x08,0x84,0x42,0x23,0xf2,0x0c,0x00,0xff,0x00,0x80,0x80,0x80,0x40,0x40,0x40,0x80,0xff,0x00,0x00,0x7f,0x80,0x80,0x60,0x10,0x0c,0x04,0x02,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x01,0x01,0x02,0x04,0x0c,0x1a,0x62,0x82,0x04,0x78,0x20,0x10,0x08,0xc4,0x38,0x00,0x00,0x01,0x01,0x01,0x01,0x0e,0xf0,0x00,0x00,0x00,0x7f,0xc0,0x00,0x00,0x1c,0x22,0x22,0x1e,0x00,0x80,0x3c,0xc2,0x01,0x00,0x1c,0x22,0x42,0x42,0x7e,0x82,0x01,0xc0,0x20,0x42,0x85,0x08,0x30,0x40,0xff,0x00,0x00,0x7f,0x81,0x00,0x18,0x2a,0x4a,0x4a,0x48,0x44,0xff,0x00,0x00,0x38,0x48,0x3f,0xfe,0xfc,0xfc,0xf8,0xf8,0xf8,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf8,0xf8,0xf8,0xfc,0xfc,0xfe,0x3f,0xc0,0x00,0x04,0x9a,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x7e,0x80,0x80,0x80,0x71,0x0e,0x04,0x04,0x04,0x04,0x02,0x01,0x00,0x01,0x02,0x03,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x03,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x1f,0x20,0x20,0x20,0x1f,0x01,0x02,0x02,0x02,0x02,0x02,0x01,0x03,0x06,0x04,0x04,0x02,0x02,0x01,0x01,0x03,0x0b,0x0b,0x2b,0x33,0xb7,0xb7,0xf7,0xf7,0x77,0x57,0x87,0x93,0x13,0x3b,0x3b,0x2b,0x09,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,
0x00,0x00,0x1c,0xe2,0x02,0x02,0x02,0x02,0x3c,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0xc4,0x04,0x04,0x04,0x18,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x01,0x01,0x01,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x10,0x10,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xc0,0xa0,0x20,0x20,0xa0,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x90,0x08,0x08,0x07,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x82,0x42,0x22,0x3c,0x20,0x20,0x20,0x20,0x20,0x40,0x80,0x00,0x80,0x40,0x41,0x46,0x78,0x40,0x80,0x00,0x0f,0x30,0x10,0x08,0x84,0x42,0x23,0xf2,0x0c,0x00,0xff,0x00,0x80,0x80,0x80,0x40,0x40,0x40,0x80,0xff,0x00,0x00,0x7f,0x80,0x80,0x60,0x10,0x0c,0x04,0x02,0x01,0x01,0x00,0x00,0x01,0x01,0x01,0x01,0x00,0x01,0x01,0x02,0x04,0x0c,0x1a,0x62,0x82,0x04,0x78,0x20,0x10,0x08,0xf0,0x00,0x00,0x01,0x01,0x01,0x01,0x0e,0xf0,0x00,0x00,0x00,0x7f,0xc0,0x00,0x00,0x1c,0x22,0x22,0x1e,0x00,0x80,0x3c,0xc2,0x01,0x00,0x1c,0x22,0x42,0x42,0x7e,0x82,0x01,0xc0,0x20,0x42,0x85,0x08,0x30,0x40,0xff,0x00,0x00,0x7f,0x81,0x00,0x18,0x2a,0x4a,0x4a,0x48,0x44,0xff,0x00,0x00,0x38,0x48,0x3f,0xfe,0xfc,0xfc,0xf8,0xf8,0xf8,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xf8,0xf8,0xf8,0xfc,0xfc,0xfe,0x3f,0xc0,0x00,0x04,0x9a,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x7e,0x80,0x80,0x80,0x71,0x0e,0x04,0x04,0x04,0x04,0x02,0x01,0x00,0x01,0x02,0x03,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x03,0x00,0x00,0x00,0x00,0x03,0x04,0x04,0x1f,0x20,0x20,0x20,0x1f,0x01,0x02,0x02,0x02,0x02,0x02,0x01,0x03,0x06,0x04,0x04,0x02,0x02,0x01,0x01,0x03,0x0b,0x0b,0x2b,0x33,0xb7,0xb7,0xf7,0xf7,0x77,0x57,0x87,0x93,0x13,0x3b,0x3b,0x2b,0x09,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,
};

const uint8_t PROGMEM map_tiles[] = {
Expand Down
6 changes: 3 additions & 3 deletions src/strings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ const uint8_t youHaveNoFish_string[25] PROGMEM = {
};


// "I AM NOT BUYING\nTHOSE CRUSTY BOOTS"
const uint8_t notBuyingBoots_string[35] PROGMEM = {
19, 0, 11, 23, 0, 24, 25, 30, 0, 12, 31, 35, 19, 24, 17, 42, 30, 18, 25, 29, 15, 0, 13, 28, 31, 29, 30, 35, 0, 12, 25, 25, 30, 29, 0xFF
// "I AM NOT BUYING\nTHOSE BOOTS"
const uint8_t notBuyingBoots_string[28] PROGMEM = {
19, 0, 11, 23, 0, 24, 25, 30, 0, 12, 31, 35, 19, 24, 17, 42, 30, 18, 25, 29, 15, 0, 12, 25, 25, 30, 29, 0xFF
};


Expand Down
2 changes: 1 addition & 1 deletion strings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{ "key": "sellFor", "value": "SELL ALL FISH FOR" },
{ "key": "adviceFor", "value": "USEFUL ADVICE FOR" },
{ "key": "youHaveNoFish", "value": "YOU HAVE NO FISH\nTO SELL" },
{ "key": "notBuyingBoots", "value": "I AM NOT BUYING\nTHOSE CRUSTY BOOTS" },
{ "key": "notBuyingBoots", "value": "I AM NOT BUYING\nTHOSE BOOTS" },
{ "key": "digit0", "value": "0" },
{ "key": "digit1", "value": "1" },
{ "key": "digit2", "value": "2" },
Expand Down

0 comments on commit e62d1bf

Please sign in to comment.