From 82a3162ef5ad0dc75f71b75702d8be34d2a0f90a Mon Sep 17 00:00:00 2001
From: Golen <golen87@hotmail.com>
Date: Sat, 17 Aug 2024 01:05:22 +0200
Subject: [PATCH] Add customer request

---
 src/assets/assets.ts            |   1 +
 src/assets/images/ui/bubble.png | Bin 0 -> 1215 bytes
 src/components/Customer.ts      |  38 ++++++++++++++++++++++++++----
 src/components/Station.ts       |  40 ++++++++++++++++++++++----------
 src/scenes/GameScene.ts         |  31 ++++++++++++++++++-------
 5 files changed, 84 insertions(+), 26 deletions(-)
 create mode 100644 src/assets/images/ui/bubble.png

diff --git a/src/assets/assets.ts b/src/assets/assets.ts
index 00a659e..7e43470 100644
--- a/src/assets/assets.ts
+++ b/src/assets/assets.ts
@@ -16,6 +16,7 @@ const images: Image[] = [
 
 	// UI
 	image('ui/hud', 'hud'),
+	image('ui/bubble', 'bubble'),
 
 	// Titlescreen
 	image('titlescreen/sky', 'title_sky'),
diff --git a/src/assets/images/ui/bubble.png b/src/assets/images/ui/bubble.png
new file mode 100644
index 0000000000000000000000000000000000000000..24781fd8155c8c0881b99c258d6f55851a2b2821
GIT binary patch
literal 1215
zcmV;w1VH<VP)<h;3K|Lk000e1NJLTq005={005c@1^@s6BQP_e0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTct%S3U&}t$WWauh>AFB6^c+H)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx6k5c1aNLh~_a1le0DryARI_6oP&La)
zCE`LRyD9`<5kepO(T!n=nfjb4CgC~0?&0I>U5saWpZjz4C^?e>K7n|a>4rtTK|H-_
z>74h8BdjPX#OK6g23?T&k?XR{Z=4Gb`*~)>NT=qBBg8_Xjpa6GMMEW?B91DmM*04X
z%L?Z$&T6^Jn)l={4Cl0!Wv<g4LIR6ef(QXJswklh3o%+XQcR?1Kknflbo?T@WO9|j
z$gzM5R7j2={11M2Yvv~>+@x?E=zOv5j}aia3p8rB{e5iPjT0d73|wg~f29u0e3D*k
zY0)E~cN@64ZfWu!aJd5vJn51lIZ}Y8Kc5HQ&*+=7K>sb!wdVHL+{ftykfyGZH^9Lm
zFj}DOb&q$4+I#!=OtZfqL&S2F)<N}h00006VoOIv04e~80I*hdb#4Fv010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru=m-!N2?~D}qJ#hd02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00NguL_t(|+U?!ZO2jY_hS5&({a?9W$U>17YTIo7H0Qe(
z#d4fUbk$n)wr$(C)*qv)%9H-%*?0tfPyz~OG)g!h4zm|1aKU^$K1c_H3FLf83q)AK
z1QE_rU_uFJ3``hdje`j#pm8vvgfk8%l(0s@1QO0Tm{7ubwiQZEbH;?y^o)ZEC8SX>
zfdn)PCXjH(!Guz+aIPM$9&;-<Db;#%7L-cFX_YH7Fg5-e(;C;O)_FmxM5G0!5^)xk
zO2p~%qw#L#rlsO;<xr~UIxi@dh_j$nBF+^`4R`sGz?8sLuZ|uUSLaKan9{)^2&N)&
zf~m;L`BL2xzWJtmL8(NXR=M2DB`^i1bhY1i9WZ5LN?;012~2@0^}3mZsYsk)$|{$@
z)X;g^n@mgzOo1tZsW~n`%i@>O6bchgS>+O#0#gE0(_DUBfMjAyU~2ePZk@}-l>Rd@
zO--4Y5||o(m0RbEg$bylVZteAOlkS~M*-{6H}tp^IWgf>+!@n(Q=eSpr(nXVmLM-(
zeynx5m20|bd3u#w>1qY?)tASk6pXj6a%W971ANyzvetFyAiH(q!Ku5pXp>b8D3p;f
z0R{1DZsm%+=r;dgrY4k;Fd+rdD%Vi>VkV}k31uuyNCAw83Fw^YhJgtul(8^<Q2@Em
z3xx%yWR+XvCMJ{u(=8lKK?$ay+~q|aK$@5mm;zJQxHBe<CZ?bSQ`&#w&iaY>{Bfjd
zX<}O8U`k*LOj+Y#N?@9nU_vP{p#)P<f(a#<f)Y$91*X6>Ed?f&U`k+`mS74>FrgHf
zP=X1iz!aD=Ex{C+GA+TBz%(rf&YvL!GV{65_(>oAgIZ968HEx^XG{r9fhmD0m!HR9
dfLwes`Ud<d8C5{gpJxC7002ovPDHLkV1h#%5cU87

literal 0
HcmV?d00001

diff --git a/src/components/Customer.ts b/src/components/Customer.ts
index ba954a6..61ba3eb 100644
--- a/src/components/Customer.ts
+++ b/src/components/Customer.ts
@@ -1,6 +1,6 @@
 import { GameScene } from "@/scenes/GameScene";
 import { Button } from "./elements/Button";
-import { Station } from "./Station";
+import { Station, StationType, StationTypeColors } from "./Station";
 import { Employee } from "./Employee";
 
 export class Customer extends Button {
@@ -10,11 +10,16 @@ export class Customer extends Button {
 	public dragY: number;
 	public currentStation: Station | null;
 	public currentEmployee: Employee | null;
+	public requestedStation: StationType | null;
 	public doingCuteThing: boolean;
 
-	private spriteSize: number;
+	// Customer sprite
 	private sprite: Phaser.GameObjects.Sprite;
 
+	// Request bubble
+	private bubble: Phaser.GameObjects.Sprite;
+	private bubbleImage: Phaser.GameObjects.Ellipse;
+
 	constructor(scene: GameScene, x: number, y: number) {
 		super(scene, x, y);
 		scene.add.existing(this);
@@ -26,15 +31,25 @@ export class Customer extends Button {
 		this.dragY = y;
 		this.currentStation = null;
 		this.currentEmployee = null;
+		this.requestedStation = null;
 
 		/* Sprite */
-		this.spriteSize = 150;
+		const size = 150;
 		this.sprite = this.scene.add.sprite(0, 0, "player");
 		this.sprite.setOrigin(0.5, 1.0);
-		this.sprite.y += this.spriteSize / 2;
-		this.sprite.setScale(this.spriteSize / this.sprite.width);
+		this.sprite.y += size / 2;
+		this.sprite.setScale(size / this.sprite.width);
 		this.add(this.sprite);
 
+		this.bubble = this.scene.add.sprite(0, -0.75 * size, "bubble");
+		this.bubble.setScale(0.5);
+		this.bubble.setVisible(false);
+		this.add(this.bubble);
+
+		this.bubbleImage = this.scene.add.ellipse(0, -0.82 * size, 40, 40, 0);
+		this.bubbleImage.setVisible(false);
+		this.add(this.bubbleImage);
+
 		this.bindInteractive(this.sprite, true);
 	}
 
@@ -81,4 +96,17 @@ export class Customer extends Button {
 	setAction(temp: boolean) {
 		this.doingCuteThing = temp;
 	}
+
+	setRequest(type: StationType | null) {
+		if (type !== null) {
+			this.requestedStation = type;
+
+			this.bubble.setVisible(true);
+			this.bubbleImage.setVisible(true);
+			this.bubbleImage.fillColor = StationTypeColors[type];
+		} else {
+			this.bubble.setVisible(false);
+			this.bubbleImage.setVisible(false);
+		}
+	}
 }
diff --git a/src/components/Station.ts b/src/components/Station.ts
index 085cdf2..2bc077b 100644
--- a/src/components/Station.ts
+++ b/src/components/Station.ts
@@ -2,35 +2,51 @@ import { GameScene } from "@/scenes/GameScene";
 import { Button } from "./elements/Button";
 import { Customer } from "./Customer";
 
+export enum StationType {
+	HornAndNails = 0,
+	ScalePolish = 1,
+	GoldBath = 2,
+}
+
+export const StationTypeColors: { [key in StationType]: number } = {
+	[StationType.HornAndNails]: 0xff0000,
+	[StationType.ScalePolish]: 0x00ff00,
+	[StationType.GoldBath]: 0x0000ff,
+};
+
 export class Station extends Button {
+	public stationType: StationType;
 	public currentCustomer: Customer | null; // The customer using the station
 	public taskDuration: number; // Time it takes to complete a task
 
 	private sprite: Phaser.GameObjects.Rectangle;
 	private text: Phaser.GameObjects.Text;
 
-	constructor(scene: GameScene, x: number, y: number) {
+	constructor(scene: GameScene, x: number, y: number, type: StationType) {
 		super(scene, x, y);
 		scene.add.existing(this);
 		this.scene = scene;
+		this.stationType = type;
 
 		this.currentCustomer = null;
 		this.taskDuration = 3000;
 
 		/* Sprite */
 		const size = 150;
-		this.sprite = this.scene.add.rectangle(0, 0, size, size, 0x777777);
+		const color = StationTypeColors[type];
+		this.sprite = this.scene.add.rectangle(0, 0, size, size, color);
+		this.sprite.alpha = 0.5;
 		this.add(this.sprite);
 
 		this.text = this.scene.addText({
 			x: 0,
 			y: size / 2,
-            size: 32,
+			size: 32,
 			text: "Available",
 		});
-        this.text.setOrigin(0.5);
-        this.text.setStroke("#000000", 4);
-        this.add(this.text);
+		this.text.setOrigin(0.5);
+		this.text.setStroke("#000000", 4);
+		this.add(this.text);
 	}
 
 	update(time: number, delta: number) {
@@ -41,18 +57,18 @@ export class Station extends Button {
 	setCustomer(customer: Customer | null) {
 		this.currentCustomer = customer;
 
-		this.sprite.fillColor = customer ? 0x7777ff : 0x777777;
-        this.text.setText(customer ? "Click me!" : "Available");
+		this.sprite.alpha = customer ? 0.75 : 0.5;
+		this.text.setText(customer ? "Click me!" : "Available");
 	}
 
 	startTask() {
-		this.sprite.fillColor = 0x0000ff;
-        this.text.setText("Working");
+		this.sprite.alpha = 1.0;
+		this.text.setText("Working");
 
 		this.scene.addEvent(this.taskDuration, () => {
 			this.emit("taskend");
-			this.sprite.fillColor = this.currentCustomer ? 0x7777ff : 0xff0000;
-            this.text.setText("Click me!");
+			this.sprite.alpha = this.currentCustomer ? 0.75 : 0.5;
+			this.text.setText("Click me!");
 		});
 	}
 }
diff --git a/src/scenes/GameScene.ts b/src/scenes/GameScene.ts
index 82010cf..3cd6049 100644
--- a/src/scenes/GameScene.ts
+++ b/src/scenes/GameScene.ts
@@ -2,7 +2,7 @@ import { BaseScene } from "@/scenes/BaseScene";
 import { Board } from "@/components/Board";
 import { Employee } from "@/components/Employee";
 import { Customer } from "@/components/Customer";
-import { Station } from "@/components/Station";
+import { Station, StationType } from "@/components/Station";
 import { UI } from "@/components/UI";
 import { custom } from "@neutralinojs/lib";
 
@@ -30,10 +30,10 @@ export class GameScene extends BaseScene {
 		this.board = new Board(this, 900, 500);
 
 		this.stations = [];
-		this.addStation(2, 3);
-		this.addStation(4, 3);
-		this.addStation(6, 3);
-		this.addStation(6, 1);
+		this.addStation(2, 3, StationType.HornAndNails);
+		this.addStation(4, 3, StationType.HornAndNails);
+		this.addStation(6, 3, StationType.ScalePolish);
+		this.addStation(6, 1, StationType.GoldBath);
 
 		this.employees = [];
 		this.addEmployee(5, 5);
@@ -55,9 +55,9 @@ export class GameScene extends BaseScene {
 	}
 
 	// Add new station
-	addStation(gridX: number, gridY: number) {
+	addStation(gridX: number, gridY: number, type: StationType) {
 		const coord = this.board.gridToCoord(gridX, gridY);
-		const station = new Station(this, coord.x, coord.y);
+		const station = new Station(this, coord.x, coord.y, type);
 		this.stations.push(station);
 
 		// Station task completed
@@ -69,6 +69,8 @@ export class GameScene extends BaseScene {
 				customer.setEmployee(null);
 				employee.setAction(false);
 				employee.setCustomer(null);
+
+				this.setCustomerRequest(customer);
 			}
 		});
 	}
@@ -101,6 +103,9 @@ export class GameScene extends BaseScene {
 		const customer = new Customer(this, coord.x, coord.y);
 		this.customers.push(customer);
 
+		// Set random customer request
+		this.setCustomerRequest(customer);
+
 		// Picking up a customer
 		customer.on("pickup", () => {
 			if (customer.currentStation) {
@@ -140,7 +145,6 @@ export class GameScene extends BaseScene {
 
 		// Clicking a customer
 		customer.on("click", () => {
-			console.log("CLICK");
 			this.callEmployee(customer);
 		});
 	}
@@ -161,7 +165,8 @@ export class GameScene extends BaseScene {
 			if (
 				!station.currentCustomer &&
 				distance < closestDistance &&
-				distance < maxDistance
+				distance < maxDistance &&
+				station.stationType === customer.requestedStation
 			) {
 				closestStation = station;
 				closestDistance = distance;
@@ -199,9 +204,17 @@ export class GameScene extends BaseScene {
 			const { x, y } = this.board.gridToCoord(gridX, gridY - 1);
 
 			customer.setEmployee(closestEmployee);
+			customer.setRequest(null);
+
 			closestEmployee.setCustomer(customer);
 			closestEmployee.walkTo(x, y);
 			// Wait for employee.on("walkend")
 		}
 	}
+
+	// Set a random request for the customer
+	setCustomerRequest(customer: Customer) {
+		const type = Phaser.Math.RND.between(0, 2);
+		customer.setRequest(type);
+	}
 }