aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStella <stellaarnott1@gmail.com>2024-07-07 02:26:23 -0700
committerGitHub <noreply@github.com>2024-07-07 11:26:23 +0200
commit4c300de2cf0a33a737a4c4a8291d61bb99fc1074 (patch)
tree6689f6ee8c1acc57abf316c0fd214696ffca444c
parent63fe8d8986954ab8c274018e069957886503e5e6 (diff)
downloadskyhanni-4c300de2cf0a33a737a4c4a8291d61bb99fc1074.tar.gz
skyhanni-4c300de2cf0a33a737a4c4a8291d61bb99fc1074.tar.bz2
skyhanni-4c300de2cf0a33a737a4c4a8291d61bb99fc1074.zip
Fix: Adds new mayor perks to scoreboard (#2187)
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/Mayors.kt113
1 files changed, 94 insertions, 19 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
index 7ff74aeda..b2ac98b32 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/Mayors.kt
@@ -11,26 +11,92 @@ enum class Mayor(
val color: String,
vararg val perks: Perk,
) {
- AATROX("Aatrox", "§3", Perk.SLASHED_PRICING, Perk.SLAYER_XP_BUFF, Perk.PATHFINDER),
- COLE("Cole", "§e", Perk.PROSPECTION, Perk.MINING_XP_BUFF, Perk.MINING_FIESTA),
- DIANA("Diana", "§2", Perk.LUCKY, Perk.MYTHOLOGICAL_RITUAL, Perk.PET_XP_BUFF),
- DIAZ("Diaz", "§6", Perk.BARRIER_STREET, Perk.SHOPPING_SPREE),
- FINNEGAN("Finnegan", "§c", Perk.FARMING_SIMULATOR, Perk.PELT_POCALYPSE, Perk.GOATED),
+ AATROX(
+ "Aatrox",
+ "§3",
+ Perk.SLASHED_PRICING,
+ Perk.SLAYER_XP_BUFF,
+ Perk.PATHFINDER
+ ),
+ COLE(
+ "Cole",
+ "§e",
+ Perk.PROSPECTION,
+ Perk.MINING_XP_BUFF,
+ Perk.MINING_FIESTA,
+ Perk.MOLTEN_FORGE
+ ),
+ DIANA(
+ "Diana",
+ "§2",
+ Perk.LUCKY,
+ Perk.MYTHOLOGICAL_RITUAL,
+ Perk.PET_XP_BUFF,
+ Perk.SHARING_IS_CARING
+ ),
+ DIAZ(
+ "Diaz",
+ "§6",
+ Perk.VOLUME_TRADING,
+ Perk.SHOPPING_SPREE,
+ Perk.STOCK_EXCHANGE,
+ Perk.LONG_TERM_INVESTMENT
+ ),
+ FINNEGAN(
+ "Finnegan",
+ "§c",
+ Perk.FARMING_SIMULATOR,
+ Perk.PELT_POCALYPSE,
+ Perk.GOATED,
+ Perk.BLOOMING_BUSINESS
+ ),
FOXY(
"Foxy",
"§d",
- Perk.SWEET_TOOTH,
- Perk.BENEVOLENCE,
+ Perk.SWEET_BENEVOLENCE,
+ Perk.A_TIME_FOR_GIVING,
+ Perk.CHIVALROUS_CARNIVAL,
Perk.EXTRA_EVENT_MINING,
Perk.EXTRA_EVENT_FISHING,
- Perk.EXTRA_EVENT_SPOOKY
+ Perk.EXTRA_EVENT_SPOOKY,
+ ),
+ MARINA(
+ "Marina",
+ "§b",
+ Perk.FISHING_XP_BUFF,
+ Perk.LUCK_OF_THE_SEA,
+ Perk.FISHING_FESTIVAL,
+ Perk.DOUBLE_TROUBLE
+ ),
+ PAUL(
+ "Paul",
+ "§c",
+ Perk.MARAUDER,
+ Perk.EZPZ,
+ Perk.BENEDICTION
),
- MARINA("Marina", "§b", Perk.FISHING_XP_BUFF, Perk.LUCK_OF_THE_SEA, Perk.FISHING_FESTIVAL),
- PAUL("Paul", "§c", Perk.MARAUDER, Perk.EZPZ, Perk.BENEDICTION),
- SCORPIUS("Scorpius", "§d", Perk.BRIBE, Perk.DARKER_AUCTIONS),
- JERRY("Jerry", "§d", Perk.PERKPOCALYPSE, Perk.STATSPOCALYPSE, Perk.JERRYPOCALYPSE),
- DERPY("Derpy", "§d", Perk.TURBO_MINIONS, Perk.AH_CLOSED, Perk.DOUBLE_MOBS_HP, Perk.MOAR_SKILLZ),
+ SCORPIUS(
+ "Scorpius",
+ "§d",
+ Perk.BRIBE,
+ Perk.DARKER_AUCTIONS
+ ),
+ JERRY(
+ "Jerry",
+ "§d",
+ Perk.PERKPOCALYPSE,
+ Perk.STATSPOCALYPSE,
+ Perk.JERRYPOCALYPSE
+ ),
+ DERPY(
+ "Derpy",
+ "§d",
+ Perk.TURBO_MINIONS,
+ Perk.AH_TAX,
+ Perk.DOUBLE_MOBS_HP,
+ Perk.MOAR_SKILLZ
+ ),
UNKNOWN("Unknown", "§c"),
DISABLED("§cDisabled", "§7"),
@@ -62,7 +128,7 @@ enum class Mayor(
"mayor name not in Mayor enum",
"name" to name,
"perksJson" to perksJson,
- betaOnly = true
+ betaOnly = true,
)
return null
}
@@ -87,7 +153,7 @@ enum class Mayor(
val foxyExtraEventPairs = mapOf(
"Spooky Festival" to "Extra Event (Spooky)",
"Mining Fiesta" to "Extra Event (Mining)",
- "Fishing Festival" to "Extra Event (Fishing)"
+ "Fishing Festival" to "Extra Event (Fishing)",
)
foxyExtraEventPattern.matchMatcher(this.description) {
@@ -108,24 +174,30 @@ enum class Perk(val perkName: String) {
PROSPECTION("Prospection"),
MINING_XP_BUFF("Mining XP Buff"),
MINING_FIESTA("Mining Fiesta"),
+ MOLTEN_FORGE("Molten Forge"),
// Diana
LUCKY("Lucky!"),
MYTHOLOGICAL_RITUAL("Mythological Ritual"),
PET_XP_BUFF("Pet XP Buff"),
+ SHARING_IS_CARING("Sharing is Caring"),
// Diaz
- BARRIER_STREET("Barrier Street"),
SHOPPING_SPREE("Shopping Spree"),
+ VOLUME_TRADING("Volume Trading"),
+ STOCK_EXCHANGE("Stock Exchange"),
+ LONG_TERM_INVESTMENT("Long Term Investment"),
// Finnegan
FARMING_SIMULATOR("Farming Simulator"),
PELT_POCALYPSE("Pelt-pocalypse"),
GOATED("GOATed"),
+ BLOOMING_BUSINESS("Blooming Business"),
// Foxy
- SWEET_TOOTH("Sweet Tooth"),
- BENEVOLENCE("Benevolence"),
+ SWEET_BENEVOLENCE("Sweet Benevolence"),
+ A_TIME_FOR_GIVING("A Time for Giving"),
+ CHIVALROUS_CARNIVAL("Chivalrous Carnival"),
EXTRA_EVENT_MINING("Extra Event (Mining)"),
EXTRA_EVENT_FISHING("Extra Event (Fishing)"),
EXTRA_EVENT_SPOOKY("Extra Event (Spooky)"),
@@ -134,6 +206,7 @@ enum class Perk(val perkName: String) {
FISHING_XP_BUFF("Fishing XP Buff"),
LUCK_OF_THE_SEA("Luck of the Sea 2.0"),
FISHING_FESTIVAL("Fishing Festival"),
+ DOUBLE_TROUBLE("Double Trouble"),
// Paul
MARAUDER("Marauder"),
@@ -151,7 +224,9 @@ enum class Perk(val perkName: String) {
// Derpy
TURBO_MINIONS("TURBO MINIONS!!!"),
- AH_CLOSED("AH CLOSED!!!"),
+ AH_TAX("MOAR TAX!!!"),
+
+ // I don't know what the perk is actually gonna be named
DOUBLE_MOBS_HP("DOUBLE MOBS HP!!!"),
MOAR_SKILLZ("MOAR SKILLZ!!!"),
;