Merge pull request #35 from mashirochan/main

Author: GoldElysium

src/branches/Branch.ts

@@ -27,11 +27,11 @@ export default abstract class Branch extends Container {
 		return this.count >= this.capacity;
 	}
 
-	addDonation(donation: Donation): LeafInfo {
+	addDonation(donation: Donation, branchLabel: string, isLeftBranch: boolean): LeafInfo {
 		if (this.full) throw new Error('Branch is full!');
 
 		this.donationCount += 1;
-		return this.leafs[this.count - 1].setDonation(donation);
+		return this.leafs[this.count - 1].setDonation(donation, branchLabel, this.leafs[this.count - 1].label, isLeftBranch);
 	}
 
 	protected renderBranchSection(sprite: Sprite, label?: string) {

src/branches/Branch01.ts

@@ -5,7 +5,7 @@ import Leaf from './Leaf.ts';
 export default class Branch01 extends Branch {
 	constructor() {
 		super();
-		this.label = 'Branch variant 01';
+		this.label = 'Branch_01';
 		this.scale = 0.4;
 	}
 

src/branches/Leaf.ts

@@ -9,6 +9,14 @@ export interface LeafInfo {
 	brightness: number;
 }
 
+type BranchSide = 'leftSide' | 'rightSide';
+type BranchLabel = 'Branch_01' | 'Branch_02';
+type LeafLabel = 'Leaf 01' | 'Leaf 02' | 'Leaf 03' | 'Leaf 04' | 'Leaf 05' | 'Leaf 06' | 'Leaf 07' | 'Leaf 08' | 'Leaf 09' | 'Leaf 10' | 'Leaf 11' | 'Leaf 12' | 'Leaf 13' | 'Leaf 14' | 'Leaf 15';
+
+function isLeafLabel(label: string): label is LeafLabel {
+    return ['Leaf 01', 'Leaf 02', 'Leaf 03', 'Leaf 04', 'Leaf 05', 'Leaf 06', 'Leaf 07', 'Leaf 08', 'Leaf 09', 'Leaf 10', 'Leaf 11', 'Leaf 12', 'Leaf 13', 'Leaf 14', 'Leaf 15'].includes(label);
+}
+
 export default class Leaf extends Container {
 	private readonly prerequisites?: Container[];
 	private readonly leafSprite;
@@ -17,6 +25,17 @@ export default class Leaf extends Container {
 
 	private hasDonation = false;
 
+	private static readonly leavesToRotate: Record<BranchSide, Record<BranchLabel, LeafLabel[]>> = {
+		'leftSide': {
+			'Branch_01': ['Leaf 01', 'Leaf 02', 'Leaf 03', 'Leaf 04', 'Leaf 05', 'Leaf 06', 'Leaf 07', 'Leaf 08', 'Leaf 09', 'Leaf 10', 'Leaf 11', 'Leaf 12', 'Leaf 14', 'Leaf 15'],
+			'Branch_02': ['Leaf 01', 'Leaf 02', 'Leaf 03', 'Leaf 04', 'Leaf 05', 'Leaf 06', 'Leaf 07', 'Leaf 08', 'Leaf 09', 'Leaf 11', 'Leaf 12', 'Leaf 13', 'Leaf 15']
+		},
+		'rightSide': {
+			'Branch_01': ['Leaf 12', 'Leaf 13'],
+			'Branch_02': ['Leaf 13', 'Leaf 14']
+		}
+	};
+
 	// tint, brightness
 	public static readonly sakuraThemeLeafColors: [number, number][] = [
 		[0xff8bd4, 1.75],
@@ -111,7 +130,7 @@ export default class Leaf extends Container {
 		}
 	}
 
-	setDonation(donation: Donation): LeafInfo {
+	setDonation(donation: Donation, branchLabel: string, leafLabel: string, isLeftBranch: boolean): LeafInfo {
 		if (this.hasDonation) {
 			throw new Error('Cannot reassign leaf!');
 		}
@@ -122,12 +141,27 @@ export default class Leaf extends Container {
 		this.usernameText.text = donation.username;
 		this.amountText.text = `$${donation.amount}`;
 
+		const currentBranch: BranchSide = isLeftBranch ? 'leftSide' : 'rightSide';
+		const currentBranchLabel: BranchLabel = branchLabel === 'Branch_01' ? 'Branch_01' : 'Branch_02'; // Oof...
+
+		if (isLeafLabel(leafLabel)) {
+			const shouldRotateText = Leaf.leavesToRotate[currentBranch][currentBranchLabel].includes(leafLabel);
+
+			if (shouldRotateText) {
+				this.usernameText.angle += 180;
+				this.usernameText.y = 40;
+				this.amountText.angle += 180;
+				this.amountText.y = -40;
+			}
+		} else {
+			console.error(`Error! Invalid leaf label: ${leafLabel}\nSkipping rotation check for this leaf!`);
+		}
+
 		const [tint, brightness] = this.getTint(donation.amount);
 		this.leafSprite.tint = tint;
 		const brightnessFilter = new ColorMatrixFilter();
 		brightnessFilter.brightness(brightness, true);
 		this.leafSprite.filters = brightnessFilter;
-
 		this.eventMode = 'static';
 		this.cursor = 'pointer';
 		this.on('pointerdown', () => {

src/tree.ts

@@ -218,7 +218,7 @@ export async function buildTreeSpriteGraph(
 			treeContainer.addChild(currentBranch);
 		}
 
-		const { x, y, tint, brightness } = currentBranch.addDonation(donation);
+		const { x, y, tint, brightness } = currentBranch.addDonation(donation, currentBranch.label, !isLeftBranch);
 		void db.leaves.upsert({
 			id: donationId,
 			x: x,