Skip to content

Commit

Permalink
Merge branch 'release' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
meltingscales committed Apr 2, 2024
2 parents 2592bd7 + ec484d1 commit 7b28975
Show file tree
Hide file tree
Showing 5 changed files with 256 additions and 253 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8
FROM python:3.12.0b3-slim

RUN pip install poetry

Expand Down
16 changes: 3 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# LithicRivers

An ASCII game in development
An ASCII game I want to finish.

![actual screenshot](media/screenshot.png)
![Screenshot of the game](media/screenshot.png)

## Play the game

Expand Down Expand Up @@ -61,14 +61,4 @@ read the help page
- https://github.com/topics/asciimatics
- https://github.com/meysam81/notable-newts
- https://github.com/JnyJny/GameOfLife
- https://github.com/VedantKhairnar/The-Maze-Runner

## meme

take a look at some of our reviews below...

![why do we exist...just to suffer...?](media/dafuq.png)

![gnerf](http://images3.memedroid.com/images/UPLOADED727/5c1d01829c2ff.jpeg)

god help me
- https://github.com/VedantKhairnar/The-Maze-Runner
8 changes: 4 additions & 4 deletions lithicrivers/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def __init__(self, frame, active_tab_idx, game: Game = None):
Button("Help", raiseFn(NextScene, "HelpPage")),
Button("Root Page", raiseFn(NextScene, "RootPage")),
Button("Message Log", raiseFn(NextScene, "MessageLogPage")),
Button("Charlie Page", raiseFn(NextScene, "CharliePage")),
Button("Extra Page", raiseFn(NextScene, "ExtraPage")),
Button("Quit", raiseFn(StopGame, "Game stopping :P"))
]

Expand Down Expand Up @@ -289,13 +289,13 @@ def __init__(self, screen):
self.fix()


class CharliePage(Frame):
class ExtraPage(Frame):
def __init__(self, screen):
super().__init__(screen,
screen.height,
screen.width,
can_scroll=False,
title="Charlie Page")
title="Extra Page")
layout1 = Layout([1], fill_frame=True)
self.add_layout(layout1)
# add your widgets here
Expand Down Expand Up @@ -366,7 +366,7 @@ def demo(screen: Screen, scene: Scene, game: Game):
Scene([HelpPage(screen, game)], -1, name="HelpPage"),
Scene([RootPage(screen, game)], -1, name="RootPage"),
Scene([MessageLogPage(screen)], -1, name="MessageLogPage"),
Scene([CharliePage(screen)], -1, name="CharliePage"),
Scene([ExtraPage(screen)], -1, name="ExtraPage"),
]

for scene in scenes[::-1]:
Expand Down
Loading

0 comments on commit 7b28975

Please sign in to comment.