random nonsense

Author: SubAt0m1c

src/main/kotlin/com/github/subat0m1c/hatecheaters/commands/impl/pvcommands.kt

@@ -24,6 +24,7 @@ val PVCommand = Commodore("pv") {
     }
 }
 
+// this cant just be an alias because we disable the normal pv command.
 val HCPVCommand = Commodore("hcpv") {
     executable {
         param("name").suggests {
@@ -38,6 +39,7 @@ val HCPVCommand = Commodore("hcpv") {
     }
 }
 
+
 val profileNames = setOf(
     "apple", "banana", "blueberry", "cucumber", "coconut",
     "grapes", "kiwi", "lemon", "lime", "mango", "orange",

src/main/kotlin/com/github/subat0m1c/hatecheaters/modules/dungeons/BetterPartyFinder.kt

@@ -11,6 +11,7 @@ import com.github.subat0m1c.hatecheaters.utils.DungeonStats.displayDungeonData
 import com.github.subat0m1c.hatecheaters.utils.ItemUtils.witherImpactRegex
 import com.github.subat0m1c.hatecheaters.utils.LogHandler.Logger
 import com.github.subat0m1c.hatecheaters.utils.apiutils.HypixelApi.getProfile
+import com.github.subat0m1c.hatecheaters.utils.odinwrappers.Party
 import me.odinmain.clickgui.settings.Setting.Companion.withDependency
 import me.odinmain.clickgui.settings.impl.*
 import me.odinmain.features.Module
@@ -230,7 +231,7 @@ object BetterPartyFinder : Module(
             alert("§eYour party is full!")
         }
 
-        onMessage(pfRegex, { enabled && statsDisplay && !autokicktoggle }) { matchResult ->
+        onMessage(pfRegex, { enabled && statsDisplay && (!autokicktoggle || !Party.isLeader) }) { matchResult ->
             val name = matchResult.groupValues[1].takeUnless { it == mc.session.username } ?: return@onMessage
             if (joinSound) playCustomSound()
 
@@ -245,7 +246,7 @@ object BetterPartyFinder : Module(
         }
 
 
-        onMessage(pfRegex, { enabled && autokicktoggle }) { matchResult ->
+        onMessage(pfRegex, { enabled && autokicktoggle && Party.isLeader }) { matchResult ->
             val name = matchResult.groupValues[1].takeUnless { it == mc.session.username } ?: return@onMessage
             Logger.info("$name is being searched")
 
@@ -324,7 +325,7 @@ object BetterPartyFinder : Module(
             }
         }
 
-        onMessage(kickRegex, { kickCache && enabled }) { message ->
+        onMessage(kickRegex, { kickCache && enabled && autokicktoggle && Party.isLeader }) { message ->
             message.groupValues[1].takeUnless { name -> kickedList.contains(name) }?.let { name -> kickedList.add(name) }
         }
     }

src/main/kotlin/com/github/subat0m1c/hatecheaters/modules/render/ProfileViewer.kt

@@ -225,13 +225,13 @@ object ProfileViewer : Module(
     override fun onKeybind() {
         val entity = mc.objectMouseOver.entityHit
         val player: PvPlayer = when {
-            System.currentTimeMillis() - toPv.added <= 5000 -> toPv.player
+            System.currentTimeMillis() - toPv.added <= 10000 -> toPv.player
             entity != null && entity is EntityPlayer && entity.uniqueID.version() != 2 -> PvPlayer(
                 entity.name,
                 entity.uniqueID
             )
 
-            System.currentTimeMillis() - lastLoaded.added <= 5000 -> lastLoaded.player
+            System.currentTimeMillis() - lastLoaded.added <= 10000 -> lastLoaded.player
             else -> PvPlayer(mc.thePlayer.name, mc.thePlayer.uniqueID)
         }
 

src/main/kotlin/com/github/subat0m1c/hatecheaters/pvgui/v2/pages/Profile.kt

@@ -32,8 +32,8 @@ object Profile : PVPage("Profile") {
 
     private val skillText: List<String> by resettableLazy {
         profile.playerData.experience.without("SKILL_DUNGEONEERING").entries.sortedByDescending { it.value }.map {
-            val level = getSkillLevel(it.value).round(2).toDouble()
             val skill = it.key.lowercase().substringAfter("skill_")
+            val level = getSkillLevel(skill, it.value).round(2).toDouble()
             val cap = getSkillCap(skill).toDouble()
             "§${getSkillColorCode(skill)}${skill.capitalizeWords()}§7: ${
                 level.coerceAtMost(cap).colorize(cap)

src/main/kotlin/com/github/subat0m1c/hatecheaters/utils/apiutils/LevelUtils.kt

@@ -74,31 +74,47 @@ object LevelUtils {
     )
 
     inline val PlayerData.skillAverage: Double get() =
-        experience.without("SKILL_SOCIAL", "SKILL_SOCIAL", "SKILL_DUNGEONEERING").let { skills -> skills.values.sumOf { getSkillLevel(it) }/skills.size }
+        experience.without("SKILL_SOCIAL", "SKILL_SOCIAL", "SKILL_DUNGEONEERING").let { skills ->
+            skills.entries.sumOf { skill ->
+                val name = skill.key.lowercase().substringAfter("skill_")
+                getSkillLevel(name, skill.value)
+            } / skills.size
+        }
 
     inline val PlayerData.cappedSkillAverage: Double get() =
-        experience.without("SKILL_SOCIAL", "SKILL_SOCIAL", "SKILL_DUNGEONEERING").let { skills -> skills.entries.sumOf { getSkillLevel(it.value).coerceAtMost(
-            getSkillCap(it.key.lowercase().substringAfter("skill_")).toDouble()) }/skills.size }
+        experience.without("SKILL_SOCIAL", "SKILL_SOCIAL", "SKILL_DUNGEONEERING").let { skills ->
+            skills.entries.sumOf { skill ->
+                val name = skill.key.lowercase().substringAfter("skill_")
+                getSkillLevel(name, skill.value).coerceAtMost(getSkillCap(name).toDouble())
+            } / skills.size
+        }
 
-    fun getSkillLevel(exp: Double): Double =
-        getLevelWithProgress(exp, skillLevels, 600000)
+    fun getSkillLevel(skill: String, exp: Double): Double =
+        getLevelWithProgress(exp, getSkillLevels(skill), 600000)
 
     fun getSkillCap(skill: String): Int =
         when (skill) {
             "taming"       -> 60
             "mining"       -> 60
-            "foraging"     -> 50
+            "foraging" -> 54 // whjat are we cooking admins
             "enchanting"   -> 60
             "carpentry"    -> 50
             "farming"      -> 60
             "combat"       -> 60
             "fishing"      -> 50
             "alchemy"      -> 50
             "runecrafting" -> 25
-            "social"       -> 20
+            "social" -> 25
             else           -> -1
         }
 
+    fun getSkillLevels(skill: String): Array<Long> =
+        when (skill) {
+            "runecrafting" -> runeCraftingLevels
+            "social" -> socialLevels
+            else -> skillLevels
+        }
+
     fun getSkillColorCode(skill: String): String = when (skill) {
         "taming" -> ProfileViewer.currentTheme.fontCode
         "mining" -> "7"
@@ -143,6 +159,20 @@ object LevelUtils {
         6400000, 6700000, 7000000
     )
 
+    // why are these so weird bro
+    private val socialLevels: Array<Long> = arrayOf(
+        50, 100, 150, 250, 500, 750, 1000, 1250, 1500,
+        2000, 2500, 3000, 3750, 4500, 6000, 8000, 10000,
+        12500, 15000, 20000, 25000, 30000, 35000, 40000,
+        50000
+    )
+
+    private val runeCraftingLevels: Array<Long> = arrayOf(
+        50, 100, 125, 160, 200, 250, 315, 400, 500, 625,
+        785, 1000, 1250, 1565, 2000, 2500, 3125, 4000,
+        5000, 6250, 7850, 9800, 12250, 15300, 19100
+    )
+
     fun getSlayerSkillLevel(exp: Double, slayer: String): Double =
         (if (slayer != "vampire") getLevelWithProgress(exp, slayerLevels) else getLevelWithProgress(exp, vampireLevels)).coerceAtMost(
             getSlayerCap(slayer).toDouble())

src/main/kotlin/com/github/subat0m1c/hatecheaters/utils/odinwrappers/Party.kt

@@ -0,0 +1,7 @@
+package com.github.subat0m1c.hatecheaters.utils.odinwrappers
+
+import me.odinmain.utils.skyblock.PartyUtils
+
+object Party {
+    inline val isLeader get() = PartyUtils.isLeader()
+}