Skip to content

Commit

Permalink
Rewrite examples
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikvoloshin
nikvoloshin committed Feb 2, 2021
1 parent 15c501e commit 3329243
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 106 deletions.
152 changes: 77 additions & 75 deletions ...me-clock/src/main/kotlin/com/justai/jaicf/examples/gameclock/scenario/GameLoopScenario.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ import com.justai.jaicf.channel.googleactions.ActionsReactions
import com.justai.jaicf.channel.googleactions.actions
import com.justai.jaicf.examples.gameclock.GameController
import com.justai.jaicf.examples.gameclock.model.colorLink
import com.justai.jaicf.examples.gameclock.scenario.GameLoopScenario.playStream
import com.justai.jaicf.helpers.ssml.*
import com.justai.jaicf.model.scenario.Scenario
import kotlin.math.floor

object GameLoopScenario: Scenario {
object GameLoopScenario : Scenario {

private const val AUDIO_URL = "https://bitbucket.org/just-ai/examples/downloads/game-timer-1.mp3"
private const val STARTED_AT = "started_at"
Expand All @@ -34,25 +35,24 @@ object GameLoopScenario: Scenario {
game.restart()
game.nextGamer()

reactions.run {
say(
"Okay! We are ready to start the game! ${breakMs(300)} " +
"${game.currentColor()} player! You're the first! "
)
reactions.say(
"Okay! We are ready to start the game! ${breakMs(300)} " +
"${game.currentColor()} player! You're the first! "
)

actions?.playStream(game.currentColor())
actions {
reactions.playStream(game.currentColor())
}

alexa?.run {
say(
"Just say me next $break300ms once you have finished your turn! " +
"Say pause $break300ms for a short break! " +
"Or say stop music $break300ms to finish the game."
)
alexa {
reactions.say(
"Just say me next $break300ms once you have finished your turn! " +
"Say pause $break300ms for a short break! " +
"Or say stop music $break300ms to finish the game."
)

playStream(game.currentColor())
}
reactions.playStream(game.currentColor())
}

}
}

Expand All @@ -67,17 +67,17 @@ object GameLoopScenario: Scenario {
val game = GameController(context)
var time: Long = 0

request.alexa?.run {
time = handlerInput.requestEnvelope.context.audioPlayer.offsetInMilliseconds
alexa {
time = request.handlerInput.requestEnvelope.context.audioPlayer.offsetInMilliseconds
}

request.actions?.run {
time = System.currentTimeMillis() - (request.userStorage[STARTED_AT] as Number).toLong()
actions {
time = System.currentTimeMillis() - (request.request.userStorage[STARTED_AT] as Number).toLong()
}

game.record(time)

activator.intent?.run {
intent {
reactions.run {
say(
"${game.currentColor()} player! " +
Expand All @@ -92,14 +92,12 @@ object GameLoopScenario: Scenario {

game.nextGamer()

activator.intent?.run {
intent {
reactions.say("$break1s ${game.currentColor()} player! It is your turn now!")
}

reactions.run {
alexa?.playStream(game.currentColor())
actions?.playStream(game.currentColor())
}
alexa { reactions.playStream(game.currentColor()) }
actions { reactions.playStream(game.currentColor()) }
}
}

Expand All @@ -114,16 +112,18 @@ object GameLoopScenario: Scenario {
val game = GameController(context)
game.prevGamer()

activator.intent?.run {
reactions.say("${game.currentColor()} player! Please continue your ${ordinal(
game.currentTurn()
)} turn.")
intent {
reactions.say(
"${game.currentColor()} player! Please continue your ${
ordinal(
game.currentTurn()
)
} turn."
)
}

reactions.run {
alexa?.playStream(game.currentColor())
actions?.playStream(game.currentColor())
}
alexa { reactions.playStream(game.currentColor()) }
actions { reactions.playStream(game.currentColor()) }
}
}

Expand All @@ -137,17 +137,17 @@ object GameLoopScenario: Scenario {
action {
val game = GameController(context)

request.alexa?.run {
game.currentTime = handlerInput.requestEnvelope.context.audioPlayer.offsetInMilliseconds
alexa {
game.currentTime = request.handlerInput.requestEnvelope.context.audioPlayer.offsetInMilliseconds
}

activator.intent?.run {
intent {
reactions.say("Okay! Let's have a break! Once you are ready to continue, just say me play. Or say stop music to finish the game.")
}

reactions.alexa?.run {
stopAudioPlayer()
endSession()
alexa {
reactions.stopAudioPlayer()
reactions.endSession()
}
}
}
Expand All @@ -162,16 +162,18 @@ object GameLoopScenario: Scenario {
action {
val game = GameController(context)

activator.intent?.run {
reactions.say("${game.currentColor()} player! Please continue your ${ordinal(
game.currentTurn()
)} turn.")
intent {
reactions.say(
"${game.currentColor()} player! Please continue your ${
ordinal(
game.currentTurn()
)
} turn."
)
}

reactions.run {
alexa?.playStream(game.currentColor(), game.currentTime ?: 0)
actions?.playStream(game.currentColor(), true)
}
alexa { reactions.playStream(game.currentColor(), game.currentTime ?: 0) }
actions { reactions.playStream(game.currentColor(), true) }
}
}

Expand All @@ -184,39 +186,39 @@ object GameLoopScenario: Scenario {
action {
val game = GameController(context)

reactions.run {
say("The game is over! $break500ms Here is your overall timing.")
reactions.say("The game is over! $break500ms Here is your overall timing.")

game.gamersTime.forEach { (color, time) ->
say("$break1s $color gamer $break200ms ${timeSpeech(time)}")
}

alexa?.run {
stopAudioPlayer()
endSession("$break1s I also sent this game summary to your Alexa app! Please check for details!")
}

actions?.run {
endConversation()
response.builder.add(
TableCard().apply {
title = "Overall timing"
subtitle = formatTime(game.overall!!)
game.gamersTime.forEach { (color, time) ->
reactions.say("$break1s $color gamer $break200ms ${timeSpeech(time)}")
}

columnProperties = listOf(
TableCardColumnProperties().setHeader("Player"),
TableCardColumnProperties().setHeader("Time")
)
alexa {
reactions.stopAudioPlayer()
reactions.endSession("$break1s I also sent this game summary to your Alexa app! Please check for details!")
}

rows = game.gamersTime.map {
TableCardRow().setCells(listOf(
actions {
reactions.endConversation()
reactions.response.builder.add(
TableCard().apply {
title = "Overall timing"
subtitle = formatTime(game.overall!!)

columnProperties = listOf(
TableCardColumnProperties().setHeader("Player"),
TableCardColumnProperties().setHeader("Time")
)

rows = game.gamersTime.map {
TableCardRow().setCells(
listOf(
TableCardCell().setText(it.key),
TableCardCell().setText(formatTime(it.value))
))
}
)
)
}
)
}
}
)
}
}
}
Expand Down
12 changes: 8 additions & 4 deletions ...lock/src/main/kotlin/com/justai/jaicf/examples/gameclock/scenario/GamersColorsScenario.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ package com.justai.jaicf.examples.gameclock.scenario

import com.justai.jaicf.builder.startScenario
import com.justai.jaicf.channel.alexa.activator.alexaIntent
import com.justai.jaicf.channel.alexa.alexa
import com.justai.jaicf.channel.alexa.intent
import com.justai.jaicf.channel.googleactions.actions
import com.justai.jaicf.channel.googleactions.dialogflow.actionsDialogflow
import com.justai.jaicf.channel.googleactions.intent
import com.justai.jaicf.examples.gameclock.GameController
import com.justai.jaicf.examples.gameclock.model.supportedColors
import com.justai.jaicf.helpers.ssml.break200ms
Expand Down Expand Up @@ -43,12 +47,12 @@ object GamersColorsScenario: Scenario {
val game = GameController(context)
var color: String? = null

activator.alexaIntent?.run {
color = slots["color"]?.value
alexa.intent {
color = activator.slots["color"]?.value
}

activator.actionsDialogflow?.run {
color = slots["color"] as? String
actions.intent {
color = activator.slots["color"] as? String
}

runInTest {
Expand Down
12 changes: 8 additions & 4 deletions ...clock/src/main/kotlin/com/justai/jaicf/examples/gameclock/scenario/GamersCountScenario.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ package com.justai.jaicf.examples.gameclock.scenario

import com.justai.jaicf.builder.startScenario
import com.justai.jaicf.channel.alexa.activator.alexaIntent
import com.justai.jaicf.channel.alexa.alexa
import com.justai.jaicf.channel.alexa.intent
import com.justai.jaicf.channel.googleactions.actions
import com.justai.jaicf.channel.googleactions.dialogflow.actionsDialogflow
import com.justai.jaicf.channel.googleactions.intent
import com.justai.jaicf.helpers.ssml.breakMs
import com.justai.jaicf.model.scenario.Scenario
import com.justai.jaicf.test.context.runInTest
Expand All @@ -29,12 +33,12 @@ class GamersCountScenario(private val min: Int, private val max: Int) : Scenario
action {
var gamers: Int? = null

activator.alexaIntent?.run {
gamers = slots["gamers"]?.value?.toInt()
alexa.intent {
gamers = activator.slots["gamers"]?.value?.toInt()
}

activator.actionsDialogflow?.run {
gamers = (slots["gamers"] as? Number)?.toInt()
actions.intent {
gamers = (activator.slots["gamers"] as? Number)?.toInt()
}

runInTest {
Expand Down
20 changes: 12 additions & 8 deletions ...s/game-clock/src/main/kotlin/com/justai/jaicf/examples/gameclock/scenario/MainScenario.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ package com.justai.jaicf.examples.gameclock.scenario
import com.justai.jaicf.builder.Scenario
import com.justai.jaicf.channel.alexa.activator.alexaIntent
import com.justai.jaicf.channel.alexa.alexa
import com.justai.jaicf.channel.alexa.intent
import com.justai.jaicf.channel.alexa.model.AlexaEvent
import com.justai.jaicf.channel.alexa.model.AlexaIntent
import com.justai.jaicf.channel.googleactions.actions
import com.justai.jaicf.channel.googleactions.dialogflow.DialogflowIntent
import com.justai.jaicf.channel.googleactions.dialogflow.actionsDialogflow
import com.justai.jaicf.channel.googleactions.intent
import com.justai.jaicf.examples.gameclock.GameController
import com.justai.jaicf.helpers.ssml.break200ms
import com.justai.jaicf.helpers.ssml.break300ms
Expand Down Expand Up @@ -75,12 +77,14 @@ object MainScenario : Scenario by Scenario({
reactions.run {
say("Okay $break200ms See you latter then! Bye bye!")

actions?.endConversation()
alexa?.run {
stopAudioPlayer()
endSession()
actions {
reactions.endConversation()
}

alexa {
reactions.stopAudioPlayer()
reactions.endSession()
}
}
}
}
Expand All @@ -94,12 +98,12 @@ object MainScenario : Scenario by Scenario({
val game = GameController(context)
var gamers: Int? = null

activator.alexaIntent?.run {
gamers = slots["gamers"]?.value?.toInt()
alexa.intent {
gamers = activator.slots["gamers"]?.value?.toInt()
}

activator.actionsDialogflow?.run {
gamers = (slots["gamers"] as? Number)?.toInt()
actions.intent {
gamers = (activator.slots["gamers"] as? Number)?.toInt()
}

when {
Expand Down
Loading

0 comments on commit 3329243

Please sign in to comment.