Merge pull request #24 from nickc01/develop

Added Linux Support and more bug fixes

.gitignore

@@ -11,3 +11,4 @@ Other Projects~/WeaverCore.Game/CompilationLog.txt
 Other Projects~/WeaverCore.Game/WeaverCore.Game/CompilationLog.txt
 
 Other Projects~/WeaverCore.Game/WeaverCore Build/
+Other Projects~/WeaverCore.Game/Settings.txt

Hollow Knight/GameManager.cs

@@ -249,7 +249,7 @@ private void OnApplicationQuit()
 
     public void BeginSceneTransition(GameManager.SceneLoadInfo info)
     {
-        //info.SceneName = ModHooks.BeforeSceneLoad(info.SceneName);
+        info.SceneName = ModHooks.BeforeSceneLoad(info.SceneName);
         orig_BeginSceneTransition(info);
     }
 
@@ -1231,15 +1231,15 @@ public void SetState(GameState newState)
 
     public void LoadScene(string destScene)
     {
-        //destScene = ModHooks.BeforeSceneLoad(destScene);
+        destScene = ModHooks.BeforeSceneLoad(destScene);
         orig_LoadScene(destScene);
-        //ModHooks.OnSceneChanged(destScene);
+        ModHooks.OnSceneChanged(destScene);
     }
 
     public IEnumerator LoadSceneAdditive(string destScene)
     {
         Debug.Log("Loading " + destScene);
-        //destScene = ModHooks.BeforeSceneLoad(destScene);
+        destScene = ModHooks.BeforeSceneLoad(destScene);
         tilemapDirty = true;
         startedOnThisScene = false;
         nextSceneName = destScene;
@@ -1257,7 +1257,7 @@ public IEnumerator LoadSceneAdditive(string destScene)
         asyncOperation.allowSceneActivation = true;
         yield return asyncOperation;
         yield return UnityEngine.SceneManagement.SceneManager.UnloadSceneAsync(exitingScene);
-        //ModHooks.OnSceneChanged(destScene);
+        ModHooks.OnSceneChanged(destScene);
         RefreshTilemapInfo(destScene);
         if (IsUnloadAssetsRequired(exitingScene, destScene))
         {
@@ -2443,9 +2443,9 @@ public void LoadGame(int saveSlot, Action<bool> callback)
 
     public void ClearSaveFile(int saveSlot, Action<bool> callback)
     {
-        /*ModHooks.OnSavegameClear(saveSlot);
-		this.orig_ClearSaveFile(saveSlot, callback);
-		ModHooks.OnAfterSaveGameClear(saveSlot);*/
+        ModHooks.OnSavegameClear(saveSlot);
+		//this.orig_ClearSaveFile(saveSlot, callback);
+		ModHooks.OnAfterSaveGameClear(saveSlot);
     }
 
     /*public void GetSaveStatsForSlot(int saveSlot, Action<SaveStats> callback)

Hollow Knight/HeroPlatformStick.cs

@@ -5,9 +5,13 @@ public class HeroPlatformStick : MonoBehaviour
     private void OnCollisionEnter2D(Collision2D collision)
     {
         GameObject gameObject = collision.gameObject;
-        if (gameObject.layer == 9)
+        if (gameObject.layer == 9 || gameObject.GetComponent<HeroController>() != null)
         {
             HeroController component = gameObject.GetComponent<HeroController>();
+            if (component.cState.transitioning)
+            {
+                return;
+            }
             if (component != null)
             {
                 component.SetHeroParent(transform);
@@ -27,7 +31,7 @@ private void OnCollisionEnter2D(Collision2D collision)
     private void OnCollisionExit2D(Collision2D collision)
     {
         GameObject gameObject = collision.gameObject;
-        if (gameObject.layer == 9)
+        if (gameObject.layer == 9 || gameObject.GetComponent<HeroController>() != null)
         {
             HeroController component = gameObject.GetComponent<HeroController>();
             if (component != null)

Hollow Knight/Modding/ModHooks.cs

@@ -1129,8 +1129,78 @@ internal static float OnFocusCost()
 
             return result;
         }
-
-		/// <summary>
+
+        /// <summary>
+        ///     Called right before a scene gets loaded, can change which scene gets loaded
+        /// </summary>
+        /// <remarks>N/A</remarks>
+        internal static string BeforeSceneLoad(string sceneName)
+        {
+            //Debug.Log("BeforeSceneLoad Invoked");
+
+            if (BeforeSceneLoadHook == null)
+            {
+                return sceneName;
+            }
+
+            Delegate[] invocationList = BeforeSceneLoadHook.GetInvocationList();
+
+            foreach (Func<string, string> toInvoke in invocationList)
+            {
+                try
+                {
+                    sceneName = toInvoke.Invoke(sceneName);
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogError(ex);
+                }
+            }
+
+            return sceneName;
+        }
+
+        /// <summary>
+        ///     Called after a new Scene has been loaded
+        /// </summary>
+        /// <remarks>N/A</remarks>
+        internal static void OnSceneChanged(string targetScene)
+        {
+            Debug.Log("OnSceneChanged Invoked");
+
+            if (SceneChanged == null)
+            {
+                return;
+            }
+
+            Delegate[] invocationList = SceneChanged.GetInvocationList();
+
+            foreach (Action<string> toInvoke in invocationList)
+            {
+                try
+                {
+                    toInvoke.Invoke(targetScene);
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogError(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        ///     Called after a new Scene has been loaded
+        /// </summary>
+        /// <remarks>N/A</remarks>
+        public static event Action<string> SceneChanged;
+
+        /// <summary>
+        ///     Called right before a scene gets loaded, can change which scene gets loaded
+        /// </summary>
+        /// <remarks>N/A</remarks>
+        public static event Func<string, string> BeforeSceneLoadHook;
+
+        /// <summary>
         ///     Called whenever focus cost is calculated, allows a focus cost multiplier.
         /// </summary>
         public static event Func<float> FocusCostHook;

Hollow Knight/TextMesh Pro/TextMesh Pro/Resources/Fonts & Materials/Materials/Chinese Bold Material.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 2185737cc0508734aa7386644f6a477e, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8acfdb48cc2a635439fbd1eff244a928, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineTex:

Hollow Knight/TextMesh Pro/TextMesh Pro/Resources/Fonts & Materials/Materials/Japanese Material.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 60a836d715be9a247b83bdb65dd4382d, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8acfdb48cc2a635439fbd1eff244a928, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineTex:

Hollow Knight/TextMesh Pro/TextMesh Pro/Resources/Fonts & Materials/Materials/Korean Material.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: d2627649b701d9141a6507c7efbff250, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8acfdb48cc2a635439fbd1eff244a928, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineTex:

Hollow Knight/TextMesh Pro/TextMesh Pro/Resources/Fonts & Materials/Materials/Perpetua-SDF Material.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 774cdb224155cee4ba5fa38929c07c3b, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8acfdb48cc2a635439fbd1eff244a928, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineTex:

Hollow Knight/TextMesh Pro/TextMesh Pro/Resources/Fonts & Materials/Materials/Russian Fallback Material.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: a98fb8a1d49582841abecec09d8d5732, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8acfdb48cc2a635439fbd1eff244a928, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineTex:

Hollow Knight/TextMesh Pro/TextMesh Pro/Resources/Fonts & Materials/Materials/Russian Material.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 2edecbaeb5eabd54f8eafc52ceb07d8b, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8acfdb48cc2a635439fbd1eff244a928, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineTex:

Hollow Knight/TextMesh Pro/TextMesh Pro/Resources/Fonts & Materials/Materials/Simsun Chinese Material.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 35ad0f3b09dbc1747bb59a9c83f86243, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8acfdb48cc2a635439fbd1eff244a928, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineTex:

Hollow Knight/TextMesh Pro/TextMesh Pro/Resources/Fonts & Materials/Materials/TrajanPro-Bold Material.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 5e594fbf23cbc344982af33961eeafea, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8acfdb48cc2a635439fbd1eff244a928, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineTex:

Hollow Knight/TextMesh Pro/TextMesh Pro/Resources/Fonts & Materials/Materials/perpetua_tmpro Material.mat

@@ -32,7 +32,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: c6f692727898ca145aaa2636704815f4, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8acfdb48cc2a635439fbd1eff244a928, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineTex: