Skip to content

Commit b21ee53

Browse files
committed
feat(SkyBlockGardenCropMilestones): New crops from 0.24
Signed-off-by: Jacob <kathund@proton.me>
1 parent e1556fd commit b21ee53

File tree

5 files changed

+508
-334
lines changed

5 files changed

+508
-334
lines changed

src/Structures/SkyBlock/Garden/SkyBlockGardenCropMilestones.test.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ test('SkyBlockGardenCropMilestones', () => {
2727
expectTypeOf(data.mushroom).toEqualTypeOf<SkillLevelData>();
2828
expect(data.netherWart).toBeDefined();
2929
expectTypeOf(data.netherWart).toEqualTypeOf<SkillLevelData>();
30+
expect(data.moonFlower).toBeDefined();
31+
expectTypeOf(data.moonFlower).toEqualTypeOf<SkillLevelData>();
32+
expect(data.sunFlower).toBeDefined();
33+
expectTypeOf(data.sunFlower).toEqualTypeOf<SkillLevelData>();
34+
expect(data.wildRose).toBeDefined();
35+
expectTypeOf(data.wildRose).toEqualTypeOf<SkillLevelData>();
3036
expect(data.average).toBeDefined();
3137
expect(data.average).toBeGreaterThanOrEqual(0);
3238
expectTypeOf(data.average).toEqualTypeOf<number>();

src/Structures/SkyBlock/Garden/SkyBlockGardenCropMilestones.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ class SkyBlockGardenCropMilestones {
1212
cocoaBeans: SkillLevelData;
1313
mushroom: SkillLevelData;
1414
netherWart: SkillLevelData;
15+
moonFlower: SkillLevelData;
16+
sunFlower: SkillLevelData;
17+
wildRose: SkillLevelData;
1518
average: number;
1619
constructor(data: Record<string, any>) {
1720
this.wheat = getLevelByXp(data?.WHEAT || 0, { type: 'wheat' });
@@ -24,6 +27,9 @@ class SkyBlockGardenCropMilestones {
2427
this.cocoaBeans = getLevelByXp(data?.['INK_SACK:3'] || 0, { type: 'cocoaBeans' });
2528
this.mushroom = getLevelByXp(data?.MUSHROOM_COLLECTION || 0, { type: 'mushroom' });
2629
this.netherWart = getLevelByXp(data?.NETHER_STALK || 0, { type: 'netherWart' });
30+
this.moonFlower = getLevelByXp(data?.MOONFLOWER || 0, { type: 'moonFlower' });
31+
this.sunFlower = getLevelByXp(data?.DOUBLE_PLANT || 0, { type: 'sunFlower' });
32+
this.wildRose = getLevelByXp(data?.WILD_ROSE || 0, { type: 'wildRose' });
2733
this.average =
2834
(this.wheat.level +
2935
this.carrot.level +
@@ -34,8 +40,11 @@ class SkyBlockGardenCropMilestones {
3440
this.cactus.level +
3541
this.cocoaBeans.level +
3642
this.mushroom.level +
37-
this.netherWart.level) /
38-
10;
43+
this.netherWart.level +
44+
this.moonFlower.level +
45+
this.sunFlower.level +
46+
this.wildRose.level) /
47+
13;
3948
}
4049

4150
toString(): number {

src/Types/SkyBlock.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ export type GardenCrops =
6565
| 'cactus'
6666
| 'cocoaBeans'
6767
| 'mushroom'
68-
| 'netherWart';
68+
| 'netherWart'
69+
| 'moonFlower'
70+
| 'sunFlower'
71+
| 'wildRose';
6972

7073
export type BankingTransactionAction = 'DEPOSIT' | 'WITHDRAW';
7174
export type CommunityUpgradesUpgrades =

0 commit comments

Comments
 (0)