Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Epilogue 2 update #23

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Epilogue 2 update #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe5c915
Add main branch Epilogue 2 3x3 capture
WUOTE Apr 10, 2024
803cfd9
Add 3x3 main branch loop.yml
WUOTE Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/loop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Print all var names with values before change
run: |

PROJECT_NAMES=("ALTERNATE_BIOMES" "APOTHEOSIS"{,"_NEW_GAME_PLUS","_TUONELA"} "NEW_GAME_PLUS_HD" "NIGHTMARE"{"_MIDDLE","_LEFT_PW","_RIGHT_PW"} "NOITAVANIA"{,"_NEW_GAME_PLUS"} "PURGATORY" "REGULAR"{"_LEFT_PW","_MAIN_BRANCH","_MIDDLE","_RIGHT_PW"})
PROJECT_NAMES=("ALTERNATE_BIOMES" "APOTHEOSIS"{,"_NEW_GAME_PLUS","_TUONELA"} "NEW_GAME_PLUS_HD" "NIGHTMARE"{"_MIDDLE","_LEFT_PW","_RIGHT_PW"} "NOITAVANIA"{,"_NEW_GAME_PLUS"} "PURGATORY" "REGULAR"{"_LEFT_PW","_MAIN_BRANCH","_MIDDLE","_RIGHT_PW","_MAIN_BRANCH_LEFT_PW","_MAIN_BRANCH_RIGHT_PW"})

