Intro Scripting - Puzzles and Camera Work

Test_CYOA/Assembly-CSharp.csproj

@@ -5,10 +5,10 @@
 	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 	<ProductVersion>10.0.20506</ProductVersion>
 	<SchemaVersion>2.0</SchemaVersion>
+	<RootNamespace></RootNamespace>
 	<ProjectGuid>{AF2B69A2-1891-9A21-A1B9-F7954609D6E3}</ProjectGuid>
 	<OutputType>Library</OutputType>
 	<AppDesignerFolder>Properties</AppDesignerFolder>
-	<RootNamespace></RootNamespace>
 	<AssemblyName>Assembly-CSharp</AssemblyName>
 	<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
 	<FileAlignment>512</FileAlignment>
@@ -19,7 +19,7 @@
 	<DebugType>full</DebugType>
 	<Optimize>false</Optimize>
 	<OutputPath>Temp\bin\Debug\</OutputPath>
-	<DefineConstants>DEBUG;TRACE;UNITY_5_1_3;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN</DefineConstants>
+	<DefineConstants>DEBUG;TRACE;UNITY_5_2_0;UNITY_5_2;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_REFLECTION_BUFFERS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN</DefineConstants>
 	<ErrorReport>prompt</ErrorReport>
 	<WarningLevel>4</WarningLevel>
 	<NoWarn>0169</NoWarn>
@@ -28,7 +28,6 @@
 	<DebugType>pdbonly</DebugType>
 	<Optimize>true</Optimize>
 	<OutputPath>Temp\bin\Release\</OutputPath>
-	<DefineConstants>TRACE</DefineConstants>
 	<ErrorReport>prompt</ErrorReport>
 	<WarningLevel>4</WarningLevel>
 	<NoWarn>0169</NoWarn>
@@ -56,8 +55,8 @@
  <Reference Include="UnityEngine.Networking">
  <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
  </Reference>
- <Reference Include="UnityEngine.Analytics">
- <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
+ <Reference Include="Mono.Cecil">
+ <HintPath>C:/Program Files/Unity/Editor/Data/Managed/Mono.Cecil.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.iOS.Extensions.Xcode">
  <HintPath>C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>

Test_CYOA/Assets/Scripts/Camera_Control.cs

@@ -43,7 +43,7 @@ public class Camera_Control : MonoBehaviour {
     public Vector3 pos4 = new Vector3(1.0f, 0f, 35.0f);
     public Vector3 pos5 = new Vector3(17.0f, 0f, 35.0f);
     public Vector3 pos6 = new Vector3(15.0f, 0f, 20.0f);
-    public Vector3 pos7 = new Vector3(-18.0f, 0f, 18.0f);
+    public Vector3 pos7 = new Vector3(-27.0f, 0f, 33.0f);
     public Vector3 pos8 = new Vector3(-20.0f, 0f, 3.0f);
     public Vector3 pos9 = new Vector3(-31.0f, 0f, 12.0f);
     public Vector3 pos10 = new Vector3(-31.0f, 0f, 0.0f);
@@ -199,39 +199,11 @@ public class Camera_Control : MonoBehaviour {
             }
         }
 
