Merge branch 'main' of https://github.com/Chocobois/built-to-scale

src/components/Customer.ts

@@ -3,7 +3,7 @@ import { Button } from "./elements/Button";
 import { Station } from "./Station";
 import { Employee } from "./Employee";
 import { Timer } from "./Timer";
-import { interpolateColor } from "@/functions";
+import { interpolateColor } from "@/utils/functions";
 import { ThoughtBubble } from "./ThoughtBubble";
 import { StationType } from "./StationData";
 import { CustomerData, CustomerId } from "./CustomerData";

src/components/Station.ts

@@ -8,7 +8,7 @@ import {
 	StationType,
 	StationTypeData,
 } from "./StationData";
-import { interpolateColor } from "@/functions";
+import { interpolateColor } from "@/utils/functions";
 import { SimpleButton } from "./elements/SimpleButton";
 import { TextEffect } from "./TextEffect";
 

src/components/elements/Button.ts

@@ -2,6 +2,7 @@ import { BaseScene } from "@/scenes/BaseScene";
 
 export class Button extends Phaser.GameObjects.Container {
 	public scene: BaseScene;
+	public enabled: boolean;
 	// private hover: boolean;
 	private _hold: boolean;
 	public dragged: boolean;
@@ -20,6 +21,7 @@ export class Button extends Phaser.GameObjects.Container {
 		this._hold = false;
 		this.dragged = false;
 		this.blocked = false;
+		this.enabled = true;
 
 		this.liftSmooth = 0;
 		this.holdSmooth = 0;
@@ -105,7 +107,7 @@ export class Button extends Phaser.GameObjects.Container {
 		localY: number,
 		event: Phaser.Types.Input.EventData
 	) {
-		if (this.hold && !this.blocked) {
+		if (this.hold && !this.blocked && this.enabled) {
 			this.emit("click");
 		}
 		if (this.hold) this.emit("up");

src/scenes/TitleScene.ts

@@ -1,5 +1,5 @@
 import { BaseScene } from "@/scenes/BaseScene";
-import { Music } from "@/components/Music";
+import { Music } from "@/utils/Music";
 
 import { title, version } from "@/version.json";
 

src/components/Music.ts → src/utils/Music.ts

@@ -1,4 +1,4 @@
-import MusicData, { MusicKey } from "@/components/MusicData";
+import MusicData, { MusicKey } from "@/utils/MusicData";
 
 export class Music extends Phaser.Sound.WebAudioSound {
 	public _prevBarTime: number;