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 0000000..50e5a5f
Binary files /dev/null and b/static/graphics/bird.png differ
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...
+
{% endif %}
@@ -93,7 +98,18 @@
{% endblock body %}
\ No newline at end of file