Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Origin/lumberjack #130

Merged
merged 61 commits into from
Nov 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
0e2fb61
Title screen update
MrTroyD Sep 16, 2023
f126adc
External Map loader
MrTroyD Sep 16, 2023
ca52dca
File format updated
MrTroyD Sep 17, 2023
a040b2e
Add Game Over
MrTroyD Sep 19, 2023
509e38d
Back in the groove QoL updates
MrTroyD Oct 7, 2023
61bc49c
Continuing level flow
MrTroyD Oct 7, 2023
e31d68c
Removed onTitle and gameOver bools for a state machine
MrTroyD Oct 7, 2023
8508c83
Small level format clean up
MrTroyD Oct 8, 2023
302ebc0
Adding level continuation
MrTroyD Oct 8, 2023
1cc576a
Additional level updates
MrTroyD Oct 9, 2023
89f521b
Merge branch 'main' into origin/lumberjack
MrTroyD Oct 9, 2023
7efc2a0
Didn't want to lose the main file in the merge commit
MrTroyD Oct 9, 2023
f132878
Bug Fixes
MrTroyD Oct 9, 2023
4cd3a56
Quick bug fixes
MrTroyD Oct 9, 2023
397e4e3
Ghost officially added
MrTroyD Oct 15, 2023
514f013
Added water drain block for panic mode
MrTroyD Oct 15, 2023
8688558
Merge branch 'main' into origin/lumberjack
MrTroyD Oct 15, 2023
2a1ce06
Spawn Fix
MrTroyD Oct 15, 2023
9938068
Shifted levels around a bit more
MrTroyD Oct 20, 2023
0361dd7
Cho nuff update
MrTroyD Oct 21, 2023
144e172
Ghostly fixes
MrTroyD Oct 21, 2023
b3d20ac
Multiplayer madness starts
MrTroyD Oct 21, 2023
6669ece
Added You Win
MrTroyD Oct 22, 2023
337deea
Added combos at a crude level
MrTroyD Oct 31, 2023
ade385f
Merge branch 'main' into origin/lumberjack
MrTroyD Nov 2, 2023
19ff035
Spawning Update starting Attack
MrTroyD Nov 3, 2023
62d3bb1
Refactored tiled collision detection
MrTroyD Nov 3, 2023
5b2b4a5
Multiplayer bug fixes
MrTroyD Nov 4, 2023
0e62136
Bonus update
MrTroyD Nov 5, 2023
d34261c
Items Added
MrTroyD Nov 5, 2023
efeeafe
New Fast Enemy
MrTroyD Nov 6, 2023
1426923
Additional levels
MrTroyD Nov 6, 2023
bd91198
Attack mode updates
MrTroyD Nov 9, 2023
1dd26a2
Merge branch 'main' into origin/lumberjack
MrTroyD Nov 9, 2023
1aff05d
Removing showstopping bug
MrTroyD Nov 10, 2023
a520a0a
Multiplayer Score Sending
MrTroyD Nov 11, 2023
7a4d68d
Simple multiplayer update
MrTroyD Nov 11, 2023
9aab581
Additional multiplayer tweaks
MrTroyD Nov 12, 2023
049c1bd
Multiplayer bug fixes
MrTroyD Nov 12, 2023
000e66c
Started SFX
MrTroyD Nov 13, 2023
0fba5b8
Added Panic Theme
MrTroyD Nov 13, 2023
087f464
Adding final levels
MrTroyD Nov 14, 2023
9ce8bc4
Music Add
MrTroyD Nov 15, 2023
bf1ce72
Applying memory leak fixes from Adam
MrTroyD Nov 15, 2023
7253951
Use charactersArray in lumberjack_t
AEFeinstein Nov 15, 2023
39a2ab8
Fix networking in emulator
AEFeinstein Nov 16, 2023
89cadbd
Make P2P easier to debug
AEFeinstein Nov 16, 2023
8b8a6b9
Make lumberjack p2p symmetrical
AEFeinstein Nov 16, 2023
7de1f28
Patched in Adams Multiplayer fix
MrTroyD Nov 16, 2023
3131df0
Merge branch 'main' into origin/lumberjack
MrTroyD Nov 16, 2023
496ba21
Merge branch 'origin/lumberjack' into lumberjack-wireless
AEFeinstein Nov 17, 2023
3e54a7c
Added a few TODOs
AEFeinstein Nov 17, 2023
c6580e3
Add note about cppcheck warning
AEFeinstein Nov 17, 2023
7fb4f10
Started TODO fixes
MrTroyD Nov 17, 2023
c897e29
Added instructions
MrTroyD Nov 18, 2023
9f7bce1
Moved networking to after loading
MrTroyD Nov 18, 2023
fab9565
Lite networking fixes
MrTroyD Nov 18, 2023
4fb6035
Added connection lost functionality
MrTroyD Nov 19, 2023
d3f0c06
Merge branch 'main' into origin/lumberjack
MrTroyD Nov 19, 2023
83fb45c
Fixed networking icons
MrTroyD Nov 19, 2023
1280221
Fixed secret characters not loading
MrTroyD Nov 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/fonts/eightbit_atari_grube2.font.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/l_sfx_being_attacked.mid
Binary file not shown.
Binary file added assets/lumbers/l_sfx_brick.mid
Binary file not shown.
Binary file added assets/lumbers/l_sfx_enemy_death.mid
Binary file not shown.
Binary file added assets/lumbers/l_sfx_enemy_flip.mid
Binary file not shown.
Binary file added assets/lumbers/l_sfx_jump.mid
Binary file not shown.
Binary file added assets/lumbers/l_sfx_pear.mid
Binary file not shown.
Binary file added assets/lumbers/l_sfx_upgrade.mid
Binary file not shown.
Binary file added assets/lumbers/l_sfx_water.mid
Binary file not shown.
Binary file added assets/lumbers/l_song_attack.mid
Binary file not shown.
Binary file added assets/lumbers/l_song_attack_title.mid
Binary file not shown.
Binary file added assets/lumbers/l_song_gameover.mid
Binary file not shown.
Binary file added assets/lumbers/l_song_panic.mid
Binary file not shown.
Binary file added assets/lumbers/l_song_panic_title.mid
Binary file not shown.
Binary file added assets/lumbers/l_song_respawn.mid
Binary file not shown.
40 changes: 40 additions & 0 deletions assets/lumbers/lumberjacks.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="Base" tilewidth="16" tileheight="16" tilecount="12" columns="0">
<grid orientation="orthogonal" width="1" height="1"/>
<tile id="0">
<image width="16" height="16" source="lumbers_bottom_floor1.png"/>
</tile>
<tile id="1">
<image width="16" height="16" source="lumbers_bottom_floor2.png"/>
</tile>
<tile id="2">
<image width="16" height="16" source="lumbers_bottom_floor3.png"/>
</tile>
<tile id="3">
<image width="16" height="16" source="lumbers_bottom_floor4.png"/>
</tile>
<tile id="4">
<image width="16" height="16" source="lumbers_bottom_floor5.png"/>
</tile>
<tile id="5">
<image width="16" height="16" source="lumbers_bottom_floor6.png"/>
</tile>
<tile id="6">
<image width="16" height="16" source="lumbers_bottom_floor7.png"/>
</tile>
<tile id="7">
<image width="16" height="16" source="lumbers_bottom_floor8.png"/>
</tile>
<tile id="8">
<image width="16" height="16" source="lumbers_bottom_floor9.png"/>
</tile>
<tile id="9">
<image width="16" height="16" source="lumbers_bottom_floor10.png"/>
</tile>
<tile id="10">
<image width="16" height="16" source="lumbers_normal_ax_block1.png"/>
</tile>
<tile id="11">
<image width="16" height="16" source="lumbers_rtile_1.png"/>
</tile>
</tileset>
Binary file added assets/lumbers/lumberjacks_attack_1.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_10.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_2.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_3.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_4.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_5.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_6.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_7.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_8.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_9.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_attack_vs.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_1.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_10.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_2.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_3.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_4.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_5.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_6.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_7.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_8.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_9.bin
Binary file not shown.
Binary file added assets/lumbers/lumberjacks_panic_vs.bin
Binary file not shown.
File renamed without changes
Binary file added assets/lumbers/lumbers_bonus_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_bonus_x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_cho_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_cho_10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lumbers/lumbers_cho_11.png
Binary file added assets/lumbers/lumbers_cho_12.png
Binary file added assets/lumbers/lumbers_cho_13.png
Binary file added assets/lumbers/lumbers_cho_14.png
Binary file added assets/lumbers/lumbers_cho_15.png
Binary file added assets/lumbers/lumbers_cho_16.png
Binary file added assets/lumbers/lumbers_cho_17.png
Binary file added assets/lumbers/lumbers_cho_18.png
Binary file added assets/lumbers/lumbers_cho_2.png
Binary file added assets/lumbers/lumbers_cho_3.png
Binary file added assets/lumbers/lumbers_cho_4.png
Binary file added assets/lumbers/lumbers_cho_5.png
Binary file added assets/lumbers/lumbers_cho_6.png
Binary file added assets/lumbers/lumbers_cho_7.png
Binary file added assets/lumbers/lumbers_cho_8.png
Binary file added assets/lumbers/lumbers_cho_9.png
Binary file added assets/lumbers/lumbers_cho_lives.png
Binary file added assets/lumbers/lumbers_conn_lost.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added assets/lumbers/lumbers_enemy_e1.png
Binary file added assets/lumbers/lumbers_enemy_e2.png
Binary file added assets/lumbers/lumbers_enemy_e3.png
Binary file added assets/lumbers/lumbers_enemy_e4.png
Binary file added assets/lumbers/lumbers_enemy_e5.png
Binary file added assets/lumbers/lumbers_enemy_e6.png
Binary file added assets/lumbers/lumbers_enemy_e7.png
Binary file added assets/lumbers/lumbers_enemy_f1.png
Binary file added assets/lumbers/lumbers_enemy_f2.png
Binary file added assets/lumbers/lumbers_enemy_f3.png
Binary file added assets/lumbers/lumbers_enemy_f4.png
Binary file added assets/lumbers/lumbers_enemy_f5.png
Binary file added assets/lumbers/lumbers_enemy_f6.png
Binary file added assets/lumbers/lumbers_enemy_f7.png
Binary file added assets/lumbers/lumbers_game_over.png
Binary file added assets/lumbers/lumbers_game_over_win.png
Binary file added assets/lumbers/lumbers_green_ax_block.png
Binary file added assets/lumbers/lumbers_green_ax_block3.png
Binary file added assets/lumbers/lumbers_green_ax_block4.png
Binary file added assets/lumbers/lumbers_green_ax_block5.png
Binary file added assets/lumbers/lumbers_green_ax_block6.png
Binary file added assets/lumbers/lumbers_green_ax_block7.png
Binary file added assets/lumbers/lumbers_green_lives.png
Binary file added assets/lumbers/lumbers_item_ui.png
Binary file added assets/lumbers/lumbers_items_grapes1.png
Binary file added assets/lumbers/lumbers_items_grapes2.png
Binary file added assets/lumbers/lumbers_items_grapes3.png
Binary file added assets/lumbers/lumbers_items_grapes4.png
Binary file added assets/lumbers/lumbers_items_grapes5.png
Binary file added assets/lumbers/lumbers_items_grapes6.png
Binary file added assets/lumbers/lumbers_items_orange1.png
Binary file added assets/lumbers/lumbers_items_orange2.png
Binary file added assets/lumbers/lumbers_items_orange3.png
Binary file added assets/lumbers/lumbers_items_orange4.png
Binary file added assets/lumbers/lumbers_items_orange5.png
Binary file added assets/lumbers/lumbers_items_orange6.png
Binary file added assets/lumbers/lumbers_items_pear1.png
Binary file added assets/lumbers/lumbers_items_pear2.png
Binary file added assets/lumbers/lumbers_items_pear3.png
Binary file added assets/lumbers/lumbers_items_pear4.png
Binary file added assets/lumbers/lumbers_items_pear5.png
Binary file added assets/lumbers/lumbers_items_pear6.png
Binary file added assets/lumbers/lumbers_itemused_block.png
Binary file added assets/lumbers/lumbers_normal_ax_block1.png
Binary file added assets/lumbers/lumbers_normal_ax_block2.png
Binary file added assets/lumbers/lumbers_normal_ax_block3.png
Binary file added assets/lumbers/lumbers_normal_ax_block4.png
Binary file added assets/lumbers/lumbers_normal_ax_block5.png
Binary file added assets/lumbers/lumbers_normal_ax_block6.png
Binary file added assets/lumbers/lumbers_normal_ax_block7.png
Binary file added assets/lumbers/lumbers_red_ax_block1.png
Binary file added assets/lumbers/lumbers_red_ax_block2.png
Binary file added assets/lumbers/lumbers_red_ax_block3.png
Binary file added assets/lumbers/lumbers_red_ax_block4.png
Binary file added assets/lumbers/lumbers_red_ax_block5.png
Binary file added assets/lumbers/lumbers_red_ax_block6.png
Binary file added assets/lumbers/lumbers_red_ax_block7.png
Binary file added assets/lumbers/lumbers_red_lives.png
Binary file added assets/lumbers/lumbers_rtile_1.png
Binary file added assets/lumbers/lumbers_rtile_2.png
Binary file added assets/lumbers/lumbers_rtile_3.png
Binary file added assets/lumbers/lumbers_rtile_4.png
Binary file added assets/lumbers/lumbers_swadgeland_lives.png
Binary file added assets/lumbers/lumbers_title.png
Binary file added assets/lumbers/lumbers_title_attack_green.png
Binary file added assets/lumbers/lumbers_title_attack_red.png
Binary file added assets/lumbers/lumbers_title_attack_white.png
Binary file added assets/lumbers/lumbers_title_panic_green.png
Binary file added assets/lumbers/lumbers_title_panic_red.png
Binary file added assets/lumbers/lumbers_title_panic_white.png
49 changes: 38 additions & 11 deletions main/modes/demo/demoMode.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ swadgeMode_t demoMode = {

typedef struct
{
bool inMenu;
font_t ibm;
wsg_t king_donut;
song_t ode_to_joy;
Expand All @@ -62,6 +63,7 @@ typedef struct
uint16_t recvPackets;
connectionEvt_t conStatus;
menu_t* menu;
menuLogbookRenderer_t* menuLogbookRenderer;
} demoVars_t;

demoVars_t* dv;
Expand Down Expand Up @@ -99,6 +101,8 @@ static void demoEnterMode(void)
addSingleItemToMenu(dv->menu, demoMenu5);
addSingleItemToMenu(dv->menu, demoMenu6);

dv->menuLogbookRenderer = initMenuLogbookRenderer(&dv->ibm);

dv->conStatus = CON_LOST;

p2pInitialize(&dv->p2p, 'p', demoConCb, demoMsgRxCb, -70);
Expand All @@ -114,6 +118,8 @@ static void demoEnterMode(void)
printf("High score in NVS is %" PRId32 "\n", highScoreToRead);
}
}

