diff --git a/images/png/angels/menu.png b/images/png/backgrounds/menu.png similarity index 100% rename from images/png/angels/menu.png rename to images/png/backgrounds/menu.png diff --git a/images/png/levels/1/level1.png b/images/png/levels/1/level.png similarity index 100% rename from images/png/levels/1/level1.png rename to images/png/levels/1/level.png diff --git a/images/png/levels/2/level2.png b/images/png/levels/2/level.png similarity index 100% rename from images/png/levels/2/level2.png rename to images/png/levels/2/level.png diff --git a/images/png/levels/2/level2_bottom.png b/images/png/levels/2/level_bottom.png similarity index 100% rename from images/png/levels/2/level2_bottom.png rename to images/png/levels/2/level_bottom.png diff --git a/images/png/levels/2/level2_top.png b/images/png/levels/2/level_top.png similarity index 100% rename from images/png/levels/2/level2_top.png rename to images/png/levels/2/level_top.png diff --git a/images/png/levels/3/level3.png b/images/png/levels/3/level.png similarity index 100% rename from images/png/levels/3/level3.png rename to images/png/levels/3/level.png diff --git a/images/png/levels/3/level3_bottom.png b/images/png/levels/3/level_bottom.png similarity index 100% rename from images/png/levels/3/level3_bottom.png rename to images/png/levels/3/level_bottom.png diff --git a/images/png/levels/3/level3_top.png b/images/png/levels/3/level_top.png similarity index 100% rename from images/png/levels/3/level3_top.png rename to images/png/levels/3/level_top.png diff --git a/src/game/gameScene.js b/src/game/gameScene.js index 318a96c..e88e8de 100644 --- a/src/game/gameScene.js +++ b/src/game/gameScene.js @@ -57,23 +57,26 @@ export class GameScene extends Phaser.Scene { preload() { this.load.setBaseURL(); - this.load.image("level1", "./sprite/level1.webp"); - this.load.image("level2", "./sprite/level2.webp"); - this.load.image("level3", "./sprite/level3.webp"); - this.load.image("lyre", "./sprite/lyre.webp"); - this.load.image("cloud", "./sprite/clouds.webp"); - this.load.image("pillar", "./sprite/pillar.webp"); - this.load.image("key", "./sprite/key.webp"); - this.load.image("lock", "./sprite/lock.webp"); - this.load.spritesheet("wind", "./sprite/wind.png", { frameWidth: textureWidth }); - this.load.spritesheet("uriel", "./sprite/uriel.png", { frameWidth: textureWidth }); - this.load.spritesheet("michael", "./sprite/michael.png", { frameWidth: textureWidth }); - this.load.spritesheet("spawn", "./sprite/yahweh.png", { frameWidth: textureWidth }); - this.load.spritesheet("azrael", "./sprite/azrael.png", { frameWidth: textureWidth }); - this.load.spritesheet("celestine", "./sprite/celestine.png", { frameWidth: textureWidth }); - this.load.spritesheet("gabriel", "./sprite/gabriel.png", { frameWidth: textureWidth }); - this.load.spritesheet("uziel", "./sprite/uziel.png", { frameWidth: textureWidth }); - this.load.spritesheet("yahweh", "./sprite/yahweh.png", { frameWidth: textureWidth }); + this.load.image("level1", "./images/levels/1/level.webp"); + this.load.image("level2", "./images/levels/2/level.webp"); + this.load.image("level3", "./images/levels/3/level.webp"); + this.load.image("lyre", "./images/levels/lyre.webp"); + this.load.image("cloud", "./images/levels/clouds.webp"); + this.load.image("pillar", "./images/levels/pillar.webp"); + this.load.image("key", "./images/levels/key.webp"); + this.load.image("lock", "./images/levels/lock.webp"); + this.load.spritesheet("wind", "./images/sprites/wind.png", { frameWidth: textureWidth }); + this.load.spritesheet("spawn", "./images/sprites/taker/dance.png", { frameWidth: textureWidth }); + this.load.spritesheet("dance", "./images/sprites/taker/dance.png", { frameWidth: textureWidth }); + this.load.spritesheet("move", "./images/sprites/taker/move.png", { frameWidth: textureWidth }); + this.load.spritesheet("kick", "./images/sprites/taker/kick.png", { frameWidth: textureWidth }); + this.load.spritesheet("uriel", "./images/sprites/angels_chibi/uriel.png", { frameWidth: textureWidth }); + this.load.spritesheet("michael", "./images/sprites/angels_chibi/michael.png", { frameWidth: textureWidth }); + this.load.spritesheet("azrael", "./images/sprites/angels_chibi/azrael.png", { frameWidth: textureWidth }); + this.load.spritesheet("celestine", "./images/sprites/angels_chibi/celestine.png", { frameWidth: textureWidth }); + this.load.spritesheet("gabriel", "./images/sprites/angels_chibi/gabriel.png", { frameWidth: textureWidth }); + this.load.spritesheet("uziel", "./images/sprites/angels_chibi/uziel.png", { frameWidth: textureWidth }); + this.load.spritesheet("yahweh", "./images/sprites/angels_chibi/yahweh.png", { frameWidth: textureWidth }); this.load.bitmapFont("gem", "fonts/gem/font.png", "fonts/gem/font.xml"); } diff --git a/src/pages/button.svelte b/src/pages/button.svelte index 39655ba..7cc9d43 100644 --- a/src/pages/button.svelte +++ b/src/pages/button.svelte @@ -12,7 +12,7 @@ max-width: 800px; position: relative; font-size: clamp(1rem, 4vh - 0.2rem, 1.5rem); - background: url("../sprite/button2.webp"); + background: url("../images/button/middle.webp"); background-size: auto 100%; background-repeat: repeat-x; padding: 5px 5px; @@ -27,7 +27,7 @@ content: ""; height: 1.72em; width: 2.56em; - background: url("../sprite/button1.webp"); + background: url("../images/button/start.webp"); background-size: contain; left: -2.56em; top: 0; @@ -37,7 +37,7 @@ content: ""; height: 1.72em; width: 2.56em; - background: url("../sprite/button1.webp"); + background: url("../images/button/start.webp"); background-size: contain; right: -2.56em; top: 0; diff --git a/src/pages/dialog.svelte b/src/pages/dialog.svelte index e6419d5..66b3c78 100644 --- a/src/pages/dialog.svelte +++ b/src/pages/dialog.svelte @@ -49,15 +49,15 @@ art = null; background = null; showText = false; - art = "/sprite/death1.webp"; + art = "/sprite/death/1.webp"; failure = true; (async() => { await asleep(150); - art = "/sprite/death2.webp"; + art = "/sprite/death/2.webp"; await asleep(150); - art = "/sprite/death3.webp"; + art = "/sprite/death/3.webp"; await asleep(150); - art = "/sprite/death4.webp"; + art = "/sprite/death/4.webp"; allowSwitch = true; failureShown = true; })(); @@ -158,10 +158,10 @@
{#if background} - + {/if} {#if art} - + {/if}
{#if showText} diff --git a/src/stores/characters.js b/src/stores/characters.js index 20df29c..bed372e 100644 --- a/src/stores/characters.js +++ b/src/stores/characters.js @@ -1,47 +1,55 @@ export const characters = [{ name: "Uriel", - art: "/sprite/uriel_idle.webp", + art: "uriel_idle", title: "the gate guardian", poses: { - semi_angry: "/sprite/uriel_normal.webp", - side_happy: "/sprite/uriel_happy.webp", - bat: "/sprite/uriel_angry.webp", - chibi: "/sprite/uriel.gif" + semi_angry: "uriel_normal", + side_happy: "uriel_happy", + bat: "uriel_angry" } }, { name: "Michael", - art: "/sprite/michael_idle.webp", + art: "michael_idle", title: "the high marshal", poses: { - wings: "/sprite/michael_angry.webp", - happy: "/sprite/michael_happy.webp", - chibi: "/sprite/uriel.gif" + wings: "michael_angry", + happy: "michael_happy" } }, { name: "Uziel", - art: "/sprite/uziel_idle.webp", + art: "uziel_idle", title: "the chief commissar", poses: { - happy: "/sprite/uziel_happy.webp", - dead: "/sprite/uziel_angry.webp" + happy: "uziel_happy", + dead: "uziel_angry" } }, { name: "Gabriel", - art: "/sprite/gabriel_idle.webp", + art: "gabriel_idle", title: "the administrator", poses: { - happy: "/sprite/gabriel_win.webp", - sad: "/sprite/gabriel_fail.webp" + happy: "gabriel_win", + sad: "gabriel_fail" } }, { name: "Azrael", - art: "/sprite/azrael_idle.webp", + art: "azrael_idle", title: "the great executioner", poses: { - happy: "/sprite/azrael_happy.webp", - angry: "/sprite/azrael_angry.webp" + happy: "azrael_happy", + angry: "azrael_angry" } }, { name: "Hadraniel", title: "the seraphim" +}, { + name: "Yahweh", + title: "the all-seeing", + art: "yahweh_idle", + poses: { + angry1: "yahweh_angry1", + angry2: "yahweh_angry2", + confuse: "yahweh_confuse", + happy: "yahweh_happy" + } }]; \ No newline at end of file diff --git a/src/stores/dialog.js b/src/stores/dialog.js index d32d0e0..41fd6a5 100644 --- a/src/stores/dialog.js +++ b/src/stores/dialog.js @@ -23,7 +23,7 @@ export const chapters = { */ export const dialog = [{ name: "start", - background: "/sprite/menu.webp", + background: "menu", text: "Hello and welcome on your way to heaven. My name is Hadraniel, and I'm the one appointed to you at the moment.", next: "start2", buttons: [{ @@ -32,25 +32,25 @@ export const dialog = [{ }] }, { name: "start2", - background: "/sprite/menu.webp", + background: "menu", character: "Hadraniel", text: "Sure. Oh and before you go there, just a warning: don't even think about trying to seduce the angels. It doesn't work here the same as down there.", next: "start3" }, { name: "start3", - background: "/sprite/menu.webp", + background: "menu", character: "Hadraniel", text: "Wait where are you going? That's not the way to the main gate-", next: "uriel_entrance" }, { name: "restart", - background: "/sprite/menu.webp", + background: "menu", character: "Hadraniel", text: "Welcome back. What do you desire now?", next: "menu" }, { name: "menu", - background: "/sprite/menu.webp", + background: "menu", character: "Hadraniel", text: "", buttons: [{ @@ -63,7 +63,7 @@ export const dialog = [{ flags: ["menu", "nosave"] }, { name: "chapters", - background: "/sprite/menu.webp", + background: "menu", character: "Hadraniel", text: "Which chapter would you like to solve?", alt: "You must first complete a chapter to be able to solve it.", @@ -72,7 +72,7 @@ export const dialog = [{ }, { name: "uriel_entrance", chapterStart: "uriel", - background: "/sprite/backg.webp", + background: "heaven", character: "Uriel", text: "Ummm... I don't want to be rude so just leave or go to the main gate.", map: "uriel", @@ -85,14 +85,14 @@ export const dialog = [{ }] }, { name: "uriel_restart", - background: "/sprite/backg.webp", + background: "heaven", character: "Uriel", pose: "semi_angry", text: "Really dude? Well if you insist, let's start from the beggining", next: "uriel_failure" }, { name: "uriel_failure", - background: "/sprite/backg.webp", + background: "heaven", character: "Uriel", text: "You picked the wrong gate fool.", next: "uriel_entrance", @@ -101,7 +101,7 @@ export const dialog = [{ }, { name: "uriel_success", chapter: "uriel", - background: "/sprite/backg.webp", + background: "heaven", character: "Uriel", text: "Well since it already got boring around here, and how can I say no to pancakes.", flags: ["success"], @@ -110,7 +110,7 @@ export const dialog = [{ }, { name: "michael_heretic", chapterStart: "michael", - background: "/sprite/backg.webp", + background: "heaven", character: "Michael", text: "How did you... You know what I don't even care. Heretic like you needs to be punished.", map: "michael", @@ -124,7 +124,7 @@ export const dialog = [{ }, { name: "michael_success", chapter: "michael", - background: "/sprite/backg.webp", + background: "heaven", character: "Michael", pose: "happy", text: "Really? Well, big man: if you survive this whole ordeal, prepare a room and we shall see how into this shit you really are", @@ -132,7 +132,7 @@ export const dialog = [{ next: "uziel_start" }, { name: "michael_failure", - background: "/sprite/backg.webp", + background: "heaven", character: "Michael", text: "I also have something to offer: eat shit and die.", pose: "wings", @@ -140,7 +140,7 @@ export const dialog = [{ next: "michael_heretic" }, { name: "uziel_start", - background: "/sprite/backg.webp", + background: "heaven", character: "Uziel", chapterStart: "uziel", map: "uziel", @@ -154,7 +154,7 @@ export const dialog = [{ }] }, { name: "uziel_failure", - background: "/sprite/backg.webp", + background: "heaven", character: "Uziel", text: "I can't beat the living shit out of you without getting closer.", next: "uziel_start", @@ -163,7 +163,7 @@ export const dialog = [{ }, { name: "uziel_success", chapter: "uziel", - background: "/sprite/backg.webp", + background: "heaven", character: "Uziel", pose: "happy", text: "That had to be the madest and stupidest thing i ever heard. Yes, i must see how this whole thing will end up.", @@ -171,7 +171,7 @@ export const dialog = [{ next: "gabriel_start" }, { name: "gabriel_start", - background: "/sprite/backg.webp", + background: "heaven", character: "Gabriel", chapterStart: "gabriel", text: "Hello sir. My name is Gabriel, Heaven's administration department. How may I help you?", @@ -185,7 +185,7 @@ export const dialog = [{ }, { name: "gabriel_success", chapter: "gabriel", - background: "/sprite/backg.webp", + background: "heaven", character: "Gabriel", text: "That... That would be lovely actually. Could you buy me some coffee? After my department got defund I can't even afford it.", next: "azrael_start", @@ -193,26 +193,26 @@ export const dialog = [{ flags: ["success"] }, { name: "gabriel_fail", - background: "/sprite/backg.webp", + background: "heaven", character: "Gabriel", text: "Oh... you looking for that type of girl, don't worry I know just the place.", next: "helltaker", pose: "sad" }, { name: "helltaker", - background: "/sprite/gabriel_background.webp", + background: "hell", text: "...", next: "helltaker2", flags: ["helltaker"] }, { name: "helltaker2", - background: "/sprite/gabriel_background.webp", + background: "hell", text: "What are you doing here?", next: "gabriel_start", flags: ["failure"] }, { name: "azrael_start", - background: "/sprite/backg.webp", + background: "heaven", character: "Azrael", chapterStart: "azrael", text: "Oh my my, what do we have here a lost soul wandering around heaven with an intent lust for angel.", @@ -227,7 +227,7 @@ export const dialog = [{ name: "azrael_fail", next: "azrael_start", character: "Azrael", - background: "/sprite/backg.webp", + background: "heaven", flags: ["failure"], text: "And with that another horny soul bite the dust.", pose: "angry" @@ -235,7 +235,7 @@ export const dialog = [{ name: "azrael_win", chapter: "azrael", next: "restart", - background: "/sprite/backg.webp", + background: "heaven", character: "Azrael", pose: "happy", flags: ["success"],