Merge branch 'main' of github.com:Chocobois/TurtleTrampoline

src/assets/assets.ts

@@ -20,6 +20,8 @@ const images: Image[] = [
 	image('characters/turtle_waiting', 'turtle_walking_angry'),
 	image('characters/turtle_walking1', 'turtle_walking_angry1'),
 	image('characters/turtle_walking2', 'turtle_walking_angry2'), // For walking animation, do this: turtle_walking - turtle_walking1 - turtle_walking - turtle_walking2 -loop
+	image('characters/shopper', 'shopper'),
+	image('characters/raccoon', 'raccoon'),
 
 	// Items
 	image('items/coin', 'coin'),

src/components/ShopOwner.ts

@@ -0,0 +1,45 @@
+import { GameScene } from "@/scenes/GameScene";
+import { Button } from "./Button";
+import { Trampoline } from "./Trampoline";
+
+export class ShopOwner extends Button {
+	public scene: GameScene;
+
+	// Sprites
+	private spriteSize: number;
+	public sprite: Phaser.GameObjects.Sprite;
+	private tween: Phaser.Tweens.Tween;
+
+	constructor(scene: GameScene, x: number, y: number) {
+		super(scene, x, y);
+		scene.add.existing(this);
+		this.scene = scene;
+
+		/* Sprite */
+		this.spriteSize = 150;
+		this.sprite = this.scene.add.sprite(this.scene.W*0.85, this.scene.H*0.95, "raccoon");
+        this.sprite.setOrigin(0.5, 1);
+
+		this.sprite.setScale(this.spriteSize / this.sprite.width);
+		this.add(this.sprite);
+
+		/* Input */
+		this.bindInteractive(this.sprite, true);
+	}
+
+	update(time: number, delta: number) {
+        const squish = 0.02 * Math.sin((6 * time) / 1000);
+		this.sprite.setScale(
+            (1.0 + squish) + this.spriteSize / this.sprite.width,
+            (1.0 - squish) + this.spriteSize / this.sprite.height
+        );
+	}
+
+
+	setSpriteOrigin(ox: number, oy: number) {
+		this.sprite.x += (ox - this.sprite.originX) * this.sprite.displayWidth;
+		this.sprite.y += (oy - this.sprite.originY) * this.sprite.displayHeight;
+		this.sprite.setOrigin(ox, oy);
+	}
+
+}

src/components/Shopper.ts

@@ -0,0 +1,44 @@
+import { GameScene } from "@/scenes/GameScene";
+import { Button } from "./Button";
+import { Trampoline } from "./Trampoline";
+
+export class Shopper extends Button {
+	public scene: GameScene;
+
+	// Sprites
+	private spriteSize: number;
+	public sprite: Phaser.GameObjects.Sprite;
+	private tween: Phaser.Tweens.Tween;
+
+	constructor(scene: GameScene, x: number, y: number) {
+		super(scene, x, y);
+		scene.add.existing(this);
+		this.scene = scene;
+
+		/* Sprite */
+		this.spriteSize = 1;
+		this.sprite = this.scene.add.sprite(-60, this.scene.H, "shopper");
+        this.sprite.setOrigin(0, 1);
+
+		this.sprite.setScale(this.spriteSize / this.sprite.width);
+		this.add(this.sprite);
+
+		this.bindInteractive(this.sprite, true);
+	}
+
+	update(time: number, delta: number) {
+        const squish = Math.sin((2.5 * (time+0.5)) / 1000);
+		this.sprite.setScale(
+            (1.0 + 0.005 * squish) + this.spriteSize / this.sprite.width,
+            (1.0 - 0.01 * squish) + this.spriteSize / this.sprite.height
+        );
+	}
+
+
+	setSpriteOrigin(ox: number, oy: number) {
+		this.sprite.x += (ox - this.sprite.originX) * this.sprite.displayWidth;
+		this.sprite.y += (oy - this.sprite.originY) * this.sprite.displayHeight;
+		this.sprite.setOrigin(ox, oy);
+	}
+
+}

src/scenes/GameScene.ts

@@ -30,7 +30,7 @@ export class GameScene extends BaseScene {
 		this.shop = new ShopState(this);
 		this.ui = new UI(this);
 
-		this.setState(State.Overworld);
+		this.setState(this.state);
 	}
 
 	update(time: number, delta: number) {
@@ -41,6 +41,7 @@ export class GameScene extends BaseScene {
 
 	setState(state: State) {
 		this.state = state;
+		this.events.emit(`state_${state}`);
 		this.overworld.setVisible(state == State.Overworld);
 		this.shop.setVisible(state == State.Shop);
 	}

src/scenes/ShopState.ts

@@ -1,12 +1,45 @@
 import { GameScene, State } from "@/scenes/GameScene";
 import { Button } from "@/components/Button";
+import { Shopper } from "@/components/Shopper";
+import { ShopOwner } from "@/components/ShopOwner";
+
+type Item = {
+	title: string[];
+	description: string[];
+	image: string[];
+	prices: number[],
+	onBuy: (() => null | null)[]
+}
+
+const shopItems: Item[] = [
+	/*
+	{
+		name: 'Duct Tape',
+		description: 'Will fix your trampoline 100% of the time!',
+		image: 'tape',
+		prices: [500],
+		onBuy: []
+	},
+	*/
+	{
+		title: ['Spring'],
+		description: ['Enhances the bounce'],
+		image: ['spring'],
+		prices: [100],
+		onBuy: []
+	}
+];
 
 export class ShopState extends Phaser.GameObjects.Container {
 	public scene: GameScene;
 
 	private background: Phaser.GameObjects.Image;
 	private someButton: Button;
 
+	private itemsForSale: Item[];
+	private shopper: Shopper;
+	private owner: ShopOwner;
+
 	constructor(scene: GameScene) {
 		super(scene, 0, 0);
 		this.scene = scene;
@@ -31,9 +64,27 @@ export class ShopState extends Phaser.GameObjects.Container {
 		this.someButton.on("click", () => {
 			this.scene.setState(State.Overworld);
 		});
+
+		this.itemsForSale = [];
+		this.scene.events.addListener('state_Shop', () => {
+			this.populateShop();
+		});
+
+		this.shopper = new Shopper(scene, 0.5, 0.5);
+		this.add(this.shopper);
+
+		this.owner = new ShopOwner(scene, 0.5, 0.5);
+		this.add(this.owner);
+	}
+
+	populateShop() {
+		this.itemsForSale = shopItems;
+
 	}
 
 	update(time: number, delta: number) {
 		if (!this.visible) return;
+		this.shopper.update(time, delta);
+		this.owner.update(time, delta);
 	}
 }