diff --git a/.gitignore b/.gitignore index 008ee69..f7f2929 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /node_modules/ /public/build/ +/build_cache/ .DS_Store /public/service-worker.js diff --git a/README.md b/README.md index 0d27323..cb2a781 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,6 @@ Dev version available [here](https://heaventaker.danbulant.eu). ## License -The game and art is licensed under AGPL 3. More info about the license [here](https://choosealicense.com/licenses/agpl-3.0/). +The game code is licensed under AGPL 3. More info about the license [here](https://choosealicense.com/licenses/agpl-3.0/). + +Background music by Mittsies, licensed under CC-NC. Sound effects under CC-0. Sprites CC-BY-NC by hohodo. diff --git a/public/sound/mittsies-departure.mp3 b/public/sound/mittsies-departure.mp3 new file mode 100644 index 0000000..61bee50 Binary files /dev/null and b/public/sound/mittsies-departure.mp3 differ diff --git a/public/sound/thought_patterns.m4a b/public/sound/thought_patterns.m4a deleted file mode 100644 index dc71ec8..0000000 Binary files a/public/sound/thought_patterns.m4a and /dev/null differ diff --git a/src/App.svelte b/src/App.svelte index 435df5e..65ab583 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -4,7 +4,7 @@ import Overlay from "./pages/overlay.svelte"; import { characters } from "./stores/characters.js"; import { dialog } from "./stores/dialog.js"; -import Game from "./pages/game.svelte"; + import Game from "./pages/game.svelte"; var page = "game"; var current = localStorage.getItem("dialog-page") || 0; @@ -23,7 +23,7 @@ import Game from "./pages/game.svelte"; } var music = new Howl({ - src: "/sound/thought_patterns.m4a", + src: "/sound/mittsies-departure.mp3", html5: true, loop: true, autoplay: true @@ -46,8 +46,8 @@ import Game from "./pages/game.svelte"; Heaventaker - + - + diff --git a/src/pages/dialog.svelte b/src/pages/dialog.svelte index 08155fd..58c497c 100644 --- a/src/pages/dialog.svelte +++ b/src/pages/dialog.svelte @@ -2,10 +2,9 @@ import Button from "./button.svelte"; import { Howl } from "howler"; import { dialog } from "../stores/dialog.js"; + import { characters } from "../stores/characters.js"; export var current; - /** @type {any[]} */ - export var characters; export var page; /** @type {typeof dialog[number]}*/ @@ -90,7 +89,7 @@ * @argument {MouseEvent} e */ function next(e) { - var path = e.path || (e.composedPath || (() => {[]}))(); + var path = e.composedPath(); if(path.includes(buttons)) return; reset(); select(); diff --git a/src/pages/game.svelte b/src/pages/game.svelte index 10d4d92..4e8bf38 100644 --- a/src/pages/game.svelte +++ b/src/pages/game.svelte @@ -1,7 +1,34 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/service-worker.js b/src/service-worker.js index 60fc04d..05d2bea 100644 --- a/src/service-worker.js +++ b/src/service-worker.js @@ -1,6 +1,6 @@ import { precacheAndRoute } from 'workbox-precaching'; import { registerRoute } from 'workbox-routing'; -import { CacheFirst, StaleWhileRevalidate } from 'workbox-strategies'; +import { CacheFirst, NetworkFirst, StaleWhileRevalidate } from 'workbox-strategies'; precacheAndRoute(self.__WB_MANIFEST); @@ -11,5 +11,5 @@ registerRoute( registerRoute( ({ request }) => request.destination === "script" || request.destination === "document", - new StaleWhileRevalidate() + process.env.NODE_ENV === "production" ? new StaleWhileRevalidate() : new NetworkFirst() ); \ No newline at end of file diff --git a/src/stores/characters.js b/src/stores/characters.js index 148c721..8f59434 100644 --- a/src/stores/characters.js +++ b/src/stores/characters.js @@ -1,12 +1,4 @@ export const characters = [{ - name: "Michael", - art: "/sprite/michael_normal.webp", - title: "the high marshal", - poses: { - wings: "/sprite/michael_wings.webp", - happy: "/sprite/michael_happy.webp" - } -}, { name: "Uriel", art: "/sprite/uriel_normal.webp", title: "the gate guardian", @@ -15,6 +7,14 @@ export const characters = [{ side_happy: "/sprite/uriel_side_happy.webp", bat: "/sprite/uriel_bat.webp" } +}, { + name: "Michael", + art: "/sprite/michael_normal.webp", + title: "the high marshal", + poses: { + wings: "/sprite/michael_wings.webp", + happy: "/sprite/michael_happy.webp" + } }, { name: "Uziel", art: "/sprite/uziel_normal.webp",