Skip to content

Commit

Permalink
Add spike collision & respawn
Browse files Browse the repository at this point in the history
  • Loading branch information
copyrat90 committed Jun 29, 2021
1 parent 1c93503 commit e35b380
Show file tree
Hide file tree
Showing 42 changed files with 1,128 additions and 250 deletions.
Binary file added audio/sfx_player_damage.wav
Binary file not shown.
Binary file modified graphics/bg_w0_s0_0.bmp
Binary file not shown.
Binary file added graphics/pal_ingame_protagonist_star_damage.bmp
Binary file not shown.
3 changes: 3 additions & 0 deletions graphics/pal_ingame_protagonist_star_damage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "sprite_palette"
}
Binary file modified graphics/spr_ingame_protagonist_star.bmp
Binary file not shown.
36 changes: 18 additions & 18 deletions graphics_source/bg_w0_s0_0.tmx
Original file line number Diff line number Diff line change
Expand Up @@ -108,32 +108,32 @@
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,55,56,0,0,0,0,0,0,0,0,0,49,74,27,28,27,28,27,28,27,27,28,27,28,29,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,55,56,0,0,0,0,0,0,0,0,0,121,122,123,124,123,35,7,7,7,51,51,51,51,51,104,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,60,7,7,51,51,51,51,51,51,29,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,7,8,99,100,99,100,99,100,99,100,99,100,99,100,99,100,100,101,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,7,7,51,51,51,51,51,51,51,104,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,31,32,123,124,123,124,123,124,123,124,123,124,123,124,123,124,124,125,126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,60,7,7,51,51,51,51,51,51,51,51,29,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,7,8,99,100,99,100,99,100,99,100,99,100,99,100,99,100,100,101,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,7,7,51,51,51,51,51,51,51,104,5,6,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,31,32,123,124,123,124,123,124,123,124,123,124,123,124,123,124,124,125,126,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,60,7,7,51,51,51,51,51,51,51,51,29,30,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,7,7,51,51,51,51,51,51,51,51,51,104,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,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,3,4,3,4,3,107,51,7,7,51,51,51,51,51,51,51,51,51,51,29,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,26,28,27,28,27,11,12,7,7,51,51,51,51,51,51,51,51,51,51,51,104,5,6,0,0,0,0,0,0,0,0,0,0,0,0,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,74,7,51,51,51,51,36,7,7,51,51,51,51,51,51,51,51,51,51,51,51,29,30,0,0,0,0,0,0,0,0,0,0,0,0,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,104,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,4,4,3,4,4,3,4,107,51,7,51,51,51,51,51,7,7,51,51,51,51,51,51,51,51,51,51,51,51,51,104,5,6,0,0,0,0,0,0,0,0,0,0,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,51,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,28,28,27,28,28,27,28,99,99,100,99,100,99,99,100,99,100,99,100,99,100,99,100,99,100,99,100,99,100,99,100,101,102,0,0,0,0,0,0,0,0,0,0,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,32,122,123,124,125,122,123,124,125,122,123,124,125,122,123,124,125,124,125,125,125,122,123,125,122,123,122,123,124,123,124,123,123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,125,126,0,0,0,0,0,0,1,6,0,0,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,121,126,0,0,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,104,6,727,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,726,1,3,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,3,4,3,4,3,4,3,4,3,4,3,107,108,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,77,54,726,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,725,25,26,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,27,28,27,28,27,28,27,28,27,28,27,131,132,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,53,30,725,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,724,49,50,51,51,51,51,7,7,7,7,7,7,7,7,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,77,54,724,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,723,73,74,51,51,51,51,7,7,7,7,7,7,7,7,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,53,78,723,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,722,49,50,51,51,51,51,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,77,102,722,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,107,74,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,26,28,27,28,27,11,12,7,7,51,51,51,51,51,51,51,51,51,51,51,104,5,6,0,0,0,0,0,0,0,0,0,0,0,82,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,74,7,51,51,51,51,36,7,7,51,51,51,51,51,51,51,51,51,51,51,51,29,30,0,0,0,0,0,0,0,0,0,0,0,82,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,104,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,4,4,3,4,4,3,4,107,51,7,51,51,51,51,51,7,7,51,51,51,51,51,51,51,51,51,51,51,51,51,104,5,6,0,0,0,0,0,0,0,0,0,82,59,60,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,51,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,28,28,27,28,28,27,28,99,99,100,99,100,99,99,100,99,100,99,100,99,100,99,100,99,100,99,100,99,100,99,100,101,102,0,0,0,0,0,0,0,0,81,81,83,84,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,32,122,123,124,125,122,123,124,125,122,123,124,125,122,123,124,125,124,125,125,125,122,123,125,122,123,122,123,124,123,124,123,123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,123,124,125,126,0,0,0,0,1,2,3,4,3,4,107,108,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,58,58,58,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,58,58,58,58,0,0,0,0,25,26,27,28,27,28,131,132,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,49,50,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,74,51,51,51,51,51,51,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,77,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,83,84,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,53,104,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,3,4,3,4,3,107,108,51,51,51,51,51,51,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,77,54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,26,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,27,28,27,28,27,131,132,51,51,51,51,51,51,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,53,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,49,50,51,51,51,51,7,7,7,7,7,7,7,7,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,51,52,75,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,77,54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,74,51,51,51,51,7,7,7,7,7,7,7,7,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,75,76,51,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,53,78,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,49,50,51,51,51,51,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,77,102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,107,74,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,51,104,3,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,3,4,107,51,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,127,128,128,27,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,28,27,51,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
<group id="5" name="MUST DISABLE BEFORE EXPORT" locked="1">
<group id="5" name="MUST DISABLE BEFORE EXPORT" visible="0" locked="1">
<layer id="4" name="Numeric Helper" width="128" height="128">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
Expand Down
Binary file modified graphics_source/spr_ingame_protagonist_star.aseprite
Binary file not shown.
1 change: 1 addition & 0 deletions include/constant.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ constexpr bn::fixed sfx_symbol_ground_bump = SFX_DEFAULT;
constexpr bn::fixed sfx_symbol_throw = SFX_DEFAULT;
constexpr bn::fixed sfx_hover_button_toggle = SFX_DEFAULT;
constexpr bn::fixed sfx_pressure_button_toggle = SFX_DEFAULT;
constexpr bn::fixed sfx_player_damage = 0.5;

