dan/heaventaker
1
0
Fork 0
mirror of https://github.com/danbulant/heaventaker synced 2026-07-09 05:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wind propagation

Browse source
This commit is contained in:
Daniel Bulant 2021-07-13 19:03:38 +02:00
parent e58ef02eed
commit 1cc3163ce4
5 changed files with 196 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/App.svelte
View file

@ -7,6 +7,7 @@
import Game from "./pages/game.svelte"; import Game from "./pages/game.svelte";
import { gameActive, menuActive, page } from "./stores/gameActive"; import { gameActive, menuActive, page } from "./stores/gameActive";
import Menu from "./pages/menu.svelte"; import Menu from "./pages/menu.svelte";
import CrashHandler from "./pages/crashHandler.svelte";
var preloads = new Map; var preloads = new Map;
function preload(url) { function preload(url) {
@ -59,6 +60,8 @@
<svelte:head> <svelte:head>
<title>Heaventaker</title> <title>Heaventaker</title>
<meta name="tags" value="heaventaker, Game, free, online, helltaker, fan">
<meta name="description" value="Heaventaker, a free online open-source helltaker fangame. Solve puzzles and get your angle harem.">
</svelte:head> </svelte:head>
{#if width < height / 1080 * 615 * 2} {#if width < height / 1080 * 615 * 2}
@ -80,6 +83,8 @@
<Dialog bind:current={$page} /> <Dialog bind:current={$page} />
</Overlay> </Overlay>
<CrashHandler />
<style> <style>
.warning { .warning {
width: 100vw; width: 100vw;

168
src/game/gameScene.js
View file

@ -15,6 +15,11 @@ menuActive.subscribe(t => {
paused = t; paused = t;
}); });
var fpsBuffer = [];
export const shared = {
lastUpdate: null
};
export class GameScene extends Phaser.Scene { export class GameScene extends Phaser.Scene {
constructor(map) { constructor(map) {
super({ super({
@ -35,7 +40,10 @@ export class GameScene extends Phaser.Scene {
map: (string | null | { map: (string | null | {
type: string, type: string,
direction?: number direction?: number
})[][] })[][],
fieldFlags: {
stopsClouds?: boolean
}[][]
}} */ }} */
this.map = map; this.map = map;
steps.set(map.steps); steps.set(map.steps);
@ -66,6 +74,7 @@ export class GameScene extends Phaser.Scene {
this.load.spritesheet("gabriel", "./sprite/gabriel.png", { frameWidth: textureWidth }); this.load.spritesheet("gabriel", "./sprite/gabriel.png", { frameWidth: textureWidth });
this.load.spritesheet("uziel", "./sprite/uziel.png", { frameWidth: textureWidth }); this.load.spritesheet("uziel", "./sprite/uziel.png", { frameWidth: textureWidth });
this.load.spritesheet("yahweh", "./sprite/yahweh.png", { frameWidth: textureWidth }); this.load.spritesheet("yahweh", "./sprite/yahweh.png", { frameWidth: textureWidth });
this.load.bitmapFont("gem", "fonts/gem/font.png", "fonts/gem/font.xml");
} }
create() { create() {
@ -109,7 +118,18 @@ export class GameScene extends Phaser.Scene {
* @type {{ type: string, direction?: number, sprite: Phaser.GameObjects.Sprite, animated: boolean }[][]} * @type {{ type: string, direction?: number, sprite: Phaser.GameObjects.Sprite, animated: boolean }[][]}
*/ */
this.items = new Array(this.map.map.length); this.items = new Array(this.map.map.length);
/**
* @type {{ type: string, direction?: number, sprite: Phaser.GameObjects.Sprite, animated: boolean, shouldPropagate?: boolean }[][]}
*/
this.winds = new Array(this.map.map.length); this.winds = new Array(this.map.map.length);
/**
* @type {{ type: string, direction?: number, sprite: Phaser.GameObjects.Sprite, animated: boolean, shouldPropagate?: boolean }[][]}
*/
this.sourceWinds = new Array(this.map.map.length);
/**
* @type {{ stopsClouds?: boolean }[][]}
*/
this.flags = new Array(this.map.map.length);
for(var y in this.map.map) { for(var y in this.map.map) {
var row = this.map.map[y]; var row = this.map.map[y];
@ -117,11 +137,25 @@ export class GameScene extends Phaser.Scene {
if(!this.items[x]) { if(!this.items[x]) {
this.items[x] = new Array(row.length); this.items[x] = new Array(row.length);
this.winds[x] = new Array(row.length); this.winds[x] = new Array(row.length);
this.sourceWinds[x] = new Array(row.length);
this.flags[x] = new Array(this.map.fieldFlags && this.map.fieldFlags[y] && this.map.fieldFlags[y].length || 0);
}
if(this.map.fieldFlags && this.map.fieldFlags[y] && this.map.fieldFlags[y][x]) {
this.flags[x][y] = this.map.fieldFlags[y][x];
} else {
this.flags[x][y] = null;
} }
var item = row[x]; var item = row[x];
if(!item) { if(!item) {
this.items[x][y] = null; this.items[x][y] = null;
this.winds[x][y] = null; this.winds[x][y] = null;
this.sourceWinds[x][y] = null;
continue;
}
if(item.type === null) {
this.items[x][y] = item;
this.winds[x][y] = null;
this.sourceWinds[x][y] = null;
continue; continue;
} }
if(typeof item === "string") { if(typeof item === "string") {
@ -188,9 +222,17 @@ export class GameScene extends Phaser.Scene {
} else { } else {
this.items[x][y] = null; this.items[x][y] = null;
this.winds[x][y] = item; this.winds[x][y] = item;
this.sourceWinds[x][y] = item;
} }
} }
} }
this.fpsText = this.add.bitmapText(0, this.container.height / 2, "gem", "");
this.container.add(this.fpsText);
this.propagateWinds();
if(window.location.hostname === "localhost") {
this.physics.config.debug = true;
this.physics.world.createDebugGraphic();
}
} }
move(fromX, fromY, toX, toY, onComplete = () => {}) { move(fromX, fromY, toX, toY, onComplete = () => {}) {
@ -223,7 +265,9 @@ export class GameScene extends Phaser.Scene {
isWindActive(x, y) { isWindActive(x, y) {
if(!this.winds[x] || !this.winds[x][y]) return false; if(!this.winds[x] || !this.winds[x][y]) return false;
if(x < 0 || y < 0 || x > this.map.size.x || y > this.map.size.y) throw new Error(`Wind out of bounds at ${x} ${y} in map ${this.map.background}`);
var mov = this.getMovementFromDirection(this.winds[x][y].direction); var mov = this.getMovementFromDirection(this.winds[x][y].direction);
if(mov.x === 0 && mov.y === 0) throw new Error(`Wind without direction at ${x} ${y} in map ${this.map.background}`);
if(this.items[x][y] && this.items[x][y].type !== "wind" && this.items[x][y].type !== "spawn") { if(this.items[x][y] && this.items[x][y].type !== "wind" && this.items[x][y].type !== "spawn") {
return false; return false;
} }
@ -233,11 +277,13 @@ export class GameScene extends Phaser.Scene {
return this.isWindActive(x-mov.x, y-mov.y); return this.isWindActive(x-mov.x, y-mov.y);
} }
/**
* Checks if the sprite at X Y can be destroyed, and if yes, destroys it.
*/
tryDestroy(toX, toY) { tryDestroy(toX, toY) {
if(this.items[toX][toY].destroyable) { if(this.items[toX][toY].destroyable) {
this.items[toX][toY].sprite.alpha = 0; this.items[toX][toY].sprite.alpha = 0;
this.items[toX][toY].sprite.destroy(); this.items[toX][toY].sprite.destroy();
console.log("Destroyed", this.items[toX][toY].sprite);
this.items[toX][toY] = null; this.items[toX][toY] = null;
this.canMove = false; this.canMove = false;
setTimeout(() => { setTimeout(() => {
@ -247,12 +293,102 @@ export class GameScene extends Phaser.Scene {
} }
} }
/**
* Propagates winds as needed.
*/
propagateWinds() {
const buf = [];
for(let x in this.winds) {
if(!this.sourceWinds[x]) continue;
for(let y in this.winds[x]) {
if(this.winds[x][y] && !this.sourceWinds[x][y]) {
buf.push(this.winds[x][y].sprite);
}
}
}
this.winds = new Array(this.items.length);
for(let x in this.items) {
this.winds[x] = new Array(this.map.size.x);
}
console.log("Winds", this.winds.length);
for(let x in this.items) {
x = parseInt(x);
for(let y in this.items[x]) {
y = parseInt(y);
if(!this.sourceWinds[x] || !this.sourceWinds[x][y]) continue;
const item = this.sourceWinds[x][y];
if(item.type !== "wind") continue;
this.winds[x][y] = item;
if(!item.shouldPropagate) continue;
const move = this.getMovementFromDirection(item.direction);
if(!move.x && !move.y) throw new Error(`Wind must have a valid direction (at ${x} ${y} of map ${this.map.background}`);
if(this.items[x] && this.items[x][y] && this.items[x][y].type) {
// hide the wind
this.sourceWinds[x][y].sprite.setAlpha(0);
// don't propagate if source hidden under wind.
continue;
} else {
if(this.sourceWinds[x][y].sprite.alpha !== 1)
this.sourceWinds[x][y].sprite.setAlpha(1);
}
var type = item.type;
var direction = item.direction;
while(x < this.map.size.x && y < this.map.size.y && x > 0 && y > 0) {
x += move.x;
y += move.y;
if(this.items[x] && this.items[x][y] && this.items[x][y].type) break;
if((this.winds[x] && this.winds[x][y]) || (this.sourceWinds[x] && this.sourceWinds[x][y])) continue;
if(!this.items[x] || !this.items[x][y] || !this.items[x][y].type) {
let item = { type: "wind", direction: direction };
var sprite = buf.pop();
if(!sprite) {
var sprite = this.add.sprite(x * this.map.px, y * this.map.px);
item.animated = true;
if(!this.anims.exists(type)) {
this.anims.create({
key: type,
frames: this.anims.generateFrameNumbers(type, {
start: 0
}),
frameRate: 10,
repeat: -1
});
}
sprite.play(type);
sprite.scale = this.map.px / 100;
sprite.setRotation(item.direction * Math.PI / 2);
this.grid.add(sprite);
} else {
sprite.x = x * this.map.px;
sprite.y = y * this.map.px;
sprite.setRotation(item.direction * Math.PI / 2);
}
item.sprite = sprite;
item.sprite.setDepth(0);
this.children.queueDepthSort();
if(!this.winds[x]) this.winds[x] = [];
this.winds[x][y] = item;
}
if(this.flags[x] && this.flags[x][y] && this.flags[x][y].stopsClouds) break;
}
}
}
for(const unused of buf) {
unused.destroy();
}
}
movePlayer(moveX, moveY, fromWind = false) { movePlayer(moveX, moveY, fromWind = false) {
if(!this.canMove) return; if(!this.canMove) return;
var toX = this.player.x + moveX; var toX = this.player.x + moveX;
var toY = this.player.y + moveY; var toY = this.player.y + moveY;
if(toX > this.map.size.x - 1 || toX < 0 || toY > this.map.size.y - 1 || toY < 0) return; if(toX > this.map.size.x - 1 || toX < 0 || toY > this.map.size.y - 1 || toY < 0) return;
if(this.items[toX][toY]) { if(this.items[toX][toY] && this.items[toX][toY].type) {
if(this.items[toX][toY].type === "key") { if(this.items[toX][toY].type === "key") {
this.items[toX][toY].sprite.destroy(); this.items[toX][toY].sprite.destroy();
this.items[toX][toY] = null; this.items[toX][toY] = null;
@ -262,6 +398,7 @@ export class GameScene extends Phaser.Scene {
if(!this.player.hasKey) return; if(!this.player.hasKey) return;
this.items[toX][toY].sprite.destroy(); this.items[toX][toY].sprite.destroy();
this.items[toX][toY] = null; this.items[toX][toY] = null;
this.propagateWinds();
} else if(this.items[toX][toY].type !== "lyre" && this.tryDestroy(toX, toY)) { } else if(this.items[toX][toY].type !== "lyre" && this.tryDestroy(toX, toY)) {
steps.update(t => --t); steps.update(t => --t);
if(stepNum <= 0) { if(stepNum <= 0) {
@ -269,8 +406,9 @@ export class GameScene extends Phaser.Scene {
this.createMap(); this.createMap();
return; return;
} }
this.propagateWinds();
return; return;
} else if(this.items[toX][toY].type === "lyre" && !this.items[toX + moveX][toY + moveY] && this.items[toX + moveX]) { } else if(this.items[toX] && this.items[toX][toY].type === "lyre" && this.items[toX + moveX] && (!this.items[toX + moveX][toY + moveY] || !this.items[toX + moveX][toY + moveY].type)) {
if(toX + moveX > this.map.size.x - 1|| toX + moveX < 0 || toY + moveY > this.map.size.y - 1 || toY + moveY < 0) return; if(toX + moveX > this.map.size.x - 1|| toX + moveX < 0 || toY + moveY > this.map.size.y - 1 || toY + moveY < 0) return;
if(this.items[toX + moveX][toY + moveY] && this.items[toX + moveX][toY + moveY].type !== "wind") return; if(this.items[toX + moveX][toY + moveY] && this.items[toX + moveX][toY + moveY].type !== "wind") return;
if(stepNum <= 0) { if(stepNum <= 0) {
@ -281,6 +419,7 @@ export class GameScene extends Phaser.Scene {
this.canMove = false; this.canMove = false;
this.move(toX, toY, toX + moveX, toY + moveY, () => { this.move(toX, toY, toX + moveX, toY + moveY, () => {
this.canMove = true; this.canMove = true;
this.propagateWinds();
}); });
return; return;
} else return; } else return;
@ -298,7 +437,7 @@ export class GameScene extends Phaser.Scene {
this.canMove = true; this.canMove = true;
this.player.x = toX; this.player.x = toX;
this.player.y = toY; this.player.y = toY;
if(!fromWind) this.checkAngel(); if(!fromWind && !this.winds[toX] && !this.winds[toX][toY]) this.checkAngel();
}); });
} }
@ -314,11 +453,14 @@ export class GameScene extends Phaser.Scene {
canMove = true; canMove = true;
update() { update(time, delta) {
shared.lastUpdate = time;
fpsBuffer.push(delta);
if(fpsBuffer.length > 200) fpsBuffer.shift();
this.container.x = this.cameras.main.width / 2 - this.container.width / 2; this.container.x = this.cameras.main.width / 2 - this.container.width / 2;
this.container.y = this.cameras.main.height / 2 - this.container.height / 2; this.container.y = this.cameras.main.height / 2 - this.container.height / 2;
if(keys.wasKeyPressed("pause")) { if(keys.wasKeyPressed("pause")) {
console.log("Paused");
menuActive.set(!paused); menuActive.set(!paused);
} }
@ -326,13 +468,21 @@ export class GameScene extends Phaser.Scene {
// debug mode // debug mode
if(keys.wasKeyPressed("debug")) { if(keys.wasKeyPressed("debug")) {
console.log("Toggled debug mode");
this.physics.config.debug = !this.physics.config.debug; this.physics.config.debug = !this.physics.config.debug;
console.log("Toggled debug mode", this.physics.config.debug ? "on" : "off");
if(this.physics.config.debug) this.physics.world.createDebugGraphic(); if(this.physics.config.debug) this.physics.world.createDebugGraphic();
this.physics.world.drawDebug = this.physics.config.debug; this.physics.world.drawDebug = this.physics.config.debug;
if(!this.physics.config.debug) this.physics.world.debugGraphic.destroy(); if(!this.physics.config.debug) {
this.physics.world.debugGraphic.destroy();
this.fpsText.setText("");
}
} }
if(keys.isKeyPressed("debug") && keys.isKeyPressed("debugCrash")) throw new Error("Debug crash");
if(this.physics.config.debug) {
const fps = 1 / (fpsBuffer.reduce((a, b) => a + b, 0) / fpsBuffer.length) * 1000;
this.fpsText.setText(`${fps.toFixed(2)} FPS`);
}
if(this.isWindActive(this.player.x, this.player.y)) { if(this.isWindActive(this.player.x, this.player.y)) {
var movement = this.getMovementFromDirection(this.winds[this.player.x][this.player.y].direction); var movement = this.getMovementFromDirection(this.winds[this.player.x][this.player.y].direction);

3
src/game/input.js
View file

@ -6,7 +6,8 @@ const keybinds = {
"up": "ArrowUp", "up": "ArrowUp",
"down": "ArrowDown", "down": "ArrowDown",
"debug": "f3", "debug": "f3",
"pause": "Escape" "pause": "Escape",
"debugCrash": "c"
}; };
class KeyHandler { class KeyHandler {

34
src/game/maps.js
View file

@ -1,7 +1,8 @@
function wind(direction) { function wind(direction, shouldPropagate) {
return { return {
type: "wind", type: "wind",
direction direction,
shouldPropagate: !!shouldPropagate
} }
} }
@ -15,6 +16,16 @@ const cloud = {
destroyable: true destroyable: true
} }
const stopcloud = {
stopsClouds: true,
type: null
}
function sc(type) {
if(typeof type === "string") type = { type };
type.stopsClouds = true;
}
/** /**
* @type { * @type {
[key: string]: { [key: string]: {
@ -27,7 +38,11 @@ const cloud = {
map: { map: {
x: number, x: number,
y: number, y: number,
type: string type: string,
shouldPropagate?: boolean
}[],
fieldFlags: {
stopsClouds?: boolean
}[] }[]
} }
} }
@ -102,9 +117,18 @@ export const maps = {
[null , cloud , null , "lyre" , "lock" , "barrier" ], [null , cloud , null , "lyre" , "lock" , "barrier" ],
["barrier" , null , "lyre" , null , null , "barrier" ], ["barrier" , null , "lyre" , null , null , "barrier" ],
["barrier" , cloud , "lyre" , null , null , "barrier" , "barrier" ], ["barrier" , cloud , "lyre" , null , null , "barrier" , "barrier" ],
["spawn" , null , null , wind(2) , cloud , "lyre" , "key" ], ["spawn" , null , null , wind(2, 1), cloud , "lyre" , "key" ],
["barrier" , "barrier" , wind(2) , "lyre" ], ["barrier" , "barrier" , wind(2, 1), "lyre" , null , null , null ],
[null , "barrier" , null , null , null , "barrier" , "barrier" ] [null , "barrier" , null , null , null , "barrier" , "barrier" ]
],
fieldFlags: [
[],
[],
[],
[null , null , null , null , stopcloud ],
[],
[null , null , null , null , stopcloud ],
[null , null , null , null , null , stopcloud]
] ]
} }
}; };

2
src/pages/menu.svelte
View file

@ -1,7 +1,7 @@
<script> <script>
import { dialog } from "../stores/dialog"; import { dialog } from "../stores/dialog";
import { gameActive, menuActive, page } from "../stores/gameActive"; import { gameActive, menuActive, page } from "../stores/gameActive";
import Keypress from "../stores/keypress.svelte"; import Keypress from "../stores/keypress.svelte";
import Button from "./button.svelte"; import Button from "./button.svelte";
const buttons = [ const buttons = [