# curl get repo variables into $response
response=$(curl -L \
Expand Down
44 changes: 23 additions & 21 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,18 @@ <h5 class="offcanvas-title" id="offcanvasDarkNavbarLabel">Available maps</h5>
<ul class="navbar-nav justify-content-end flex-grow-1 pe-3">
<ul class="column-gap-3 navbar-nav ml-auto mb-2 mb-lg-0 w-100 d-flex flex-row-md flex-column-sm mb-md-1 mt-md-0 mb-3 mt-2"
id="navLinksList">
<a id="mapId0" class="nav-link text-nowrap active" href="#" data-bs-toggle="pill"
onclick="changeMap(0);">Regular <span class="badge text-bg-info">β branch</span> <span
class="badge text-bg-warning">March 25</span></a>
<a id="mapId0" class="nav-link text-nowrap" href="#" data-bs-toggle="pill"
onclick="changeMap(0);">Regular <span class="badge text-bg-success">Epilogue 2</span>
<span class="badge text-bg-warning">April 8</span></a>
<a id="mapId1" class="nav-link text-nowrap" href="#" data-bs-toggle="pill"
onclick="changeMap(1);">Nightmare <span class="badge text-bg-info">β branch</span> <span
class="badge text-bg-warning">April 6</span></a>
<a id="mapId2" class="nav-link text-nowrap" href="#" data-bs-toggle="pill"
onclick="changeMap(2);">NG+ <span class="badge text-bg-info">β branch</span> <span
class="badge text-bg-warning">February 12</span></a>
<a id="mapId3" class="nav-link text-nowrap" href="#" data-bs-toggle="pill"
onclick="changeMap(3);">Regular <span class="badge text-bg-success">main branch</span>
<span class="badge text-bg-warning">February 12</span></a>
<a id="mapId3" class="nav-link text-nowrap active" href="#" data-bs-toggle="pill"
onclick="changeMap(3);">Regular <span class="badge text-bg-info">β branch</span> <span
class="badge text-bg-warning">March 25</span></a>
<a id="mapId4" class="nav-link text-nowrap" href="#" data-bs-toggle="pill"
onclick="changeMap(4);">Purgatory <span class="badge text-bg-light"><i
class="bi bi-tools"></i> Mod</span></a>
Expand Down Expand Up @@ -116,21 +116,23 @@ <h5 class="offcanvas-title" id="offcanvasDarkNavbarLabel">Available maps</h5>
<div class="coordinate-content">
</div>
</div>
<script id="cachekeys">const tileCacheKeys = {"purgatory.acidflow.stream":"1711949623",
"noitavania-new-game-plus.acidflow.stream":"1711831834",
"apotheosis-tuonela.acidflow.stream":"1711831560",
"nightmare-left-pw.acidflow.stream":"1712478755",
"regular-left-pw.acidflow.stream":"1711832069",
"apotheosis-new-game-plus.acidflow.stream":"1711831522",
"regular-middle.acidflow.stream":"1711832204",
"nightmare-middle.acidflow.stream":"1712479654",
"alternate-biomes.acidflow.stream":"1711831441",
"nightmare-right-pw.acidflow.stream":"1712480170",
"regular-main-branch.acidflow.stream":"1711832235",
"noitavania.acidflow.stream":"1711831797",
"regular-right-pw.acidflow.stream":"1711832278",
"apotheosis.acidflow.stream":"1711831489",
"new-game-plus-hd.acidflow.stream":"1711831587",};</script>
<script id="cachekeys">const tileCacheKeys = {
"purgatory.acidflow.stream": "1711949623",
"noitavania-new-game-plus.acidflow.stream": "1711831834",
"apotheosis-tuonela.acidflow.stream": "1711831560",
"nightmare-left-pw.acidflow.stream": "1712478755",
"regular-left-pw.acidflow.stream": "1711832069",
"apotheosis-new-game-plus.acidflow.stream": "1711831522",
"regular-middle.acidflow.stream": "1711832204",
"nightmare-middle.acidflow.stream": "1712479654",
"alternate-biomes.acidflow.stream": "1711831441",
"nightmare-right-pw.acidflow.stream": "1712480170",
"regular-main-branch.acidflow.stream": "1711832235",
"noitavania.acidflow.stream": "1711831797",
"regular-right-pw.acidflow.stream": "1711832278",
"apotheosis.acidflow.stream": "1711831489",
"new-game-plus-hd.acidflow.stream": "1711831587",
};</script>
<script src="js/script.js"></script>
</body>

Expand Down
35 changes: 18 additions & 17 deletions public/js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ const CHUNK_SIZE = 512;

let tileSources = [
[
"https://regular-middle.acidflow.stream/maps/regular-middle/regular-middle-2024-03-25-78633191.dzi",
"https://regular-left-pw.acidflow.stream/maps/regular-left-pw/regular-left-pw-2024-03-25-78633191.dzi",
"https://regular-right-pw.acidflow.stream/maps/regular-right-pw/regular-right-pw-2024-03-25-78633191.dzi",
"https://regular-main-branch-middle.acidflow.stream/maps/regular-main-branch-middle/regular-main-branch-middle-2024-04-08-78633191.dzi",
"https://regular-main-branch-left-pw.acidflow.stream/maps/regular-main-branch-left-pw/regular-main-branch-left-pw-2024-04-08-78633191.dzi",
"https://regular-main-branch-right-pw.acidflow.stream/maps/regular-main-branch-right-pw/regular-main-branch-right-pw-2024-04-08-78633191.dzi",
],

[
"https://nightmare-middle.acidflow.stream/maps/nightmare-middle/nightmare-middle-2024-04-06-78633191.dzi",
"https://nightmare-left-pw.acidflow.stream/maps/nightmare-left-pw/nightmare-left-pw-2024-04-06-78633191.dzi",
Expand All @@ -68,9 +69,9 @@ let tileSources = [
"",
],
[
"https://regular-main-branch.acidflow.stream/maps/regular-main-branch/regular-main-branch-2024-01-18-78633191.dzi",
"",
"",
"https://regular-middle.acidflow.stream/maps/regular-middle/regular-middle-2024-03-25-78633191.dzi",
"https://regular-left-pw.acidflow.stream/maps/regular-left-pw/regular-left-pw-2024-03-25-78633191.dzi",
"https://regular-right-pw.acidflow.stream/maps/regular-right-pw/regular-right-pw-2024-03-25-78633191.dzi",
],
[
"https://purgatory.acidflow.stream/maps/purgatory/purgatory-2024-01-18-78633191.dzi",
Expand Down Expand Up @@ -142,14 +143,13 @@ function changeMap(tileSource) {
" " + document.getElementById(`mapId${tileSource}`).innerHTML;
switch (tileSource) {
case 0:
updatedUrlParams.set("map", "regular");
updatedUrlParams.set("map", "regular-main-branch");
os.world.removeAll();
os.addTiledImage({ tileSource: tileSources[0][0] });
os.addTiledImage({ tileSource: tileSources[0][1] });
os.addTiledImage({ tileSource: tileSources[0][2] });
os.addTiledImage({ tileSource: tileSources[3][0] });
os.addTiledImage({ tileSource: tileSources[3][1] });
os.addTiledImage({ tileSource: tileSources[3][2] });
os.forceRedraw();
document.querySelector("body").removeAttribute("class");

document.querySelector("body").setAttribute("class", "toggle-hidden");
break;
case 1:
updatedUrlParams.set("map", "nightmare");
Expand All @@ -170,13 +170,14 @@ function changeMap(tileSource) {
document.querySelector("body").setAttribute("class", "toggle-hidden");
break;
case 3:
updatedUrlParams.set("map", "regular-main-branch");
updatedUrlParams.set("map", "regular");
os.world.removeAll();
os.addTiledImage({ tileSource: tileSources[3][0] });
// os.addTiledImage({ tileSource: tileSources[3][1] });
// os.addTiledImage({ tileSource: tileSources[3][2] });
os.addTiledImage({ tileSource: tileSources[0][0] });
os.addTiledImage({ tileSource: tileSources[0][1] });
os.addTiledImage({ tileSource: tileSources[0][2] });
os.forceRedraw();
document.querySelector("body").setAttribute("class", "toggle-hidden");
document.querySelector("body").removeAttribute("class");

break;
case 4:
updatedUrlParams.set("map", "purgatory");
Expand Down