Skip to content

GitLab

Commit cce7f675 authored by mmaluschnig's avatar mmaluschnig
Browse files

fixed a couple of minor bugs

parent 29f51959
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs
View file @ cce7f675
......@@ -161,8 +161,8 @@ public class AhavaSpeech : MonoBehaviour, Character {
conversation.Enqueue("I'm just saying the crowd can only handle so much pizzazz and I already put out more than enough.");
responseQueue.Enqueue(new string[] { "But everyone loves pizza?", "What's a pizzazz?", "Maybe it's time for you to get out the razor" });
conversation.Enqueue("Be careful Dennnnnis, you're messing with the wrong bearded lady... also the only... bearded lady, people trust in the Baird, Baird is the word");
responseQueue.Enqueue(new string[] { "I just wanna be friends", "I'm still confused", "*Give her the bird* The bird is the word" });
conversation.Enqueue("Be careful Dennnnnis, you're messing with the wrong bearded lady... the only... bearded lady, people trust the Baird.");
responseQueue.Enqueue(new string[] { "I just wanna be friends", "I'm still confused", "I don't trust the beard" });
conversation.Enqueue("HMMPPPHH");
responseQueue.Enqueue(new string[] { "=(", "*Back away slowly*", "Sing 'Let it go'" });
......
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/JohnSmithSpeech.cs
View file @ cce7f675
......@@ -55,7 +55,7 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
}
public string nothingMoreToSay() {
currentResponses = new string[] { };
currentResponses = new string[] { "...", "....", "....." };
if (Random.Range(0, 1f) < 0.8) {
return "Hey";
} else {
......@@ -139,7 +139,7 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
conversation.Enqueue("Welcome to the circus.");
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 lets me take care of that.");
conversation.Enqueue("If you wanna try a really unique performance, 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" });
conversation.Enqueue("I mean if you don't want to it's fine, I guess. I'm John Smith, by the way.");
......@@ -170,12 +170,12 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
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'");
responseQueue.Enqueue(new string[] { "I wish I had a penny for every time I heard a joke that bad", "*Chuckles slightly*", "That was terrible" });
responseQueue.Enqueue(new string[] { "If I had a penny for every time I heard that", "*Chuckles slightly*", "That was terrible" });
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", "*Chuckles slightly*", "That was terrible" });
conversation.Enqueue("HAHAHAHAHHAHAAHAHA/n" + " You feel like he took your rejection well");
responseQueue.Enqueue(new string[] { "HAHAHAHAHAH", "Try to back away", "Are you okay?" });
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");
conversation.Enqueue("It's cool having you around, kid. Looking forward to seeing you in the tent");
responseQueue.Enqueue(new string[] { "Can't wait", "Looking forward to flying again, cya", "*Feigns interest*" });
}
......
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs
View file @ cce7f675
......@@ -26,7 +26,7 @@ public class SilasSpeech : MonoBehaviour, Character {
return "...";
} else if ((int)GameManager.getLevel(getName()) == 2) {
currentResponses = new string[] { "Hi, Silas!", "I'm back to get my other ear talked off", "*'Mimes' a wave*" };
currentResponses = new string[] { "Hi, Sila...!", "I'm back to get my other ear talked of...", "*'Mimes' a wave*" };
return "Well, hello! Back again?";
} else if ((int)GameManager.getLevel(getName()) == 3) {
......
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/SimonSpeech.cs
View file @ cce7f675
......@@ -55,7 +55,7 @@ public class SimonSpeech : MonoBehaviour, Character {
}
public string nothingMoreToSay() {
currentResponses = new string[] { };
currentResponses = new string[] { "Grr(...)", "Grrr(....)", "GRRR(.....)" };
if (Random.Range(0, 1f) < 0.8) {
return "Grr?";
} else {
......@@ -122,13 +122,13 @@ public class SimonSpeech : MonoBehaviour, Character {
private void conversationStage2() {
conversation.Enqueue("gRr (You throw pies like a champion!)");
responseQueue.Enqueue(new string[] { "GrrR", "Thanks!", "It's almost like I can understand what you're saying" });
responseQueue.Enqueue(new string[] { "GrrR", "Thanks!", "It's almost like I can understand you" });
conversation.Enqueue("grrrr (I'm not that great with throwing things, to be honest, but being a target is plenty fun too!)");
responseQueue.Enqueue(new string[] { "GrRrR", "You're a pretty smooth mover on your unicycle", "I'd rather throw pies than get hit by them" });
responseQueue.Enqueue(new string[] { "GrRrR", "You're pretty smooth on your unicycle", "I'd rather throw pies than get hit by them" });
conversation.Enqueue("Grr (I originally wanted to be a juggler, but that's easier said than done with big bear paws)");
responseQueue.Enqueue(new string[] { "Grr?", "Aww, that sucks", "Unicycling is much cooler" });
responseQueue.Enqueue(new string[] { "Grr?", "Aww, you paw thing", "Unicycling is much cooler" });
conversation.Enqueue("grr (Is that your real hair?)");
responseQueue.Enqueue(new string[] { "grrRRRr", "Doesn't it look real?", "I'm all natural, promise!" });
......@@ -141,14 +141,14 @@ public class SimonSpeech : MonoBehaviour, Character {
}
private void conversationStage3() {
conversation.Enqueue("grrrr (So, where would you guess I come from?");
conversation.Enqueue("grrrr (So, where would you guess I come from?)");
responseQueue.Enqueue(new string[] { "GRRRR", "Russia?", "The woods?" });
conversation.Enqueue("GRR! (Close! The proud nation of Arstotzka! *salutes*)");
responseQueue.Enqueue(new string[] { "grrRrrrR", "Never heard of it", "Glory to Arstotzka!" });
conversation.Enqueue("Grrr (Though I must admit that life isn't all that great there, even for a celebrity like me)");
responseQueue.Enqueue(new string[] { "Grrrg", "You're a celebrity?", "Better not hear the Glorious Leader hear that" });
responseQueue.Enqueue(new string[] { "Grrrg", "You're a celebrity?", "Better not let Glorious Leader hear that" });
conversation.Enqueue("grrR (I wouldn't recommend it for a holiday: border control alone is a nightmare)");
responseQueue.Enqueue(new string[] { "grrRR", "It really doesn't sound inviting", "Cobrastan is nice this time of year, isn't it?" });
......@@ -157,7 +157,7 @@ public class SimonSpeech : MonoBehaviour, Character {
responseQueue.Enqueue(new string[] { "GrRrR", "Yeah, it's not bad here", "I'm glad to hear it!" });
conversation.Enqueue("grr... (Ahava's been great to me but you seem to be shining a little to bright for her, if you get what I mean)");
responseQueue.Enqueue(new string[] { "grrr", "I hadn't noticed...", "She seems to be getting a bit grumpy, I guess" });
responseQueue.Enqueue(new string[] { "grrr", "I hadn't noticed...", "She does seem a bit grumpy, I guess" });
}
private void conversationStage4() {
......
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