add "Splash combo" feature

Author: realooffyy

changelog.txt

@@ -1,3 +1,4 @@
++ add "Splash combo" feature
 + add "Timer over Spider's Den bones" feature
-= fix "Chicken Head Timer"
-= fix Bingo Party incoming message formatter
+= fix Chicken Head Timer not hiding properly
+= fix incoming party message formatter again

features/other/splashCombo.js

@@ -0,0 +1,82 @@
+import settings from "../../settings"
+import Skyblock from "../../utils/Skyblock"
+
+const colours = ["§8", "§c", "§6", "§e", "§2", "§a", "§b"]
+const thresholds = [5, 10, 15, 20, 25, 30, 35]
+
+// BUFF! You were splashed by BingoSplasher with Mushed Glowy Tonic I! Press TAB or type /effects to view your active effects!
+const regex =
+	/^BUFF! (?:You splashed yourself|You were splashed by (\w{1,16})) with (.*)! Press TAB or type \/effects to view your active effects!$/
+
+let splashedPotions = {}
+let messageID = 5967
+
+// splash combo!
+register("chat", (user = Player.getName(), potion, event) => {
+	if (!Skyblock.inSkyblock) return
+	if (!settings().splashCombo) return
+
+	// create user
+	if (!splashedPotions[user]) {
+		messageID += 1
+		splashedPotions[user] = {
+			displayName:
+				World.getAllPlayers()
+					?.find((player) => player?.getName() === user)
+					?.getDisplayName()?.text || user,
+			id: messageID,
+			combo: 0,
+			potions: []
+		}
+	}
+
+	let currentUser = splashedPotions[user]
+
+	// return if the same potion type is already splashed
+	// TODO: disregard potion level (roman numerals)
+	if (currentUser.potions.includes(potion)) return
+
+	currentUser.potions.push(potion)
+	currentUser.combo += 1
+
+	let combo = currentUser.combo
+
+	// chat message
+	/*
+	ChatLib.clearChat(currentUser.id)
+	new Message(`Combo: ${currentUser.combo}`)
+		.setChatLineId(currentUser.id)
+		.chat()
+    */
+
+	// title
+	let colour = colours[thresholds.findIndex((threshold) => combo < threshold)]
+	if (colour === undefined) colour = "&b"
+	Client.showTitle(
+		`${colour}${combo} combo!`,
+		"", // TODO: fix the splasher not showing
+            // `&7Splasher: ${currentUser.displayName}`
+		0,
+		60,
+		20
+	)
+
+	// sounds
+	const pitch = 0.5 + combo / 20
+	World.playSound("note.pling", 100, pitch)
+	if (combo <= 10) return
+	new Thread(() => {
+		Thread.sleep(30)
+		World.playSound("random.successful_hit", 100, pitch - 0.5)
+		if (combo <= 15) return
+		Thread.sleep(5)
+		World.playSound("random.orb", 100, pitch - 1)
+	}).start()
+}).setCriteria(regex)
+
+register("worldLoad", init)
+
+function init() {
+	splashedPotions = {}
+	messageID = 5967
+}

index.js

@@ -29,6 +29,8 @@ import "./features/party/messageFormatter"
 
 import "./features/chat/oringoCost"
 
+import "./features/other/splashCombo"
+
 import "./features/splasher/brewingUtils"
 import "./features/splasher/brewingStandUtils"
 import "./features/splasher/splasherDisplay"
@@ -43,6 +45,8 @@ import "./features/world/windCompass"
 
 
 /* TODO
+ * - fix feature file structure !!!
+
  * - reminder to do bingo stuff like cakes, experiments, fetchur, puzzler, bednom
  * - hotm tree unlock reminders
  * - king talisman helper!

settings.js

@@ -180,6 +180,14 @@ const config = new DefaultConfig("BingoPlus", "data/settings.json")
 
 // Other
 
+.addSwitch({
+    category: "Other",
+    configName: "splashCombo",
+    title: "Splash combo",
+    description: "Shows a fun combo counter during a splash",
+    subcategory: "Splashes"
+})
+
 .addSwitch({
     category: "Other",
     configName: "chickenHeadTimer",
@@ -690,7 +698,7 @@ const config = new DefaultConfig("BingoPlus", "data/settings.json")
     title: "Oringo Abiphone Cost",
     description: "Convert Oringo's Abiphone message to include the rarity and cost of each pet.",
     subcategory: "Oringo",
-    value: true
+    value: false
 })
 .addSwitch({
     category: "Chat",
@@ -699,7 +707,7 @@ const config = new DefaultConfig("BingoPlus", "data/settings.json")
     description: "Also automatically copy this message to send in Discord.",
     subcategory: "Oringo",
     shouldShow: data => data.oringoAbiphoneCost,
-    value: true
+    value: false
 })
 
 // Commands
@@ -733,66 +741,6 @@ const config = new DefaultConfig("BingoPlus", "data/settings.json")
     value: true
 })
 
-// i'll leave it in, i got tired of moving it in and out
-.addTextInput({
-    configName: "devAddTextInput",
-    title: "Text Input",
-    description: "Example of text input that does not wrap the text",
-    category: "Dev",
-    subcategory: "All elements",
-    value: "",
-    placeHolder: "Empty... :("
-})
-.addColorPicker({
-    configName: "devAddColorPicker",
-    title: "Color Picker",
-    description: "Pick a color! (hopefully...)",
-    category: "Dev",
-    subcategory: "All elements",
-    value: [0, 0, 255, 255]
-})
-.addSwitch({
-    configName: "devAddSwitch",
-    title: "Switch",
-    description: "toggle the checkbox in Not general! tab!",
-    category: "Dev",
-    subcategory: "All elements"
-})
-.addToggle({
-    configName: "devAddToggle",
-    title: "Checkbox/Toggle",
-    description: "Check this box",
-    category: "Dev",
-    subcategory: "All elements"
-})
-.addDropDown({
-    configName: "devAddDropDown",
-    title: "DropDown",
-    description: "Select an option",
-    category: "Dev",
-    subcategory: "All elements",
-    options: ["one", "two", "three"],
-    value: 0
-})
-.addSlider({
-    configName: "devAddSlider",
-    title: "Slider",
-    description: "Select a value",
-    category: "Dev",
-    subcategory: "All elements",
-    options: [0, 100],
-    value: 0
-})
-.addButton({
-    configName: "devAddButton",
-    title: "Button",
-    description: "yay",
-    category: "Dev",
-    subcategory: "All elements",
-    onClick() {
-        ChatLib.chat("hi :P")
-    }
-})
 
 const settings = new FuckYouIWantToUseThatName("BingoPlus", config, "data/vigilanceScheme.json", `${constants.PREFIX}&bv${version} &aby &dooffyy`)
     .setSize(80, 80)