From cf703842392dbdf7f99b4b0b5e85e5b743cbe90e Mon Sep 17 00:00:00 2001
From: csd4ni3l <v3xq21w7@duck.com>
Date: Sat, 1 Nov 2025 18:13:09 +0100
Subject: [PATCH] Move static resources into their own directories

---
 static/{ => graphics}/pumpkin.png | Bin
 static/{ => js}/game.js           |   6 +++---
 static/{ => js}/gameui.js         |   0
 static/{ => js}/pumpkin.js        |   2 +-
 static/{ => js}/pumpkin_memory.js |   2 +-
 static/{ => js}/pumpkin_roll.js   |   3 ++-
 templates/base.jinja2             |   2 +-
 templates/countdown.jinja2        |   4 ++--
 templates/pumpkin_memory.jinja2   |   6 +++---
 templates/pumpkin_roll.jinja2     |   6 +++---
 10 files changed, 16 insertions(+), 15 deletions(-)
 rename static/{ => graphics}/pumpkin.png (100%)
 rename static/{ => js}/game.js (95%)
 rename static/{ => js}/gameui.js (100%)
 rename static/{ => js}/pumpkin.js (99%)
 rename static/{ => js}/pumpkin_memory.js (98%)
 rename static/{ => js}/pumpkin_roll.js (90%)

diff --git a/static/pumpkin.png b/static/graphics/pumpkin.png
similarity index 100%
rename from static/pumpkin.png
rename to static/graphics/pumpkin.png
diff --git a/static/game.js b/static/js/game.js
similarity index 95%
rename from static/game.js
rename to static/js/game.js
index b8da471..0a9500b 100644
--- a/static/game.js
+++ b/static/js/game.js
@@ -6,7 +6,7 @@ function change_setting(category, setting, value) {
     go("settings", category);
 }
 
-function show_settings(category) {
+function show_settings(category, SETTINGS) {
     const x = 400;
     const label_x = 50;
     const space_between = 100;
@@ -99,10 +99,10 @@ function start_game() {
         horizontal_buttons(10, 10, generated_button_lists, 200, 75, 10);
 
         if (setting_category != null) {
-            show_settings(setting_category);
+            show_settings(setting_category, SETTINGS);
         }
         else {
-            show_settings(Object.keys(SETTINGS)[0]);
+            show_settings(Object.keys(SETTINGS)[0], SETTINGS);
         }
     })
 
diff --git a/static/gameui.js b/static/js/gameui.js
similarity index 100%
rename from static/gameui.js
rename to static/js/gameui.js
diff --git a/static/pumpkin.js b/static/js/pumpkin.js
similarity index 99%
rename from static/pumpkin.js
rename to static/js/pumpkin.js
index 708c5f7..8e0510b 100644
--- a/static/pumpkin.js
+++ b/static/js/pumpkin.js
@@ -171,7 +171,7 @@ function setup_pumpkin(canvas_id, clearbtn_id, lightbtn_id, form_id, pattern_fie
     const canvas = document.getElementById(canvas_id);
     const ctx = canvas.getContext('2d');
     const img = new Image();
-    img.src = '/static/pumpkin.png';
+    img.src = '/static/graphics/pumpkin.png';
     const GRID_SIZE = grid_size;
     const CELL_SIZE = canvas.width / GRID_SIZE;
     
diff --git a/static/pumpkin_memory.js b/static/js/pumpkin_memory.js
similarity index 98%
rename from static/pumpkin_memory.js
rename to static/js/pumpkin_memory.js
index 3cc78f3..9f8872c 100644
--- a/static/pumpkin_memory.js
+++ b/static/js/pumpkin_memory.js
@@ -1,5 +1,5 @@
 function setup_game() {
-    loadSprite("pumpkin", "/static/pumpkin.png");
+    loadSprite("pumpkin", "/static/graphics/pumpkin.png");
     const SETTINGS = {
         "Graphics": {
             "Anti-Aliasing": {"type": "bool", "default": true},
diff --git a/static/pumpkin_roll.js b/static/js/pumpkin_roll.js
similarity index 90%
rename from static/pumpkin_roll.js
rename to static/js/pumpkin_roll.js
index ce99370..8992e7a 100644
--- a/static/pumpkin_roll.js
+++ b/static/js/pumpkin_roll.js
@@ -1,5 +1,6 @@
 function setup_game() {
-    loadSprite("pumpkin", "/static/pumpkin.png");
+    loadSprite("pumpkin", "/static/graphics/pumpkin.png");
+    loadSprite("gravestone", "/static/gravestone.png")
     const SETTINGS = {
         "Graphics": {
             "Anti-Aliasing": {"type": "bool", "default": true},
diff --git a/templates/base.jinja2 b/templates/base.jinja2
index e75f92d..5a6ddf3 100644
--- a/templates/base.jinja2
+++ b/templates/base.jinja2
@@ -8,7 +8,7 @@
         <link href="https://fonts.googleapis.com/css2?family=New Rocker&display=swap" rel="stylesheet">
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
         <script src="https://unpkg.com/kaplay@3001.0.12/dist/kaplay.js"></script>
-        <script src="/static/pumpkin.js"></script>
+        <script src="/static/js/pumpkin.js"></script>
         <title>{% block title %} {% endblock %}</title>
         <style>
             .spider-web-1 {
diff --git a/templates/countdown.jinja2 b/templates/countdown.jinja2
index 7ee64b8..26e0339 100644
--- a/templates/countdown.jinja2
+++ b/templates/countdown.jinja2
@@ -57,7 +57,7 @@ function update() {
     let year = current_time.getFullYear();
 
     const halloween_time = new Date(year, 9, 31);
-    const after_halloween = new Date(year, 15, 1);
+    const after_halloween = new Date(year, 10, 1);
 
     if (current_time > halloween_time) {
         if (current_time < after_halloween) {
@@ -65,7 +65,7 @@ function update() {
             return;
         }
         else {
-            halloween.setFullYear(year + 1);
+            halloween_time.setFullYear(year + 1);
         }
     }
 
diff --git a/templates/pumpkin_memory.jinja2 b/templates/pumpkin_memory.jinja2
index 6be29f6..42ec8fe 100644
--- a/templates/pumpkin_memory.jinja2
+++ b/templates/pumpkin_memory.jinja2
@@ -31,9 +31,9 @@
         <canvas width="1280", height="720" id="canvas"></canvas>
     </div>
 </div>
-<script src="/static/gameui.js"></script>
-<script src="/static/game.js"></script>
-<script src="/static/pumpkin_memory.js"></script>
+<script src="/static/js/gameui.js"></script>
+<script src="/static/js/game.js"></script>
+<script src="/static/js/pumpkin_memory.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", () => {
     start_game();
diff --git a/templates/pumpkin_roll.jinja2 b/templates/pumpkin_roll.jinja2
index 4afa7fd..298f537 100644
--- a/templates/pumpkin_roll.jinja2
+++ b/templates/pumpkin_roll.jinja2
@@ -30,9 +30,9 @@
         <canvas width="1280", height="720" id="canvas"></canvas>
     </div>
 </div>
-<script src="/static/gameui.js"></script>
-<script src="/static/game.js"></script>
-<script src="/static/pumpkin_roll.js"></script>
+<script src="/static/js/gameui.js"></script>
+<script src="/static/js/game.js"></script>
+<script src="/static/js/pumpkin_roll.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", () => {
     start_game();