-        //Camera Angle Movement
-		float tiltAroundZ = Input.GetAxis ("Horizontal") * tiltAngle;
-
-//		if (Input.GetKeyDown(KeyCode.H))
-//		{
-//			Debug.Log ("H Pressed");
-//			Quaternion target = Quaternion.Euler (0, 0, tiltAroundZ);
-//			transform.rotation = Quaternion.Slerp(transform.rotation, target, Time.deltaTime * 2.0f);
-//		}
-//		
-
-        var camRot = Quaternion.Euler(Camera.main.transform.eulerAngles);
-
-		//mainCam.transform.rotation = cameraAngle;
-
-
-        if(Input.GetKeyDown(KeyCode.H))
-        {
-			//camAngleY = camAngleY + 90;
-
-			//mainCam.transform.rotation = Quaternion.AngleAxis(90,camRot);
-			//Debug.Log ("H button pushed");
-			//Camera.main.transform.Rotate = (Vector3.right * Time.deltaTime);
-        }
-
         //Camera Move Switch Statement
         switch (cameraPos)
         {
             case 1:
                 mainCam.transform.position = pos1;
-                rot.eulerAngles = ang1;
-                mainCam.transform.rotation = rot;
-                //mainCam;
                 break;
             case 2:
                 mainCam.transform.position = pos2;
@@ -241,23 +213,15 @@ public class Camera_Control : MonoBehaviour {
                 break;
             case 4:
                 mainCam.transform.position = pos4;
-                rot.eulerAngles = ang4;
-                transform.rotation = rot;
                 break;
             case 5:
                 mainCam.transform.position = pos5;
-                rot.eulerAngles = ang5;
-                transform.rotation = rot;
                 break;
             case 6:
                 mainCam.transform.position = pos6;
-                rot.eulerAngles = ang6;
-                transform.rotation = rot;
                 break;
             case 7:
                 mainCam.transform.position = pos7;
-                rot.eulerAngles = ang7;
-                mainCam.transform.rotation = rot;
                 break;
             case 8:
                 mainCam.transform.position = pos8;
@@ -273,8 +237,6 @@ public class Camera_Control : MonoBehaviour {
                 break;
             default:
                 mainCam.transform.position = pos1;
-                rot.eulerAngles = ang1;
-                mainCam.transform.rotation = rot;
                 break;
         }
 

Test_CYOA/Assets/Scripts/LeftyRighty.cs

@@ -4,24 +4,36 @@ using System.Collections;
 public class LeftyRighty : MonoBehaviour {
 	public Camera mainCam;
 	bool STFU;
+
+    public float yAngle = 0.0f;
+
+
 	// Use this for initialization
 	void Start () {
 		mainCam = Camera.main;
-	}
+        gameObject.transform.localEulerAngles = new Vector3(0, yAngle, 0);
+    }
 
 	// Update is called once per frame
 	void Update () {
 		if (STFU == true) {
 			mainCam.transform.Rotate(Vector3.up, Time.deltaTime, Space.World);
 		}
-		if(Input.GetKeyDown(KeyCode.H))
+		if(Input.GetKeyDown(KeyCode.RightArrow))
 		{
-			//mainCam.transform.Rotate(Vector3.up * Time.deltaTime, Space.World);
 			STFU = true;
-			gameObject.transform.localEulerAngles = new Vector3(90,0,0);
-			Debug.Log ("YOYO");
+            yAngle = yAngle + 30;
+            gameObject.transform.localEulerAngles = new Vector3(0, yAngle, 0);
+            Debug.Log ("right");
 		}
-	}
+        if (Input.GetKeyDown(KeyCode.LeftArrow))
+        {
+            STFU = true;
+            yAngle = yAngle - 30;
+            gameObject.transform.localEulerAngles = new Vector3(0, yAngle , 0);
+            Debug.Log("left");
+        }
+    }
 
 
 }

Test_CYOA/Assets/Scripts/Puzzle_231.cs

@@ -23,6 +23,7 @@ public class Puzzle_231 : MonoBehaviour {
 	// Update is called once per frame
 	void Update () {
         ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+        total = first + second + third;
 
 
         if (Physics.Raycast(ray, out hit))
@@ -33,7 +34,86 @@ public class Puzzle_231 : MonoBehaviour {
                 {
                     second = 1;
                 }
+                //Switch Statment - Correct Order
+                switch (total)
+                {
+                    case 1:
+                        if (hit.transform.name == "Switch3")
+                        {
+                            third = 1;
+                        }
+                        break;
+                    case 2:
+                        if (hit.transform.name == "Switch1")
+                        {
+                            first = 1;
+                        }
+                        break;
+                }
+
+                //Switch Statement - False Order - Double 2's
+                switch (total)
+                {
+                    case 1:
+                        if (hit.transform.name == "Switch2")
+                        {
+                            first = 0;
+                            second = 0;
+                            third = 0;
+                        }
+                        break;
+                    case 2:
+                        if (hit.transform.name == "Switch2")
+                        {
+                            first = 0;
+                            second = 0;
+                            third = 0;
+                        }
+                        break;
+                }
+                //Switch Statement - False Order - Double 3's
+                switch (total)
+                {
+                    case 2:
+                        if (hit.transform.name == "Switch3")
+                        {
+                            first = 0;
+                            second = 0;
+                            third = 0;
+                        }
+                        break;
+
+                }
+                //Switch Statement - False Order - Stray 1's
+                switch (total)
+                {
+                    case 0:
+                        if (hit.transform.name == "Switch1")
+                        {
+                            first = 0;
+                            second = 0;
+                            third = 0;
+                        }
+                        break;
+                    case 1:
+                        if (hit.transform.name == "Switch1")
+                        {
+                            first = 0;
+                            second = 0;
+                            third = 0;
+                        }
+                        break;
+                }
             }
         }
+
+        if (total == 3)
+        {
+            Debug.Log("Puzzle Complete!");
+            Destroy(button1);
+            Destroy(button2);
+            Destroy(button3);
+            Destroy(wall);
+        }
     }
 }

Test_CYOA/Library/ScriptAssemblies/BuiltinAssemblies.stamp

@@ -1,2 +1,2 @@
-0000.55d3536a.0000
-0000.55d3538a.0000
+0000.55e0ab26.0000
+0000.55e0ab44.0000

Test_CYOA/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 5.1.3f1
+m_EditorVersion: 5.2.0f3
 m_StandardAssetsVersion: 0

Test_CYOA/Test_CYOA.sln

@@ -17,7 +17,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-															GlobalSection(MonoDevelopProperties) = preSolution
+																				GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1