Commit 508f2ecb authored by astatham's avatar astatham
Browse files

Added muffled music to intro scene, started tidying up/finishing dialogue

parent 3dfc6d4a
......@@ -1493,7 +1493,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 178d09aa2704a45b68d85008d69c7e95, type: 3}
m_Name:
m_EditorClassIdentifier:
pauseMenu: {fileID: 1586100788}
Ahava: {fileID: 0}
--- !u!4 &241155501
Transform:
m_ObjectHideFlags: 0
......@@ -1728,8 +1728,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
songs:
- {fileID: 8300000, guid: 6492c1c2b65dd475ebbe25ebcae4f780, type: 3}
- {fileID: 8300000, guid: 1e5816223313147d088f56ac191b233a, type: 3}
- {fileID: 8300000, guid: 6887ce842f38d4373b8ba3da6e8ab372, 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
GameObject:
m_ObjectHideFlags: 0
......@@ -29543,11 +29553,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!223 &1586100788 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 223530405003063200, guid: a6dd0ddad611645efbc5ef92c67041a7,
type: 2}
m_PrefabInternal: {fileID: 1532274092}
--- !u!1 &1646371379
GameObject:
m_ObjectHideFlags: 0
......
......@@ -24,7 +24,7 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
if ((int)GameManager.getLevel(getName()) == 1) {
currentResponses = new string[] { "Hi there"};
return "Hello, im John Smith";
return "Hello, I'm John Smith";
} 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" };
......
......@@ -25,7 +25,7 @@ public class PaperSpeech : MonoBehaviour, Character {
loadConversation();
currentResponses = new string[] {"Read"};
return "You encounter a well drawn piece of paper on the ground. You can use the number keys to interact";
return "You encounter a well-drawn piece of paper on the ground. You can use the number keys to interact";
}
public string GoodbyeMessage()
......@@ -49,7 +49,7 @@ public class PaperSpeech : MonoBehaviour, Character {
{
currentResponses = new string[] { };
return "WHAT ARE YOU WAITING FOR, JUST WALK TO THE RIGHT TO LEAVE THE CONVERSATION AND START " +
return "WHAT ARE YOU WAITING FOR? JUST WALK TO THE RIGHT TO LEAVE THE CONVERSATION AND START " +
" YOUR CIRCUS CAREER";
}
......@@ -89,10 +89,10 @@ public class PaperSpeech : MonoBehaviour, Character {
//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("The words on the page speak to you: CIRQUE DU SOLAME NOW HIRING, NO EXPERIENCE NECCESSARY");
responseQueue.Enqueue(new string[] { "It's better than Macdonalds."});
responseQueue.Enqueue(new string[] { "It's better than McDonald's."});
conversation.Enqueue("BE THE PERFORMER YOUR PARENTS ALWAYS HOPED YOU WOULDN'T ");
responseQueue.Enqueue(new string[] { "This is tearible", "I just wanna perform", "Actually it's what they always wanted" });
responseQueue.Enqueue(new string[] { "This is tearible", "I just wanna perform", "Actually, it's what they always wanted" });
conversation.Enqueue("WHAT ARE YOU WAITING FOR, JUST WALK TO THE RIGHT TO LEAVE THE CONVERSATION AND START " +
" YOUR CIRCUS CAREER");
......
m_EditorVersion: 2018.2.11f1
m_EditorVersion: 2018.2.12f1
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