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 %}
+ {% include "tracker/codes/index.html" %}
+ {% 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 @@
-
+
Holy Cross Codes
-
-
-
+
+
- {% for name, code in codes.items %}
-
+ {% for name, code in default_codes.items %}
+ {% include "tracker/codes/block.html" with is_entered=false %}
+ {% endfor %}
+ {% for name, code in spell_codes.items %}
+ {% include "tracker/codes/block.html" with is_entered=false %}
+ {% endfor %}
+ {% for name, code_tuple in current_codes.items %}
+ {% include "tracker/codes/block.html" with code=code_tuple.0 is_entered=code_tuple.1 %}
{% endfor %}
diff --git a/tunictracker/tracker/templates/tracker/index.html b/tunictracker/tracker/templates/tracker/index.html
index 013990f..71a99f6 100644
--- a/tunictracker/tracker/templates/tracker/index.html
+++ b/tunictracker/tracker/templates/tracker/index.html
@@ -35,7 +35,11 @@
{% include "tracker/breakdown/block.html" with extra_classes="hidden" %}
{% for scene_title, scene_data in scenes.items %}
- {% include "tracker/breakdown/block.html" %}
+ {% if scene_title == current_scene.title %}
+ {% include "tracker/breakdown/block.html" with extra_classes="hidden" %}
+ {% else %}
+ {% include "tracker/breakdown/block.html" %}
+ {% endif %}
{% endfor %}
@@ -45,8 +49,7 @@
Tracker Debug
-
+
{% for name, value in debug.items %}
diff --git a/tunictracker/tracker/views.py b/tunictracker/tracker/views.py
index b315996..d62fc7b 100644
--- a/tunictracker/tracker/views.py
+++ b/tunictracker/tracker/views.py
@@ -39,25 +39,30 @@ def index(request):
tracker_debug = tracker_output["Debug"]
tracker_totals = tracker_output["Totals"]
tracker_current_scene = tracker_output["Current"]["Scene"]
- tracker_current_scane_data = tracker_output["Scenes"][tracker_current_scene]
+ tracker_current_scene_data = tracker_output["Scenes"][tracker_current_scene]
tracker_scenes = tracker_output["Scenes"]
tracker_codes = tracker_output["Codes"]
try:
current_cross_codes = cross_codes[tracker_current_scene]
- except:
+ for k, v in cross_codes[tracker_current_scene].items():
+ current_cross_codes[k] = (
+ v, tracker_codes[tracker_current_scene][k])
+ except Exception as e:
current_cross_codes = {}
+ print(e)
template = loader.get_template("tracker/index.html")
context = {
"server_address": server_address,
"is_hidden": is_hidden,
"debug": tracker_debug,
- "codes": current_cross_codes,
- "codes_entered": tracker_codes,
+ "default_codes": cross_codes["Default"],
+ "spell_codes": cross_codes["Spells"],
+ "current_codes": current_cross_codes,
"totals": tracker_totals,
"scenes": tracker_scenes,
"current_scene": {
"title": tracker_current_scene,
- "data": tracker_current_scane_data
+ "data": tracker_current_scene_data
}
}
return HttpResponse(template.render(context, request))