final cutscene and where's that ant cutscene added

Banashek · Aug 25, 2014 · 83fb97d · 83fb97d
1 parent ac2ecd1
commit 83fb97d
Show file tree

Hide file tree

Showing 47 changed files with 174 additions and 22 deletions.
diff --git a/Ant-MBA-csharp.sln b/Ant-MBA-csharp.sln
@@ -23,7 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																							GlobalSection(MonoDevelopProperties) = preSolution
+																																											GlobalSection(MonoDevelopProperties) = preSolution
 =======
 																			GlobalSection(MonoDevelopProperties) = preSolution
 >>>>>>> sideScrollAnimation

diff --git a/Ant-MBA.sln b/Ant-MBA.sln
@@ -23,7 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																						GlobalSection(MonoDevelopProperties) = preSolution
+																																										GlobalSection(MonoDevelopProperties) = preSolution
 =======
 																			GlobalSection(MonoDevelopProperties) = preSolution
 >>>>>>> sideScrollAnimation

diff --git a/Ant-MBA.userprefs b/Ant-MBA.userprefs
@@ -1,17 +1,6 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/keyboard/keyboard.cs">
-    <Files>
-      <File FileName="Assets/Scripts/keyboard/key.cs" Line="20" Column="53" />
-      <File FileName="Assets/Scripts/Cutscenes/Dialogue_controller.cs" Line="1" Column="1" />
-      <File FileName="Assets/Scripts/Cutscenes/Chat_text.cs" Line="1" Column="1" />
-      <File FileName="Assets/Scripts/Cutscenes/Cutscene_Controller.cs" Line="14" Column="34" />
-      <File FileName="Assets/Scripts/Cutscenes/Enter_Printer.cs" Line="1" Column="1" />
-      <File FileName="Assets/Scripts/Cutscenes/Behold_Printer.cs" Line="1" Column="1" />
-      <File FileName="Assets/Scripts/Hallway/Top_down_ant_controller.cs" Line="14" Column="3" />
-      <File FileName="Assets/Scripts/keyboard/keyboard.cs" Line="10" Column="57" />
-    </Files>
-  </MonoDevelop.Ide.Workbench>
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
+  <MonoDevelop.Ide.Workbench />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
   </MonoDevelop.Ide.DebuggingService.Breakpoints>

diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj
@@ -51,6 +51,7 @@
      <Compile Include="Assets\Scripts\Cutscenes\Cutscene_Controller.cs" />
      <Compile Include="Assets\Scripts\Cutscenes\Dialogue_controller.cs" />
      <Compile Include="Assets\Scripts\Cutscenes\Enter_Printer.cs" />
+     <Compile Include="Assets\Scripts\Cutscenes\Switch_Backgrounds.cs" />
      <Compile Include="Assets\Scripts\Hallway\Foot_Stomp_Controller.cs" />
      <Compile Include="Assets\Scripts\Hallway\Top_down_ant_controller.cs" />
      <Compile Include="Assets\Scripts\Hallway\foot_controller.cs" />
@@ -59,6 +60,7 @@
      <Compile Include="Assets\Scripts\RingScript.cs" />
      <Compile Include="Assets\Scripts\SideScrollerController.cs" />
      <Compile Include="Assets\Scripts\SideScrollerPlayerCameraFollow.cs" />
+     <Compile Include="Assets\Scripts\keyboard\Ant_Name.cs" />
      <Compile Include="Assets\Scripts\keyboard\key.cs" />
      <Compile Include="Assets\Scripts\keyboard\keyboard.cs" />
      <Compile Include="Assets\Scripts\title\StartScript.cs" />

diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -51,6 +51,7 @@
      <Compile Include="Assets\Scripts\Cutscenes\Cutscene_Controller.cs" />
      <Compile Include="Assets\Scripts\Cutscenes\Dialogue_controller.cs" />
      <Compile Include="Assets\Scripts\Cutscenes\Enter_Printer.cs" />
+     <Compile Include="Assets\Scripts\Cutscenes\Switch_Backgrounds.cs" />
      <Compile Include="Assets\Scripts\Hallway\Foot_Stomp_Controller.cs" />
      <Compile Include="Assets\Scripts\Hallway\Top_down_ant_controller.cs" />
      <Compile Include="Assets\Scripts\Hallway\foot_controller.cs" />
@@ -59,6 +60,7 @@
      <Compile Include="Assets\Scripts\RingScript.cs" />
      <Compile Include="Assets\Scripts\SideScrollerController.cs" />
      <Compile Include="Assets\Scripts\SideScrollerPlayerCameraFollow.cs" />
