Merge branch 'Albeoris:main' into main

SamsamTS · Sep 10, 2023 · 4e86e00 · 4e86e00
2 parents 92d0a4c + e459698
commit 4e86e00
Show file tree

Hide file tree

Showing 15 changed files with 1,087 additions and 134 deletions.
diff --git a/Assembly-CSharp/Memoria/VoiceActing/BattleVoice.cs b/Assembly-CSharp/Memoria/VoiceActing/BattleVoice.cs
diff --git a/Assembly-CSharp/NCalc/NCalcUtility.cs b/Assembly-CSharp/NCalc/NCalcUtility.cs
@@ -96,7 +96,7 @@ public static String EvaluateNCalcString(Object obj, String defaultResult = "")
             else if (name == "IsCharacterInParty" && args.Parameters.Length == 1)
             {
                 CharacterId index = (CharacterId)NCalcUtility.ConvertNCalcResult(args.Parameters[0].Evaluate(), Byte.MaxValue);
-                args.Result = index != CharacterId.NONE && FF9StateSystem.Common.FF9.party.member.Any(p => p.Index == index);
+                args.Result = index != CharacterId.NONE && FF9StateSystem.Common.FF9.party.member.Any(p => p?.Index == index);
             }
             else if (name == "GetCategoryKillCount" && args.Parameters.Length == 1)
             {

diff --git a/Assembly-CSharp/UnityXInput/Input.cs b/Assembly-CSharp/UnityXInput/Input.cs
@@ -275,41 +275,28 @@ private static Boolean GetXButtonDown(String keyName)
 
         public static Single GetAxis(String axisName)
         {
-            Single axis = UnityEngine.Input.GetAxis(axisName);
-            if ((Double)axis != 0.0)
-                return axis;
-            return Input.GetXAxis(axisName);
+            return Input.GetAxisRaw(axisName);
         }
 
         public static Single GetAxisRaw(String axisName)
         {
-            Single axisRaw = UnityEngine.Input.GetAxisRaw(axisName);
-            if ((Double)axisRaw != 0.0)
-                return axisRaw;
-            return Input.GetXAxis(axisName);
+            float axisRaw = UnityEngine.Input.GetAxisRaw(axisName);
+            axisRaw += Input.GetXAxis(axisName);
+            return Mathf.Clamp(axisRaw, -1f, 1f);
         }
 
         public static Boolean GetButtonUp(String keyName)
         {
-            Boolean buttonUp = UnityEngine.Input.GetButtonUp(keyName);
-            if (buttonUp)
-                return buttonUp;
             return Input.GetXButtonUp(keyName);
         }
 
         public static Boolean GetButtonDown(String keyName)
         {
-            Boolean buttonDown = UnityEngine.Input.GetButtonDown(keyName);
-            if (buttonDown)
-                return buttonDown;
             return Input.GetXButtonDown(keyName);
         }
 
         public static Boolean GetButton(String keyName)
         {
-            Boolean button = UnityEngine.Input.GetButton(keyName);
-            if (button)
-                return button;
             return Input.GetXButton(keyName);
         }
 

diff --git a/Memoria.MSBuild/Pack.cs b/Memoria.MSBuild/Pack.cs
@@ -62,7 +62,9 @@ public Boolean Execute()
                     PackOptionalFile("Launcher\\Memoria.Launcher.exe.config", "FF9_Launcher.exe.config", compressStream, bw, pathMap, ref uncompressedDataSize);
                     PackOptionalFile("Launcher\\Memoria.SteamFix.exe", "Memoria.SteamFix.exe", compressStream, bw, pathMap, ref uncompressedDataSize);
                     PackOptionalFile("Launcher\\Memoria.ini", "Memoria.ini", compressStream, bw, pathMap, ref uncompressedDataSize);
-
+                    PackOptionalFile("XInputDotNetPure.dll", "{PLATFORM}\\FF9_Data\\Managed\\XInputDotNetPure.dll", compressStream, bw, pathMap, ref uncompressedDataSize);
+                    PackOptionalFile("JoyShockLibrary\\x64\\JoyShockLibrary.dll", "x64\\FF9_Data\\Plugins\\JoyShockLibrary.dll", compressStream, bw, pathMap, ref uncompressedDataSize);
+                    PackOptionalFile("JoyShockLibrary\\x86\\JoyShockLibrary.dll", "x86\\FF9_Data\\Plugins\\JoyShockLibrary.dll", compressStream, bw, pathMap, ref uncompressedDataSize);
 
                     bw.Flush();
                     Int64 compressedDataSize = executableFile.Position - compressedDataPosition;