erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Switched to random extension function.

Browse source
This commit is contained in:
Erik C. Thauvin 2021-11-12 09:19:14 -08:00
parent 5dd8b36f92
commit 0a6b84fa2b
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
View file

@ -35,7 +35,6 @@ import net.thauvin.erik.mobibot.Utils.bold
import net.thauvin.erik.mobibot.Utils.bot import net.thauvin.erik.mobibot.Utils.bot
import net.thauvin.erik.mobibot.Utils.helpFormat import net.thauvin.erik.mobibot.Utils.helpFormat
import org.pircbotx.hooks.types.GenericMessageEvent import org.pircbotx.hooks.types.GenericMessageEvent
import kotlin.random.Random
/** /**
* The Dice module. * The Dice module.
@ -67,7 +66,7 @@ class Dice : AbstractModule() {
} }
private fun roll(): Pair<Int, Int> { private fun roll(): Pair<Int, Int> {
return Random.nextInt(1, DICE_FACES.size) to Random.nextInt(1, DICE_FACES.size) return (1..DICE_FACES.size).random() to (1..DICE_FACES.size).random()
} }
companion object { companion object {

3
src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
View file

@ -34,7 +34,6 @@ package net.thauvin.erik.mobibot.modules
import net.thauvin.erik.mobibot.Utils.bot import net.thauvin.erik.mobibot.Utils.bot
import net.thauvin.erik.mobibot.Utils.helpFormat import net.thauvin.erik.mobibot.Utils.helpFormat
import org.pircbotx.hooks.types.GenericMessageEvent import org.pircbotx.hooks.types.GenericMessageEvent
import kotlin.random.Random
/** /**
* The Ping module. * The Ping module.
@ -69,7 +68,7 @@ class Ping : AbstractModule() {
@JvmStatic @JvmStatic
fun randomPing(): String { fun randomPing(): String {
return PINGS[Random.nextInt(PINGS.size)] return PINGS[PINGS.indices.random()]
} }
/** /**

3
src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
View file

@ -36,7 +36,6 @@ import net.thauvin.erik.mobibot.Utils.bot
import net.thauvin.erik.mobibot.Utils.capitalise import net.thauvin.erik.mobibot.Utils.capitalise
import net.thauvin.erik.mobibot.Utils.helpFormat import net.thauvin.erik.mobibot.Utils.helpFormat
import org.pircbotx.hooks.types.GenericMessageEvent import org.pircbotx.hooks.types.GenericMessageEvent
import kotlin.random.Random
/** /**
@ -104,7 +103,7 @@ class RockPaperScissors : AbstractModule() {
override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) { override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
val hand = Hands.valueOf(cmd.uppercase()) val hand = Hands.valueOf(cmd.uppercase())
val botHand = Hands.values()[Random.nextInt(0, Hands.values().size)] val botHand = Hands.values()[(0..Hands.values().size).random()]
with(event.bot()) { with(event.bot()) {
sendIRC().message(channel, "${hand.emoji} vs. ${botHand.emoji}") sendIRC().message(channel, "${hand.emoji} vs. ${botHand.emoji}")
when { when {

3
src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
View file

@ -50,7 +50,6 @@ import net.thauvin.erik.mobibot.modules.Weather2.Companion.getCountry
import net.thauvin.erik.mobibot.modules.Weather2.Companion.getWeather import net.thauvin.erik.mobibot.modules.Weather2.Companion.getWeather
import net.thauvin.erik.mobibot.modules.Weather2.Companion.mphToKmh import net.thauvin.erik.mobibot.modules.Weather2.Companion.mphToKmh
import org.testng.annotations.Test import org.testng.annotations.Test
import kotlin.random.Random
/** /**
* The `Weather2Test` class. * The `Weather2Test` class.
@ -69,7 +68,7 @@ class Weather2Test : LocalProperties() {
val country = OWM.Country.values() val country = OWM.Country.values()
repeat(3) { repeat(3) {
val rand = country[Random.nextInt(0, country.size - 1)] val rand = country[(country.indices).random()]
assertThat(getCountry(rand.value), rand.name).isEqualTo(rand) assertThat(getCountry(rand.value), rand.name).isEqualTo(rand)
} }
} }