|
@@ -2,6 +2,7 @@ from flask_sqlalchemy import SQLAlchemy
|
|
|
|
|
|
db = SQLAlchemy()
|
|
|
|
|
|
+
|
|
|
class Game(db.Model):
|
|
|
game_id = db.Column(db.String, primary_key=True)
|
|
|
timer = db.Column(db.Integer)
|
|
@@ -48,7 +49,7 @@ class CoordSet(db.Model):
|
|
|
c = self.coord_5
|
|
|
else:
|
|
|
raise ValueError(f"Invalid round number {round_num}")
|
|
|
-
|
|
|
+
|
|
|
if c is not None:
|
|
|
return tuple(float(x) for x in c.split(","))
|
|
|
# returns None if the selected coord was None
|
|
@@ -70,7 +71,8 @@ class CoordSet(db.Model):
|
|
|
|
|
|
|
|
|
class GuessSet(db.Model):
|
|
|
- game_id = db.Column(db.String, db.ForeignKey("game.game_id"), primary_key=True)
|
|
|
+ game_id = db.Column(db.String, db.ForeignKey(
|
|
|
+ "game.game_id"), primary_key=True)
|
|
|
player_name = db.Column(db.String, primary_key=True)
|
|
|
coord_id = db.Column(db.Integer, db.ForeignKey("coord_set.coord_id"))
|
|
|
coord_set = db.relationship("CoordSet")
|
|
@@ -96,11 +98,11 @@ class GuessSet(db.Model):
|
|
|
# returns None if all rounds completed
|
|
|
|
|
|
def get_total_score(self):
|
|
|
- return ((self.score_1 or 0) +
|
|
|
- (self.score_2 or 0) +
|
|
|
- (self.score_3 or 0) +
|
|
|
- (self.score_4 or 0) +
|
|
|
- (self.score_5 or 0))
|
|
|
+ return ((self.score_1 or 0) +
|
|
|
+ (self.score_2 or 0) +
|
|
|
+ (self.score_3 or 0) +
|
|
|
+ (self.score_4 or 0) +
|
|
|
+ (self.score_5 or 0))
|
|
|
|
|
|
def set_timed_out(self, round_num):
|
|
|
self.set_guess(round_num, -200, -200, 0)
|