Merge ktanemodkit from upstream

.gitignore

@@ -19,7 +19,6 @@ ExportedObj/
 *.mdb
 .idea*
 
-
 # Unity3D generated meta files
 *.pidb.meta
 

Assets/Editor/Scripts/AssetBundler.cs

@@ -235,7 +235,13 @@ void CompileAssemblyWithEditor()
             .Select(path => "Assets/Plugins/Managed/" + Path.GetFileNameWithoutExtension(path))
             .ToList();
 
+<<<<<<< HEAD
         managedReferences.Add("Library/UnityAssemblies/UnityEngine");
+=======
+        string unityAssembliesLocation = EditorApplication.applicationPath.Replace("Unity.exe", "Data/Managed/");
+
+        managedReferences.Add(unityAssembliesLocation + "UnityEngine");
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
 
         //Next we need to grab some type references and use reflection to build things the way Unity does.
         //Note that EditorUtility.CompileCSharp will do *almost* exactly the same thing, but it unfortunately

Assets/Editor/Scripts/Workshop/WorkshopEditorWindow.cs

@@ -103,7 +103,11 @@ protected void OnGUI()
 
             if (dir.Exists)
             {
+<<<<<<< HEAD
                 FileInfo[] files = dir.GetFiles();
+=======
+                FileInfo[] files = dir.GetFiles("*.*", SearchOption.AllDirectories);
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
                 long totalSize = 0;
                 foreach (var file in files)
                 {

Assets/Editor/Scripts/Workshop/WorkshopItemEditor.cs

@@ -6,7 +6,11 @@
 [CustomEditor(typeof(WorkshopItem))]
 public class WorkshopItemEditor : Editor
 {
+<<<<<<< HEAD
     private static string[] tags = { "Module", "Setup Room", "Gameplay Room", "Audio", "Bomb Casing", "Other" };
+=======
+    private static string[] tags = { "Regular Module", "Needy Module", "Missions", "Setup Room", "Gameplay Room", "Audio", "Bomb Casing", "Widget", "Other" };
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
 
     public override void OnInspectorGUI()
     {

Assets/Examples/1.1 Module/ExampleModule.cs

@@ -5,10 +5,19 @@ public class ExampleModule : MonoBehaviour
     public KMSelectable[] buttons;
 
     int correctIndex;
+<<<<<<< HEAD
+=======
+    bool isActivated = false;
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
 
     void Start()
     {
         Init();
+<<<<<<< HEAD
+=======
+
+        GetComponent<KMBombModule>().OnActivate += ActivateModule;
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
     }
 
     void Init()
@@ -26,6 +35,7 @@ void Init()
         }
     }
 
+<<<<<<< HEAD
     void OnPress(bool correctButton)
     {
         Debug.Log("Pressed " + correctButton + " button");
@@ -36,6 +46,33 @@ void OnPress(bool correctButton)
         else
         {
             GetComponent<KMBombModule>().HandleStrike();
+=======
+    void ActivateModule()
+    {
+        isActivated = true;
+    }
+
+    void OnPress(bool correctButton)
+    {
+        GetComponent<KMAudio>().PlayGameSoundAtTransform(KMSoundOverride.SoundEffect.ButtonPress, transform);
+
+        if (!isActivated)
+        {
+            Debug.Log("Pressed button before module has been activated!");
+            GetComponent<KMBombModule>().HandleStrike();
+        }
+        else
+        {
+            Debug.Log("Pressed " + correctButton + " button");
+            if (correctButton)
+            {
+                GetComponent<KMBombModule>().HandlePass();
+            }
+            else
+            {
+                GetComponent<KMBombModule>().HandleStrike();
+            }
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
         }
     }
 }

Assets/Examples/1.1 Module/ExampleModule.prefab

@@ -695,7 +695,11 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 100008}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+<<<<<<< HEAD
   m_LocalPosition: {x: 0, y: 0, z: 0}
+=======
+  m_LocalPosition: {x: 0.004, y: 0, z: 0}
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
@@ -711,7 +715,11 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 100018}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+<<<<<<< HEAD
   m_LocalPosition: {x: 0, y: 0, z: 0}
+=======
+  m_LocalPosition: {x: 0.004, y: 0, z: 0}
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
@@ -740,7 +748,11 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 100024}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+<<<<<<< HEAD
   m_LocalPosition: {x: 0, y: 0, z: 0}
