Commit 15fc5492 authored by mmaluschnig's avatar mmaluschnig
Browse files

updating ahava speech

parent f141e600
<Properties StartupConfiguration="{67A4F128-F6AC-CD88-DA35-F29416A0792A}|">
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/PieScripts/PieTutorial.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs">
<Files>
<File FileName="Assets/Scripts/TrapezeScripts/TrapezeController.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/TrapezeScripts/TrapezePerson.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/TrapezeScripts/TrapezeTutorial.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/JohnSmithSpeech.cs" Line="100" Column="5" />
<File FileName="Assets/Scripts/TrapezeScripts/GenerateTrapezes.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/PieScripts/throwManager.cs" Line="44" Column="1" />
<File FileName="Assets/Scripts/PieScripts/PieTutorial.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs" Line="1" Column="1" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
......
......@@ -23,8 +23,8 @@ public class AhavaSpeech : MonoBehaviour, Character {
loadConversation();
if (GameManager.ConversationStage == 1) {
currentResponses = new string[] { "Hi there", "Who are you", "what is this place" };
return "Hello Player, I am Ahava";
currentResponses = new string[] { "Spur of the moment", "i feel like someone is controlling me", "I was told by a magical piece of paper" };
return "Hello? I wasnt expecting any new performers today.";
} else if (GameManager.ConversationStage == 2) {
currentResponses = new string[] { "stage 2 greeting response" };
......@@ -58,10 +58,10 @@ public class AhavaSpeech : MonoBehaviour, Character {
public string nothingMoreToSay() {
currentResponses = new string[] { };
if (Random.Range(0, 1f) < 0.8) {
if (Random.Range(0, 1f) < 0.5) {
return "my beard grows tired of your chitter chatter";
} else {
return "Dennis the mennis!";
return "Dennnnnis the mennnnnis!";
}
}
......@@ -101,21 +101,21 @@ public class AhavaSpeech : MonoBehaviour, Character {
}
private void conversationStage1() {
conversation.Enqueue("welcome to the circus");
responseQueue.Enqueue(new string[] { "response 1" });
conversation.Enqueue("It was nice of you to turn up when you did, Simon's complaining was getting unBEARable");
responseQueue.Enqueue(new string[] { "I was happy to do it","I always wanted to be a performer" });
//GameManager.speechState will be the size of the queue when this dequeued
//make sure to change the check integer in CharacterInteractins when changing dialogue
conversation.Enqueue("What Is Your Name");
conversation.Enqueue("Since your now one of us, what shall your stage name be?");
responseQueue.Enqueue(new string[] {"okay"});
conversation.Enqueue("Great Name! How about we call you John Smith instead");
responseQueue.Enqueue(new string[] { "I Love it!", "I Hate it!", "I know a guy called John Smith" });
conversation.Enqueue("Maybe we'll just call you Dennnis");
responseQueue.Enqueue(new string[] { "fine", "not Dennis!" });
conversation.Enqueue("You can call me Baird... Ahava Baird, And i shall call you Dennnis");
responseQueue.Enqueue(new string[] { "fine", "not Dennnis!","Did you mean Dennis?" });
conversation.Enqueue("No Takebacksies");
conversation.Enqueue("Dennnnis it is!");
responseQueue.Enqueue(new string[] { "..." });
}
......@@ -125,14 +125,19 @@ public class AhavaSpeech : MonoBehaviour, Character {
responseQueue.Enqueue(new string[] { "great", "you were young once?", "thanks mum" });
}
private void conversationStage3() {
private void conversationStage3()
{
conversation.Enqueue("Stage 3 conversation stuff");
responseQueue.Enqueue(new string[] { "Stage 3 response 1", "stage 3 resposne 2" });
}
private void conversationStage4() {
private void conversationStage4()
{
conversation.Enqueue("Stage 4 conversation stuff");
responseQueue.Enqueue(new string[] { "Stage 4 response 1", "stage 4 resposne 2" });
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment