diff --git a/app/bloonsa_api/views.py b/app/bloonsa_api/views.py index 54175dc..ab79dc1 100644 --- a/app/bloonsa_api/views.py +++ b/app/bloonsa_api/views.py @@ -70,14 +70,18 @@ class CompleteLevel(CSRFexemptTemplateView): return HttpResponse(content="GG", status=200) bloonsa_util.tag_player(request=request) + level_id = int(request.POST.get("level_id")) darts_left = int(request.POST.get("darts_left")) - dart_glitch = bool(request.POST.get("dart_glitch")) + dart_glitch = bool(request.POST.get("dart_glitch") == "true") pops = int(request.POST.get("pops")) level: Level = Level.objects.get(level_id=level_id) player: Player = Player.objects.get(user=request.user) + print(f"{darts_left=} {dart_glitch=}") + + prevScore = LevelScore.objects.filter(player=player, level=level).first() if prevScore is None \ diff --git a/app/bloonsa_game/models.py b/app/bloonsa_game/models.py index 499f636..aeb7a95 100644 --- a/app/bloonsa_game/models.py +++ b/app/bloonsa_game/models.py @@ -68,5 +68,6 @@ class LevelScore(models.Model): def __str__(self): clearState = "✅" if self.clear else "❌" - return (f"{self.player.user.username if self.player else ''}'s {clearState} @ {self.level.title}: " - f"🎈{self.pops} | 🎯{self.darts_left}") \ No newline at end of file + scoreView = f"🎈{self.pops} | 🎯{self.darts_left} {'✏' if self.dart_glitch else ''}" + return (f"{self.player.user.username if self.player else ''}'s " + f"{clearState} @ {self.level.title}: {scoreView}") \ No newline at end of file diff --git a/app/bloonsa_game/static/bloonsa_game/css/append.css b/app/bloonsa_game/static/bloonsa_game/css/append.css index 5a530b1..2ff467f 100644 --- a/app/bloonsa_game/static/bloonsa_game/css/append.css +++ b/app/bloonsa_game/static/bloonsa_game/css/append.css @@ -63,4 +63,8 @@ #level_clear_state { +} + +#level_info_row1 #level_info_row2 { + display: block; } \ No newline at end of file diff --git a/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js b/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js index 70e7ece..b221670 100644 --- a/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js +++ b/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js @@ -1,9 +1,10 @@ function bloonsa_new_level_started(level_id) { - console.log("call to new_level_started"); + console.log("call to bloonsa_new_level_started"); bloonsa_update_data(level_id); } function bloonsa_level_completed(level_id) { + console.log("call to bloonsa_level_completed"); bloonsa_update_data(level_id) } diff --git a/app/bloonsa_game/templates/bloonsa_game/base.html b/app/bloonsa_game/templates/bloonsa_game/base.html index 4c08920..bd1418b 100644 --- a/app/bloonsa_game/templates/bloonsa_game/base.html +++ b/app/bloonsa_game/templates/bloonsa_game/base.html @@ -69,24 +69,28 @@ {% block content %}{% endblock content %}
-
-