diff --git a/src/main/kotlin/entries/FurnaceEntry.kt b/src/main/kotlin/entries/FurnaceEntry.kt index d753473..3a114f4 100644 --- a/src/main/kotlin/entries/FurnaceEntry.kt +++ b/src/main/kotlin/entries/FurnaceEntry.kt @@ -4,5 +4,5 @@ import game_logic.runescape.RunescapeRoutines fun main() { - RunescapeRoutines.processInventoryAtFurnace(1839) + RunescapeRoutines.processInventoryAtFurnace(2137) } \ No newline at end of file diff --git a/src/main/kotlin/entries/NecromancyInk.kt b/src/main/kotlin/entries/NecromancyInk.kt new file mode 100644 index 0000000..ff96491 --- /dev/null +++ b/src/main/kotlin/entries/NecromancyInk.kt @@ -0,0 +1,11 @@ +package entries + +import game_logic.runescape.RunescapeRoutines + +fun main() { + RunescapeRoutines.createNecromancyInk(2000) +} + + + + diff --git a/src/main/kotlin/simulation/dice/Dice.kt b/src/main/kotlin/simulation/dice/Dice.kt index 0ed8beb..9af9e1e 100644 --- a/src/main/kotlin/simulation/dice/Dice.kt +++ b/src/main/kotlin/simulation/dice/Dice.kt @@ -2,7 +2,7 @@ package simulation.dice object Dice { fun regular(rollString: String, modifiers: List> = ArrayList()): DiceRoller { - return DiceImpl(rollString, modifiers) + return DiceRollerImpl(rollString, modifiers) } fun critDice(rollString: String, modifiers: List> = ArrayList()): CritDiceRoller { diff --git a/src/main/kotlin/simulation/dice/DiceRoller.kt b/src/main/kotlin/simulation/dice/DiceRoller.kt index e1aed99..dadd649 100644 --- a/src/main/kotlin/simulation/dice/DiceRoller.kt +++ b/src/main/kotlin/simulation/dice/DiceRoller.kt @@ -38,6 +38,15 @@ interface DiceRoller { val nDice: Int val dieSize: Int + + companion object { + internal fun defaultDiceStringParseFn(rollString: String): Pair { + val cleanRollString = rollString.lowercase() + val parts = cleanRollString.split('d') + return Pair(parts[0].toInt(), parts[1].toInt()) + } + } + /** * Rolls the dice and returns the result. * @@ -89,22 +98,18 @@ interface DiceRoller { } - fun defaultParseFn(rollString: String): Pair { - val cleanRollString = rollString.lowercase() - val parts = cleanRollString.split('d') - return Pair(parts[0].toInt(), parts[1].toInt()) - } } -internal class DiceImpl( +internal class DiceRollerImpl( override val rollString: String, override val modifiers: List> = ArrayList() ) : DiceRoller { override val nDice: Int override val dieSize: Int + init { - val rollPair = defaultParseFn(rollString) + val rollPair = DiceRoller.defaultDiceStringParseFn(rollString) nDice = rollPair.first dieSize = rollPair.second } diff --git a/src/main/kotlin/simulation/dice/RerollDiceRoller.kt b/src/main/kotlin/simulation/dice/RerollDiceRoller.kt index 79ab896..f09202f 100644 --- a/src/main/kotlin/simulation/dice/RerollDiceRoller.kt +++ b/src/main/kotlin/simulation/dice/RerollDiceRoller.kt @@ -25,7 +25,7 @@ class RerollDiceImpl( override val dieSize: Int init { - val rollPair = this.defaultParseFn(rollString) + val rollPair = DiceRoller.defaultDiceStringParseFn(rollString) nDice = rollPair.first dieSize = rollPair.second }