Skip to content

GitLab

Commit 597d6970 authored by astatham's avatar astatham
Browse files

Finished dialogue

parent 508f2ecb
Show whitespace changes
Inline Side-by-side
RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
View file @ 597d6970
<Properties StartupConfiguration="{67A4F128-F6AC-CD88-DA35-F29416A0792A}|"> <Properties StartupConfiguration="{67A4F128-F6AC-CD88-DA35-F29416A0792A}|">
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" /> <MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/DaytimeScripts/CharacterSpeech/JohnSmithSpeech.cs">
<Files> <Files>
<File FileName="Assets/Scripts/MimeScripts/SpawnKeys.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/MimeScripts/TriggerManager.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/PaperSpeech.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/DaytimeScripts/PaperController.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/DaytimeScripts/IntroTent.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs" Line="140" Column="55" /> <File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs" Line="140" Column="55" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs" Line="1" Column="1" /> <File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/JohnSmithSpeech.cs" Line="1" Column="1" />
</Files> </Files>
</MonoDevelop.Ide.Workbench> </MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
......
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/JohnSmithSpeech.cs
View file @ 597d6970
...@@ -27,7 +27,7 @@ public class JohnSmithSpeech : MonoBehaviour, Character { ...@@ -27,7 +27,7 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
return "Hello, I'm John Smith"; return "Hello, I'm John Smith";
} else if ((int)GameManager.getLevel(getName()) == 2) { } else if ((int)GameManager.getLevel(getName()) == 2) {
currentResponses = new string[] { "Thanks, How's it going John Smith?", "Thanks clown man", "It was a terrible time funny man" }; currentResponses = new string[] { "Thanks. How's it going, John Smith?", "Thanks, clown man", "It was a terrible time, funny man" };
return "Nice job on the trapeze"; return "Nice job on the trapeze";
} else if ((int)GameManager.getLevel(getName()) == 3) { } else if ((int)GameManager.getLevel(getName()) == 3) {
...@@ -35,8 +35,8 @@ public class JohnSmithSpeech : MonoBehaviour, Character { ...@@ -35,8 +35,8 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
return "Hey, can I ask you a question?"; return "Hey, can I ask you a question?";
} else if ((int)GameManager.getLevel(getName()) == 4) { } else if ((int)GameManager.getLevel(getName()) == 4) {
currentResponses = new string[] { "stage 4 greeting response" }; currentResponses = new string[] { "Hello!", "What's up?", "Here we go again" };
return "stage 4 (hello) grr"; return "Hi...";
} }
return "Something has gone terribly wrong: The stage is: " + GameManager.ConversationStage; return "Something has gone terribly wrong: The stage is: " + GameManager.ConversationStage;
} }
...@@ -57,7 +57,7 @@ public class JohnSmithSpeech : MonoBehaviour, Character { ...@@ -57,7 +57,7 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
public string nothingMoreToSay() { public string nothingMoreToSay() {
currentResponses = new string[] { }; currentResponses = new string[] { };
if (Random.Range(0, 1f) < 0.8) { if (Random.Range(0, 1f) < 0.8) {
return "hey"; return "Hey";
} else { } else {
return "So nice of you to stay, but I'm not that exciting"; return "So nice of you to stay, but I'm not that exciting";
} }
...@@ -105,16 +105,16 @@ public class JohnSmithSpeech : MonoBehaviour, Character { ...@@ -105,16 +105,16 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
conversation.Enqueue("So nice of you to SWING BY"); conversation.Enqueue("So nice of you to SWING BY");
responseQueue.Enqueue(new string[] { "Continue" }); responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("To Swing yourself just hold A to swing left and D to swing right"); conversation.Enqueue("To swing yourself just hold A to swing left and D to swing right");
responseQueue.Enqueue(new string[] { "Continue" }); responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Well Done! Ill give you a bit more power"); conversation.Enqueue("Well Done! I'll give you a bit more power");
responseQueue.Enqueue(new string[] { "Continue" }); responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Cool! Now press SPACEABR to let go and Fly!"); conversation.Enqueue("Cool! Now press SPACEABR to let go and fly!");
responseQueue.Enqueue(new string[] { "Continue" }); responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Dont worry Simon will catch you! Use A and D to rotate in the air"); conversation.Enqueue("Don't worry, Simon will catch you! Use A and D to rotate in the air");
responseQueue.Enqueue(new string[] { "Continue" }); responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Nice Job! Try and manoeuvre yourself across these platforms"); conversation.Enqueue("Nice Job! Try and manoeuvre yourself across these platforms");
...@@ -123,7 +123,7 @@ public class JohnSmithSpeech : MonoBehaviour, Character { ...@@ -123,7 +123,7 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
conversation.Enqueue("Good one! PIES give you points and boost your time!"); conversation.Enqueue("Good one! PIES give you points and boost your time!");
responseQueue.Enqueue(new string[] { "Continue" }); responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Im so proud of you! youll be the best Trapezeist ever!"); conversation.Enqueue("I'm so proud of you! You'll be the best trapezeist ever!");
responseQueue.Enqueue(new string[] { "Continue" }); responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Feel free to keep playing here or you could give it a go for real now!"); conversation.Enqueue("Feel free to keep playing here or you could give it a go for real now!");
...@@ -136,62 +136,101 @@ public class JohnSmithSpeech : MonoBehaviour, Character { ...@@ -136,62 +136,101 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
private void conversationStage1() { private void conversationStage1() {
if (GameManager.HasTalkedToAhava) { if (GameManager.HasTalkedToAhava) {
conversation.Enqueue("welcome to the circus."); conversation.Enqueue("Welcome to the circus.");
responseQueue.Enqueue(new string[] { "Thanks", "It's an interesting place", "What do you do?"}); responseQueue.Enqueue(new string[] { "Thanks", "It's an interesting place", "What do you do?"});
conversation.Enqueue("if you ever wanna try a really unique performance you should try the trapezing, Ahava let's me take care of that."); conversation.Enqueue("If you ever wanna try a really unique performance you should try the trapezing, Ahava lets me take care of that.");
responseQueue.Enqueue(new string[] { "I already have", "I'll give it a go", "Sorry, I don't swing that way" }); responseQueue.Enqueue(new string[] { "I already have", "I'll give it a go", "Sorry, I don't swing that way" });
conversation.Enqueue("I mean if you don't want to its fine I guess, I'm John Smith by the way."); conversation.Enqueue("I mean if you don't want to it's fine, I guess. I'm John Smith, by the way.");
responseQueue.Enqueue(new string[] { "My name is Dennnnnis", "My name is " + GameManager.playerName, "I'm sure I can find time" }); responseQueue.Enqueue(new string[] { "My name is Dennnnnis", "My name is " + GameManager.playerName, "I'm sure I can find time" });
conversation.Enqueue("It's nice to meet a new face here, maybe you'll be different from the rest."); conversation.Enqueue("It's nice to meet a new face here, maybe you'll be different from the rest.");
responseQueue.Enqueue(new string[] { "What do you mean?", "different?", "It's nice to meet you to" }); responseQueue.Enqueue(new string[] { "What do you mean?", "Different?", "It's nice to meet you too" });
conversation.Enqueue("Not that I mean anything by that of course, just nice to have a few more ummmm... clowns around here."); conversation.Enqueue("Not that I mean anything by that of course, just nice to have a few more ummmm... clowns around here.");
responseQueue.Enqueue(new string[] { "You do seem a few short of a car", "Surely as long as you all get on well?", "something about you seems funny" }); responseQueue.Enqueue(new string[] { "You do seem a few short of a car", "Surely as long as you all get on well?", "Something about you seems funny" });
conversation.Enqueue("you're not wrong, I should probably head back into the tent shortly. See you around"); conversation.Enqueue("You're not wrong, I should probably head back into the tent shortly. See you around");
responseQueue.Enqueue(new string[] { "See you in there", "cya", "*just back away*" }); responseQueue.Enqueue(new string[] { "See you in there", "cya", "*Just backs away*" });
} else { } else {
conversation.Enqueue("talk to the bearded lady before you start clowning around"); conversation.Enqueue("Talk to the bearded lady before you start clowning around");
responseQueue.Enqueue(new string[] { "okay", "that was a terrible joke", "*back away*" }); responseQueue.Enqueue(new string[] { "Okay", "That was a terrible joke", "*Backs away*" });
} }
} }
private void conversationStage2() { private void conversationStage2() {
conversation.Enqueue("Just remember to keep practicing, wouldn't want someone with a name like yours to waste their talent"); conversation.Enqueue("Just remember to keep practising, wouldn't want someone with a name like yours to waste their talent");
responseQueue.Enqueue(new string[] { "I will", "What does that have to do with it?", "My name is pretty lame" }); responseQueue.Enqueue(new string[] { "I will", "What does that have to do with it?", "My name is pretty lame" });
conversation.Enqueue("say, do you wanna hear a joke?"); conversation.Enqueue("Say, do you wanna hear a joke?");
responseQueue.Enqueue(new string[] { "wouldn't miss it", "yes", "no" }); responseQueue.Enqueue(new string[] { "Wouldn't miss it", "Yes", "No" });
conversation.Enqueue("you'll love it"); conversation.Enqueue("You'll love it");
responseQueue.Enqueue(new string[] { "I'm waiting", "hurry up", "please no" }); responseQueue.Enqueue(new string[] { "I'm waiting", "Hurry up", "Please, no" });
conversation.Enqueue("an accountant asks a trapeze artist what is their net worth. The trapeze artist says 'Every penny'"); conversation.Enqueue("An accountant asks a trapeze artist what is their net worth. The trapeze artist says 'Every penny'");
responseQueue.Enqueue(new string[] { "I wish I had a penny for every time I heard a joke that bad", "*chuckle slightly*", "that was terrible" }); responseQueue.Enqueue(new string[] { "I wish I had a penny for every time I heard a joke that bad", "*Chuckles slightly*", "That was terrible" });
conversation.Enqueue("AHAHAHAHHAHAHAHAHHAHAHAHHAHAHHAHAHAHHAHAHHHAHHAHAHHAHHHAHAHHAHAHAHAHHAHAHAHHAHAHAHAHHAHAHAHAHAHAHHAHA/n" + " you feel like he took your rejection well"); conversation.Enqueue("AHAHAHAHHAHAHAHAHHAHAHAHHAHAHHAHAHAHHAHAHHHAHHAHAHHAHHHAHAHHAHAHAHAHHAHAHAHHAHAHAHAHHAHAHAHAHAHAHHAHA/n" + " You feel like he took your rejection well");
responseQueue.Enqueue(new string[] { "I wish I had a penny for every time I heard a joke that bad", "*chuckle slightly*", "that was terrible" }); responseQueue.Enqueue(new string[] { "I wish I had a penny for every time I heard a joke that bad", "*Chuckles slightly*", "That was terrible" });
conversation.Enqueue("*John struggles to catch his breath* it's cool having you around kid, maybe I'll tell that one to the others. Looking forward to seeing you in the tent"); conversation.Enqueue("*Struggles to catch his breath* It's cool having you around, kid. Maybe I'll tell that one to the others. Looking forward to seeing you in the tent");
responseQueue.Enqueue(new string[] { "Can't wait", "looking forward to flying again, cya", "feign interest" }); responseQueue.Enqueue(new string[] { "Can't wait", "Looking forward to flying again, cya", "*Feigns interest*" });
} }
private void conversationStage3() { private void conversationStage3() {
conversation.Enqueue("Stage 3 conversation stuff"); conversation.Enqueue("What do you think of trapezing?");
responseQueue.Enqueue(new string[] { "Stage 3 response 1", "stage 3 resposne 2" }); responseQueue.Enqueue(new string[] { "What do you mean?", "Uhh...", "Well..." });
conversation.Enqueue("Stage 3 conversation stuff 2"); conversation.Enqueue("Like...do you think it's fun?");
responseQueue.Enqueue(new string[] { "Stage 3 response 1", "stage 3 resposne 2" }); responseQueue.Enqueue(new string[] { "Absolutely! It's the best part of the circus", "It's pretty good", "It's okay, I guess" });
conversation.Enqueue("Glad to hear it! I just worry that people don't like it: it's not as showy as Simon's stuff and doesn't have Silas' catchy tunes");
responseQueue.Enqueue(new string[] { "Who needs that other stuff?", "Throwing pies is kinda cathartic...", "To be honest, I like getting my dance on" });
conversation.Enqueue("There's something so much more...primal and natural about trapezing, don't you think?");
responseQueue.Enqueue(new string[] { "I'm not sure...", "Huh?", "What?" });
conversation.Enqueue("It's like we're monkies again! Swinging from branch to branch, tree to tree");
responseQueue.Enqueue(new string[] { "Oh! That's true!", "I'd rather keep my feet on the ground", "I'm not into 'primal'" });
conversation.Enqueue("Maybe it would be better if we were monkies again, no talking about people behind their backs...");
responseQueue.Enqueue(new string[] { "You might have a point there", "Are you implying something?", "I'd miss my creature comforts" });
conversation.Enqueue("Anyway, I should probably get to rigging the platforms up for tonight");
responseQueue.Enqueue(new string[] { "Catch you later!", "Okay, bye", "At least there were no jokes this time" });
} }
private void conversationStage4() { private void conversationStage4() {
conversation.Enqueue("Stage 4 conversation stuff"); conversation.Enqueue("What do you think of me?");
responseQueue.Enqueue(new string[] { "Stage 4 response 1", "stage 4 resposne 2" }); responseQueue.Enqueue(new string[] { "What do you mean?", "Uhh...", "Well..." });
conversation.Enqueue("Like...am I funny? Am I special?");
responseQueue.Enqueue(new string[] { "Umm...", "Err...", "Well..." });
conversation.Enqueue("Some people think I'm 'just another clown'. A lot of people...most people...");
responseQueue.Enqueue(new string[] { "I wouldn't say that", "*Stares awkwardly*", "But you ARE just another clown" });
conversation.Enqueue("Apparently old John Smith is...generic *sniffs*");
responseQueue.Enqueue(new string[] { "Not in the slightest!", "You're a trapezist! That's not generic at all!", "John Smith is a pretty generic name..." });
conversation.Enqueue("I just want to entertain the people with amazing feats of trapeze! *sobs*");
responseQueue.Enqueue(new string[] { "You already do that!", "I'm amazed, at least!", "You've taught me so much!" });
conversation.Enqueue("*Wipes eyes* You really mean that?");
responseQueue.Enqueue(new string[] { "I don't say things I don't mean", "Of course! You're great!", "Sure! *crosses fingers*" });
conversation.Enqueue("I thought...for a moment...that I might hang up my trapezing boots");
responseQueue.Enqueue(new string[] { "Don't even think about it!", "You're the best trapezist I've ever seen!", "I mean, if you're getting old..." });
conversation.Enqueue("No, I couldn't do that: trapezing is my life! It's what I live for!");
responseQueue.Enqueue(new string[] { "That's what I like to hear!", "Keep on swinging, John!", "Living's pretty cool, I hear" });
conversation.Enqueue("Thank you... What you've said means a lot: no one else has been so kind to me before");
responseQueue.Enqueue(new string[] { "You deserve better!", "A friend in need, you know?", "If I'm kind, what kind of jerks do you know?" });
conversation.Enqueue("Stage 4 conversation stuff 2"); conversation.Enqueue("You'll always be welcome to come trapezing with me, friend. I'll see you later!");
responseQueue.Enqueue(new string[] { "Stage 4 response 1", "stage 4 resposne 2" }); responseQueue.Enqueue(new string[] { "Take care up there!", "It's always a pleasure!", "Yeah, sure, bye!" });
} }
} }
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs
View file @ 597d6970
...@@ -30,12 +30,12 @@ public class SilasSpeech : MonoBehaviour, Character { ...@@ -30,12 +30,12 @@ public class SilasSpeech : MonoBehaviour, Character {
return "Well, hello! Back again?"; return "Well, hello! Back again?";
} else if ((int)GameManager.getLevel(getName()) == 3) { } else if ((int)GameManager.getLevel(getName()) == 3) {
currentResponses = new string[] { "*'Mimes' an enthusiastic wave*", "*'Mimes' a neutral wave*", "*'Mimes' a grumpy wave*" }; currentResponses = new string[] { "It's me!", "*Looks around* Who?!", "*'Mimes' a half-hearted greeting*" };
return "It's the master mime!"; return "Look who it is!";
} else if ((int)GameManager.getLevel(getName()) == 4) { } else if ((int)GameManager.getLevel(getName()) == 4) {
currentResponses = new string[] { "stage 4 greeting response" }; currentResponses = new string[] { "*'Mimes' an enthusiastic wave*", "*'Mimes' a neutral wave*", "*'Mimes' a grumpy wave*" };
return "stage 4 greeting"; return "It's the master mime!";
} }
return "Something has gone terribly wrong: The stage is: " + GameManager.ConversationStage; return "Something has gone terribly wrong: The stage is: " + GameManager.ConversationStage;
......
Supports Markdown
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