Commit c17fbfae authored by mmaluschnig's avatar mmaluschnig
Browse files

Merge branch 'piethrowing'

* piethrowing:
  Simon's dialogue done
  Added boing to Trapeze and -5 seconds of time when hit trampoline
  Started Simon's dialogue
  Finished Tarantella, added music to Pie Throwing and Trapeze

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
#	RingMaster/RingMaster/Assets/Scenes/TrapezeTutorial.unity
parents 3f3058aa 42912c5d
......@@ -38,4 +38,148 @@ up 19.55
down 19.85
left 20.4
right 20.7
up 22.25
\ No newline at end of file
up 22.25
left 25.2
down 25.9
right 26.05
right 27.35
down 27.5
up 27.6
left 27.75
up 27.9
down 28.2
right 28.35
down 28.5
up 28.65
down 29.35
right 29.5
right 30.8
down 30.9
up 31.1
left 31.25
up 31.35
down 31.5
right 31.7
down 31.8
up 31.95
left 32.1
down 32.7
right 32.85
right 34.3
down 34.4
right 34.55
up 34.7
right 34.8
left 35.0
down 35.15
down 35.4
right 35.55
down 36.3
right 36.45
down 37.2
right 37.3
down 37.6
right 37.75
down 38.05
right 38.15
down 38.45
left 38.6
down 38.9
left 39.05
down 39.8
right 39.9
right 41.2
down 41.3
up 41.5
left 41.65
up 41.75
down 41.9
right 42.1
down 42.2
up 42.35
left 42.5
down 43.2
right 43.35
right 44.65
down 44.85
up 44.95
left 45.1
up 45.2
down 45.4
right 45.55
down 45.65
up 45.8
left 45.95
down 46.7
right 46.85
right 48.15
down 48.25
right 48.45
up 48.6
right 48.7
left 48.85
down 49.0
left 49.15
up 49.25
right 49.45
down 50.2
right 50.3
down 51.0
right 51.15
down 51.45
up 51.6
down 51.9
left 52.05
right 52.45
down 52.75
up 52.9
right 53.15
down 53.3
up 53.45
down 53.6
left 53.75
left 54.6
left 54.9
left 55.0
up 55.2
down 55.3
left 55.45
left 55.7
right 55.9
left 56.15
right 56.3
right 56.6
right 56.7
left 56.85
right 57.0
left 57.15
right 58.0
up 58.25
up 58.4
up 58.65
left 58.85
left 59.7
down 60.0
up 60.1
right 60.25
up 60.4
down 60.55
down 61.4
down 61.65
down 61.8
up 61.95
left 62.1
left 62.5
right 62.65
left 62.9
right 63.05
right 63.35
right 63.45
up 63.65
right 63.75
down 63.9
down 64.75
down 65.05
left 65.2
left 65.45
down 65.6
\ No newline at end of file
......@@ -840,7 +840,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 289d382b3061449ed9d1c4925bcd7231, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: 0.69
m_Pitch: 1
Loop: 0
Mute: 0
......
......@@ -994,7 +994,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 289d382b3061449ed9d1c4925bcd7231, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: 0.69
m_Pitch: 1
Loop: 0
Mute: 0
......
......@@ -736,6 +736,7 @@ GameObject:
m_Component:
- component: {fileID: 847592695}
- component: {fileID: 847592694}
- component: {fileID: 847592696}
m_Layer: 0
m_Name: LevelMaster
m_TagString: Untagged
......@@ -771,6 +772,101 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &847592696
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 847592693}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 0bb8a9baae64949078b0d70a928a5848, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.68
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &848583036
GameObject:
m_ObjectHideFlags: 0
......@@ -1990,6 +2086,8 @@ GameObject:
- component: {fileID: 2023603711}
- component: {fileID: 2023603710}
- component: {fileID: 2023603709}
- component: {fileID: 2023603712}
- component: {fileID: 2023603713}
m_Layer: 0
m_Name: Trampoline
m_TagString: Untagged
......@@ -2049,6 +2147,126 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &2023603712
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2023603708}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0.6}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3, y: 0.1}
m_EdgeRadius: 0
--- !u!82 &2023603713
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2023603708}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 3ae896e9e52674372bec157939579d91, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &2061639490
GameObject:
m_ObjectHideFlags: 0
......
......@@ -22,44 +22,44 @@ public class SimonSpeech : MonoBehaviour, Character {
loadConversation();
if ((int)GameManager.getLevel(getName()) == 1) {
currentResponses = new string[] { "Wow a bear" };
return "(happy) grr";
currentResponses = new string[] { "Wow, a bear!" };
return "(happy) Grr";
} else if ((int)GameManager.getLevel(getName()) == 2) {
currentResponses = new string[] { "stage 2 greeting response" };
return "stage 2 (hello) grr";
currentResponses = new string[] { "Can I get my fez now?" };
return "Grr! (Hello again! Having fun?)";
} else if ((int)GameManager.getLevel(getName()) == 3) {
currentResponses = new string[] { "stage 3 greeting response" };
return "stage 3 (hello) grr";
currentResponses = new string[] { "Hi, Simon!" };
return "GrrRRR! (Welcome back, friend!)";
} else if ((int)GameManager.getLevel(getName()) == 4) {
currentResponses = new string[] { "stage 4 greeting response" };
return "stage 4 (hello) grr";
currentResponses = new string[] { "It's me again!" };
return "grrRr (It's the mighty Pie-Thrower!)";
}
return "Something has gone terribly wrong: The stage is: " + GameManager.ConversationStage;
}
public string GoodbyeMessage(){
currentResponses = new string[] { };
return "(relieved) grr";
return "(relieved) Grr";
}
public string ProximityMessage(){
currentResponses = new string[] { };
return "(thoughtful) grr";
return "(thoughtful) Grr?";
}
public string butthurtGoodbye(){
currentResponses = new string[] { };
return "(angry) GRR";
return "(angry) GRR!";
}
public string nothingMoreToSay() {
currentResponses = new string[] { };
if (Random.Range(0, 1f) < 0.8) {
return "grr?";
return "Grr?";
} else {
return "*cough cough* ... umm ... GRR";
return "*cough cough* ... Umm ... GRR";
}
}
......@@ -97,42 +97,90 @@ public class SimonSpeech : MonoBehaviour, Character {
private void conversationStage1() {
if (GameManager.HasTalkedToAhava) {
conversation.Enqueue("grR");
responseQueue.Enqueue(new string[] { "GRR", "..." });
conversation.Enqueue("grR (It's great to have some new blood in the circus!)");
responseQueue.Enqueue(new string[] { "GRR", "...", "Come again?" });
conversation.Enqueue("GrR");
responseQueue.Enqueue(new string[] { "GRR", "umm" });
conversation.Enqueue("grrR (We haven't had anyone new join in ages! Most people seem to run away when they see me...)");
responseQueue.Enqueue(new string[] { "GRR", "Umm", "I don't speak Bear" });
conversation.Enqueue("gRR");
responseQueue.Enqueue(new string[] { "GRR", "you sound funny" });
conversation.Enqueue("GrR (My name is Anton Grrkov, but people around here call me Simon for some reason)");
responseQueue.Enqueue(new string[] { "GRR", "You sound funny", "I like your fez" });
conversation.Enqueue("GRr");
responseQueue.Enqueue(new string[] { "GRR", "sorta, non bearish" });
conversation.Enqueue("GRr (But yes! It's great to have you in our circus now!)");
responseQueue.Enqueue(new string[] { "GRR", "Sorta... non-bearish", "Will I get a fez too?" });
conversation.Enqueue("GRR");
responseQueue.Enqueue(new string[] { "GRR", "..." });
conversation.Enqueue("GRR (Have you heard of monocycles? They've got one wheel like my unicycle, except you sit INSIDE the wheel!)");
responseQueue.Enqueue(new string[] { "GRR", "...", "Do you have fezes in colours other than red?" });
conversation.Enqueue("grr");
responseQueue.Enqueue(new string[] { "GRR", "..." });
conversation.Enqueue("Grr (Feel free to come talk to me any time! I've always got time for new friends)");
responseQueue.Enqueue(new string[] { "GRR", "...", "I think a green fez would really suit me" });
} else {
conversation.Enqueue("grr (you should talk to the BEARded lady over there)");
responseQueue.Enqueue(new string[] { "okay" });
conversation.Enqueue("grr (You should talk to the BEARded lady over there)");
responseQueue.Enqueue(new string[] { "Okay" });
}
}
private void conversationStage2() {
conversation.Enqueue("grr (in stage 2)");
responseQueue.Enqueue(new string[] { "stage 2 grr?" });
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" });
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" });
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" });
conversation.Enqueue("grr (Is that your real hair?)");
responseQueue.Enqueue(new string[] { "grrRRRr", "Doesn't it look real?", "I'm all natural, promise!" });
conversation.Enqueue("grRR (No offense meant! It's just that I've seen many a wig like your 'do)");
responseQueue.Enqueue(new string[] { "Grrgrr", "It's okay, I get it a lot", "It's a nightmare to comb" });
conversation.Enqueue("grr... (I like you, I feel like I could really start opening up to you!)");
responseQueue.Enqueue(new string[] { "grrr", "You're really cool too!", "You're the nicest bear I've ever met" });
}
private void conversationStage3() {
conversation.Enqueue("Stage 3 conversation grr");
responseQueue.Enqueue(new string[] { "Stage 3 response 1", "stage 3 resposne 2" });
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" });
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?" });
conversation.Enqueue("gRr... (I'm much happier here, though! Even if I did have to leave my celebrity status behind)");
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" });
}
private void conversationStage4() {
conversation.Enqueue("Stage 4 conversation grr");
responseQueue.Enqueue(new string[] { "Stage 4 response 1", "stage 4 resposne 2" });
conversation.Enqueue("Grr! (Have you talked to Ahava lately?)");
responseQueue.Enqueue(new string[] { "Grr?", "Yeah, she doesn't seem herself", "No, why?" });
conversation.Enqueue("Grrgrr (You seem to be taking a bit of her limelight)");
responseQueue.Enqueue(new string[] { "GRrR", "I didn't mean to...", "Mmm...lime..." });
conversation.Enqueue("gRrRRR (Maybe you should talk to her about it some time)");
responseQueue.Enqueue(new string[] { "Grr!", "I suppose I should", "What if I don't want to?" });
conversation.Enqueue("gRR (But I'm just a bear, what do I know?)");
responseQueue.Enqueue(new string[] { "Grrr...", "More than 'just a bear'!", "Wait, you're a bear?" });
conversation.Enqueue("Grr! (I can't even speak!)");
responseQueue.Enqueue(new string[] { "Grrrr", "But I'm talking to you!", "I knew there was something odd about you" });
conversation.Enqueue("gRRrRR (Everything I've been saying has been in your head!)");
responseQueue.Enqueue(new string[] { "GRR!", "In my head, you say?", "That explains a lot" });
conversation.Enqueue("GrrrrR (The only way this could be weirder is if I was just some pixels roughly in the shape of a bear)");
responseQueue.Enqueue(new string[] { "Umm...grr?", "That's just silly", "Now that you say that..." });
}
public string[] getResponses() {
......@@ -146,13 +194,13 @@ public class SimonSpeech : MonoBehaviour, Character {
conversation.Enqueue("*confused grr* (Who are you? Where is our pie thrower?)");
responseQueue.Enqueue(new string[] { "okay" });
conversation.Enqueue("GRr (well its too late now, looks like youll have to be our pie thrower tonight)");
conversation.Enqueue("GRr (Well it's too late now, looks like you'll have to be our pie thrower tonight)");