-
Lv. {{ plant.level }}
+
Lv. {{ plant.getLevel() }}
-
diff --git a/src/app/plant-container/plant-container.component.scss b/src/app/plant-container/plant-container.component.scss
index 6fae6c5..94e7156 100644
--- a/src/app/plant-container/plant-container.component.scss
+++ b/src/app/plant-container/plant-container.component.scss
@@ -76,3 +76,20 @@
line-height: calc(100vh / 16 - 3vh);
width: calc(100% - 1vh - 100vh / 8 - 21vh);
}
+
+.ready-to-harvest {
+ position: absolute;
+ top: 1vh;
+ right: 1vh;
+ height: calc(100vh / 8 - 2vh);
+ width: calc(100vh / 8 - 2vh);
+ background: #1a1a1acc;
+ color: white;
+ line-height: calc(100vh / 25);
+ text-align: center;
+}
+
+
+.disabled {
+ background: #cacaca;
+}
diff --git a/src/app/plant-container/plant-container.component.ts b/src/app/plant-container/plant-container.component.ts
index 371e977..b67064e 100644
--- a/src/app/plant-container/plant-container.component.ts
+++ b/src/app/plant-container/plant-container.component.ts
@@ -1,53 +1,18 @@
-import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {FormulasService} from "../formulas.service";
-import {UtilitiesService} from "../utilities.service";
-import {PlantDto} from "../plant.dto";
+import {Component, Input, OnInit} from '@angular/core';
+import Plant from "../Plant";
@Component({
selector: 'app-plant-container',
templateUrl: './plant-container.component.html',
styleUrls: ['./plant-container.component.scss'],
- // changeDetection: ChangeDetectionStrategy.OnPush,
})
export class PlantContainerComponent implements OnInit {
- @Input('plant') plant: PlantDto | undefined;
- @Output('onBuy') onBuy = new EventEmitter
();
+ @Input('plant') plant!: Plant;
- constructor(
- private formulasService: FormulasService,
- private utilitiesService: UtilitiesService
- ) { }
+ constructor() { }
ngOnInit() {}
- buy() {
- this.onBuy.emit(this.plant);
- }
-
- getPrice() {
- if (!this.plant) return 0;
- return this.formulasService.getPrice(this.plant.basePrice, this.plant.growthRate, this.plant.level);
- }
-
- getReward() {
- if (!this.plant) return 0;
- return this.plant.reward;
- }
-
- getRewardTotal() {
- if (!this.plant) return 0;
- return this.plant.level * this.plant.reward;
- }
-
- progress(): number {
- if (!this.plant) return 0;
- return this.plant.timePassed / this.plant.timeToGrow * 100;
- }
-
- timeLeft(): string {
- if (!this.plant) return '';
- return this.utilitiesService.convertToTime(this.plant.timeToGrow - this.plant.timePassed);
- }
}
diff --git a/src/app/plant.dto.ts b/src/app/plant.dto.ts
index cf8bf7f..c552a7d 100644
--- a/src/app/plant.dto.ts
+++ b/src/app/plant.dto.ts
@@ -1,4 +1,7 @@
+import {FarmerDto} from "./farmer.dto";
+
export type PlantDto = {
+ id: number,
name: string,
level: number,
basePrice: number,
@@ -6,4 +9,5 @@ export type PlantDto = {
timeToGrow: number,
timePassed: number,
reward: number,
+ farmer: FarmerDto,
}
diff --git a/src/app/player.service.ts b/src/app/player.service.ts
index aa9671d..94a4a34 100644
--- a/src/app/player.service.ts
+++ b/src/app/player.service.ts
@@ -1,102 +1,63 @@
import { Injectable } from '@angular/core';
import {PlantDto} from "./plant.dto";
+import Plant from "./Plant";
+import Plants from "./Plants";
+import {FormulasService} from "./formulas.service";
+import {UtilitiesService} from "./utilities.service";
@Injectable({
providedIn: 'root'
})
export class PlayerService {
+ private lastSaved = Date.now();
public lastTime = Date.now();
public seeds: number = 0;
- public plants: PlantDto[] = [
- {
- name: 'Plant 1',
- level: 1,
- basePrice: 4,
- growthRate: 1.07,
- timeToGrow: 600,
- timePassed: 0,
- reward: 1,
- },
- {
- name: 'Plant 2',
- level: 0,
- basePrice: 60,
- growthRate: 1.15,
- timeToGrow: 3000,
- timePassed: 0,
- reward: 60,
- },
- {
- name: 'Plant 3',
- level: 0,
- basePrice: 720,
- growthRate: 1.14,
- timeToGrow: 6000,
- timePassed: 0,
- reward: 540,
- },
- {
- name: 'Plant 4',
- level: 0,
- basePrice: 8640,
- growthRate: 1.13,
- timeToGrow: 12000,
- timePassed: 0,
- reward: 4320,
- },
- {
- name: 'Plant 5',
- level: 0,
- basePrice: 103680,
- growthRate: 1.12,
- timeToGrow: 24000,
- timePassed: 0,
- reward: 51840,
- },
- {
- name: 'Plant 6',
- level: 0,
- basePrice: 51200,
- growthRate: 1.11,
- timeToGrow: 45000,
- timePassed: 0,
- reward: 102400,
- },
- {
- name: 'Plant 7',
- level: 0,
- basePrice: 1000000,
- growthRate: 1.106,
- timeToGrow: 60000,
- timePassed: 0,
- reward: 204800,
- },
- {
- name: 'Plant 8',
- level: 0,
- basePrice: 5000000,
- growthRate: 1.10,
- timeToGrow: 60000,
- timePassed: 0,
- reward: 614150,
- }
- ];
- constructor() {
+ public plants: Plant[] = [];
+ constructor(
+ private readonly formulasService: FormulasService,
+ private readonly utilitiesService: UtilitiesService,
+ ) {
const data = localStorage.getItem('PlayerSave');
if (data) {
const parsed = JSON.parse(data);
- this.plants = parsed.plants;
+
+ for (let index = 1; index < Plants.getPlantCount(); index++) {
+ this.plants.push(new Plant({...(parsed.plants.find((x: any) => x.id === index) ?? {}), id: index}, formulasService, this, utilitiesService));
+ }
+
+ // this.plants = parsed.plants.map((plant: PlantDto) => ({...this.BlankPlant, ...plant}));
this.seeds = parsed.seeds;
this.lastTime = parsed.lastTime ? parsed.lastTime : Date.now();
+ } else {
+ // add default plants
}
}
save() {
+ if (this.lastSaved + 1000 > Date.now()) return;
+ this.lastSaved = Date.now();
localStorage.setItem('PlayerSave', JSON.stringify({
seeds: this.seeds,
- plants: this.plants,
+ plants: this.plants.map(plant => plant.getSaveData()),
lastTime: this.lastTime
}));
}
+
+
+
+ public canAffordFarmer(id: number): boolean {
+ const plant = this.plants.find(x => x.id === id);
+ if (!plant) return false;
+ return this.seeds >= plant.getPlantData().farmer.price;
+ }
+
+ public buyFarmer(id: number) {
+ const plant = this.plants.find(x => x.id === id);
+ if (!plant) return;
+ if (!this.canAffordFarmer(id)) return;
+ if (plant.isFarmerBought()) return;
+ this.seeds -= plant.getPlantData().farmer.price;
+ plant.farmerBough = true;
+ }
}
diff --git a/src/app/playerPlant.dto.ts b/src/app/playerPlant.dto.ts
new file mode 100644
index 0000000..059465c
--- /dev/null
+++ b/src/app/playerPlant.dto.ts
@@ -0,0 +1,8 @@
+import {FarmerDto} from "./farmer.dto";
+
+export type PlayerPlantDto = {
+ id: number,
+ level: number,
+ timePassed: number,
+ farmerBought: boolean,
+}
diff --git a/src/app/progress-bar/progress-bar.component.html b/src/app/progress-bar/progress-bar.component.html
index 262e002..6e485e3 100644
--- a/src/app/progress-bar/progress-bar.component.html
+++ b/src/app/progress-bar/progress-bar.component.html
@@ -1,4 +1,4 @@
-
+
{{ progressBarText }}