diff --git a/app/bloonsa_game/models.py b/app/bloonsa_game/models.py index b145a00..7942264 100644 --- a/app/bloonsa_game/models.py +++ b/app/bloonsa_game/models.py @@ -42,7 +42,7 @@ class Level(models.Model): @property def stars(self): result = list(self.bloonsa_level_ratings.aggregate(Avg("rating")).values())[0] - return 0 if result is None else math.floor(result) + return 0 if result is None else math.ceil(result) def __str__(self): diff --git a/app/bloonsa_game/static/bloonsa_game/css/levelinfo.css b/app/bloonsa_game/static/bloonsa_game/css/levelinfo.css index 9b3565a..907d77e 100644 --- a/app/bloonsa_game/static/bloonsa_game/css/levelinfo.css +++ b/app/bloonsa_game/static/bloonsa_game/css/levelinfo.css @@ -66,6 +66,10 @@ color: #F1F125; } +.clear-color { + color: lime; +} + .level-star-img { height: 14px; width: 14px; @@ -79,17 +83,11 @@ vertical-align: bottom; } -.level-wins-img, .level-glitches-img { - filter: invert(75%) sepia(23%) saturate(6404%) hue-rotate(355deg) brightness(98%) contrast(107%) !important; // orange -} -.level-plays-img { - filter: invert(17%) sepia(2%) saturate(72%) hue-rotate(66deg) brightness(94%) contrast(89%); // grey -} -.level-pops-img { +.filter-red { filter: invert(61%) sepia(72%) saturate(7291%) hue-rotate(338deg) brightness(108%) contrast(101%); // red } -.level-darts-img { - filter: invert(0%) sepia(96%) saturate(15%) hue-rotate(246deg) brightness(105%) contrast(105%); // black +.filter-grey { + filter: invert(17%) sepia(2%) saturate(72%) hue-rotate(66deg) brightness(94%) contrast(89%); // grey } .filter-black { filter: invert(0%) sepia(96%) saturate(15%) hue-rotate(246deg) brightness(105%) contrast(105%); // black @@ -99,4 +97,4 @@ } .filter-orange { filter: invert(75%) sepia(23%) saturate(6404%) hue-rotate(355deg) brightness(98%) contrast(107%) !important; // orange -} +} \ No newline at end of file diff --git a/app/bloonsa_game/static/bloonsa_game/img/ads/banner160x600.png b/app/bloonsa_game/static/bloonsa_game/img/ads/banner160x600.png index d725f72..f24c50b 100644 Binary files a/app/bloonsa_game/static/bloonsa_game/img/ads/banner160x600.png and b/app/bloonsa_game/static/bloonsa_game/img/ads/banner160x600.png differ 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 decc110..42b1a56 100644 --- a/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js +++ b/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js @@ -64,9 +64,9 @@ function bloonsa_update_html(r) { document.getElementById("level-pb-darts-glitch").textContent = r.score_dart_glitch ? "+1": ""; if (r.score_dart_glitch) { - darts_img.classList.add("level-glitches-img"); + darts_img.classList.add("filter-orange"); } else { - darts_img.classList.remove("level-glitches-img"); + darts_img.classList.remove("filter-orange"); } } else { @@ -74,13 +74,18 @@ function bloonsa_update_html(r) { document.getElementById("level-target").textContent = r.level_target; document.getElementById("level-pb-darts-number").textContent = "-"; document.getElementById("level-pb-darts-glitch").textContent = ""; - darts_img.classList.remove("level-glitches-img"); + darts_img.classList.remove("filter-orange"); } - - - - //if (r.level_cleared) { + if (r.level_cleared) { + document.getElementById("level-pb-pops-number").classList.add("clear-color"); + document.getElementById("level-pb-pops-separator").classList.add("clear-color"); + document.getElementById("level-target").classList.add("clear-color"); + } else { + document.getElementById("level-pb-pops-number").classList.remove("clear-color"); + document.getElementById("level-pb-pops-separator").classList.remove("clear-color"); + document.getElementById("level-target").classList.remove("clear-color"); + } // Profile diff --git a/app/bloonsa_game/templates/bloonsa_game/base.html b/app/bloonsa_game/templates/bloonsa_game/base.html index 7a7cc73..b89bd20 100644 --- a/app/bloonsa_game/templates/bloonsa_game/base.html +++ b/app/bloonsa_game/templates/bloonsa_game/base.html @@ -25,39 +25,23 @@ - - - - {% if head %} - {{ head }} - {% endif %} + {% block head %}{% endblock head %}