Updated scam to use new aI scheme

Vibrant-Media-Lab · Nov 19, 2020 · dac64c1 · dac64c1
1 parent 82a7a75
commit dac64c1
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 5 deletions.
diff --git a/OdysseyNow/Assets/ModeDirector.cs b/OdysseyNow/Assets/ModeDirector.cs
@@ -82,25 +82,26 @@ private void StartSuperCatAndMouse() {
         calibration.SetActive(false);
         var p1 = ElementSettings.FindFromNameAndTag("PlayerTarget", "Player1");
         var p2 = ElementSettings.FindFromNameAndTag("PlayerTarget", "Player2");
+        var game = AI.transform.Find("SCAM-Stonehenge").gameObject;
 
         var p1Input = (LocalInputManager.ControlScheme) System.Enum.Parse(typeof(LocalInputManager.ControlScheme),
                                                                           PlayerPrefs.GetString("P1Input"));
         var p2Input = (LocalInputManager.ControlScheme) System.Enum.Parse(typeof(LocalInputManager.ControlScheme),
                                                                           PlayerPrefs.GetString("P2Input"));
         if (p1Input == LocalInputManager.ControlScheme.AI) {
             p1.GetComponent<NavMeshAgent>().enabled = true;
-            p1.GetComponent<CatAI>().enabled = true;
-            p1.GetComponent<CatAI>().level = PlayerPrefs.GetInt("ai1");
+            game.GetComponent<CatAI>().enabled = true;
+            game.GetComponent<CatAI>().level = PlayerPrefs.GetInt("ai1");
         }
 
         if (p2Input == LocalInputManager.ControlScheme.AI) {
             p2.GetComponent<NavMeshAgent>().enabled = true;
-            p2.GetComponent<MouseAI>().enabled = true;
-            p2.GetComponent<MouseAI>().level = PlayerPrefs.GetInt("ai2");
+            game.GetComponent<MouseAI>().enabled = true;
+            game.GetComponent<MouseAI>().level = PlayerPrefs.GetInt("ai2");
         }
 
         if (p1Input == LocalInputManager.ControlScheme.AI || p2Input == LocalInputManager.ControlScheme.AI) {
-            AI.transform.Find("SCAM-Stonehenge").gameObject.SetActive(true);
+            game.SetActive(true);
             AI.SetActive(true);
         }
     }

diff --git a/OdysseyNow/Assets/Scenes/Card4.unity b/OdysseyNow/Assets/Scenes/Card4.unity
@@ -481,6 +481,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 93647768}
+  - component: {fileID: 93647770}
+  - component: {fileID: 93647769}
   m_Layer: 0
   m_Name: SCAM-Stonehenge
   m_TagString: Untagged
@@ -504,6 +506,36 @@ Transform:
   m_Father: {fileID: 511151602}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &93647769
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 93647767}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b6aa0652006149c41b9fca129b5a01d5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 2051804291}
+  mouse: {fileID: 21414805}
+  level: 0
+--- !u!114 &93647770
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 93647767}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 293ba996f8d224288996decbbd8734e0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 5755280646347381179}
+  cat: {fileID: 5755280646347381176}
+  level: 0
 --- !u!1 &102701091
 GameObject:
   m_ObjectHideFlags: 0
@@ -34394,3 +34426,9 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 5755280646347381175}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &5755280646347381179 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 621243042690390925, guid: 6335a3f5d84d6421eb04d6f447784f85,
+    type: 3}
+  m_PrefabInstance: {fileID: 5755280646347381175}
+  m_PrefabAsset: {fileID: 0}