Improving Imports

README.md

@@ -37,5 +37,8 @@ If we want to expand the API for connections, we can always add more symbols
 for parsing. One I was thinking about is `\->`, which would denote an
 "ending" connection (to signal destroying the path to reach the current action)
 
+# Running Games
 
+1. Enter the repository: `cd Classic-RPG`
 
+2. Run a game: `python -m games.game-1`

crpg/builtin.py

@@ -1,4 +1,4 @@
-from __future__ import annotations #needed for Node type hints
+from __future__ import annotations # needed for Node type hints
 # Base player classes
 
 class Player:

crpg/crpg.py → crpg/engine.py

@@ -1,5 +1,5 @@
-from setup import start
-from builtin import Connection, Node, Location, Player
+from .setup import start
+from .builtin import Connection, Node, Location, Player
 
 # the base crpg game
 

crpg/parser/parser_v1.py

@@ -1,7 +1,8 @@
-from crpg import Game
 from typing import Callable # for connection function type hints
 import re
-from builtin import Connection, BreakingConnection, Node, Location 
+
+from crpg.engine import Game
+from crpg.builtin import Connection, BreakingConnection, Node, Location 
 
 
 node_types = {

crpg/parser/parser_v2.py

@@ -1,7 +1,8 @@
-from crpg import Game
 from typing import Callable, Any # for connection function type hints
 import re
-from builtin import Connection, BreakingConnection, Node, Location
+
+from crpg.engine import Game
+from crpg.builtin import Connection, BreakingConnection, Node, Location
 
 
 # connection function mapping

games/game-1.py

@@ -1,8 +1,5 @@
-import sys
-sys.path.insert(0, "../crpg")
-
-from crpg import Game
-from builtin import Location, Node
+from crpg.engine import Game
+from crpg.builtin import Location, Node
 
 starting_location = Location("castle")
 starting_location.add_attr(

games/game-2.py

@@ -1,7 +1,8 @@
-import sys
-sys.path.insert(0, "../crpg")
+import os
 
-import parser
+from crpg.parser import v1 as v1_parser
 
-game = parser.v1("game-2-layout.dl")
+
+filepath = os.path.abspath("games/game-2-layout.dl")
+game = v1_parser(filepath)
 game.start()

games/game-3.py

@@ -1,7 +1,8 @@
-import sys
-sys.path.insert(0, "../crpg")
+import os
 
-import parser
+from crpg.parser import v2 as v2_parser
 
-game = parser.v2("game-3.dl")
+
+filepath = os.path.abspath("games/game-2-layout.dl")
+game = v2_parser(filepath)
 game.start()