constexpr bn::fixed ClampVolume(bn::fixed volume)
{
Expand Down
72 changes: 67 additions & 5 deletions include/effect_Transition.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class Transition
*/
enum class Types
{
NONE = 0,
TRANSPARENCY = 1,
FADE = 2,
INTENSITY = 4,
Expand All @@ -32,6 +33,7 @@ class Transition
};
enum class Direction
{
NONE,
IN,
OUT
};
Expand All @@ -43,6 +45,7 @@ class Transition
};

Transition(Types types, Direction direction, int updateCount);
Transition();

~Transition();

Expand All @@ -57,6 +60,17 @@ class Transition
*/
void Init();

/**
* @brief Allocates transition actions & sets state to ONGOING.
* You must call this function before using Transition.
*
* Calling Init() of the second transition object after calling Destroy() of the first transition object,
* you can prevent having FADE and other blendings at the same time,
* while keeping both Transition objects alive.
*
*/
void Init(Types types, Direction direction, int updateCount);

/**
* @brief Updates transition actions.
* you must check Done() first.
Expand Down Expand Up @@ -84,10 +98,58 @@ class Transition
return state_;
}

/**
* @brief Mimics constructing a new effect::Transition object.
* You can't use this if transition is ongoing.
*
*/
void Set(Types types, Direction direction, int updateCount);

/**
* @brief Get the transition types.
*
*/
Types GetTypes() const;

/**
* @brief Set the transition types.
* You can't set the transition if it is ongoing.
*
*/
void SetTypes(Types types);

Direction GetDirection() const;

/**
* @brief Set the direction
* You can't set it if it is ongoing.
*
*/
void SetDirection(Direction);

/**
* @brief Get the update count, which is used to set the blending actions.
*
*/
int GetUpdateCount() const;

/**
* @brief Set the update count
* You can't set it if it is ongoing.
*
*/
void SetUpdateCount(int updateCount);

/**
* @brief Get the remaining update count before it is done.
*
*/
int GetRemainingUpdateCount() const;

private:
const Types types_;
const Direction direction_;
const int updateCount_;
Types types_;
Direction direction_;
int updateCount_;
int updateCountDown_;

State state_ = State::NOT_READY;
Expand All @@ -99,12 +161,12 @@ class Transition
bn::optional<bn::bgs_mosaic_stretch_to_action> bgMosaicAction_;
};

inline Transition::Types operator|(Transition::Types t1, Transition::Types t2)
[[nodiscard]] constexpr Transition::Types operator|(Transition::Types t1, Transition::Types t2)
{
return static_cast<Transition::Types>(static_cast<int>(t1) | static_cast<int>(t2));
}

