From 8e7c65303daf947d36a14b5c81f66475eb671f4b Mon Sep 17 00:00:00 2001 From: Ada Werefox Date: Thu, 7 Mar 2024 01:00:55 -0600 Subject: [PATCH] Added spell codes to the holy cross codes panel, logic for whether a code has been entered. --- .../tracker/data/holy_cross_codes.json | 10 ++++++ .../tracker/static/tracker/assets/refresh.js | 11 +----- .../templates/tracker/breakdown/block.html | 6 +++- .../templates/tracker/codes/block.html | 18 ++++++++++ .../templates/tracker/codes/index.html | 35 ++++++------------- .../tracker/templates/tracker/index.html | 9 +++-- tunictracker/tracker/views.py | 15 +++++--- 7 files changed, 61 insertions(+), 43 deletions(-) create mode 100644 tunictracker/tracker/templates/tracker/codes/block.html diff --git a/tunictracker/tracker/data/holy_cross_codes.json b/tunictracker/tracker/data/holy_cross_codes.json index 9dd44ea..4109e1c 100644 --- a/tunictracker/tracker/data/holy_cross_codes.json +++ b/tunictracker/tracker/data/holy_cross_codes.json @@ -1,4 +1,8 @@ { + "Default": { + "Speedrunner Code": "RULDDRULU", + "Seeking Spell": "ULURDL" + }, "Cathedral": { "Secret Legend Door": "LULURULURDRRURDLDRDLDL" }, @@ -61,6 +65,12 @@ "Secret Gathering Place": { "Waterfall Fairy": "DRURURULULURURULDLDLDRDLDRDRUR" }, + "Spells": { + "Healing Spell": "DRDLURU", + "Dynamite": "DRURULULDLDR", + "Fire Bomb": "LURDRURDRURDL", + "Ice Bomb": "LDRURDLURDLUL" + }, "West Garden": { "Sword Door": "DRULUR", "Tiles Fairy": "URULURULURDRULRLURULURULU", diff --git a/tunictracker/tracker/static/tracker/assets/refresh.js b/tunictracker/tracker/static/tracker/assets/refresh.js index 0624a60..2a6b48e 100644 --- a/tunictracker/tracker/static/tracker/assets/refresh.js +++ b/tunictracker/tracker/static/tracker/assets/refresh.js @@ -5,7 +5,7 @@ window.onload = () => { }; async function refresh_elements() { - fetch("http://192.168.1.101:8000/spoiler") + fetch("http://localhost:8000/spoiler") .then((response) => response.json()) .then( (data) => { @@ -233,7 +233,6 @@ async function refresh_elements() { }); // Replace with new data. - // console.log(new_summary_list); document .getElementById("overview") .querySelector(".summary-list") @@ -242,17 +241,9 @@ async function refresh_elements() { .getElementById("overview") .querySelector(".breakdown-list") .replaceWith(new_breakdown_list.cloneNode(true)); - // document - // .getElementById("breakdown-current") - // .replaceWith( - // document.getElementById("breakdown-current").cloneNode(true) - // ); document .getElementById("debug-block") .replaceWith(new_debug_block.cloneNode(true)); - - // Debug - // console.log("We have data."); }, (error) => { document.getElementById("status-block").classList.remove("hidden"); diff --git a/tunictracker/tracker/templates/tracker/breakdown/block.html b/tunictracker/tracker/templates/tracker/breakdown/block.html index d7476a7..185eddb 100644 --- a/tunictracker/tracker/templates/tracker/breakdown/block.html +++ b/tunictracker/tracker/templates/tracker/breakdown/block.html @@ -57,5 +57,9 @@ {% endfor %} -
{% include "tracker/codes/index.html" %}
+ {% if current_scene.title != scene_title %} + + {% else %} +
{% include "tracker/codes/index.html" %}
+ {% endif %} diff --git a/tunictracker/tracker/templates/tracker/codes/block.html b/tunictracker/tracker/templates/tracker/codes/block.html new file mode 100644 index 0000000..4357d20 --- /dev/null +++ b/tunictracker/tracker/templates/tracker/codes/block.html @@ -0,0 +1,18 @@ + diff --git a/tunictracker/tracker/templates/tracker/codes/index.html b/tunictracker/tracker/templates/tracker/codes/index.html index d26513c..8023370 100644 --- a/tunictracker/tracker/templates/tracker/codes/index.html +++ b/tunictracker/tracker/templates/tracker/codes/index.html @@ -1,30 +1,17 @@ -
+