tookeyman/RuneFactory
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed WiggleParams to MouseWiggleParams to better indicate its purpose

Browse Source
This commit is contained in:
dtookey 2023-08-07 08:53:41 -04:00
parent 99556be92f
commit e44a61958e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/controllers/DesktopController.kt
View File

@ -1,6 +1,6 @@
package controllers package controllers
import params.WiggleParams import params.MouseWiggleParams
import java.awt.MouseInfo import java.awt.MouseInfo
import java.awt.Point import java.awt.Point
import kotlin.random.Random import kotlin.random.Random
@ -39,7 +39,7 @@ interface DesktopController {
* Gets a point near the given [point], with some random wiggle. * Gets a point near the given [point], with some random wiggle.
* *
* This generates a new point that is randomly offset from the given [point] * This generates a new point that is randomly offset from the given [point]
* by an amount controlled by the given [WiggleParams]. * by an amount controlled by the given [MouseWiggleParams].
* *
* Usage example: * Usage example:
* *
@ -63,7 +63,7 @@ interface DesktopController {
* @param params The wiggle parameters that control the random offset amount * @param params The wiggle parameters that control the random offset amount
* @return A new [Point] near the given point with some random wiggle applied * @return A new [Point] near the given point with some random wiggle applied
*/ */
fun getAlmostPoint(point: Point, params: WiggleParams = WiggleParams()): Point { fun getAlmostPoint(point: Point, params: MouseWiggleParams = MouseWiggleParams()): Point {
val xDel = Random.nextInt(0, params.xWiggle) val xDel = Random.nextInt(0, params.xWiggle)
val yDel = Random.nextInt(0, params.yWiggle) val yDel = Random.nextInt(0, params.yWiggle)
val xDir = if (Random.nextDouble() > 0.5) { val xDir = if (Random.nextDouble() > 0.5) {

6
src/main/kotlin/game_logic/runescape/RSAgent.kt
View File

@ -2,7 +2,7 @@ package game_logic.runescape
import controllers.Automaton import controllers.Automaton
import controllers.RobotAutomaton import controllers.RobotAutomaton
import params.WiggleParams import params.MouseWiggleParams
import params.StandingTaskParams import params.StandingTaskParams
import params.TravelTaskParams import params.TravelTaskParams
import java.awt.Point import java.awt.Point
@ -86,7 +86,7 @@ class RSAgent(override val automaton: Automaton = RobotAutomaton()) : RSOrchestr
taskParams: StandingTaskParams taskParams: StandingTaskParams
) { ) {
//open the bank located by the chest parameter //open the bank located by the chest parameter
moveMouseLeftClickAndSleep(automaton.getAlmostPoint(taskParams.bankPoint, WiggleParams(10, 10)), 900, 400) moveMouseLeftClickAndSleep(automaton.getAlmostPoint(taskParams.bankPoint, MouseWiggleParams(10, 10)), 900, 400)
//withdraw the desired inventory preset //withdraw the desired inventory preset
automaton.keyPress(taskParams.bankPresetHotkey) automaton.keyPress(taskParams.bankPresetHotkey)
//sleep for a server tick //sleep for a server tick
@ -131,7 +131,7 @@ class RSAgent(override val automaton: Automaton = RobotAutomaton()) : RSOrchestr
) { ) {
//move to the bank and open the interface //move to the bank and open the interface
moveMouseLeftClickAndSleep( moveMouseLeftClickAndSleep(
automaton.getAlmostPoint(taskParams.bankPoint, WiggleParams(10, 10)), automaton.getAlmostPoint(taskParams.bankPoint, MouseWiggleParams(10, 10)),
taskParams.travelDurationMillis, taskParams.travelDurationMillis,
taskParams.travelDurationVarianceMillis taskParams.travelDurationVarianceMillis
) )

2
src/main/kotlin/params/WiggleParams.kt → src/main/kotlin/params/MouseWiggleParams.kt
View File

@ -24,7 +24,7 @@ package params
* @param xWiggle The max amount of variance in x direction. Default 25. * @param xWiggle The max amount of variance in x direction. Default 25.
* @param yWiggle The max amount of variance in y direction. Default 25. * @param yWiggle The max amount of variance in y direction. Default 25.
*/ */
data class WiggleParams( data class MouseWiggleParams(
val xWiggle: Int = 25, val xWiggle: Int = 25,
val yWiggle: Int = 25 val yWiggle: Int = 25
) )

4
src/test/kotlin/controllers/DesktopControllerTest.kt
View File

@ -1,6 +1,6 @@
package controllers package controllers
import params.WiggleParams import params.MouseWiggleParams
import kotlin.test.* import kotlin.test.*
import org.mockito.Mockito.* import org.mockito.Mockito.*
import java.awt.Point import java.awt.Point
@ -47,7 +47,7 @@ class DesktopControllerTest {
@Test @Test
fun `getAlmostPoint returns wiggly point`() { fun `getAlmostPoint returns wiggly point`() {
val controller = mock(DesktopController::class.java) val controller = mock(DesktopController::class.java)
val params = WiggleParams(xWiggle = 10, yWiggle = 10) val params = MouseWiggleParams(xWiggle = 10, yWiggle = 10)
// Mock random wiggle // Mock random wiggle
`when`(controller.getAlmostPoint(Point(100, 200), params)) `when`(controller.getAlmostPoint(Point(100, 200), params))