Commit 05df969e authored by gstuitje's avatar gstuitje
Browse files
parents 2e941414 6aed7208
...@@ -169,7 +169,7 @@ MonoBehaviour: ...@@ -169,7 +169,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 89 m_FontSize: 86
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 10
...@@ -180,7 +180,7 @@ MonoBehaviour: ...@@ -180,7 +180,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: RingMaster m_Text: BeardMaster
--- !u!222 &187337962 --- !u!222 &187337962
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -744,6 +744,8 @@ RectTransform: ...@@ -744,6 +744,8 @@ RectTransform:
- {fileID: 1187243199} - {fileID: 1187243199}
- {fileID: 1245358143} - {fileID: 1245358143}
- {fileID: 530105918} - {fileID: 530105918}
- {fileID: 1705314998}
- {fileID: 1657391120}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -1294,6 +1296,144 @@ CanvasRenderer: ...@@ -1294,6 +1296,144 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1581411525} m_GameObject: {fileID: 1581411525}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &1657391119
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1657391120}
- component: {fileID: 1657391122}
- component: {fileID: 1657391121}
m_Layer: 5
m_Name: Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1657391120
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1657391119}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 0.9999999}
m_Children: []
m_Father: {fileID: 896807685}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -200, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1657391121
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1657391119}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &1657391122
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1657391119}
m_CullTransparentMesh: 0
--- !u!1 &1705314997
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1705314998}
- component: {fileID: 1705315000}
- component: {fileID: 1705314999}
m_Layer: 5
m_Name: Ahava
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1705314998
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1705314997}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 896807685}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 400, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1705314999
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1705314997}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &1705315000
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1705314997}
m_CullTransparentMesh: 0
--- !u!1 &2144649528 --- !u!1 &2144649528
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -1493,7 +1493,7 @@ MonoBehaviour: ...@@ -1493,7 +1493,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 178d09aa2704a45b68d85008d69c7e95, type: 3} m_Script: {fileID: 11500000, guid: 178d09aa2704a45b68d85008d69c7e95, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
pauseMenu: {fileID: 1586100788} Ahava: {fileID: 0}
--- !u!4 &241155501 --- !u!4 &241155501
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1728,8 +1728,18 @@ MonoBehaviour: ...@@ -1728,8 +1728,18 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
songs: songs:
- {fileID: 8300000, guid: 6492c1c2b65dd475ebbe25ebcae4f780, type: 3} - {fileID: 8300000, guid: 6887ce842f38d4373b8ba3da6e8ab372, type: 3}
- {fileID: 8300000, guid: 1e5816223313147d088f56ac191b233a, type: 3} - {fileID: 8300000, guid: 8de4a48d78f24413aac65b705536e8c4, type: 3}
- {fileID: 8300000, guid: 7e8e03d6dcd5044d4a785e8118065729, type: 3}
- {fileID: 8300000, guid: 1633a428e3e91484d9e5eb8f5f74c2d5, type: 3}
- {fileID: 8300000, guid: c23e323e20393461da14a477bbec4416, type: 3}
- {fileID: 8300000, guid: f2c29f0f4250648cfb8287c40b371420, type: 3}
- {fileID: 8300000, guid: 3c6820f98355346d0a98f50c20dc8199, type: 3}
- {fileID: 8300000, guid: 85f547ede6afa4ed0bbeb5c8e10b3145, type: 3}
- {fileID: 8300000, guid: b8ddbf933d41f4d9cbe36f344cebe703, type: 3}
- {fileID: 8300000, guid: c11baa07b486e48558001a41b16f5002, type: 3}
- {fileID: 8300000, guid: c63b74098d5494d048736a099c6b28ab, type: 3}
- {fileID: 8300000, guid: b45e87f3e97ca4d82b2331861ab0ef7f, type: 3}
--- !u!1 &327992298 --- !u!1 &327992298
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -29543,11 +29553,6 @@ SpriteRenderer: ...@@ -29543,11 +29553,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!223 &1586100788 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 223530405003063200, guid: a6dd0ddad611645efbc5ef92c67041a7,
type: 2}
m_PrefabInternal: {fileID: 1532274092}
--- !u!1 &1646371379 --- !u!1 &1646371379
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -347,13 +347,16 @@ MonoBehaviour: ...@@ -347,13 +347,16 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 89139954} m_GameObject: {fileID: 89139954}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 26745d9592487994d8b2f3dd21daa035, type: 3} m_Script: {fileID: 11500000, guid: 26745d9592487994d8b2f3dd21daa035, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
score: {fileID: 1270994740} score: {fileID: 1270994740}
combo: {fileID: 1828139996} combo: {fileID: 1828139996}
multi: {fileID: 0}
exitPanel: {fileID: 0}
exitText: {fileID: 0}
--- !u!114 &89139959 --- !u!114 &89139959
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -668,7 +671,7 @@ GameObject: ...@@ -668,7 +671,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &333498656 --- !u!224 &333498656
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2019,7 +2022,7 @@ RectTransform: ...@@ -2019,7 +2022,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 51.82666, y: 73} m_AnchoredPosition: {x: -73.5, y: 99.4}
m_SizeDelta: {x: 653, y: 173.57} m_SizeDelta: {x: 653, y: 173.57}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1109535831 --- !u!114 &1109535831
......
...@@ -23,20 +23,20 @@ public class AhavaSpeech : MonoBehaviour, Character { ...@@ -23,20 +23,20 @@ public class AhavaSpeech : MonoBehaviour, Character {
loadConversation(); loadConversation();
if (GameManager.ConversationStage == 1) { if (GameManager.ConversationStage == 1) {
currentResponses = new string[] { "Spur of the moment", "i feel like someone is controlling me", "I was told by a magical piece of paper" }; 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."; return "Hello? I wasn't expecting any new performers today.";
} else if (GameManager.ConversationStage == 2) { } else if (GameManager.ConversationStage == 2) {
currentResponses = new string[] { "Thanks", "It was nothing", "I could have done better!" }; currentResponses = new string[] { "Thanks", "It was nothing", "I could have done better!" };
return "well done on your performances!"; return "Well done on your performances!";
} else if (GameManager.ConversationStage == 3) { } else if (GameManager.ConversationStage == 3) {
currentResponses = new string[] { "I wouldn't say that", "That's me", "Understatement much?" }; currentResponses = new string[] { "I wouldn't say that", "That's me", "Understatement much?" };
return "Hey there hotshot"; return "Hey there, hotshot";
} else if (GameManager.ConversationStage == 4) { } else if (GameManager.ConversationStage == 4) {
currentResponses = new string[] { "Give her one of Simon's patented bear hugs", "What's the matter?", "try not to notice"}; currentResponses = new string[] { "Give her one of Simon's patented bear hugs", "What's the matter?", "Try not to notice"};
return "*Ahava seems to be crying*"; return "*Seems to be crying*";
} }
return "Something has gone terribly wrong: The stage is: " + GameManager.ConversationStage; return "Something has gone terribly wrong: The stage is: " + GameManager.ConversationStage;
...@@ -53,13 +53,13 @@ public class AhavaSpeech : MonoBehaviour, Character { ...@@ -53,13 +53,13 @@ public class AhavaSpeech : MonoBehaviour, Character {
} }
public string butthurtGoodbye(){ public string butthurtGoodbye(){
currentResponses = new string[] {}; currentResponses = new string[] {};
return "Didnt want to admire my glorious beard?"; return "Didn't want to admire my glorious beard?";
} }
public string nothingMoreToSay() { public string nothingMoreToSay() {
currentResponses = new string[] {"...", "....", "....." }; currentResponses = new string[] {"...", "....", "....." };
if (Random.Range(0, 1f) < 0.5) { if (Random.Range(0, 1f) < 0.5) {
return "my beard grows tired of your chitter chatter"; return "My beard grows tired of your chitter chatter";
} else { } else {
return "Dennnnnis the mennnnnis!"; return "Dennnnnis the mennnnnis!";
} }
...@@ -107,13 +107,13 @@ public class AhavaSpeech : MonoBehaviour, Character { ...@@ -107,13 +107,13 @@ public class AhavaSpeech : MonoBehaviour, Character {
//GameManager.speechState will be the size of the queue when this dequeued //GameManager.speechState will be the size of the queue when this dequeued
//make sure to change the check integer in CharacterInteractins when changing dialogue //make sure to change the check integer in CharacterInteractins when changing dialogue
conversation.Enqueue("Since you're now one of us, what shall your stage name be?"); conversation.Enqueue("Since you're now one of us, what shall your stage name be?");
responseQueue.Enqueue(new string[] {"Thats me!"}); responseQueue.Enqueue(new string[] {"That's me!"});
conversation.Enqueue("How about we call you John Smith instead"); conversation.Enqueue("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" }); responseQueue.Enqueue(new string[] { "I love it!", "I hate it!", "I know a guy called John Smith" });
conversation.Enqueue("You can call me Baird... Ahava Baird, And i shall call you Dennnis"); 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?" }); responseQueue.Enqueue(new string[] { "Fine", "Not Dennnis!","Did you mean Dennis?" });
conversation.Enqueue("Dennnnis it is!"); conversation.Enqueue("Dennnnis it is!");
responseQueue.Enqueue(new string[] { "..." }); responseQueue.Enqueue(new string[] { "..." });
...@@ -121,23 +121,23 @@ public class AhavaSpeech : MonoBehaviour, Character { ...@@ -121,23 +121,23 @@ public class AhavaSpeech : MonoBehaviour, Character {
} }
private void conversationStage2() { private void conversationStage2() {
conversation.Enqueue("You're fitting in nicely here " + GameManager.playerName + ", you remind me of Myself when i was younger"); conversation.Enqueue("You're fitting in nicely here " + GameManager.playerName + ", you remind me of myself when I was younger");
responseQueue.Enqueue(new string[] { "great", "you were young once?", "thanks mum" }); responseQueue.Enqueue(new string[] { "Great", "You were young once?", "Thanks, mum" });
conversation.Enqueue("Back in my day, I was the talk of the circus, people came from miles around to see the luscious Baird"); conversation.Enqueue("Back in my day, I was the talk of the circus: people came from miles around to see the luscious Baird");
responseQueue.Enqueue(new string[] { "It's still pretty luscious", "What's a mile?", "It's just hair on your face..." }); responseQueue.Enqueue(new string[] { "It's still pretty luscious", "What's a mile?", "It's just hair on your face..." });
conversation.Enqueue("If you keep up the good work maybe you can become half as good as me *wink*"); conversation.Enqueue("If you keep up the good work maybe you can become half as good as me *winks*");
responseQueue.Enqueue(new string[] { "Wow, you think so?!", "Are you hitting on me?", "I think I'm gonna have to talk to my union rep" }); responseQueue.Enqueue(new string[] { "Wow, you think so?!", "Are you hitting on me?", "I think I'm gonna have to talk to my union rep" });
conversation.Enqueue("Of course, you'd need someone great to help you get there"); conversation.Enqueue("Of course, you'd need someone great to help you get there");
responseQueue.Enqueue(new string[] { "You seem pretty great *smile*", "Maybe Simon can help me?", "I'll be fine by myself" }); responseQueue.Enqueue(new string[] { "You seem pretty great *smiles*", "Maybe Simon can help me?", "I'll be fine by myself" });
conversation.Enqueue("You are growing on me, so maybe if you do some more performances I'll consider taking you under my beard"); conversation.Enqueue("You are growing on me, so maybe if you do some more performances I'll consider taking you under my beard");
responseQueue.Enqueue(new string[] { "I hope I can be as good as you!", "That sounds unhygenic", "I think I'd prefer Simon" }); responseQueue.Enqueue(new string[] { "I hope I can be as good as you!", "That sounds unhygenic", "I think I'd prefer Simon" });
conversation.Enqueue("You'd better get in there then!"); conversation.Enqueue("You'd better get in there, then!");
responseQueue.Enqueue(new string[] { "Yes mam!", "maybe...", "Yes sir!" }); responseQueue.Enqueue(new string[] { "Yes, ma'am!", "Maybe...", "Yes, sir!" });
} }
...@@ -147,14 +147,14 @@ public class AhavaSpeech : MonoBehaviour, Character { ...@@ -147,14 +147,14 @@ public class AhavaSpeech : MonoBehaviour, Character {
conversation.Enqueue("Don't you think you're getting a bit ahead of yourself?"); conversation.Enqueue("Don't you think you're getting a bit ahead of yourself?");
responseQueue.Enqueue(new string[] { "What do you mean?", "The show must go on", "The show must go on, with me to lead it." }); responseQueue.Enqueue(new string[] { "What do you mean?", "The show must go on", "The show must go on, with me to lead it." });
conversation.Enqueue("You just wouldn't want to wear out the crowd, is all, might be too much for them."); conversation.Enqueue("You just wouldn't want to wear out the crowd, is all: might be too much for them.");
responseQueue.Enqueue(new string[] { "But they love it", "I don't see why I should stop", "Don't tell me what to do Dad!" }); responseQueue.Enqueue(new string[] { "But they love it", "I don't see why I should stop", "Don't tell me what to do, dad!" });
conversation.Enqueue("I'm just saying, the crowd can only handle so much pizzazz, and I already put out more than enough."); 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" }); 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"); 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" }); responseQueue.Enqueue(new string[] { "I just wanna be friends", "I'm still confused", "*Give her the bird* The bird is the word" });
conversation.Enqueue("HMMPPPHH"); conversation.Enqueue("HMMPPPHH");
responseQueue.Enqueue(new string[] { "=(", "*Back away slowly*", "Sing 'Let it go'" }); responseQueue.Enqueue(new string[] { "=(", "*Back away slowly*", "Sing 'Let it go'" });
...@@ -164,19 +164,19 @@ public class AhavaSpeech : MonoBehaviour, Character { ...@@ -164,19 +164,19 @@ public class AhavaSpeech : MonoBehaviour, Character {
private void conversationStage4() private void conversationStage4()
{ {
conversation.Enqueue("Oh, it's you *wipes tears with beard*"); conversation.Enqueue("Oh, it's you *wipes tears with beard*");
responseQueue.Enqueue(new string[] { "What's wrong?", "would you prefer a tissue?", "What are you crying for?" }); responseQueue.Enqueue(new string[] { "What's wrong?", "Would you prefer a tissue?", "What are you crying for?" });
conversation.Enqueue("Why do you care? Congratulations on becoming the best performer I guess"); conversation.Enqueue("Why do you care? Congratulations on becoming the best performer, I guess");
responseQueue.Enqueue(new string[] { "its a Baird shave beard world out there", "I don't hate you, we're friends", "Thanks" }); responseQueue.Enqueue(new string[] { "It's a Baird shave beard world out there", "I don't hate you, we're friends", "Thanks" });
conversation.Enqueue("It's just, people used to come for miles to see my beard, and now its like they don't see me"); conversation.Enqueue("It's just... people used to come for miles to see my beard, and now its like they don't see me");
responseQueue.Enqueue(new string[] { "I think you're great!", "People still like you", "What's a mile?" }); responseQueue.Enqueue(new string[] { "I think you're great!", "People still like you", "What's a mile?" });
conversation.Enqueue("You're joking like John does, I can tell, I mean, I've never even actually performed"); conversation.Enqueue("You're joking like John does, I can tell. I mean, I've never even actually performed");
responseQueue.Enqueue(new string[] { "Well.. we only had three weeks", "But you hold the circus together", "So you just stand here all day?" }); responseQueue.Enqueue(new string[] { "Well.. we only had three weeks", "But you hold the circus together", "So you just stand here all day?" });
conversation.Enqueue("The only time I moved from this spot was when you first arrived, I don't even have a walk animation"); conversation.Enqueue("The only time I moved from this spot was when you first arrived, I don't even have a walk animation");
responseQueue.Enqueue(new string[] { "That's weird, I can't seem to stop moving", "at least you're not stuck unicycling", "You're like a beardtastic statue" }); responseQueue.Enqueue(new string[] { "That's weird, I can't seem to stop moving", "At least you're not stuck unicycling", "You're like a beardtastic statue" });
conversation.Enqueue("Can I tell you a secret?"); conversation.Enqueue("Can I tell you a secret?");
responseQueue.Enqueue(new string[] { "yes", "yes", "YES but in capitals" }); responseQueue.Enqueue(new string[] { "yes", "yes", "YES but in capitals" });
...@@ -185,7 +185,7 @@ public class AhavaSpeech : MonoBehaviour, Character { ...@@ -185,7 +185,7 @@ public class AhavaSpeech : MonoBehaviour, Character {
responseQueue.Enqueue(new string[] { "I'm sure you're still beautiful without it", "Is that what that bald patch is?", "I don't like where this is going" }); responseQueue.Enqueue(new string[] { "I'm sure you're still beautiful without it", "Is that what that bald patch is?", "I don't like where this is going" });
conversation.Enqueue("Here, take this, it's dangerous to go alone"); conversation.Enqueue("Here, take this, it's dangerous to go alone");
responseQueue.Enqueue(new string[] { "...", "this is the end?", "this really isn't necessary" }); responseQueue.Enqueue(new string[] { "...", "This is the end?", "This really isn't necessary" });
} }
......
...@@ -24,10 +24,10 @@ public class JohnSmithSpeech : MonoBehaviour, Character { ...@@ -24,10 +24,10 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
if ((int)GameManager.getLevel(getName()) == 1) { if ((int)GameManager.getLevel(getName()) == 1) {
currentResponses = new string[] { "Hi there"}; currentResponses = new string[] { "Hi there"};
return "Hello, im 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" });