+=======
+  m_LocalPosition: {x: 0.004, y: 0, z: 0}
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
@@ -769,7 +781,11 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 100032}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+<<<<<<< HEAD
   m_LocalPosition: {x: 0, y: 0, z: 0}
+=======
+  m_LocalPosition: {x: 0.004, y: 0, z: 0}
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children:
@@ -1126,7 +1142,11 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 194656}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+<<<<<<< HEAD
   m_LocalPosition: {x: -0.004, y: 0, z: 0}
+=======
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
@@ -1139,7 +1159,11 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 194658}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+<<<<<<< HEAD
   m_LocalPosition: {x: -0.004, y: 0, z: 0}
+=======
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
@@ -2104,7 +2128,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ModuleType: exampleModule1
+<<<<<<< HEAD
   ModuleDisplayName: 
+=======
+  ModuleDisplayName: Example Module 1
+  RequiresTimerVisibility: 0
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
 --- !u!114 &11448482
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Examples/1.10 NeedyModule/ExampleNeedyModule.cs

@@ -6,8 +6,11 @@ public class ExampleNeedyModule : MonoBehaviour
     public KMSelectable SolveButton;
     public KMSelectable AddTimeButton;
 
+<<<<<<< HEAD
     float timeRemaining;
 
+=======
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
     void Awake()
     {
         GetComponent<KMNeedyModule>().OnNeedyActivation += OnNeedyActivation;
@@ -47,8 +50,11 @@ protected bool AddTime()
             GetComponent<KMNeedyModule>().SetNeedyTimeRemaining(time + 5f);
         }
 
+<<<<<<< HEAD
 		GetComponent<KMNeedyModule>().HandleStrike();
 
+=======
+>>>>>>> 269498d64dd5143303ee2574f4f1ec320083d6f7
         return false;
     }
 }

Assets/Examples/1.11 Missions/TableOfContents.asset

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -434690030, guid: 45b809be76fd7a3468b6f517bced6f28, type: 3}
+  m_Name: TableOfContents
+  m_EditorClassIdentifier: 
+  Title: Example Mod Missions
+  Sections:
+  - Title: Very Easy
+    MissionIDs:
+    - example_mission_1
+    - example_mission_2
+  - Title: Mission w/ Mods
+    MissionIDs:
+    - example_mission_3

Assets/Examples/1.11 Missions/example_mission_1.asset

@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -548183353, guid: 45b809be76fd7a3468b6f517bced6f28, type: 3}
+  m_Name: example_mission_1
+  m_EditorClassIdentifier: 
+  DisplayName: Very Easy Mission
+  Description: This mission is very easy.
+  GeneratorSetting:
+    TimeLimit: 300
+    NumStrikes: 3
+    TimeBeforeNeedyActivation: 90
+    ComponentPools:
+    - Count: 1
+      AllowedSources: 2
+      ComponentTypes: 02000000
+      SpecialComponentType: 0
+      ModTypes: []
+    - Count: 1
+      AllowedSources: 2
+      ComponentTypes: 04000000
+      SpecialComponentType: 0
+      ModTypes: []
+    - Count: 1
+      AllowedSources: 2
+      ComponentTypes: 03000000
+      SpecialComponentType: 0
+      ModTypes: []
+  PacingEventsEnabled: 0

Assets/Examples/1.11 Missions/example_mission_2.asset

@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -548183353, guid: 45b809be76fd7a3468b6f517bced6f28, type: 3}
+  m_Name: example_mission_2
+  m_EditorClassIdentifier: 
+  DisplayName: Slightly More Difficult
+  Description: This mission has a shorter time limit, a needy module, and can select
+    from any solvable module in the base game.
+  GeneratorSetting:
+    TimeLimit: 240
+    NumStrikes: 1
+    TimeBeforeNeedyActivation: 5
+    ComponentPools:
+    - Count: 5
+      AllowedSources: 1
+      ComponentTypes: 
+      SpecialComponentType: 1
+      ModTypes: []
+    - Count: 2
+      AllowedSources: 2
+      ComponentTypes: 0d000000
+      SpecialComponentType: 0
+      ModTypes: []
+  PacingEventsEnabled: 1