diff --git a/.gitignore b/.gitignore index 778db6f..3bd5872 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ settings.json **/db.sqlite3 **/node_modules/** **/dist/** -spoiler.json \ No newline at end of file +spoiler.json +**/dotnet-tools.json \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 30e4534..2421536 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ asgiref==3.7.2 +autopep8==2.0.4 certifi==2024.2.2 charset-normalizer==3.3.2 click==8.1.7 @@ -6,6 +7,9 @@ colorama==0.4.6 cssbeautifier==1.15.1 Django==5.0.3 django-browser-reload==1.12.1 +django-tailwind==3.8.0 +djangorestframework==3.15.1 +djlint==1.34.1 EditorConfig==0.12.4 gunicorn==21.2.0 html-tag-names==0.1.2 @@ -16,7 +20,10 @@ json5==0.9.22 numpy==1.26.4 packaging==23.2 pathspec==0.12.1 +pillow==10.3.0 +pyarrow==15.0.1 pycodestyle==2.11.1 +pylance==0.10.2 PyYAML==6.0.1 regex==2023.12.25 requests==2.31.0 diff --git a/tunictracker/requirements.txt b/tunictracker/requirements.txt deleted file mode 100644 index 964581e..0000000 --- a/tunictracker/requirements.txt +++ /dev/null @@ -1,31 +0,0 @@ -asgiref==3.7.2 -autopep8==2.0.4 -certifi==2024.2.2 -charset-normalizer==3.3.2 -click==8.1.7 -colorama==0.4.6 -cssbeautifier==1.15.1 -Django==5.0.3 -django-browser-reload==1.12.1 -django-tailwind==3.8.0 -djlint==1.34.1 -EditorConfig==0.12.4 -gunicorn==21.2.0 -html-tag-names==0.1.2 -html-void-elements==0.1.0 -idna==3.6 -jsbeautifier==1.15.1 -json5==0.9.22 -numpy==1.26.4 -packaging==23.2 -pathspec==0.12.1 -pyarrow==15.0.1 -pycodestyle==2.11.1 -pylance==0.10.2 -PyYAML==6.0.1 -regex==2023.12.25 -requests==2.31.0 -six==1.16.0 -sqlparse==0.4.4 -tqdm==4.66.2 -urllib3==2.2.1 diff --git a/tunictracker/tracker/static/tracker/assets/main.js b/tunictracker/tracker/static/tracker/assets/main.js index 01a4924..378e7e6 100644 --- a/tunictracker/tracker/static/tracker/assets/main.js +++ b/tunictracker/tracker/static/tracker/assets/main.js @@ -18,12 +18,10 @@ var cross_codes = {}; var total_checks = 0; var total_entrances = 0; var all_scenes = []; -var image_translations = {}; window.onload = async () => { await get_updated_server_address(); await parse_cross_codes(); - await parse_image_translations(); await initialize_elements(); await refresh_elements(); }; @@ -41,19 +39,6 @@ async function parse_cross_codes() { ); } -async function parse_image_translations() { - fetch(`${document.URL}static/tracker/data/image_translations.json`) - .then((response) => response.json()) - .then( - (data) => { - image_translations = JSON.parse(JSON.stringify(data)); - }, - (error) => { - console.error(error); - } - ); -} - async function get_updated_server_address() { fetch(`${document.URL}get/address`) .then( @@ -762,7 +747,7 @@ async function update_summary(scene, checks, entrances) { async function update_summary_list(data, changed) { // Check whether entrances or checks changed - if (changed.checks) { + if (changed.checks && current_checks > 0) { Object.keys(data.scenes).forEach((scene) => update_summary(scene, data.scenes[scene], { found: document.querySelector( @@ -776,7 +761,7 @@ async function update_summary_list(data, changed) { ).dataset.entrancesTotal, }) ); - } else if (changed.entrances) { + } else if (changed.entrances && current_entrances > 0) { Object.keys(data.scenes).forEach((scene) => update_summary( scene, @@ -909,57 +894,11 @@ async function update_hints(hints) { hints_list.innerHTML = ""; hints_list.appendChild(hints_list_item.cloneNode(true)); hints_list_item.classList.remove("hidden"); - // Object.keys(hints).forEach((hint_index) => { for (const hint_index of Object.keys(hints)) { - // let hint = hints[hint_index].split( - // /(\[[\w\s]+?\]|\"[\w \d\>\<#.\-\']+\"|\<[\w\d#]+\>)/gm - // ); - // hint = await Promise.all( - // hint.map(async (segment) => { - // segment = segment.trim(); - // if (segment) { - // // if ( - // // !( - // // segment.startsWith("[") || - // // segment.startsWith("<") || - // // segment.startsWith('"') - // // ) - // // ) { - // // segment = translate(segment.trim()); - // // } else if (segment.startsWith("[")) { - // // segment = segment.trim(); - // // let translated_image_name = image_translations[segment]; - // // segment = ``; - // // } else { - // // segment = ` ${segment.trim()} `; - // // } - // // console.log(segment) - // // return segment; - // return await translate.test_parse_hints(segment, image_translations); - // } - // }) - // ); - hints[hint_index] = await translate.test_parse_hints( - hints[hint_index], - image_translations - ); - } - Object.keys(hints).forEach((hint_index) => { - // let hint = hints[hint_index]; - // let matches = Array.from( - // hint.matchAll(/\<([\w\d#]+)\>(.*)(\<[\w\d#]+\>)/gm) - // ); - // if (matches.length >= 1) { - // hint = hint.replace( - // /(\<[\w\d#]+\>.*\<[\w\d#]+\>)/gm, - // `${matches[0][2]}` - // ); - // } - // hint = hint.replace(/ "|" /gm, " "); + hints[hint_index] = await translate.parse_hints(hints[hint_index]); hints_list_item.firstElementChild.innerHTML = hints[hint_index]; hints_list.appendChild(hints_list_item.cloneNode(true)); - }); - document.getElementById("hints-list").innerHTML = ""; + } document.getElementById("hints-list").replaceWith(hints_list); } diff --git a/tunictracker/tracker/static/tracker/assets/translate-hints.js b/tunictracker/tracker/static/tracker/assets/translate-hints.js index 7c0470f..7685a8d 100644 --- a/tunictracker/tracker/static/tracker/assets/translate-hints.js +++ b/tunictracker/tracker/static/tracker/assets/translate-hints.js @@ -46,14 +46,18 @@ const skip = [" ", ",", "."]; const re = /(\\"[\w\s\.\-']*\\")|\<(#[a-fA-F0-9]*)\>(.*)\<#[a-fA-F0-9]*\>|(\[[\w]*\])/gm; -async function test_parse_hints(hint, translations) { +async function parse_hints(hint) { let new_hint = hint; const color_tags = [ ...hint.matchAll(/\<[^\>]+\>(.*)\<[^\>]+\>/gm), ...hint.matchAll(/\<([^\>]+)\>/gm), ]; + let color_tag_value = ""; if (color_tags) { if (color_tags[1]) { + if (color_tag_value == "") { + color_tag_value = color_tags[1][1]; + } const color_tags_text = `${color_tags[0][1]}`; new_hint = new_hint.replace( /\<[^\>]+\>[^\<]+\<[^\>]+\>/gm, @@ -64,48 +68,66 @@ async function test_parse_hints(hint, translations) { const image_text = [...new_hint.matchAll(/\[[^\]]+\]/gm)]; if (image_text && image_text[0]) { - console.log(image_text[0][0]); - const translated_image = translations[image_text[0][0]]; - console.log(translated_image); + let translated_image = image_text[0][0].replace(/\[|\]/g, ""); + if (translated_image == "hexagram") { + translated_image = `${color_tag_value + .substring(1) + .toUpperCase()}_${translated_image}`; + } new_hint = new_hint.replace( /\[[^\]]+\]/gm, - `` + `` ); } - const trunic_hint = new_hint - .split(/\<[^\>]+\>/gm) - .join(' "" ') - .split(/\"[^\"]*\"/gm); - - for (const trunic in trunic_hint) { - new_hint = new_hint.replace( - trunic_hint[trunic].trim(), - translate(trunic_hint[trunic].trim()) + let trunic_hint = new_hint; + const tag_matches = [...new_hint.matchAll(/\<[^\>]*\>/gm)].map((x) => x[0]); + for (const matched in tag_matches) { + trunic_hint = trunic_hint.replace( + tag_matches[matched], + "*".repeat(tag_matches[matched].length) ); } - return new_hint; -} - -async function test_fetch() { - const response = await fetch(`http://localhost:51111/hints`); - const data = await response.json(); - return data; -} - -async function translation_fetch() { - const response = await fetch( - `http://localhost:8080/static/tracker/data/image_translations.json` + const quote_matches = [...trunic_hint.matchAll(/\"[^\"]*\"/gm)].map( + (x) => x[0] ); - const data = await response.json(); - return data; + for (const matched in quote_matches) { + trunic_hint = trunic_hint.replace( + quote_matches[matched], + "*".repeat(quote_matches[matched].length) + ); + } + + let current_index = 0; + new_hint = [...trunic_hint.matchAll(/\*+/gm)] + .map((x, index) => { + let points = []; + if (index != 0) { + points = [current_index, x.index]; + } else { + points = [0, x.index]; + } + current_index = x.index + x[0].length; + const to_translate = trunic_hint.substring(points[0], points[1]).trim(); + if (to_translate.length > 0) { + return ( + translate(to_translate) + + " " + + new_hint.substring(x.index, current_index).trim() + ); + } else { + return new_hint.substring(x.index, current_index).trim(); + } + }) + .join(" "); + return new_hint; } const translate = (input) => { let payload = ""; let inQuote = false; let cursor = 0; - + // // remove [text in square brackets] // // remove extra whitespace (eg., "I saw A [hourglass] "HOURGLASS"" becomes "I saw A "HOURGLASS"") // input = input.replace(/\s+\[.+?\]\s+/gm, " "); @@ -150,7 +172,7 @@ const translate = (input) => { cursor++; } - return `${payload} `; + return `${payload}`; }; -export default { test_parse_hints, translation_fetch }; +export default { parse_hints }; diff --git a/tunictracker/tracker/static/tracker/data/image_translations.json b/tunictracker/tracker/static/tracker/data/image_translations.json deleted file mode 100644 index ffff220..0000000 --- a/tunictracker/tracker/static/tracker/data/image_translations.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "[stick]": "", - "[realsword]": "ThirdSword", - "[librariansword]": "SecondSword", - "[heirsword]": "ThirdSword", - "[wand]": "", - "[dagger]": "", - "[orb]": "", - "[shield]": "", - "[gun]": "", - "[hourglass]": "", - "[lantern]": "", - "[laurels]": "", - "[coin]": "", - "[trinket]": "", - "[square]": "", - "[fairy]": "", - "[mayor]": "SecretMayor", - "[book]": "", - "[att]": "", - "[def]": "", - "[potion]": "", - "[hp]": "", - "[sp]": "", - "[mp]": "", - "[attrelic]": "HeroRelicATT", - "[defrelic]": "HeroRelicDef", - "[potionrelic]": "HeroRelicPotion", - "[hprelic]": "HeroRelicHP", - "[sprelic]": "HeroRelicSP", - "[mprelic]": "HeroRelicMP", - "[yellowkey]": "", - "[housekey]": "", - "[vaultkey]": "", - "[firecracker]": "", - "[firebomb]": "", - "[icebomb]": "", - "[hpberry]": "", - "[mpberry]": "", - "[pepper]": "", - "[ivy]": "", - "[lure]": "", - "[effigy]": "", - "[flask]": "", - "[shard]": "", - "[dath]": "DathSteneTexture", - "[torch]": "", - "[triangle]": "", - "[realmoney]": "", - "[anklet]": "", - "[perfume]": "", - "[mufflingbell]": "", - "[rtsr]": "", - "[aurasgem]": "", - "[invertedash]": "", - "[bonecard]": "", - "[luckycup]": "", - "[glasscannon]": "", - "[daggerstrap]": "", - "[louderecho]": "", - "[magicecho]": "", - "[bracer]": "", - "[tincture]": "", - "[btsr]": "", - "[scavengermask]": "", - "[redhex]": "RedQuestagon", - "[greenhex]": "GreenQuestagon", - "[bluehex]": "BlueQuestagon", - "[goldhex]": "GoldHex", - "[mrmayor]": "MrMayor", - "[secretlegend]": "SecretLegend", - "[sacredgeometry]": "SacredGeometry", - "[vintage]": "Vintage", - "[justsomepals]": "JustSomePals", - "[regalweasel]": "RegalWeasel", - "[springfalls]": "SpringFalls", - "[powerup]": "PowerUp", - "[backtowork]": "BackToWork", - "[phonomath]": "Phonomath", - "[dusty]": "Dusty", - "[foreverfriend]": "ForeverFriend", - "[fooltrap]": "TinyFox", - "[archipelago]": "ArchipelagoItem", - "[ladder]": "Ladder", - "[hexagram]": "GoldHex" -} diff --git a/tunictracker/tracker/static/tracker/images/sprites/3333FF_hexagram.png b/tunictracker/tracker/static/tracker/images/sprites/3333FF_hexagram.png new file mode 100644 index 0000000..6c694e6 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/3333FF_hexagram.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/33FF33_hexagram.png b/tunictracker/tracker/static/tracker/images/sprites/33FF33_hexagram.png new file mode 100644 index 0000000..354ac2c Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/33FF33_hexagram.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/FF3333_hexagram.png b/tunictracker/tracker/static/tracker/images/sprites/FF3333_hexagram.png new file mode 100644 index 0000000..5b0d1d5 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/FF3333_hexagram.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/anklet.png b/tunictracker/tracker/static/tracker/images/sprites/anklet.png new file mode 100644 index 0000000..18be0c8 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/anklet.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/archipelago.png b/tunictracker/tracker/static/tracker/images/sprites/archipelago.png new file mode 100644 index 0000000..147c94a Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/archipelago.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/att.png b/tunictracker/tracker/static/tracker/images/sprites/att.png new file mode 100644 index 0000000..4b194ae Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/att.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/attrelic.png b/tunictracker/tracker/static/tracker/images/sprites/attrelic.png new file mode 100644 index 0000000..1e624d6 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/attrelic.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/aurasgem.png b/tunictracker/tracker/static/tracker/images/sprites/aurasgem.png new file mode 100644 index 0000000..6ac4bec Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/aurasgem.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/backtowork.png b/tunictracker/tracker/static/tracker/images/sprites/backtowork.png new file mode 100644 index 0000000..39b2004 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/backtowork.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/bluehex.png b/tunictracker/tracker/static/tracker/images/sprites/bluehex.png new file mode 100644 index 0000000..1278568 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/bluehex.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/bonecard.png b/tunictracker/tracker/static/tracker/images/sprites/bonecard.png new file mode 100644 index 0000000..bdf2ad2 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/bonecard.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/book.png b/tunictracker/tracker/static/tracker/images/sprites/book.png new file mode 100644 index 0000000..bfa61c1 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/book.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/bracer.png b/tunictracker/tracker/static/tracker/images/sprites/bracer.png new file mode 100644 index 0000000..dc5c658 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/bracer.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/btsr.png b/tunictracker/tracker/static/tracker/images/sprites/btsr.png new file mode 100644 index 0000000..fabc594 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/btsr.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/coin.png b/tunictracker/tracker/static/tracker/images/sprites/coin.png new file mode 100644 index 0000000..24c88d7 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/coin.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/dagger.png b/tunictracker/tracker/static/tracker/images/sprites/dagger.png new file mode 100644 index 0000000..b1304a1 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/dagger.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/daggerstrap.png b/tunictracker/tracker/static/tracker/images/sprites/daggerstrap.png new file mode 100644 index 0000000..35f9504 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/daggerstrap.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/dath.png b/tunictracker/tracker/static/tracker/images/sprites/dath.png new file mode 100644 index 0000000..59661cc Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/dath.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/def.png b/tunictracker/tracker/static/tracker/images/sprites/def.png new file mode 100644 index 0000000..6f62071 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/def.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/defrelic.png b/tunictracker/tracker/static/tracker/images/sprites/defrelic.png new file mode 100644 index 0000000..b841c18 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/defrelic.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/dusty.png b/tunictracker/tracker/static/tracker/images/sprites/dusty.png new file mode 100644 index 0000000..51d7edf Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/dusty.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/effigy.png b/tunictracker/tracker/static/tracker/images/sprites/effigy.png new file mode 100644 index 0000000..b2909d8 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/effigy.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/fairy.png b/tunictracker/tracker/static/tracker/images/sprites/fairy.png new file mode 100644 index 0000000..a72a055 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/fairy.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/firebomb.png b/tunictracker/tracker/static/tracker/images/sprites/firebomb.png new file mode 100644 index 0000000..c7f9515 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/firebomb.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/firecracker.png b/tunictracker/tracker/static/tracker/images/sprites/firecracker.png new file mode 100644 index 0000000..1d1e87f Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/firecracker.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/flask.png b/tunictracker/tracker/static/tracker/images/sprites/flask.png new file mode 100644 index 0000000..5c91181 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/flask.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/fooltrap.png b/tunictracker/tracker/static/tracker/images/sprites/fooltrap.png new file mode 100644 index 0000000..f0abd92 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/fooltrap.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/foreverfriend.png b/tunictracker/tracker/static/tracker/images/sprites/foreverfriend.png new file mode 100644 index 0000000..385633f Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/foreverfriend.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/glasscannon.png b/tunictracker/tracker/static/tracker/images/sprites/glasscannon.png new file mode 100644 index 0000000..5ad4205 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/glasscannon.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/goldhex.png b/tunictracker/tracker/static/tracker/images/sprites/goldhex.png new file mode 100644 index 0000000..25c38e5 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/goldhex.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/greenhex.png b/tunictracker/tracker/static/tracker/images/sprites/greenhex.png new file mode 100644 index 0000000..9cb85a9 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/greenhex.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/gun.png b/tunictracker/tracker/static/tracker/images/sprites/gun.png new file mode 100644 index 0000000..fd6e12f Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/gun.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/heirsword.png b/tunictracker/tracker/static/tracker/images/sprites/heirsword.png new file mode 100644 index 0000000..93f7e5f Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/heirsword.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/hexagram.png b/tunictracker/tracker/static/tracker/images/sprites/hexagram.png new file mode 100644 index 0000000..ff62f1a Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/hexagram.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/hourglass.png b/tunictracker/tracker/static/tracker/images/sprites/hourglass.png new file mode 100644 index 0000000..1af6bbb Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/hourglass.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/housekey.png b/tunictracker/tracker/static/tracker/images/sprites/housekey.png new file mode 100644 index 0000000..c5204cd Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/housekey.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/hp.png b/tunictracker/tracker/static/tracker/images/sprites/hp.png new file mode 100644 index 0000000..8553f2a Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/hp.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/hpberry.png b/tunictracker/tracker/static/tracker/images/sprites/hpberry.png new file mode 100644 index 0000000..0238739 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/hpberry.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/hprelic.png b/tunictracker/tracker/static/tracker/images/sprites/hprelic.png new file mode 100644 index 0000000..163191c Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/hprelic.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/icebomb.png b/tunictracker/tracker/static/tracker/images/sprites/icebomb.png new file mode 100644 index 0000000..daa2adf Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/icebomb.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/invertedash.png b/tunictracker/tracker/static/tracker/images/sprites/invertedash.png new file mode 100644 index 0000000..5925240 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/invertedash.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/ivy.png b/tunictracker/tracker/static/tracker/images/sprites/ivy.png new file mode 100644 index 0000000..0917c98 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/ivy.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/justsomepals.png b/tunictracker/tracker/static/tracker/images/sprites/justsomepals.png new file mode 100644 index 0000000..954b8ab Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/justsomepals.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/ladder.png b/tunictracker/tracker/static/tracker/images/sprites/ladder.png new file mode 100644 index 0000000..ecf1663 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/ladder.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/lantern.png b/tunictracker/tracker/static/tracker/images/sprites/lantern.png new file mode 100644 index 0000000..aa715e0 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/lantern.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/laurels.png b/tunictracker/tracker/static/tracker/images/sprites/laurels.png new file mode 100644 index 0000000..41fc8d4 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/laurels.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/librariansword.png b/tunictracker/tracker/static/tracker/images/sprites/librariansword.png new file mode 100644 index 0000000..e38a553 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/librariansword.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/louderecho.png b/tunictracker/tracker/static/tracker/images/sprites/louderecho.png new file mode 100644 index 0000000..5465ea8 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/louderecho.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/luckycup.png b/tunictracker/tracker/static/tracker/images/sprites/luckycup.png new file mode 100644 index 0000000..3bd22df Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/luckycup.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/lure.png b/tunictracker/tracker/static/tracker/images/sprites/lure.png new file mode 100644 index 0000000..21c2932 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/lure.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/magicecho.png b/tunictracker/tracker/static/tracker/images/sprites/magicecho.png new file mode 100644 index 0000000..bb2eb25 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/magicecho.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/mayor.png b/tunictracker/tracker/static/tracker/images/sprites/mayor.png new file mode 100644 index 0000000..331d38c Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/mayor.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/mp.png b/tunictracker/tracker/static/tracker/images/sprites/mp.png new file mode 100644 index 0000000..7b35080 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/mp.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/mpberry.png b/tunictracker/tracker/static/tracker/images/sprites/mpberry.png new file mode 100644 index 0000000..a4b0bd2 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/mpberry.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/mprelic.png b/tunictracker/tracker/static/tracker/images/sprites/mprelic.png new file mode 100644 index 0000000..94a1413 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/mprelic.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/mrmayor.png b/tunictracker/tracker/static/tracker/images/sprites/mrmayor.png new file mode 100644 index 0000000..331d38c Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/mrmayor.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/mufflingbell.png b/tunictracker/tracker/static/tracker/images/sprites/mufflingbell.png new file mode 100644 index 0000000..e490c05 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/mufflingbell.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/orb.png b/tunictracker/tracker/static/tracker/images/sprites/orb.png new file mode 100644 index 0000000..a56a5e6 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/orb.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/pepper.png b/tunictracker/tracker/static/tracker/images/sprites/pepper.png new file mode 100644 index 0000000..9859e58 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/pepper.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/perfume.png b/tunictracker/tracker/static/tracker/images/sprites/perfume.png new file mode 100644 index 0000000..9b7fe7c Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/perfume.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/phonomath.png b/tunictracker/tracker/static/tracker/images/sprites/phonomath.png new file mode 100644 index 0000000..ad042dc Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/phonomath.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/potion.png b/tunictracker/tracker/static/tracker/images/sprites/potion.png new file mode 100644 index 0000000..ebec870 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/potion.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/potionrelic.png b/tunictracker/tracker/static/tracker/images/sprites/potionrelic.png new file mode 100644 index 0000000..4aca7cc Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/potionrelic.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/powerup.png b/tunictracker/tracker/static/tracker/images/sprites/powerup.png new file mode 100644 index 0000000..893d6aa Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/powerup.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/realmoney.png b/tunictracker/tracker/static/tracker/images/sprites/realmoney.png new file mode 100644 index 0000000..4ed5489 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/realmoney.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/realsword.png b/tunictracker/tracker/static/tracker/images/sprites/realsword.png new file mode 100644 index 0000000..222204c Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/realsword.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/redhex.png b/tunictracker/tracker/static/tracker/images/sprites/redhex.png new file mode 100644 index 0000000..c86fa3f Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/redhex.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/regalweasel.png b/tunictracker/tracker/static/tracker/images/sprites/regalweasel.png new file mode 100644 index 0000000..acfb773 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/regalweasel.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/rtsr.png b/tunictracker/tracker/static/tracker/images/sprites/rtsr.png new file mode 100644 index 0000000..46a95fc Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/rtsr.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/sacredgeometry.png b/tunictracker/tracker/static/tracker/images/sprites/sacredgeometry.png new file mode 100644 index 0000000..57d80b0 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/sacredgeometry.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/scavengermask.png b/tunictracker/tracker/static/tracker/images/sprites/scavengermask.png new file mode 100644 index 0000000..cc97761 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/scavengermask.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/secretlegend.png b/tunictracker/tracker/static/tracker/images/sprites/secretlegend.png new file mode 100644 index 0000000..988e86b Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/secretlegend.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/shard.png b/tunictracker/tracker/static/tracker/images/sprites/shard.png new file mode 100644 index 0000000..a2a4740 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/shard.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/shield.png b/tunictracker/tracker/static/tracker/images/sprites/shield.png new file mode 100644 index 0000000..eabf954 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/shield.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/sp.png b/tunictracker/tracker/static/tracker/images/sprites/sp.png new file mode 100644 index 0000000..bc47659 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/sp.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/sprelic.png b/tunictracker/tracker/static/tracker/images/sprites/sprelic.png new file mode 100644 index 0000000..8d1a592 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/sprelic.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/springfalls.png b/tunictracker/tracker/static/tracker/images/sprites/springfalls.png new file mode 100644 index 0000000..1415ccd Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/springfalls.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/square.png b/tunictracker/tracker/static/tracker/images/sprites/square.png new file mode 100644 index 0000000..ea8a466 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/square.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/stick.png b/tunictracker/tracker/static/tracker/images/sprites/stick.png new file mode 100644 index 0000000..d989861 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/stick.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/tincture.png b/tunictracker/tracker/static/tracker/images/sprites/tincture.png new file mode 100644 index 0000000..2bdbba5 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/tincture.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/torch.png b/tunictracker/tracker/static/tracker/images/sprites/torch.png new file mode 100644 index 0000000..46faa09 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/torch.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/triangle.png b/tunictracker/tracker/static/tracker/images/sprites/triangle.png new file mode 100644 index 0000000..52a994c Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/triangle.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/trinket.png b/tunictracker/tracker/static/tracker/images/sprites/trinket.png new file mode 100644 index 0000000..144a5db Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/trinket.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/vaultkey.png b/tunictracker/tracker/static/tracker/images/sprites/vaultkey.png new file mode 100644 index 0000000..6ebb13c Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/vaultkey.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/vintage.png b/tunictracker/tracker/static/tracker/images/sprites/vintage.png new file mode 100644 index 0000000..a5dd96a Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/vintage.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/wand.png b/tunictracker/tracker/static/tracker/images/sprites/wand.png new file mode 100644 index 0000000..7c79a24 Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/wand.png differ diff --git a/tunictracker/tracker/static/tracker/images/sprites/yellowkey.png b/tunictracker/tracker/static/tracker/images/sprites/yellowkey.png new file mode 100644 index 0000000..bf1326a Binary files /dev/null and b/tunictracker/tracker/static/tracker/images/sprites/yellowkey.png differ diff --git a/tunictracker/tracker/static/tracker/images/trunic.svg b/tunictracker/tracker/static/tracker/images/trunic.svg deleted file mode 100644 index 5a8edca..0000000 --- a/tunictracker/tracker/static/tracker/images/trunic.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tunictracker/tracker/static/tracker/images/trunic_title.png b/tunictracker/tracker/static/tracker/images/trunic_title.png deleted file mode 100644 index 104f935..0000000 Binary files a/tunictracker/tracker/static/tracker/images/trunic_title.png and /dev/null differ diff --git a/tunictracker/tracker/templates/tracker/hints/index.html b/tunictracker/tracker/templates/tracker/hints/index.html index f592110..a01bdd6 100644 --- a/tunictracker/tracker/templates/tracker/hints/index.html +++ b/tunictracker/tracker/templates/tracker/hints/index.html @@ -1,3 +1,3 @@
-
{{ value }}
+
{{ value }}
diff --git a/tunictracker/tracker/templates/tracker/index.html b/tunictracker/tracker/templates/tracker/index.html index b26c2ed..e8c0b1c 100644 --- a/tunictracker/tracker/templates/tracker/index.html +++ b/tunictracker/tracker/templates/tracker/index.html @@ -114,7 +114,6 @@ {% else %}
{% endif %}
- {% comment %}
{% endcomment %} {% include "tracker/src/index.html" with tracker_fe_link="https://gitea.werefox.cafe/ada/tunic-tracker-redux" tracker_be_link="https://github.com/spaceglace/TunicTransitionTracker" %} {% endblock content %} diff --git a/tunictracker/werefoxtheme/static_src/tailwind.config.js b/tunictracker/werefoxtheme/static_src/tailwind.config.js index 31f941a..2b5a4ef 100644 --- a/tunictracker/werefoxtheme/static_src/tailwind.config.js +++ b/tunictracker/werefoxtheme/static_src/tailwind.config.js @@ -33,7 +33,7 @@ module.exports = { /* JS 1: Ignore any JavaScript in node_modules folder. */ // '!../../**/node_modules', /* JS 2: Process all JavaScript files in the project. */ - // '../../**/*.js', + '../../**/*.js', /** * Python: If you use Tailwind CSS classes in Python, uncomment the following line