Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
Matojeje committed Aug 20, 2024
2 parents 97a32b9 + 56131ee commit 2da685a
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 11 deletions.
Binary file modified src/assets/images/items/waitchair3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 15 additions & 2 deletions src/scenes/GameScene.ts
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,13 @@ export class GameScene extends BaseScene {
this.sortDepth();
}

// Highlight button for tutorial
if (this.shopTutorialIndex == 0) {
this.invButton.setScale(0.5 + 0.08 * Math.sin(time / 100));
} else {
this.invButton.setScale(0.5);
}

this.updateMusicState();
}

Expand Down Expand Up @@ -541,9 +548,15 @@ export class GameScene extends BaseScene {
endDay() {
this.customerSpawnTimer.destroy();

// Return employees to their starting positions
this.employees.forEach((e) => {
const path = new Phaser.Curves.Path();
path.moveTo(e.x, e.y);
path.lineTo(e.startX, e.startY);
e.walk(path);
});

//this.stations.forEach((s) => s.returnItems());
// Fix this later
// this.employees.forEach((e) => e.walkTo(e.startX, e.startY));
this.resumeInvButton();
this.cycleCount++;
this.restockShop();
Expand Down
20 changes: 11 additions & 9 deletions src/scenes/TitleScene.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ import { Music } from "@/utils/Music";

import { title, version } from "@/version.json";

const creditsLeft = `@Golenchu
const creditsLeft = `Golen
Lumie
@LuxxArt
@ArcticFqx
@MatoCookies
@KonixKun
Luxx
ArcticFqx
Mato
Kiso
Soulsong
Nemi
Dreeda
Frassy`;

const creditsRight = `code
Expand All @@ -21,7 +22,8 @@ music
art
art
art
ideas`;
code
QA`;

export class TitleScene extends BaseScene {
public background: Phaser.GameObjects.Image;
Expand Down Expand Up @@ -127,9 +129,9 @@ export class TitleScene extends BaseScene {
this.credits.setAlpha(0);

let credits1 = this.addText({
x: 0.75 * this.W,
x: 0.76 * this.W,
y: 0,
size: 35,
size: 40,
color: "#c2185b",
text: creditsLeft,
});
Expand All @@ -141,7 +143,7 @@ export class TitleScene extends BaseScene {
let credits2 = this.addText({
x: this.W,
y: 0,
size: 35,
size: 40,
color: "#c2185b",
text: creditsRight,
});
Expand Down

0 comments on commit 2da685a

Please sign in to comment.