+     <Compile Include="Assets\Scripts\keyboard\Ant_Name.cs" />
      <Compile Include="Assets\Scripts\keyboard\key.cs" />
      <Compile Include="Assets\Scripts\keyboard\keyboard.cs" />
      <Compile Include="Assets\Scripts\title\StartScript.cs" />

diff --git a/Assets/Prefabs/Cutscenes/cutscene controller.prefab b/Assets/Prefabs/Cutscenes/cutscene controller.prefab
diff --git a/Assets/Prefabs/Cutscenes/cutscene controller.prefab.meta b/Assets/Prefabs/Cutscenes/cutscene controller.prefab.meta
diff --git a/Assets/Prefabs/name.prefab b/Assets/Prefabs/name.prefab
diff --git a/Assets/Prefabs/name.prefab.meta b/Assets/Prefabs/name.prefab.meta
diff --git a/Assets/Scenes/Post Typing Cutscene.unity b/Assets/Scenes/Post Typing Cutscene.unity
diff --git a/Assets/Scenes/Typing.unity b/Assets/Scenes/Typing.unity
diff --git a/Assets/Scenes/Wheres That Ant.unity b/Assets/Scenes/Wheres That Ant.unity
diff --git a/Assets/Scenes/Wheres That Ant.unity.meta b/Assets/Scenes/Wheres That Ant.unity.meta
diff --git a/Assets/Scenes/closing.unity b/Assets/Scenes/closing.unity
diff --git a/Assets/Scenes/closing.unity.meta b/Assets/Scenes/closing.unity.meta
diff --git a/Assets/Scripts/Cutscenes/Chat_text.cs b/Assets/Scripts/Cutscenes/Chat_text.cs
@@ -103,6 +103,61 @@ public class Chat_text : MonoBehaviour {
 											"\"wait\":1," +
 											"\"say\":\"I've got to get that back!\"" +
 										"}," +
+									"]," +
+								"\"dialogue4\":" +
+									"[" +
+										"{" +
+											"\"person\":\"Illiterate Bill\"," +
+											"\"wait\":0," +
+											"\"say\":\"Where the hell is that ant?!\"" +
+										"}" +
+									"]," +
+								"\"dialogue5\":" +
+									"[" +
+										"{" +
+											"\"person\":\"Susan R. Bumpershoot\"," +
+											"\"wait\":1," +
+											"\"say\":\"Ah, there you are.\"" +
+										"}," +
+										"{" +
+											"\"person\":\"Susan R. Bumpershoot\"," +
+											"\"wait\":0," +
+											"\"say\":\"I’m very impressed with your work, Ant. You’ve gone above and beyond in your duties, and it shows.\"" +
+										"}," +
+										"{" +
+											"\"person\":\"Susan R. Bumpershoot\"," +
+											"\"wait\":0," +
+											"\"say\":\"Keep up this hustle and one day you will find your way to the tip top of this company.\"" +
+										"}," +
+										"{" +
+											"\"person\":\"Susan R. Bumpershoot\"," +
+											"\"wait\":0," +
+											"\"say\":\"You can be the long-awaited proof that ants and people can work together to create harmonious business synergy.\"" +
+										"}," +
+										"{" +
+											"\"person\":\"Susan R. Bumpershoot\"," +
+											"\"wait\":0," +
+											"\"say\":\"Think about it, ant.\"" +
+										"}," +
+										"{" +
+											"\"person\":\"Susan R. Bumpershoot\"," +
+											"\"wait\":0," +
+											"\"say\":\"Once people finally accept you and your kind into our businesses, you’ll find that you’re mere steps away from being accepted into our hearts.\"" +
+										"}," +
+										"{" +
+											"\"person\":\"Susan R. Bumpershoot\"," +
+											"\"wait\":0," +
+											"\"say\":\"I believe in you.\"" +
+										"}" +
+
+									"]," +
+								"\"dialogue6\":" +
+									"[" +
+										"{" +
+										"\"person\":\"Illiterate Bill\"," +
+										"\"wait\":1," +
+										"\"say\":\"Dude, the printer's still totally broken.\"" +
+										"}" +
 									"]" +
 								"}";
 
@@ -111,9 +166,5 @@ public class Chat_text : MonoBehaviour {
 	void Awake () {
 		chat_node = JSON.Parse (chat_json);
 	}
-
-	// Update is called once per frame
-	void Update () {
-
-	}
+
 }
diff --git a/Assets/Scripts/Cutscenes/Cutscene_Controller.cs b/Assets/Scripts/Cutscenes/Cutscene_Controller.cs
@@ -14,6 +14,11 @@ public class Cutscene_Controller : MonoBehaviour {
 				Application.LoadLevel("Typing");
 			else if (scene==1)
 				Application.LoadLevel("hallway");
+			else if (scene==2)
+				Application.LoadLevel("hallway 2");
+			else if (scene==3)
+				Debug.Log ("Cut to credits");
+				//Application.LoadLevel("credits");
 		}
 	}
 }
