Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ WORKDIR /app
# game in the player's own tab, with that tab's IndexedDB holding the saves.
#
# Two consequences worth spelling out:
# - The only pip install is tak, the kit the game imports from: it is
# installed so web/build_zip.py can copy it into the bundle (and it is
# what the browser runs), not because the server needs it. jsonschema is
# loaded browser-side by web/game-worker.js, and the server here is pure
# stdlib. git is needed for that one install and removed afterwards.
# - The only pip install is tak, the kit the game imports from: web/serve.py
# is tak's static server (tak.web.serve), which also hands out the kit's
# page assets and Worker at /tak/, and web/build_zip.py copies tak into
# the bundle the browser runs. jsonschema is loaded browser-side by tak's
# game-worker.js, so the server never imports it. git is needed for that
# one install and removed afterwards.
# - No save directory, and no volume to persist. Every visitor gets their own
# game and their own save slots, which is exactly what the server-backed
# front-end (examples/web_app.py) could not give them.
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# separately if you want UIType.PYGAME.
#
# tak is the text-adventure kit extracted from this game
# (https://github.com/Stephenson-Software/tak); FishE is being moved back onto
# it one module at a time. Installing it needs git on the PATH.
# (https://github.com/Stephenson-Software/tak), which FishE now runs on.
# Installing it needs git on the PATH.
tak @ git+https://github.com/Stephenson-Software/tak@v0.2.0
jsonschema>=4.0,<5.0
2 changes: 1 addition & 1 deletion src/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def __init__(self):
# which deployments use to point the game somewhere other than a
# cwd-relative "data" — a mounted volume for a server install, or the
# Worker-side directory that the Pyodide front-end mirrors to the
# browser's IndexedDB (see browserSaveSync and web/game-worker.js).
# browser's IndexedDB (see browserSaveSync and tak's game-worker.js).
self.dataDirectory = os.environ.get("FISHE_SAVE_DIR") or "data"

# Initial player values. Starting energy isn't configured here - see
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/test_pyodideUserInterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def test_a_game_played_in_the_browser_saves_into_browser_storage(fakeJs):
"""
from fishE import FishE

# Mirror of makeSyncSaves() in web/game-worker.js: walk the save directory
# Mirror of makeSyncSaves() in tak's game-worker.js: walk the save directory
# and hand the file map to the browser to store.
browserStorage = {}

Expand Down Expand Up @@ -358,7 +358,7 @@ def syncSaves():
def test_quitting_ends_the_page_instead_of_raising(fakeJs):
# "Quit" calls exit(), which in a tab has no process to end: the Worker
# would report it as an error rather than the game finishing. The entry
# point is exec'd here the same way web/game-worker.js runs it.
# point is exec'd here the same way tak's game-worker.js runs it.
entryPoint = os.path.join(
os.path.dirname(__file__), "..", "..", "web", "pyodide_main.py"
)
Expand Down
Loading