Merge branch 'master' of github.com:cecileceng/angelhack2016

chrismclennon · Apr 10, 2016 · 21d144e · 21d144e
2 parents bb10542 1f3030f
commit 21d144e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/rpg_assets.tsv b/rpg_assets.tsv
@@ -1,9  1,10 @@
-test_room	load	You are in a room. Outside it is dark and stormy. There is a drink. 	
 test_room	load	Version 0. You are in a room. Outside it is dark and stormy. There is a drink. 	
 test_room	reload	You can... drink water, do nothing, or exit room. 	
-test_room	drink-water	You drink the water. You die of poisoning. Good game. 	exec_endgame
-test_room	do-nothing	You don't drink the water. You die of boredom. Good game. 	exec_endgame
 test_room	drink-water	You drink the water. You are refreshed! 	nextscene_end_scene
 test_room	do-nothing	You don't drink the water. You die of boredom. 	exec_endgame
 test_room	exit-room	You exit the scene. 	nextscene_test_room_2
 test_room_2	load	You are in the second scene. Hip hip hurray! 	exec_endgame
 end_scene	load	Game over! ...	exec_endgame
 introduction	load	Welcome to Alexa Adventures. When you are ready, say "let's play". 	
 introduction	let's-play	It's nearly midnight. You received a text message from your business partner Burt Wordsworth earlier this evening. He's not typically the type to message late at night. Burt has since been unresponsive with your calls and text messages. You glance down at your phone to look at the time and the last message you received… ‘The dark visions have been increasing… I know it sounds crazy, but I think we're in danger. Not just us but everyone. I can't stay here. Meet me at the hotel at midnight. My friend Henry runs the bar, tell him that Birdie sent you. I hope we're not too late to stop it...' 	nextscene_hotel_bar_1a
 hotel_bar_1a	load	You are in a dimly lit hotel bar. It's near closing time, so it's empty aside from the bartender polishing the last of the glasses from the evening's crowd. 	

diff --git a/skill_behavior.py b/skill_behavior.py
@@ -7,7  7,7 @@ def get_welcome_response():
     """
 
     session_attributes = load_scene_data()
-    session_attributes['currentScene'] = 'introduction'
     session_attributes['currentScene'] = 'test_room'
     print 'session_attributes:', session_attributes
 
     # session_attributes['scene'] = {}
@@ -70,6  70,7 @@ def handle_action_intent(intent, session):
 
         reprompt_text = get_action_list_speech(session, scene)
 
     print 'should_end_session',should_end_session # kill me
     return response_helper.build_response(session_attributes, response_helper.build_speechlet_response(
         card_title, speech_output, reprompt_text, should_end_session))
 
@@ -98,8  99,10 @@ def get_scene_description_from_scene(session, scene):
 def terminate_conversation(session, scene, action):
     key = scene ' ' action
     next_exec = get_session_attributes(session, 'scene')[key]['next_exec']
     print 'terminate_conversation.next_exec:',next_exec
 
     if next_exec == 'exec_endgame':
         print 'terminate_conversation: True'
         return True
     return False