diff --git a/Assets/Scripts/Cutscenes/Dialogue_controller.cs b/Assets/Scripts/Cutscenes/Dialogue_controller.cs
@@ -81,7 +81,7 @@ public class Dialogue_controller : MonoBehaviour {
 		//get json data
 		//chat_text = GetComponent<Chat_text>();
 		chat_node = chat_text.chat_node;
-		Debug.Log ("chat_node: " + chat_node);
+		//Debug.Log ("chat_node: " + chat_node);
 		//set text location within chat bubble
 		Camera camera = GameObject.FindGameObjectWithTag ("MainCamera").GetComponent<Camera> ();
 		Vector3 mod_pos = transform.position;

diff --git a/Assets/Scripts/Cutscenes/Switch_Backgrounds.cs b/Assets/Scripts/Cutscenes/Switch_Backgrounds.cs
@@ -0,0 +1,21 @@
+using UnityEngine;
+using System.Collections;
+
+public class Switch_Backgrounds : MonoBehaviour {
+	public Sprite new_background;
+	private GameObject bill_dialogue_closing;
+	private bool swap;
+
+	void Awake(){
+		bill_dialogue_closing = GameObject.Find ("bill_dialogue_controller");
+	}
+	// Update is called once per frame
+	void Update () {
+		if (GameObject.FindGameObjectsWithTag("dialogue").Length<=1 && !swap){
+			GetComponent<SpriteRenderer>().sprite = new_background;
+			bill_dialogue_closing.GetComponent<Chat_text>().enabled = true;
+			bill_dialogue_closing.GetComponent<Dialogue_controller>().enabled = true;
+			swap = true;
+		}
+	}
+}
diff --git a/Assets/Scripts/Cutscenes/Switch_Backgrounds.cs.meta b/Assets/Scripts/Cutscenes/Switch_Backgrounds.cs.meta
diff --git a/Assets/Scripts/RingScript.cs b/Assets/Scripts/RingScript.cs
@@ -5,7 +5,7 @@ public class RingScript : MonoBehaviour {
 	void OnCollisionEnter2D (Collision2D coll)	{
 		if (coll.gameObject.name == "stupidant") {
 			Debug.Log("Player touched ring");
-			Application.LoadLevel("hallway 2");
+			Application.LoadLevel("Wheres That Ant");
 		}
 	}
 }
diff --git a/Assets/Scripts/keyboard/Ant_Name.cs b/Assets/Scripts/keyboard/Ant_Name.cs
@@ -0,0 +1,27 @@
+using UnityEngine;
+using System.Collections;
+
+public class Ant_Name : MonoBehaviour {
+	public string name;
+	public int[] cutscenes = new int[3];
+	public Vector3 display_location;
+	public GUIStyle style;
+	private Camera camera;
+	// Use this for initialization
+	void Start () {
+		DontDestroyOnLoad (gameObject);
+	}
+
+	void Update(){
+		foreach (int scene_number in cutscenes) {
+			if(Application.loadedLevel == scene_number){
+				camera = GameObject.FindGameObjectWithTag ("MainCamera").GetComponent<Camera> ();
+				Debug.Log("Yeah butty");
+				Vector3 screen_coords = camera.WorldToScreenPoint(display_location);
+				Debug.Log("display_location: "+display_location);
+				Debug.Log("screen_coords: "+screen_coords);
+				GUI.Label(new Rect(screen_coords.x,screen_coords.y,300,1000),name,style);
+			}
+		}
+	}
+}
diff --git a/Assets/Scripts/keyboard/Ant_Name.cs.meta b/Assets/Scripts/keyboard/Ant_Name.cs.meta
diff --git a/Assets/Scripts/keyboard/keyboard.cs b/Assets/Scripts/keyboard/keyboard.cs
@@ -9,15 +9,25 @@ public class keyboard : MonoBehaviour {
 	public float offset = 1f;
 	private Vector3 display_position = new Vector3 (0, -2.6f, 0);
 	private Camera camera;
+	private Ant_Name name_object;
 
 
 	void Awake(){
 		camera = GameObject.FindGameObjectWithTag ("MainCamera").GetComponent<Camera>();
+		name_object = GameObject.FindGameObjectWithTag ("name").GetComponent<Ant_Name> ();
 	}
 
 	void OnGUI(){
 		Vector3 display_screen_coords = camera.WorldToScreenPoint (display_position);
 		Debug.Log ("Keys entered: " + keys_entered + "\noffset: " + offset);
 		GUI.Label (new Rect(display_screen_coords.x-(offset*keys_entered),display_screen_coords.y,1000,150),name,style);
 	}
+
+	void Update(){
+		if(name.Length>4){
+			name_object.name = name.Substring(0,4);
+		}else{
+			name_object.name=name.Substring(0,name.Length-1); //accounts for the trailing '_'
+		}
+	}
 }
diff --git a/Library/CurrentLayout.dwlt b/Library/CurrentLayout.dwlt
diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt
diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
diff --git a/Library/expandedItems b/Library/expandedItems
diff --git a/Library/guidmapper b/Library/guidmapper
diff --git a/Library/metadata/04/041524c6be3f84e579e7be29c5ebf844 b/Library/metadata/04/041524c6be3f84e579e7be29c5ebf844
diff --git a/Library/metadata/0b/0baa9a85cd8474bc9be5864a1b058d51 b/Library/metadata/0b/0baa9a85cd8474bc9be5864a1b058d51
diff --git a/Library/metadata/12/12bdbe532f4834c60a363dbcdda1215c b/Library/metadata/12/12bdbe532f4834c60a363dbcdda1215c
diff --git a/Library/metadata/1a/1aef5ffdc88f741f4809cd7f62e561e3 b/Library/metadata/1a/1aef5ffdc88f741f4809cd7f62e561e3
diff --git a/Library/metadata/23/23604a43152a74bfea6929f66941d375 b/Library/metadata/23/23604a43152a74bfea6929f66941d375
diff --git a/Library/metadata/70/70e5af68747984848bd31d06c3b52c6c b/Library/metadata/70/70e5af68747984848bd31d06c3b52c6c
diff --git a/Library/metadata/7f/7f172111c59fe4067a41767cd2420532 b/Library/metadata/7f/7f172111c59fe4067a41767cd2420532
diff --git a/Library/metadata/9f/9f33238d51ed7479cb584d64e4d2d6ff b/Library/metadata/9f/9f33238d51ed7479cb584d64e4d2d6ff
diff --git a/Library/metadata/be/bede2748a0f06416794153df008584ef b/Library/metadata/be/bede2748a0f06416794153df008584ef
diff --git a/Library/metadata/c0/c034d799361084ba1816adaf4b1d1d5a b/Library/metadata/c0/c034d799361084ba1816adaf4b1d1d5a
diff --git a/Library/metadata/f2/f2e8d3f520a9f4df3be4523fceea90a3 b/Library/metadata/f2/f2e8d3f520a9f4df3be4523fceea90a3
diff --git a/Library/metadata/f4/f41c9b2b701484324983328c828fb455 b/Library/metadata/f4/f41c9b2b701484324983328c828fb455
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
diff --git a/ant_script.rtf b/ant_script.rtf
@@ -70,4 +70,17 @@
 \ls1\ilvl0\cf0 {\listtext	\uc0\u8259 	}\{\{Hallway scene back\}\}\
 {\listtext	\uc0\u8259 	}\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\'97\
 {\listtext	\uc0\u8259 	}\{\{ending scene\}\}\
+{\listtext	\uc0\u8259 	}Susan:\
+\pard\tx940\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1440\fi-1440\pardirnatural
+\ls1\ilvl1\cf0 {\listtext	\uc0\u8259 	}Ah, there you are.\
+{\listtext	\uc0\u8259 	}I\'92m very impressed with your work, Ant. You\'92ve gone above and beyond in your duties, and it shows.\
+{\listtext	\uc0\u8259 	}Keep up this hustle and one day you will find your way to the tip top of this company.\
+{\listtext	\uc0\u8259 	}You can be the long-awaited proof that ants and people can work together to create harmonious business synergy.\
+{\listtext	\uc0\u8259 	}Think about it, ant.\
+{\listtext	\uc0\u8259 	}Once people finally accept you and your kind into our businesses, you\'92ll find that you\'92re mere steps away from being accepted into our hearts.\
+{\listtext	\uc0\u8259 	}I believe in you.\
+\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural
+\ls1\ilvl0\cf0 {\listtext	\uc0\u8259 	}Bill:\
+\pard\tx940\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1440\fi-1440\pardirnatural
+\ls1\ilvl1\cf0 {\listtext	\uc0\u8259 	}Dude, the printer\'92s still broken.\
 }