From 7094603bd7489d138dbf1671d01380f1c31d5ba5 Mon Sep 17 00:00:00 2001 From: csd4ni3l Date: Sun, 2 Nov 2025 18:02:30 +0100 Subject: [PATCH] Improve README, add bird enemy to pumpkin roll and finish it, add high scores to profile --- README.md | 1 + static/graphics/bird.png | Bin 0 -> 3221 bytes static/js/pumpkin_memory.js | 33 +++++++++--------- static/js/pumpkin_roll.js | 67 +++++++++++++++++++++++------------- templates/profile.jinja2 | 20 +++++++++-- 5 files changed, 79 insertions(+), 42 deletions(-) create mode 100644 static/graphics/bird.png diff --git a/README.md b/README.md index aa1b658..c1640a8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ LoginWeen is an app where you login/register with a halloween pumpkin carving as a password. +There are 2 minigames you can play after, or you can check out the countdown to the next Loginween! Live Demo: https://loginween.csd4ni3l.hu diff --git a/static/graphics/bird.png b/static/graphics/bird.png new file mode 100644 index 0000000000000000000000000000000000000000..50e5a5f6f0d1139246cdd3a0c743781c8082b487 GIT binary patch literal 3221 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 literal 0 HcmV?d00001 diff --git a/static/js/pumpkin_memory.js b/static/js/pumpkin_memory.js index 7ef296e..3b2d919 100644 --- a/static/js/pumpkin_memory.js +++ b/static/js/pumpkin_memory.js @@ -14,22 +14,21 @@ function setup_game() { }, }; - scene("game", (pumpkin_pairs, pumpkin_array, revealed, found_pairs, start) => { + scene("game", (difficulty, pumpkin_array, revealed, found_pairs, start) => { create_button(5, 5, 150, 75, "Back", color(127, 127, 127), color(0, 0, 0, 0), scene_lambda("main_menu")) + let cols; + switch (difficulty) { + case "easy": pumpkin_pairs = 5; cols = 5; break; + case "medium": pumpkin_pairs = 10; cols = 4; break; + case "hard": pumpkin_pairs = 15; cols = 5; break; + case "extrahard": pumpkin_pairs = 20; cols = 10; break; + } + const total = pumpkin_pairs * 2; const pumpkin_size = 100; const space_between = 10; - let cols; - switch (pumpkin_pairs) { - case 5: cols = 5; break; - case 10: cols = 4; break; - case 15: cols = 5; break; - case 20: cols = 10; break; - default: cols = Math.ceil(Math.sqrt(pumpkin_pairs * 2)); - } - const rows = Math.ceil(total / cols); const grid_width = cols * (pumpkin_size + space_between) - space_between; const grid_height = rows * (pumpkin_size + space_between) - space_between; @@ -88,7 +87,7 @@ function setup_game() { if ((elapsed / 1000).toFixed(1) < best_time) { best_time = (elapsed / 1000).toFixed(1); } - localStorage.setItem(`memory_best_${pumpkin_pairs}`, best_time); + localStorage.setItem(`memory_best_${difficulty}`, best_time); create_label(520, 320, `You win!\nTime took: ${(elapsed / 1000).toFixed(1)} s Best Time: ${best_time_display}`, 48); return; @@ -108,7 +107,7 @@ function setup_game() { wait(0.5, () => { if (found_pair == null) { clearInterval(timer_interval_id); - go("game", pumpkin_pairs, arr, [], found_pairs, start); + go("game", difficulty, arr, [], found_pairs, start); } else { destroy(sprite); @@ -125,7 +124,7 @@ function setup_game() { btn.scale = 1.1; tween(btn.scale, 1, 0.2, (val) => btn.scale = val); clearInterval(timer_interval_id); - go("game", pumpkin_pairs, arr, revealed.concat([index]), found_pairs, start); + go("game", difficulty, arr, revealed.concat([index]), found_pairs, start); }) } } @@ -135,10 +134,10 @@ function setup_game() { scene("play", () => { create_label(WIDTH / 2 - 16 * "Difficulty Selector".length, HEIGHT / 8, "Difficulty Selector", 56); vertical_buttons(WIDTH / 4, HEIGHT / 4, [ - ["Easy", color(127, 127, 127), color(0, 0, 0, 0), scene_lambda("game", 5)], - ["Medium", color(127, 127, 127), color(0, 0, 0, 0), scene_lambda("game", 10)], - ["Hard", color(127, 127, 127), color(0, 0, 0, 0), scene_lambda("game", 15)], - ["Extra Hard", color(127, 127, 127), color(0, 0, 0, 0), scene_lambda("game", 20)] + ["Easy", color(127, 127, 127), color(0, 0, 0, 0), scene_lambda("game", "easy")], + ["Medium", color(127, 127, 127), color(0, 0, 0, 0), scene_lambda("game", "medium")], + ["Hard", color(127, 127, 127), color(0, 0, 0, 0), scene_lambda("game", "hard")], + ["Extra Hard", color(127, 127, 127), color(0, 0, 0, 0), scene_lambda("game", "extrahard")] ], WIDTH / 2, HEIGHT / 8, HEIGHT / 50) }); diff --git a/static/js/pumpkin_roll.js b/static/js/pumpkin_roll.js index 97d8a97..78dcc8a 100644 --- a/static/js/pumpkin_roll.js +++ b/static/js/pumpkin_roll.js @@ -1,11 +1,24 @@ -function spawn_enemy() { - let enemy_type = "tombstone"; - const enemy_width = 140; - const enemy_height = 120; +function spawn_enemy(enemy_type) { + let enemy_width; + let enemy_height; + let start_y; + if (enemy_type == "tombstone") { + scale_f = scale(0.05); + start_y = 720; + enemy_width = 140; + enemy_height = 120; + } + else { + scale_f = scale(0.5); + start_y = 600; + enemy_width = 148; + enemy_height = 147; + } + const enemy_sprite = add([ sprite(enemy_type), - pos(1280 - enemy_width, 720 - enemy_height), - scale(0.05), + pos(1280 - enemy_width, start_y - enemy_height), + scale_f, area(), "enemy" ]); @@ -23,6 +36,8 @@ function spawn_enemy() { function setup_game() { loadSprite("pumpkin", "/static/graphics/pumpkin.png"); loadSprite("tombstone", "/static/graphics/tombstone.png"); + loadSprite("bird", "/static/graphics/bird.png"); + const SETTINGS = { "Graphics": { "Anti-Aliasing": {"type": "bool", "default": "true"}, @@ -47,7 +62,7 @@ function setup_game() { let score = 0; let high_score = localStorage.getItem("pumpkin_roll_highscore"); let game_over = false; - let enemys = []; + let enemies = []; let last_enemy_spawn = performance.now(); const score_label = create_label(480, 10, `Score: ${score} High Score: ${high_score}`); @@ -73,21 +88,27 @@ function setup_game() { if (game_over) return; game_over = true; - for (let enemy of enemys) { + for (let enemy of enemies) { destroy(enemy); } create_label(520, 320, `Game Over!\nScore: ${Math.floor(score)}\nHigh Score: ${high_score}`, 48); }) - enemy_spawn_with_check = () => { - if (game_over) { - return + enemy_spawn_with_check = (count) => { + const enemy_type = Math.random() < 0.75 ? "tombstone" : "bird"; + for (let i = 0; i < count; i++) { + if (game_over) { + return + } + + setTimeout(() => { + enemies.push(spawn_enemy(enemy_type)); + }, i * 150); } - enemys.push(spawn_enemy()) } - spawn_enemy(); + enemy_spawn_with_check(1); pumpkin_sprite.onUpdate(() => { if (game_over) return; @@ -104,16 +125,13 @@ function setup_game() { last_enemy_spawn = performance.now(); const random = Math.random(); if (random < 0.2) { - enemys.push(spawn_enemy()); - setTimeout(enemy_spawn_with_check, 150); - setTimeout(enemy_spawn_with_check, 300); + enemy_spawn_with_check(3); } else if (random < 0.5) { - enemys.push(spawn_enemy()); - setTimeout(enemy_spawn_with_check, 150); + enemy_spawn_with_check(2); } else { - enemys.push(spawn_enemy()); + enemy_spawn_with_check(1); } } @@ -122,10 +140,13 @@ function setup_game() { pumpkin_sprite.isJumping = true; } - pumpkin_sprite.angle = (pumpkin_sprite.angle + dt() * 270) % 360; - - if (!pumpkin_sprite.isJumping) return; - + if (pumpkin_sprite.isJumping) { + pumpkin_sprite.angle = (pumpkin_sprite.angle + dt() * 360) % 360; + } + else { + pumpkin_sprite.angle = (pumpkin_sprite.angle + dt() * 180) % 360; + return; + } pumpkin_sprite.vy += GRAVITY * dt(); pumpkin_sprite.pos.y += pumpkin_sprite.vy * dt(); diff --git a/templates/profile.jinja2 b/templates/profile.jinja2 index a2acacd..9da213a 100644 --- a/templates/profile.jinja2 +++ b/templates/profile.jinja2 @@ -32,6 +32,11 @@ {% if logged_in_account %}

Logged in as: {{ username }}

+

Pumpkin Roll High Score: Loading...

+

Pumpkin Memory (Easy) Best Time: Loading...

+

Pumpkin Memory (Medium) Best Time: Loading...

+

Pumpkin Memory (Hard) Best Time: Loading...

+

Pumpkin Memory (Extra hard) Best Time: Loading...

{% endif %} @@ -93,7 +98,18 @@ {% endblock body %} \ No newline at end of file