dv->inMenu = true;
}

/**
Expand Down Expand Up @@ -145,22 +151,39 @@ static void demoMainLoop(int64_t elapsedUs)
static uint32_t lastBtnState = 0;
while (checkButtonQueueWrapper(&evt))
{
dv->menu = menuButton(dv->menu, evt);

// printf("state: %04X, button: %d, down: %s\n", evt.state, evt.button, evt.down ? "down" : "up");
lastBtnState = evt.state;
// drawScreen = evt.down;

if (evt.button == PB_B && evt.down && dv->conStatus == CON_ESTABLISHED)
if (dv->inMenu)
{
printf("Sending packet\n");
const uint8_t testMsg[] = {0x01, 0x02, 0x03, 0x04};
p2pSendMsg(&dv->p2p, testMsg, ARRAY_SIZE(testMsg), demoMsgTxCbFn);
dv->menu = menuButton(dv->menu, evt);

if (evt.button == PB_A && evt.down)
{
dv->inMenu = false;
}
}
else
{
// printf("state: %04X, button: %d, down: %s\n", evt.state, evt.button, evt.down ? "down" : "up");
// drawScreen = evt.down;

if (evt.button == PB_B && evt.down && dv->conStatus == CON_ESTABLISHED)
{
printf("Sending packet\n");
const uint8_t testMsg[] = {0x01, 0x02, 0x03, 0x04};
p2pSendMsg(&dv->p2p, testMsg, ARRAY_SIZE(testMsg), demoMsgTxCbFn);
}

static hid_gamepad_report_t report;
report.buttons = lastBtnState;
sendUsbGamepadReport(&report);
}
}

static hid_gamepad_report_t report;
report.buttons = lastBtnState;
sendUsbGamepadReport(&report);
if (dv->inMenu)
{
drawMenuLogbook(dv->menu, dv->menuLogbookRenderer, elapsedUs);
return;
}

// Fill the display area with a dark cyan
Expand Down Expand Up @@ -420,4 +443,8 @@ static void demoMsgTxCbFn(p2pInfo* p2p, messageStatus_t status, const uint8_t* d
static void demoMenuCb(const char* label, bool selected, uint32_t settingVal)
{
printf("%s %s\n", label, selected ? "selected" : "scrolled to");

if (selected)
{
}
}
Loading