inline Transition::Types operator&(Transition::Types t1, Transition::Types t2)
[[nodiscard]] constexpr Transition::Types operator&(Transition::Types t1, Transition::Types t2)
{
return static_cast<Transition::Types>(static_cast<int>(t1) & static_cast<int>(t2));
}
Expand Down
22 changes: 17 additions & 5 deletions include/game_entity_IEntity.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <bn_fixed_rect.h>
#include <bn_optional.h>
#include <bn_sprite_item.h>
#include <bn_sprite_palette_ptr.h>
#include <bn_sprite_ptr.h>

namespace sym::game::entity
Expand Down Expand Up @@ -54,25 +55,36 @@ class IEntity
virtual void FreeGraphicResource();
virtual void AllocateGraphicResource(int z_order);

virtual void SetBlendingEnabled(bool isEnable);
[[nodiscard]] bool GetBlendingEnabled() const;
virtual void SetMosaicEnabled(bool isEnable);
[[nodiscard]] bool GetMosaicEnabled() const;
virtual void SetVisible(bool isVisible);
[[nodiscard]] bool GetVisible() const;
virtual void SetColors(const bn::sprite_palette_item& paletteItem);
virtual void SetCamera(const bn::camera_ptr& camera);

bn::fixed_point GetPosition() const;
[[nodiscard]] bn::fixed_point GetPosition() const;
void SetPosition(const bn::fixed_point& position);
bn::fixed GetX() const;
bn::fixed GetY() const;
[[nodiscard]] bn::fixed GetX() const;
[[nodiscard]] bn::fixed GetY() const;
void SetX(bn::fixed x);
void SetY(bn::fixed y);

void SetHorizontalFlip(bool flip);
bool GetHorizontalFlip() const;
[[nodiscard]] bool GetHorizontalFlip() const;
void SetVerticalFlip(bool flip);
bool GetVerticalFlip() const;
[[nodiscard]] bool GetVerticalFlip() const;

protected:
bn::fixed_point position_;
bn::fixed_rect relativeInteractRange_;
bn::optional<bn::sprite_ptr> sprite_;
const bn::sprite_item* spriteItem_;
const bn::sprite_palette_item* paletteItem_;
bool isBlendingEnabled_ = true;
bool isMosaicEnabled_ = true;
bool isVisible_ = true;

void SyncSpritePositionToPosition_();
};
Expand Down
9 changes: 6 additions & 3 deletions include/game_entity_INumberTextEntity.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ class INumberTextEntity : public IEntity
INumberTextEntity(const INumberTextEntity& other) = delete;
INumberTextEntity& operator=(const INumberTextEntity& other) = delete;

void FreeGraphicResource();
void AllocateGraphicResource(int z_order);
void FreeGraphicResource() override;
void AllocateGraphicResource(int z_order) override;

void SetCamera(const bn::camera_ptr& camera);
void SetBlendingEnabled(bool isEnable) override;
void SetMosaicEnabled(bool isEnable) override;

void SetCamera(const bn::camera_ptr& camera) override;

protected:
bn::optional<bn::sprite_ptr> numberSprite_;
Expand Down
8 changes: 5 additions & 3 deletions include/game_entity_IPhysicsEntity.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,21 @@ class IPhysicsEntity : public IEntity
bool isGrounded_ = false;
};

inline IPhysicsEntity::MoveDirections operator|(IPhysicsEntity::MoveDirections d1, IPhysicsEntity::MoveDirections d2)
[[nodiscard]] constexpr IPhysicsEntity::MoveDirections operator|(IPhysicsEntity::MoveDirections d1,
IPhysicsEntity::MoveDirections d2)
{
using MoveDirections = IPhysicsEntity::MoveDirections;
return static_cast<MoveDirections>(static_cast<int>(d1) | static_cast<int>(d2));
}

inline IPhysicsEntity::MoveDirections operator&(IPhysicsEntity::MoveDirections d1, IPhysicsEntity::MoveDirections d2)
[[nodiscard]] constexpr IPhysicsEntity::MoveDirections operator&(IPhysicsEntity::MoveDirections d1,
IPhysicsEntity::MoveDirections d2)
{
using MoveDirections = IPhysicsEntity::MoveDirections;
return static_cast<MoveDirections>(static_cast<int>(d1) & static_cast<int>(d2));
}

inline bool operator!(IPhysicsEntity::MoveDirections dir)
[[nodiscard]] constexpr bool operator!(IPhysicsEntity::MoveDirections dir)
{
using MoveDirections = IPhysicsEntity::MoveDirections;
return dir == static_cast<MoveDirections>(0);
Expand Down
Loading

0 comments on commit e35b380

Please sign in to comment.