Merge pull request #116 from ThomasRubini/cleanup
This commit is contained in:
commit
e64bd422c6
@ -132,7 +132,6 @@ class Game:
|
|||||||
:param npc_id: the id of the npc, to get the reactions from, must be in the current game
|
:param npc_id: the id of the npc, to get the reactions from, must be in the current game
|
||||||
:return: the reaction image as bytes
|
:return: the reaction image as bytes
|
||||||
"""
|
"""
|
||||||
print(self.reaction_table)
|
|
||||||
if npc_id not in self.reaction_table:
|
if npc_id not in self.reaction_table:
|
||||||
return None
|
return None
|
||||||
trait_id = self.reaction_table[npc_id]
|
trait_id = self.reaction_table[npc_id]
|
||||||
|
@ -35,9 +35,6 @@ def create_game():
|
|||||||
@routes_api.route("/getGameMembers", methods=["GET", "POST"])
|
@routes_api.route("/getGameMembers", methods=["GET", "POST"])
|
||||||
def get_members():
|
def get_members():
|
||||||
game_id = flask.request.values.get("game_id")
|
game_id = flask.request.values.get("game_id")
|
||||||
print(50 * "#")
|
|
||||||
print(game_id)
|
|
||||||
print(50*"_")
|
|
||||||
game = game_logic.get_game(game_id)
|
game = game_logic.get_game(game_id)
|
||||||
if game is None:
|
if game is None:
|
||||||
return {"error": 1, "msg": "this game doesn't exist"}
|
return {"error": 1, "msg": "this game doesn't exist"}
|
||||||
|
@ -34,7 +34,6 @@ def lobbyRedirect():
|
|||||||
@routes_ui.route("/lobby/<game_id>")
|
@routes_ui.route("/lobby/<game_id>")
|
||||||
def lobby(game_id):
|
def lobby(game_id):
|
||||||
# rendered by the javascript client-side
|
# rendered by the javascript client-side
|
||||||
print(game_id)
|
|
||||||
if game_id is None:
|
if game_id is None:
|
||||||
return flask.redirect("")
|
return flask.redirect("")
|
||||||
return flask.render_template("lobby.html", gameid=game_id)
|
return flask.render_template("lobby.html", gameid=game_id)
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<title>NPC</title>
|
<title>NPC</title>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<link rel="stylesheet" href="admin_ui.css">
|
<link rel="stylesheet" href="/static/css/admin_ui.css">
|
||||||
<script src="/static/js/admin.js"></script>
|
<script src="/static/js/admin.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
Loading…
Reference in New Issue
Block a user