aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at
diff options
context:
space:
mode:
authorMax <max.bodifee@gmail.com>2024-06-12 07:28:45 -0700
committerGitHub <noreply@github.com>2024-06-12 16:28:45 +0200
commit637fd3bc9fe05ade7a2bb609a429b20b1e0dd1e9 (patch)
tree019922e7114030b5fb87438b990ca6bf45db9c14 /src/main/java/at
parenta432e3e77275a26c856bb53ad2469b26c2e7ca3c (diff)
downloadskyhanni-637fd3bc9fe05ade7a2bb609a429b20b1e0dd1e9.tar.gz
skyhanni-637fd3bc9fe05ade7a2bb609a429b20b1e0dd1e9.tar.bz2
skyhanni-637fd3bc9fe05ade7a2bb609a429b20b1e0dd1e9.zip
Fix: FF rework (#1861)
Co-authored-by: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt29
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFGuideGUI.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt40
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFTypes.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt148
8 files changed, 161 insertions, 94 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
index e037b80a6..fe0cd58fb 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -376,16 +376,19 @@ public class ProfileSpecificStorage {
public Map<FarmingItems, Boolean> outdatedItems = new HashMap<>();
@Expose
- public int anitaUpgrade = -1;
+ public int farmingLevel = -1;
@Expose
- public int farmingStrength = -1;
+ public double bestiary = -1.0;
@Expose
- public int farmingLevel = -1;
+ public int plotsUnlocked = -1;
@Expose
- public int plotsUnlocked = -1;
+ public int anitaUpgrade = -1;
+
+ @Expose
+ public int farmingStrength = -1;
@Expose
public SimpleTimeMark cakeExpiring = null;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
index 80f77f850..79d44d92d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt
@@ -47,6 +47,10 @@ object CaptureFarmingGear {
"fortuneupgrade",
"You claimed the Garden Farming Fortune (?<level>.*) upgrade!"
)
+ private val bestiaryPattern by patternGroup.pattern(
+ "bestiary",
+ ".*§6+(?<fortune>.*)☘ Farming Fortune.*"
+ )
private val anitaBuffPattern by patternGroup.pattern(
"anitabuff",
"You tiered up the Extra Farming Drops upgrade to [+](?<level>.*)%!"
@@ -71,7 +75,6 @@ object CaptureFarmingGear {
"strength",
" Strength: §r§c❁(?<strength>.*)"
)
-
private val tierPattern by patternGroup.pattern(
"uniquevisitors.tier",
"§7Progress to Tier (?<nextTier>\\w+):.*"
@@ -161,6 +164,26 @@ object CaptureFarmingGear {
"Configure Plots" -> configurePlots(items, storage)
"Anita" -> anita(items, storage)
"Visitor Milestones" -> visitorMilestones(items)
+ "Bestiary", "Bestiary ➜ Garden" -> bestiary(items, storage)
+ }
+ }
+
+ private fun bestiary(
+ items: Map<Int, ItemStack>,
+ storage: ProfileSpecificStorage.GardenStorage.Fortune,
+ ) {
+ for ((_, item) in items) {
+ if (item.displayName.contains("Garden")) {
+ var fortune = -1.0
+ for (line in item.getLore()) {
+ bestiaryPattern.matchMatcher(line) {
+ fortune = group("fortune").toDouble()
+ }
+ }
+ if (fortune > -1.0) {
+ storage.bestiary = fortune
+ }
+ }
}
}
@@ -315,6 +338,10 @@ object CaptureFarmingGear {
storage.farmingLevel = group("level").romanToDecimalIfNecessary()
return
}
+ bestiaryPattern.matchMatcher(msg) {
+ storage.bestiary += group("fortune").toDouble()
+ return
+ }
anitaBuffPattern.matchMatcher(msg) {
storage.anitaUpgrade = group("level").toInt() / 4
return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFGuideGUI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFGuideGUI.kt
index ff81cae6d..660c772ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFGuideGUI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFGuideGUI.kt
@@ -16,7 +16,7 @@ import net.minecraft.item.ItemStack
class FFGuideGUI : GuideGUI<FFGuideGUI.FortuneGuidePage>(FortuneGuidePage.OVERVIEW) {
override val sizeX = 360
- override val sizeY = 180
+ override val sizeY = 200
companion object {
@@ -76,7 +76,6 @@ class FFGuideGUI : GuideGUI<FFGuideGUI.FortuneGuidePage>(FortuneGuidePage.OVERVI
}
horizontalTabs.firstOrNull()?.fakeClick()
verticalTabs.firstOrNull()?.fakeClick()
-
}
private fun GuideTab.pageSwitchHorizontal() {
@@ -91,6 +90,5 @@ class FFGuideGUI : GuideGUI<FFGuideGUI.FortuneGuidePage>(FortuneGuidePage.OVERVI
OVERVIEW,
CROP,
UPGRADES,
-
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt
index 19597e6db..1d7bfd4fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFInfos.kt
@@ -12,15 +12,16 @@ internal enum class FFInfos(
val backupEquip = FarmingItems.currentEquip
FarmingItems.currentArmor = null
FarmingItems.currentEquip = null
- val total = maxSumToThis(it) + 100
+ val total = maxSumToThis(it)
FarmingItems.currentArmor = backupArmor
FarmingItems.currentEquip = backupEquip
total
}),
- ANITA_BUFF(UNIVERSAL, { FFStats.baseFF }, FFTypes.ANITA, 60),
FARMING_LEVEL(UNIVERSAL, { FFStats.baseFF }, FFTypes.FARMING_LVL, 240),
- COMMUNITY_SHOP(UNIVERSAL, { FFStats.baseFF }, FFTypes.COMMUNITY_SHOP, 40),
+ BESTIARY(UNIVERSAL, { FFStats.baseFF }, FFTypes.BESTIARY, 60),
GARDEN_PLOTS(UNIVERSAL, { FFStats.baseFF }, FFTypes.PLOTS, 72),
+ ANITA_BUFF(UNIVERSAL, { FFStats.baseFF }, FFTypes.ANITA, 60),
+ COMMUNITY_SHOP(UNIVERSAL, { FFStats.baseFF }, FFTypes.COMMUNITY_SHOP, 40),
CAKE_BUFF(UNIVERSAL, { FFStats.baseFF }, FFTypes.CAKE, 5),
TOTAL_ARMOR(UNIVERSAL, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.TOTAL),
BASE_ARMOR(TOTAL_ARMOR, { FarmingItems.currentArmor?.getFFData() ?: FFStats.armorTotalFF }, FFTypes.BASE, {
@@ -63,7 +64,7 @@ internal enum class FFInfos(
PET_BASE(TOTAL_PET, { FarmingItems.currentPet.getFFData() }, FFTypes.BASE, {
when (FarmingItems.currentPet) {
FarmingItems.ELEPHANT -> 150
- FarmingItems.MOOSHROOM_COW -> 157
+ FarmingItems.MOOSHROOM_COW -> 158
FarmingItems.BEE -> 30
else -> 0
}
@@ -107,13 +108,21 @@ internal enum class FFInfos(
val current get() = currentF().toDouble()
val max get() = maxF(this).toDouble()
- fun bar(label: String, tooltip: String) = GuiRenderUtils.getFarmingBar(label, tooltip, current, max, 90)
+ fun bar(label: String, tooltip: String, width: Int = 90) =
+ GuiRenderUtils.getFarmingBar(label, tooltip, current, max, width)
+
+ constructor(
+ sumTo: FFInfos?,
+ current: () -> Number,
+ max: Number,
+ ) : this(sumTo, current, { max })
- constructor(sumTo: FFInfos?, current: () -> Number, max: Number) : this(sumTo, current, { max })
- constructor(sumTo: FFInfos?, from: () -> Map<FFTypes, Double>, what: FFTypes, max: Number) : this(sumTo, {
- from()[what] ?: 0.0
- }, { max }
- )
+ constructor(
+ sumTo: FFInfos?,
+ from: () -> Map<FFTypes, Double>,
+ what: FFTypes,
+ max: Number,
+ ) : this(sumTo, { from()[what] ?: 0.0 }, { max })
constructor(
sumTo: FFInfos?,
@@ -121,8 +130,7 @@ internal enum class FFInfos(
what: FFTypes,
x4: () -> Boolean,
max: Number,
- ) : this(sumTo, { from()[what] ?: 0.0 }, { if (x4()) max.toDouble() * 4 else max }
- )
+ ) : this(sumTo, { from()[what] ?: 0.0 }, { if (x4()) max.toDouble() * 4 else max })
constructor(
sumTo: FFInfos?,
@@ -130,24 +138,20 @@ internal enum class FFInfos(
what: FFTypes,
x4: () -> Boolean,
max: () -> Number,
- ) : this(sumTo, { from()[what] ?: 0.0 }, { if (x4()) max().toDouble() * 4 else max() }
- )
+ ) : this(sumTo, { from()[what] ?: 0.0 }, { if (x4()) max().toDouble() * 4 else max() })
constructor(
sumTo: FFInfos?,
from: () -> Map<FFTypes, Double>,
what: FFTypes,
max: (FFInfos) -> Number,
- ) : this(
- sumTo, { from()[what] ?: 0.0 }, max
- )
+ ) : this(sumTo, { from()[what] ?: 0.0 }, max)
constructor(
sumTo: FFInfos?,
from: () -> Map<FFTypes, Double>,
what: FFTypes,
) : this(sumTo, { from()[what] ?: 0.0 }, ::maxSumToThis)
-
}
private fun maxSumToThis(self: FFInfos): Double = FFInfos.entries.filter { it.sumTo == self }.sumOf { it.max }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
index a8b79ad70..ed450b391 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFStats.kt
@@ -145,11 +145,11 @@ object FFStats {
private fun getGenericFF(): Map<FFTypes, Double> = buildMap {
val storage = GardenAPI.storage?.fortune ?: return emptyMap()
- this[FFTypes.BASE_FF] = 100.0
this[FFTypes.FARMING_LVL] = storage.farmingLevel.toDouble() * 4
- this[FFTypes.COMMUNITY_SHOP] = (ProfileStorageData.playerSpecific?.gardenCommunityUpgrade ?: -1).toDouble() * 4
+ this[FFTypes.BESTIARY] = storage.bestiary
this[FFTypes.PLOTS] = storage.plotsUnlocked.toDouble() * 3
this[FFTypes.ANITA] = storage.anitaUpgrade.toDouble() * 4
+ this[FFTypes.COMMUNITY_SHOP] = (ProfileStorageData.playerSpecific?.gardenCommunityUpgrade ?: -1).toDouble() * 4
if (cakeExpireTime.isInFuture() || cakeExpireTime.isFarPast()) {
this[FFTypes.CAKE] = 5.0
} else {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFTypes.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFTypes.kt
index fdbe4635f..35692743b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFTypes.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FFTypes.kt
@@ -8,11 +8,11 @@ enum class FFTypes {
ABILITY,
GREEN_THUMB,
PESTERMINATOR,
- BASE_FF,
- ANITA,
FARMING_LVL,
- COMMUNITY_SHOP,
+ BESTIARY,
PLOTS,
+ ANITA,
+ COMMUNITY_SHOP,
CAKE,
PET_ITEM,
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt
index ca813a4ae..e05ac4272 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt
@@ -12,10 +12,7 @@ import at.hannibal2.skyhanni.utils.renderables.Renderable
class CropPage(val crop0: () -> CropType, sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7) :
GuideTablePage(
- sizeX,
- sizeY,
- paddingX,
- paddingY
+ sizeX, sizeY, paddingX, paddingY
) {
val crop get() = crop0()
@@ -41,11 +38,7 @@ class CropPage(val crop0: () -> CropType, sizeX: Int, sizeY: Int, paddingX: Int
private fun header(): List<Renderable> = buildList {
add(FortuneStats.BASE.getFarmingBar())
-
- add(
- FortuneStats.CROP_TOTAL.getFarmingBar(110)
- )
-
+ add(FortuneStats.CROP_TOTAL.getFarmingBar(110))
add(FortuneStats.CROP_UPGRADE.getFarmingBar())
}
@@ -76,7 +69,7 @@ class CropPage(val crop0: () -> CropType, sizeX: Int, sizeY: Int, paddingX: Int
2,
verticalAlign = RenderUtils.VerticalAlignment.BOTTOM
),
- 144,
+ 164,
horizontalAlign = RenderUtils.HorizontalAlignment.CENTER,
verticalAlign = RenderUtils.VerticalAlignment.BOTTOM
)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
index 6eead6399..2bbb10b95 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt
@@ -21,8 +21,6 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
update(content, footer)
}
- // TODO display armor stats for gemstones and pesterminator
- // TODO display pest bestiary
fun getPage(): Pair<List<List<Renderable>>, List<Renderable>> {
val content = mutableListOf<MutableList<Renderable>>()
val footer = mutableListOf<Renderable>()
@@ -39,14 +37,6 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
content.addTable(
1,
- FFInfos.ANITA_BUFF.bar(
- "§2Anita Buff", if (FFTypes.ANITA.notSaved()) "§cAnita buff not saved\n§eVisit Anita to set it!"
- else "§7§2Fortune for levelling your Anita extra crops\n§2You get 4☘ per buff level"
- )
- )
-
- content.addTable(
- 2,
FFInfos.FARMING_LEVEL.bar(
"§2Farming Level",
if (FFTypes.FARMING_LVL.notSaved()) "§cFarming level not saved\n§eOpen /skills to set it!"
@@ -55,44 +45,67 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
)
content.addTable(
- 3,
- FFInfos.COMMUNITY_SHOP.bar(
- "§2Community upgrades",
- if (FFTypes.COMMUNITY_SHOP.notSaved()) "§cCommunity upgrade level not saved\n§eVisit Elizabeth to set it!"
- else "§7§2Fortune for community shop upgrades\n§2You get 4☘ per upgrade tier"
+ 2,
+ FFInfos.BESTIARY.bar(
+ "§2Bestiary",
+ if (FFTypes.BESTIARY.notSaved()) "§cBestiary fortune not saved\n§eOpen /bestiary to set it!"
+ else "§7§2Fortune for killing pests\n§2You get 0.4☘ per bestiary milestone per pest"
)
)
content.addTable(
- 4,
+ 3,
FFInfos.GARDEN_PLOTS.bar(
"§2Garden Plots",
- if (FFTypes.PLOTS.notSaved()) "§cUnlocked plot count not saved\n§eOpen /desk and view your plots to set it!"
+ if (FFTypes.PLOTS.notSaved()) "§cUnlocked plot count not saved\n" +
+ "§eOpen /desk and view your plots to set it!"
else "§7§2Fortune for unlocking garden plots\n§2You get 3☘ per plot unlocked"
)
)
content.addTable(
+ 4,
+ FFInfos.ANITA_BUFF.bar(
+ "§2Anita Buff",
+ if (FFTypes.ANITA.notSaved()) "§cAnita buff not saved\n§eVisit Anita to set it!"
+ else "§7§2Fortune for levelling your Anita extra crops\n§2You get 4☘ per buff level"
+ )
+ )
+
+ content.addTable(
5,
+ FFInfos.COMMUNITY_SHOP.bar(
+ "§2Community upgrades",
+ if (FFTypes.COMMUNITY_SHOP.notSaved()) "§cCommunity upgrade level not saved\n" +
+ "§eVisit Elizabeth to set it!"
+ else "§7§2Fortune for community shop upgrades\n§2You get 4☘ per upgrade tier"
+ )
+ )
+
+ content.addTable(
+ 6,
FFInfos.CAKE_BUFF.bar(
"§2Cake Buff", when {
- FFStats.cakeExpireTime.isFarPast() -> "§eYou have not eaten a cake since\n§edownloading this update, assuming the\n§ebuff is active!"
- FFStats.cakeExpireTime.isInPast() -> "§cYour cake buff has run out\nGo eat some cake!"
- else -> "§7§2Fortune for eating cake\n§2You get 5☘ for eating cake\n§2Time until cake buff runs out: $timeUntilCakes"
+ FFStats.cakeExpireTime.isFarPast() ->
+ "§eYou have not eaten a cake since\n§edownloading this update, assuming the\n§ebuff is active!"
+ FFStats.cakeExpireTime.isInPast() ->
+ "§cYour cake buff has run out\nGo eat some cake!"
+ else ->
+ "§7§2Fortune for eating cake\n§2You get 5☘ for eating cake\n" +
+ "§2Time until cake buff runs out: $timeUntilCakes"
}
)
)
- val armorName = FarmingItems.currentArmor?.getItem()?.displayName ?: ""
-
+ val moreInfo = "§2Select a piece for more info"
val wordArmor = if (FarmingItems.currentArmor == null) "Armor" else "Piece"
-
+ val armorName = FarmingItems.currentArmor?.getItem()?.displayName ?: ""
content.addTable(
1,
FFInfos.TOTAL_ARMOR.bar(
"§2Total $wordArmor Fortune",
- if (FarmingItems.currentArmor == null) "§7§2Total fortune from your armor\n§2Select a piece for more info"
+ if (FarmingItems.currentArmor == null) "§7§2Total fortune from your armor\n$moreInfo"
else "§7§2Total fortune from your\n$armorName"
)
)
@@ -101,7 +114,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
2,
FFInfos.BASE_ARMOR.bar(
"§2Base $wordArmor Fortune",
- if (FarmingItems.currentArmor == null) "§7§2The base fortune from your armor\n§2Select a piece for more info"
+ if (FarmingItems.currentArmor == null) "§7§2The base fortune from your armor\n$moreInfo"
else "§7§2Base fortune from your\n$armorName"
)
)
@@ -110,7 +123,7 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
3,
FFInfos.ABILITY_ARMOR.bar(
"§2$wordArmor Ability",
- if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's ability\n§2Select a piece for more info"
+ if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's ability\n$moreInfo"
else "§7§2Ability fortune from your\n$armorName"
)
)
@@ -119,23 +132,26 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
4,
FFInfos.REFORGE_ARMOR.bar(
"§2$wordArmor Reforge",
- if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's reforge\n§2Select a piece for more info"
- else "§7§2Total fortune from your\n$armorName}"
+ if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's reforge\n$moreInfo"
+ else "§7§2Reforge fortune from your\n$armorName}"
)
)
- footer.add(
- FFInfos.TOTAL_PET.bar("§2Total Pet Fortune", "§7§2The total fortune from your pet and its item")
+ content.addTable(
+ 5,
+ FFInfos.ENCHANT_ARMOR.bar(
+ "§2$wordArmor Enchantment",
+ if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's enchantments\n$moreInfo"
+ else "§7§2Enchantment fortune from your\n$armorName}"
+ )
)
- footer.add(
- FFInfos.PET_ITEM.bar(
- "§2Pet Item", when (FFStats.currentPetItem) {
- "GREEN_BANDANA" -> "§7§2The fortune from your pet's item\n§2Grants 4☘ per garden level"
- "YELLOW_BANDANA" -> "§7§2The fortune from your pet's item"
- "MINOS_RELIC" -> "§cGreen Bandana is better for fortune than minos relic!"
- else -> "No fortune boosting pet item"
- }
+ content.addTable(
+ 6,
+ FFInfos.GEMSTONE_ARMOR.bar(
+ "§2$wordArmor Gemstones",
+ if (FarmingItems.currentArmor == null) "§7§2The fortune from your armor's gemstones\n$moreInfo"
+ else "§7§2Gemstone fortune from your\n$armorName}"
)
)
@@ -147,18 +163,17 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
1,
FFInfos.TOTAL_EQUIP.bar(
"§2Total $wordEquip Fortune",
- if (FarmingItems.currentEquip == null) "§7§2Total fortune from all your equipment\n§2Select a piece for more info"
+ if (FarmingItems.currentEquip == null) "§7§2Total fortune from your equipment\n$moreInfo"
else "§7§2Total fortune from your\n$equipmentName"
)
)
-
content.addTable(
2,
FFInfos.BASE_EQUIP.bar(
"§2$wordEquip Base Fortune",
- if (FarmingItems.currentEquip == null) "§7§2The base fortune from all your equipment\n§2Select a piece for more info"
- else "§7§2Total base fortune from your\n$equipmentName"
+ if (FarmingItems.currentEquip == null) "§7§2The base fortune from your equipment\n$moreInfo"
+ else "§7§2Base fortune from your\n$equipmentName"
)
)
@@ -166,8 +181,8 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
3,
FFInfos.ABILITY_EQUIP.bar(
"§2$wordEquip Ability",
- if (FarmingItems.currentEquip == null) "§7§2The fortune from all of your equipment's abilities\n§2Select a piece for more info"
- else "§7§2Total ability fortune from your\n$equipmentName"
+ if (FarmingItems.currentEquip == null) "§7§2The fortune from your equipment's abilities\n$moreInfo"
+ else "§7§2Ability fortune from your\n$equipmentName"
)
)
@@ -175,13 +190,21 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
4,
FFInfos.REFORGE_EQUIP.bar(
"§2$wordEquip Reforge",
- if (FarmingItems.currentEquip == null) "§7§2The fortune from all of your equipment's reforges\n§2Select a piece for more info"
- else "§7§2Total reforge fortune from your\n$equipmentName"
+ if (FarmingItems.currentEquip == null) "§7§2The fortune from your equipment's reforges\n$moreInfo"
+ else "§7§2Reforge fortune from your\n$equipmentName"
)
)
content.addTable(
5,
+ FFInfos.ENCHANT_EQUIP.bar(
+ "§2$wordEquip Enchantment",
+ if (FarmingItems.currentEquip == null) "§7§2The fortune from your equipment's enchantments\n$moreInfo"
+ else "§7§2Enchantment fortune from your\n$equipmentName"
+ )
+ )
+
+ footer.add(
Renderable.horizontalContainer(
FarmingItems.getPetsDisplay(true),
4,
@@ -190,12 +213,32 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
)
)
- content.addTable(
- 5,
- FFInfos.ENCHANT_EQUIP.bar(
- "§2$wordEquip Enchantment",
- if (FarmingItems.currentEquip == null) "§7§2The fortune from all of your equipment's enchantments\n§2Select a piece for more info"
- else "§7§2Total enchantment fortune from your\n${FarmingItems.currentEquip!!.getItem().displayName}"
+ footer.add(
+ FFInfos.TOTAL_PET.bar(
+ "§2Total Pet Fortune",
+ "§7§2The total fortune from your pet and its item",
+ 71
+ )
+ )
+
+ footer.add(
+ FFInfos.PET_BASE.bar(
+ "§2Base Pet Fortune",
+ "§7§2The base fortune from your pet",
+ 71
+ )
+ )
+
+ footer.add(
+ FFInfos.PET_ITEM.bar(
+ "§2Pet Item",
+ when (FFStats.currentPetItem) {
+ "GREEN_BANDANA" -> "§7§2The fortune from your pet's item\n§2Grants 4☘ per garden level"
+ "YELLOW_BANDANA" -> "§7§2The fortune from your pet's item"
+ "MINOS_RELIC" -> "§cGreen Bandana is better for fortune than minos relic!"
+ else -> "No fortune boosting pet item"
+ },
+ 71
)
)
@@ -220,7 +263,6 @@ class OverviewPage(sizeX: Int, sizeY: Int, paddingX: Int = 15, paddingY: Int = 7
)
)
-
return content to footer
}