Skip to content

Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.

Merge main into suika

Mason363d6cfe5c354a3
diff --cc .github/workflows/build.yml
index 8da657ef,4fdbcab5..f478b6cb
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@@ -77,7 -78,7 +78,8 @@@ jobs
make -C games/sokoban host test
make -C games/flappydunk host test
make -C games/towerblock host test
+ make -C games/suika host test
+ make -C games/doodlejump host test
diff --cc Makefile
index 1b5c4271,2b480adb..64268ea0
--- a/Makefile
+++ b/Makefile
@@@ -30,8 -30,8 +30,8 @@@ APP_SPACE = 203161
# Upsilon, the N0110 and N0115's custom software, gives .nwa apps less RAM: NumPlay-Upsilon.nwa has
# the games that fit it (NumPlay draws their text there: see launcher/src/compat.c)
UPSILON_RAM = 107674
- UPSILON_GAMES = crossyroad blockblast suika portal tetris dinorun chess flappybird flappydunk towerblock pacman snake connectfour solitaire g2048 minesweeper \
-UPSILON_GAMES = crossyroad blockblast portal tetris dinorun doodlejump chess flappybird flappydunk towerblock pacman snake connectfour solitaire g2048 minesweeper \
-- breakout twoplayer invaders sudoku uttt sokoban
++UPSILON_GAMES = crossyroad blockblast suika portal tetris dinorun doodlejump chess flappybird flappydunk towerblock pacman snake connectfour \
++ solitaire g2048 minesweeper breakout twoplayer invaders sudoku uttt sokoban
# NumPlay and its discreet versions: the same app, with another name and icon
# on the calculator's home screen. Each one is a release file.
diff --cc tests/test_games.py
index 19671a8a,bb09e149..929c7ba5
--- a/tests/test_games.py
+++ b/tests/test_games.py
@@@ -69,12 -69,11 +69,15 @@@ GAMES =
# past how to play, two flaps; next time the run goes on after a flap
"flappydunk": ("FlappyDunk.nwa", "flappydunk.sav", presses((1500, "ok"), (2200, "ok"), (2550, "ok")), 3500,
presses((1500, "ok")), 2500),
+ # past how to play, a fruit dropped, the cloud moved, another dropped; next time the box is still there, and one
+ # more falls in
+ "suika": ("SuikaGame.nwa", "suika.sav", presses((1500, "ok"), (2200, "ok"), (2600, "right", 400), (3600, "ok")), 4800,
+ presses((1500, "ok")), 3000),
# past how to play, a game started and a block placed; next time the tower is still there, waiting
"towerblock": ("TowerBlocks.nwa", "towerblocks.sav", presses((1500, "ok"), (2200, "ok"), (3000, "ok")), 3600, [], 2500),
+ # past how to play, a climb started; next time it goes on after OK
+ "doodlejump": ("DoodleJump.nwa", "doodlejump.sav", presses((1500, "ok"), (2200, "ok")), 3500,
+ presses((1500, "ok")), 2500),
"flappybird": ("FlappyBird.nwa", "flappy.sav",
presses((1500, "down"), (1800, "ok"), (2100, "right"), (2400, "back"), (2700, "up"),
(2900, "right"), (3100, "ok"), (3900, "ok")) + every(4300, 7500, 450, "ok"), 9000,
diff --cc tests/test_upsilon.py
index ad2703d2,c6796be4..c433d647
--- a/tests/test_upsilon.py
+++ b/tests/test_upsilon.py
@@@ -31,11 -31,12 +31,12 @@@ def main()
st = os.path.join(a.out, "storage.bin")
save = bytes(range(30))
write_storage(st, [("pi.py", b"\x01print(3.14159)\n\x00"), ("snake.sav", save)])
- # the home screen: Crossy Road, Block Blast, Suika Game, Portal Returns, Tetris, Chrome Dino, Chess...: Right six times, OK
- # the home screen: Crossy Road, Block Blast, Portal Returns, Tetris, Chrome Dino, Doodle Jump, Chess...: Right six
- # times, OK
++ # the home screen: Crossy Road, Block Blast, Suika Game, Portal Returns, Tetris, Chrome Dino, Doodle Jump, Chess...:
++ # Right seven times, OK
c = emu.Calculator(a.nwa, storage_file=st)
c.enable_checks(reads=True)
c.keys = presses((1200, "right"), (1600, "right"), (2000, "right"), (2400, "right"), (2800, "right"), (3200, "right"),
-- (3600, "ok")) + \
++ (3600, "right"), (4000, "ok")) + \
[(7400, 7800, emu.KEYS["home"])]
menu = os.path.join(a.out, "chess.png")
c.pending_shots = [(6900, menu)]