From add0fc85473eaf67a589409e8ee1f22dff089348 Mon Sep 17 00:00:00 2001 From: Corentin Leman Date: Wed, 16 Mar 2016 18:41:06 -0500 Subject: [PATCH 1/4] Changed application name. --- .../java/gameVoiceHandler/intents/speeches/Speeches.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/gameVoiceHandler/intents/speeches/Speeches.java b/src/main/java/gameVoiceHandler/intents/speeches/Speeches.java index b6c7fd9..59d04f3 100644 --- a/src/main/java/gameVoiceHandler/intents/speeches/Speeches.java +++ b/src/main/java/gameVoiceHandler/intents/speeches/Speeches.java @@ -4,8 +4,11 @@ * Created by corentinl on 1/23/16. */ public class Speeches { + //APPLICATION NAME + public static final String APP_NAME = "Boat War"; + //WELCOMING - public static final String WELCOME = "Welcome to Battleship! "; + public static final String WELCOME = "Welcome to " + APP_NAME + "! "; public static final String PROMPT_FOR_INSTRUCTIONS = "Would you like to hear the instructions? "; //FILTER REQUESTS @@ -129,7 +132,7 @@ public class Speeches { public static final String YOU_LOSE = "You loose! The machines will kill all of you! "; //HELP - public static final String GENERAL_INSTRUCTIONS = "Battleship is a game when you and I, will each have a grid in which there will be ships. " + public static final String GENERAL_INSTRUCTIONS = APP_NAME + " is a game when you and I, will each have a grid in which there will be ships. " + "Those grids will have a size from 3 by 3, to 10 by 10. " + "For now, the ships will all have a size of two. " + "You have to memorize your grid, and I will memorize mine. "; From 89ce42f8a7a5c77e76568151a46222695f9a39c8 Mon Sep 17 00:00:00 2001 From: Corentin Leman Date: Wed, 16 Mar 2016 23:07:07 -0500 Subject: [PATCH 2/4] Fixed bad intents. Added help across the app. --- src/main/java/gameData/StateManager.java | 12 +++++++- .../handlers/HandleAnswerHitOrMiss.java | 13 ++++---- .../intents/handlers/HandleGameParameter.java | 12 +++++--- .../intents/handlers/HandleHelp.java | 13 ++------ .../handlers/HandleStartAdvancedGame.java | 3 +- ...HandleStartAdvancedGameWithParameters.java | 5 ++-- .../handlers/HandleStartQuickGame.java | 3 +- .../handlers/HandleTwoFirePositionsGiven.java | 6 ++-- .../intents/handlers/Utils/GameFireUtil.java | 14 +++++---- .../handlers/Utils/GameStarterUtil.java | 6 ++-- .../handlers/Utils/InstructionsUtil.java | 30 +++++++++---------- .../handlers/Utils/ParametersUtil.java | 2 +- .../intents/handlers/Utils/YesNoUtil.java | 1 - .../speechAssets/IntentSchema.json | 20 +------------ .../speechAssets/SampleUtterances.txt | 6 ++-- 15 files changed, 70 insertions(+), 76 deletions(-) diff --git a/src/main/java/gameData/StateManager.java b/src/main/java/gameData/StateManager.java index c97ad36..74558de 100644 --- a/src/main/java/gameData/StateManager.java +++ b/src/main/java/gameData/StateManager.java @@ -5,6 +5,7 @@ import gameData.enums.Difficulty; import gameData.enums.TurnState; import gameData.enums.VoiceState; +import gameVoiceHandler.intents.speeches.Speeches; /** * Created by corentinl on 1/23/16. @@ -25,7 +26,8 @@ public class StateManager { private boolean hitOrMissedQuestionAsked = false; - private static String lastQuestionAsked = ""; + private static String lastQuestionAsked = Speeches.WELCOME + Speeches.PROMPT_FOR_INSTRUCTIONS; + private static String lastReprompt = Speeches.PROMPT_FOR_INSTRUCTIONS; public StateManager(int gridSize, int numberOfShips, @@ -212,6 +214,14 @@ public void setLastQuestionAsked(String lastQuestionAsked) { this.lastQuestionAsked = lastQuestionAsked; } + public String getLastReprompt() { + return lastReprompt; + } + + public void setLastReprompt(String lastReprompt) { + StateManager.lastReprompt = lastReprompt; + } + public boolean isHitOrMissedQuestionAsked() { return hitOrMissedQuestionAsked; } diff --git a/src/main/java/gameVoiceHandler/intents/handlers/HandleAnswerHitOrMiss.java b/src/main/java/gameVoiceHandler/intents/handlers/HandleAnswerHitOrMiss.java index 57a72ea..e4870d2 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/HandleAnswerHitOrMiss.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/HandleAnswerHitOrMiss.java @@ -48,26 +48,23 @@ public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataIn speechOutput += Speeches.YOUR_TURN; String repromptText = Speeches.YOUR_TURN + InstructionsUtil.fireInstructions(stateManager); stateManager.setLastQuestionAsked(repromptText); + stateManager.setLastReprompt(repromptText); stateManager.setTurnState(TurnState.PLAYER); return SpeechesGenerator.newAskResponse(speechOutput, false, repromptText, false); } } else { - speechOutput = stateManager.getLastQuestionAsked(); - return SpeechesGenerator.newAskResponse(speechOutput, false, speechOutput, false); + speechOutput = Speeches.INCORRECT_HIT_MISS + stateManager.getLastReprompt(); + return SpeechesGenerator.newAskResponse(speechOutput, false, stateManager.getLastReprompt(), false); } } else { - String speechOutput = Speeches.WAS_YOUR_TURN + stateManager.getLastQuestionAsked(); - return SpeechesGenerator.newAskResponse(speechOutput, false, stateManager.getLastQuestionAsked(), false); + String speechOutput = Speeches.WAS_YOUR_TURN + stateManager.getLastReprompt(); + return SpeechesGenerator.newAskResponse(speechOutput, false, stateManager.getLastReprompt(), false); } } private boolean isIntentExpected(GameDataInstance gameDataInstance) { return gameDataInstance.getStateManager().isGamesStarted(); } - - private static SpeechletResponse handleHelpAsked() { - return null; - } } diff --git a/src/main/java/gameVoiceHandler/intents/handlers/HandleGameParameter.java b/src/main/java/gameVoiceHandler/intents/handlers/HandleGameParameter.java index eb8a2a2..7115427 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/HandleGameParameter.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/HandleGameParameter.java @@ -29,7 +29,7 @@ public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataIn StateManager stateManager = gameDataInstance.getStateManager(); String speechOutput = GameStarterUtil.incorrectParametersSpeech(); - String repromptText = speechOutput; + String repromptText; if (intent.getSlot(GRID_SIZE_SLOT) != null) { String gridSizeParameter = intent.getSlot(GRID_SIZE_SLOT).getValue(); @@ -51,11 +51,15 @@ public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataIn speechOutput += GameStarterUtil.startGameSpeech(stateManager); repromptText = Speeches.YOUR_TURN + InstructionsUtil.fireInstructions(stateManager); } else { - speechOutput += ParametersUtil.issueWithParametersSpeech(stateManager); + String missingOrIncorrectParameterSpeech = ParametersUtil.missingOrIncorrectParameterSpeech(stateManager); + speechOutput += missingOrIncorrectParameterSpeech; + repromptText = missingOrIncorrectParameterSpeech; } - stateManager.setLastQuestionAsked(repromptText); - return SpeechesGenerator.newAskResponse(speechOutput, false, speechOutput, false); + stateManager.setLastQuestionAsked(speechOutput); + stateManager.setLastReprompt(repromptText); + + return SpeechesGenerator.newAskResponse(speechOutput, false, repromptText, false); } private boolean isIntentExpected(GameDataInstance gameDataInstance) { diff --git a/src/main/java/gameVoiceHandler/intents/handlers/HandleHelp.java b/src/main/java/gameVoiceHandler/intents/handlers/HandleHelp.java index ba1877f..2d8a5bd 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/HandleHelp.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/HandleHelp.java @@ -16,16 +16,9 @@ public class HandleHelp implements HandlerInterface { public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataInstance) { StateManager stateManager = gameDataInstance.getStateManager(); - if (!stateManager.isGamesStarted()) { - String speechOutput = Speeches.IM_SORRY + Speeches.NOT_IMPLEMENTED;//Speeches.HELP_SPEECH_BEGINNING + Speeches.HELP_SPEECH_BEGINNING_REPROMPT; + String speechOutput = stateManager.getLastQuestionAsked(); + String repromptText = stateManager.getLastReprompt(); - //String repromptText = Speeches.HELP_SPEECH_BEGINNING_REPROMPT; - - return SpeechesGenerator.newAskResponse(speechOutput, false, speechOutput, false); - } else { - //TODO: determine the current state and give appropriate help. - //TODO: and help wasn't asked but result in a call from another handler, give an error message. Maybe the whole error process should be handled in a different method or class - return null; - } + return SpeechesGenerator.newAskResponse(speechOutput, false, repromptText, false); } } diff --git a/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGame.java b/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGame.java index 4732793..f77fac2 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGame.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGame.java @@ -29,7 +29,8 @@ public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataIn String repromptText = Speeches.ADVANCED_GAME_PARAMETERS_PROMPT; - stateManager.setLastQuestionAsked(repromptText); + stateManager.setLastQuestionAsked(speechOutput); + stateManager.setLastReprompt(repromptText); return SpeechesGenerator.newAskResponse(speechOutput, false, repromptText, false); } diff --git a/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGameWithParameters.java b/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGameWithParameters.java index c028f97..1189978 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGameWithParameters.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGameWithParameters.java @@ -52,12 +52,13 @@ public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataIn speechOutput = GameStarterUtil.startGameSpeech(stateManager); repromptText = Speeches.YOUR_TURN + InstructionsUtil.fireInstructions(stateManager); } else { - ParametersUtil.issueWithParametersSpeech(stateManager); + speechOutput = ParametersUtil.missingOrIncorrectParameterSpeech(stateManager); } } } - stateManager.setLastQuestionAsked(repromptText); + stateManager.setLastQuestionAsked(speechOutput); + stateManager.setLastReprompt(repromptText); return SpeechesGenerator.newAskResponse(speechOutput, false, speechOutput, false); } diff --git a/src/main/java/gameVoiceHandler/intents/handlers/HandleStartQuickGame.java b/src/main/java/gameVoiceHandler/intents/handlers/HandleStartQuickGame.java index 6ce5ee0..46a74ed 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/HandleStartQuickGame.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/HandleStartQuickGame.java @@ -28,7 +28,8 @@ public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataIn String speechOutput = Speeches.QUICK_GAME_LAUNCH + GameStarterUtil.startGameSpeech(stateManager); String repromptText = Speeches.YOUR_TURN + InstructionsUtil.fireInstructions(stateManager); - stateManager.setLastQuestionAsked(repromptText); + //NOTE: The last question asked is setup in GameStartedUtil + stateManager.setLastReprompt(repromptText); return SpeechesGenerator.newAskResponse(speechOutput, false, repromptText, false); } diff --git a/src/main/java/gameVoiceHandler/intents/handlers/HandleTwoFirePositionsGiven.java b/src/main/java/gameVoiceHandler/intents/handlers/HandleTwoFirePositionsGiven.java index 5f90489..0bcd040 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/HandleTwoFirePositionsGiven.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/HandleTwoFirePositionsGiven.java @@ -51,11 +51,11 @@ public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataIn if (gameManager.gameIsOver()) { return SpeechesGenerator.newTellResponse(speechOutput); } else { - return SpeechesGenerator.newAskResponse(speechOutput, false, speechOutput, false);//TODO: Check the reprompt + return SpeechesGenerator.newAskResponse(speechOutput, false, stateManager.getLastReprompt(), false); } } else { - String speechOutput = Speeches.NOT_YOUR_TURN + stateManager.getLastQuestionAsked(); - return SpeechesGenerator.newAskResponse(speechOutput, false, stateManager.getLastQuestionAsked(), false); + String speechOutput = Speeches.NOT_YOUR_TURN + stateManager.getLastReprompt(); + return SpeechesGenerator.newAskResponse(speechOutput, false, stateManager.getLastReprompt(), false); } } diff --git a/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameFireUtil.java b/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameFireUtil.java index 33a2ab4..e62a48c 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameFireUtil.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameFireUtil.java @@ -36,12 +36,16 @@ public static String fire(GameDataInstance gameDataInstance) { } else { Coordinates alexaFire = gameManager.nextAlexaHit(); - repromptText = String.format(Speeches.MY_TURN, (char)(alexaFire.x + 'a'), alexaFire.y + 1); - String instructions = InstructionsUtil.answerInstructionsIfRequired(stateManager); - repromptText = instructions == null ? repromptText : repromptText + instructions; + String myTurnSpeech = String.format(Speeches.MY_TURN, (char) (alexaFire.x + 'a'), alexaFire.y + 1); + String instructionsIfRequired = InstructionsUtil.answerInstructionsIfRequired(stateManager); + String instructions = InstructionsUtil.answerInstructions(stateManager); + repromptText = myTurnSpeech + instructions; + speechOutput += myTurnSpeech; - stateManager.setLastQuestionAsked(repromptText); - speechOutput += repromptText; + stateManager.setLastQuestionAsked(speechOutput + instructions); + stateManager.setLastReprompt(repromptText); + + speechOutput += instructionsIfRequired; } stateManager.setTurnState(TurnState.ALEXA); diff --git a/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameStarterUtil.java b/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameStarterUtil.java index c35a5bc..2fb9e5e 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameStarterUtil.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameStarterUtil.java @@ -35,8 +35,10 @@ public static String incorrectParametersSpeech() { public static String startGameSpeech(StateManager stateManager) { String gameLaunchSpeech = String.format(Speeches.GAME_LAUNCH, stateManager.getGridSize(), stateManager.getGridSize(), stateManager.getNumberOfShips()); String speechOutput = gameLaunchSpeech + Speeches.YOUR_TURN; - String instructions = InstructionsUtil.fireInstructionsIfRequired(stateManager); - speechOutput = instructions == null ? speechOutput : speechOutput + instructions; + String instructions = InstructionsUtil.fireInstructions(stateManager); + String instructionsIfRequired = InstructionsUtil.fireInstructionsIfRequired(stateManager); + stateManager.setLastQuestionAsked(speechOutput + instructions); + speechOutput = instructionsIfRequired == null ? speechOutput : speechOutput + instructionsIfRequired; return speechOutput; } diff --git a/src/main/java/gameVoiceHandler/intents/handlers/Utils/InstructionsUtil.java b/src/main/java/gameVoiceHandler/intents/handlers/Utils/InstructionsUtil.java index 1cc895e..c3fc2a2 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/Utils/InstructionsUtil.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/Utils/InstructionsUtil.java @@ -15,27 +15,25 @@ public class InstructionsUtil { public static SpeechletResponse startInstructions(StateManager stateManager) { boolean instructionsRequested = stateManager.isInstructionsRequested(); - String speechOutput; - String reprompt; - - if (instructionsRequested) { - speechOutput = Speeches.GENERAL_INSTRUCTIONS - + Speeches.LETS_START - + Speeches.HELP_SPEECH_BEGINNING - + Speeches.HELP_SPEECH_BEGINNING_REPROMPT - + Speeches.HELP_SPEECH_BEGINNING_INSTRUCTIONS; + String speechOutput = Speeches.GENERAL_INSTRUCTIONS + + Speeches.LETS_START + + Speeches.HELP_SPEECH_BEGINNING + + Speeches.HELP_SPEECH_BEGINNING_REPROMPT + + Speeches.HELP_SPEECH_BEGINNING_INSTRUCTIONS; + String reprompt = Speeches.HELP_SPEECH_BEGINNING_REPROMPT + + Speeches.HELP_SPEECH_BEGINNING_INSTRUCTIONS; + + stateManager.setLastQuestionAsked(speechOutput); + stateManager.setLastReprompt(reprompt); + + if (!instructionsRequested) { + speechOutput = Speeches.HELP_SPEECH_BEGINNING + + Speeches.HELP_SPEECH_BEGINNING_REPROMPT; reprompt = Speeches.HELP_SPEECH_BEGINNING_REPROMPT + Speeches.HELP_SPEECH_BEGINNING_INSTRUCTIONS; - } else { - speechOutput = Speeches.HELP_SPEECH_BEGINNING + Speeches.HELP_SPEECH_BEGINNING_REPROMPT; - reprompt = Speeches.HELP_SPEECH_BEGINNING_REPROMPT + Speeches.HELP_SPEECH_BEGINNING_INSTRUCTIONS; } - - - //stateManager.setLastQuestionAsked(reprompt); //TODO: Move the lasQuestionAsked to StateManager - return SpeechesGenerator.newAskResponse(speechOutput, false, reprompt, false); } diff --git a/src/main/java/gameVoiceHandler/intents/handlers/Utils/ParametersUtil.java b/src/main/java/gameVoiceHandler/intents/handlers/Utils/ParametersUtil.java index 0a6f1eb..df08a34 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/Utils/ParametersUtil.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/Utils/ParametersUtil.java @@ -7,7 +7,7 @@ * Created by corentinl on 3/8/16. */ public class ParametersUtil { - public static String issueWithParametersSpeech(StateManager stateManager) { + public static String missingOrIncorrectParameterSpeech(StateManager stateManager) { if (stateManager.areParametersEntered()) { return ParametersUtil.parametersIncorrectSpeech(stateManager); } else { diff --git a/src/main/java/gameVoiceHandler/intents/handlers/Utils/YesNoUtil.java b/src/main/java/gameVoiceHandler/intents/handlers/Utils/YesNoUtil.java index f9d3164..177ebdc 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/Utils/YesNoUtil.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/Utils/YesNoUtil.java @@ -14,7 +14,6 @@ public class YesNoUtil { public static SpeechletResponse handleYesNo(GameDataInstance gameDataInstance, boolean answer) { StateManager stateManager = gameDataInstance.getStateManager(); - GameManager gameManager = gameDataInstance.getGameManager(); VoiceState voiceState = stateManager.getVoiceState(); if (voiceState == VoiceState.PROMPT_FOR_INSTRUCTIONS) { diff --git a/src/main/java/gameVoiceHandler/speechAssets/IntentSchema.json b/src/main/java/gameVoiceHandler/speechAssets/IntentSchema.json index e05c5ce..eceb4aa 100644 --- a/src/main/java/gameVoiceHandler/speechAssets/IntentSchema.json +++ b/src/main/java/gameVoiceHandler/speechAssets/IntentSchema.json @@ -72,24 +72,6 @@ } ] }, - { - "intent": "oneFirePosition", - "slots": [ - { - "name": "lineOrColumn", - "type": "AMAZON.NUMBER" - } - ] - }, - { - "intent": "oneFirePositionLetter", - "slots": [ - { - "name": "lineLetter", - "type": "LETTERS" - } - ] - }, { "intent": "AMAZON.YesIntent" }, @@ -103,7 +85,7 @@ "intent": "AMAZON.StopIntent" }, { - "intent": "WhatsMyColorIntent" + "intent": "AMAZON.CancelIntent" } ] } \ No newline at end of file diff --git a/src/main/java/gameVoiceHandler/speechAssets/SampleUtterances.txt b/src/main/java/gameVoiceHandler/speechAssets/SampleUtterances.txt index 63dc3fc..d2a8b32 100644 --- a/src/main/java/gameVoiceHandler/speechAssets/SampleUtterances.txt +++ b/src/main/java/gameVoiceHandler/speechAssets/SampleUtterances.txt @@ -4,6 +4,8 @@ startQuickGameIntent quick game startQuickGameIntent game quick startQuickGameIntent launch a quick game startQuickGameIntent launch quick game +startQuickGameIntent launch boat war and quick game +startQuickGameIntent launch boat war quick game startAdvancedGameIntent start an advanced game startAdvancedGameIntent start advanced game @@ -11,6 +13,8 @@ startAdvancedGameIntent advanced game startAdvancedGameIntent game advanced startAdvancedGameIntent launch an advanced game startAdvancedGameIntent launch advanced game +startAdvancedGameIntent launch boat war and advanced game +startAdvancedGameIntent launch boat war advanced game startAdvancedGameWithParametersIntent grid size of {gridSize} and {numberOfShips} ships startAdvancedGameWithParametersIntent grid {gridSize} and {numberOfShips} ships @@ -87,5 +91,3 @@ fireAtLetterAndNumberIntent fire at line {lineLetter} column {columnNumber} fireAtLetterAndNumberIntent line {lineLetter} column {columnNumber} fireAtLetterAndNumberIntent fire at line {lineLetter} and column {columnNumber} fireAtLetterAndNumberIntent line {lineLetter} and column {columnNumber} - -oneFirePosition fire at {lineOrColumn} From 93a264e9001c802d105bb4e55a5d8ac85ff4fd09 Mon Sep 17 00:00:00 2001 From: Corentin Leman Date: Wed, 16 Mar 2016 23:26:22 -0500 Subject: [PATCH 3/4] Code cleaning. Added TODO for small bugs. --- .../intents/handlers/HandleGameParameter.java | 2 +- .../intents/handlers/HandleStartAdvancedGame.java | 2 +- .../gameVoiceHandler/intents/handlers/Utils/GameFireUtil.java | 2 +- .../intents/handlers/Utils/InstructionsUtil.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/gameVoiceHandler/intents/handlers/HandleGameParameter.java b/src/main/java/gameVoiceHandler/intents/handlers/HandleGameParameter.java index 7115427..a049002 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/HandleGameParameter.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/HandleGameParameter.java @@ -56,7 +56,7 @@ public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataIn repromptText = missingOrIncorrectParameterSpeech; } - stateManager.setLastQuestionAsked(speechOutput); + stateManager.setLastQuestionAsked(speechOutput); //TODO: The instructions are not always put in there, because of the multi use of startGameSpeech stateManager.setLastReprompt(repromptText); return SpeechesGenerator.newAskResponse(speechOutput, false, repromptText, false); diff --git a/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGame.java b/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGame.java index f77fac2..0c76d9b 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGame.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/HandleStartAdvancedGame.java @@ -29,7 +29,7 @@ public SpeechletResponse handleIntent(Intent intent, GameDataInstance gameDataIn String repromptText = Speeches.ADVANCED_GAME_PARAMETERS_PROMPT; - stateManager.setLastQuestionAsked(speechOutput); + stateManager.setLastQuestionAsked(speechOutput); //TODO: Check why this always contains the instructions even if we answered no stateManager.setLastReprompt(repromptText); return SpeechesGenerator.newAskResponse(speechOutput, false, repromptText, false); diff --git a/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameFireUtil.java b/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameFireUtil.java index e62a48c..0ac6c10 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameFireUtil.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/Utils/GameFireUtil.java @@ -38,7 +38,7 @@ public static String fire(GameDataInstance gameDataInstance) { String myTurnSpeech = String.format(Speeches.MY_TURN, (char) (alexaFire.x + 'a'), alexaFire.y + 1); String instructionsIfRequired = InstructionsUtil.answerInstructionsIfRequired(stateManager); - String instructions = InstructionsUtil.answerInstructions(stateManager); + String instructions = InstructionsUtil.answerInstructions(); repromptText = myTurnSpeech + instructions; speechOutput += myTurnSpeech; diff --git a/src/main/java/gameVoiceHandler/intents/handlers/Utils/InstructionsUtil.java b/src/main/java/gameVoiceHandler/intents/handlers/Utils/InstructionsUtil.java index c3fc2a2..a214c12 100644 --- a/src/main/java/gameVoiceHandler/intents/handlers/Utils/InstructionsUtil.java +++ b/src/main/java/gameVoiceHandler/intents/handlers/Utils/InstructionsUtil.java @@ -65,13 +65,13 @@ public static String answerInstructionsIfRequired(StateManager stateManager) { boolean instructionsRequired = stateManager.isInstructionsRequested() && stateManager.isAnswerInstructionsRequested(); if (instructionsRequired) { stateManager.setAnswerInstructionsRequested(false); - return instructions + answerInstructions(stateManager); + return instructions + answerInstructions(); } else { return instructions; } } - public static String answerInstructions(StateManager stateManager) { + public static String answerInstructions() { return Speeches.ANSWER_EXAMPLE; } From 9c397954512aed0a8a92341f3a65e04cfca0aa16 Mon Sep 17 00:00:00 2001 From: Corentin Leman Date: Wed, 16 Mar 2016 23:32:27 -0500 Subject: [PATCH 4/4] Added Sample Utterances. --- .../java/gameVoiceHandler/speechAssets/SampleUtterances.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/gameVoiceHandler/speechAssets/SampleUtterances.txt b/src/main/java/gameVoiceHandler/speechAssets/SampleUtterances.txt index d2a8b32..5b37b23 100644 --- a/src/main/java/gameVoiceHandler/speechAssets/SampleUtterances.txt +++ b/src/main/java/gameVoiceHandler/speechAssets/SampleUtterances.txt @@ -6,6 +6,8 @@ startQuickGameIntent launch a quick game startQuickGameIntent launch quick game startQuickGameIntent launch boat war and quick game startQuickGameIntent launch boat war quick game +startQuickGameIntent boat war and quick game +startQuickGameIntent boat war quick game startAdvancedGameIntent start an advanced game startAdvancedGameIntent start advanced game @@ -15,6 +17,8 @@ startAdvancedGameIntent launch an advanced game startAdvancedGameIntent launch advanced game startAdvancedGameIntent launch boat war and advanced game startAdvancedGameIntent launch boat war advanced game +startAdvancedGameIntent boat war and advanced game +startAdvancedGameIntent boat war advanced game startAdvancedGameWithParametersIntent grid size of {gridSize} and {numberOfShips} ships startAdvancedGameWithParametersIntent grid {gridSize} and {numberOfShips} ships