Updated libs to support Epic games ver which also improves controller…

… detection

.gitignore

@@ -495,12 +495,7 @@ FodyWeavers.xsd
 ### VisualStudio Patch ###
 # Additional files built by Visual Studio
 
-### Rogue Legacy .dll Files ###
-/lib/DS2DEngine.dll
-/lib/InputSystem.dll
-/lib/Nuclex.Input.dll
-/lib/SpriteSystem.dll
-/lib/Tweener.dll
+### Rogue Legacy Asset Files ###
 /Content/
 
 ### Inno Output ###

Folder.DotSettings.user

@@ -3,6 +3,15 @@
 	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogueLegacyArchipelago_005Clib_005CNewtonsoft_002EJson_002Edll/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogueLegacyArchipelago_005Clib_005Cwebsocket_002Dsharp_002Edll/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogueLegacyEnhanced_005Clib_005CNuclex_002EInput_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogue_0020Legacy_0020Randomizer_005Clib_005CDS2DEngine_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogue_0020Legacy_0020Randomizer_005Clib_005CFAudio_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogue_0020Legacy_0020Randomizer_005Clib_005CFNA_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogue_0020Legacy_0020Randomizer_005Clib_005CFNA3D_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogue_0020Legacy_0020Randomizer_005Clib_005CInputSystem_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogue_0020Legacy_0020Randomizer_005Clib_005Clibtheorafile_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogue_0020Legacy_0020Randomizer_005Clib_005CSDL2_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogue_0020Legacy_0020Randomizer_005Clib_005CSpriteSystem_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CPhar_005CDevelopment_005CRogue_0020Legacy_0020Randomizer_005Clib_005CTweener_002Edll/@EntryIndexedValue">True</s:Boolean>
 
 	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
   &lt;Assembly Path="C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.dll" /&gt;&#xD;

Rogue Legacy Randomizer.csproj

@@ -47,19 +47,25 @@
     <Reference Include="DS2DEngine">
       <HintPath>lib\DS2DEngine.dll</HintPath>
     </Reference>
+    <Reference Include="DS2DEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>lib\DS2DEngine.dll</HintPath>
+    </Reference>
+    <Reference Include="FNA, Version=22.3.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>lib\FNA.dll</HintPath>
+    </Reference>
     <Reference Include="Gma.System.MouseKeyHook, Version=5.6.130.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>packages\MouseKeyHook.5.6.0\lib\net40\Gma.System.MouseKeyHook.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Game" />
-    <Reference Include="Microsoft.Xna.Framework" />
-    <Reference Include="Microsoft.Xna.Framework.Graphics" />
+    <Reference Include="InputSystem, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>lib\InputSystem.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>packages\Archipelago.MultiClient.Net.3.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Nuclex.Input, Version=4.0.0.0, Culture=neutral, PublicKeyToken=889233c3085159a5">
-      <HintPath>lib\Nuclex.Input.dll</HintPath>
+    <Reference Include="SpriteSystem, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>lib\SpriteSystem.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Tweener">
@@ -68,13 +74,14 @@
     <Reference Include="InputSystem">
       <HintPath>lib\InputSystem.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Xact" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="Microsoft.Xna.Framework.Storage" />
     <Reference Include="System" />
     <Reference Include="SpriteSystem">
       <HintPath>lib\SpriteSystem.dll</HintPath>
     </Reference>
+    <Reference Include="Tweener, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>lib\Tweener.dll</HintPath>
+    </Reference>
     <Reference Include="websocket-sharp, Version=1.0.2.34775, Culture=neutral, PublicKeyToken=5660b08a1845a91e">
       <HintPath>packages\Archipelago.MultiClient.Net.3.0.1\lib\net35\websocket-sharp.dll</HintPath>
       <Private>True</Private>
@@ -307,7 +314,6 @@
     <Compile Include="RogueCastle\TextManager.cs" />
     <Compile Include="RogueCastle\ThroneRoomObj.cs" />
     <Compile Include="RogueCastle\Screens\TitleScreen.cs" />
-    <Compile Include="RogueCastle\ToggleDirectInputOptionsObj.cs" />
     <Compile Include="RogueCastle\TraitState.cs" />
     <Compile Include="RogueCastle\TutorialRoomObj.cs" />
     <Compile Include="RogueCastle\Enums\ClassType.cs" />

RogueCastle/Game.cs

@@ -1,6 +1,6 @@
 // 
 //  Rogue Legacy Randomizer - Game.cs
-//  Last Modified 2022-04-05
+//  Last Modified 2022-04-07
 // 
 //  This project is based on the modified disassembly of Rogue Legacy's engine, with permission to do so by its
 //  original creators. Therefore, the former creators' copyright notice applies to the original disassembly.
@@ -311,7 +311,7 @@ protected override void LoadContent()
                 InputManager.SetPadType(PlayerIndex.One, PadTypes.GamePad);
             }
 
-            InputManager.UseDirectInput = GameConfig.EnableDirectInput;
+            // InputManager.UseDirectInput = GameConfig.EnableDirectInput;
             GenericTexture = new Texture2D(GraphicsDevice, 1, 1);
             GenericTexture.SetData(new[]
             {

RogueCastle/LevelENV.cs

@@ -1,6 +1,6 @@
 // 
 //  Rogue Legacy Randomizer - LevelENV.cs
-//  Last Modified 2022-04-05
+//  Last Modified 2022-04-07
 // 
 //  This project is based on the modified disassembly of Rogue Legacy's engine, with permission to do so by its
 //  original creators. Therefore, the former creators' copyright notice applies to the original disassembly.
@@ -57,7 +57,7 @@ public static class LevelENV
         public const int   LevelDungeonBottomDoor               = 100;
 
         public static string  GameName      => "Rogue Legacy Randomizer";
-        public static Version TargetVersion => Version.Parse("0.8.3");
+        public static Version TargetVersion => Version.Parse("0.8.4");
         public static int     PreRelease    => 0;
         public static string  FullVersion   => $"v{TargetVersion}" + (PreRelease > 0 ? $"-pre{PreRelease}" : "");
 

RogueCastle/Screens/OptionsScreen.cs

@@ -1,6 +1,6 @@
 // 
 //  Rogue Legacy Randomizer - OptionsScreen.cs
-//  Last Modified 2022-04-05
+//  Last Modified 2022-04-07
 // 
 //  This project is based on the modified disassembly of Rogue Legacy's engine, with permission to do so by its
 //  original creators. Therefore, the former creators' copyright notice applies to the original disassembly.
@@ -69,7 +69,6 @@ public override void LoadContent()
             _quickDropObj = new QuickDropOptionsObj(this);
             _optionsArray.Add(_quickDropObj);
             _optionsArray.Add(new DeadZoneOptionsObj(this));
-            _optionsArray.Add(new ToggleDirectInputOptionsObj(this));
             _optionsArray.Add(new ChatOpacityOption(this));
             _optionsArray.Add(new ChatOption(this));
             _optionsArray.Add(new ChangeControlsOptionsObj(this));

inno/setup.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Rogue Legacy Randomizer"
-#define MyAppVersion "0.8.3"
+#define MyAppVersion "0.8.4"
 #define MyAppPublisher "Zach Parks & Cellar Door Games"
 #define MyAppURL "https://github.com/ThePhar/RogueLegacyRandomizer"
 #define MyAppExeName "Rogue Legacy Randomizer.exe"
@@ -35,18 +35,27 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "C:\Users\Phar\Development\Rogue Legacy Randomizer\bin\Debug\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Phar\Development\Rogue Legacy Randomizer\bin\Debug\Archipelago.MultiClient.Net.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Phar\Development\Rogue Legacy Randomizer\bin\Debug\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Phar\Development\Rogue Legacy Randomizer\bin\Debug\websocket-sharp.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Phar\Development\Rogue Legacy Randomizer\CustomContent\*"; DestDir: "{app}\CustomContent"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\Phar\Development\Rogue Legacy Randomizer\inno\xnafx40_redist.msi"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall
+Source: "..\bin\Debug\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\bin\Debug\Archipelago.MultiClient.Net.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\bin\Debug\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\bin\Debug\websocket-sharp.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\bin\Debug\DS2DEngine.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\bin\Debug\Gma.System.MouseKeyHook.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\lib\FAudio.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\lib\FNA.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\lib\FNA3D.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\lib\InputSystem.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\lib\SDL2.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\lib\SpriteSystem.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\lib\Tweener.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\CustomContent\*"; DestDir: "{app}\CustomContent"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "xnafx40_redist.msi"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Setup]
-SetupIconFile=C:\Users\Phar\Development\Rogue Legacy Randomizer\ico\RLE.ico
-WizardSmallImageFile=C:\Users\Phar\Development\Rogue Legacy Randomizer\inno\sirphar.bmp
-WizardImageFile=C:\Users\Phar\Development\Rogue Legacy Randomizer\inno\banner.bmp
+SetupIconFile="..\ico\RLE.ico"
+WizardSmallImageFile=sirphar.bmp
+WizardImageFile=banner.bmp
 UninstallDisplayIcon={app}\ico\RLE.ico
 
 [Icons]
@@ -56,11 +65,6 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
 [Run]
 Filename: "msiexec.exe"; Parameters: "/i ""{tmp}\xnafx40_redist.msi"" /qb"; WorkingDir: {tmp}; StatusMsg: "Installing XNA redistributable..."
 Filename: "xcopy.exe"; Parameters: "/Y /E /I ""{code:CopyDir}\Content"" ""{app}\Content"""; StatusMsg: "Copying Content files..."
-Filename: "xcopy.exe"; Parameters: "/Y ""{code:CopyDir}\DS2DEngine.dll"" ""{app}\DS2DEngine.dll*"""; StatusMsg: "Copying DSD2Engine dependancies..."
-Filename: "xcopy.exe"; Parameters: "/Y ""{code:CopyDir}\InputSystem.dll"" ""{app}\InputSystem.dll*"""; StatusMsg: "Copying InputSystem dependancies..."
-Filename: "xcopy.exe"; Parameters: "/Y ""{code:CopyDir}\Nuclex.Input.dll"" ""{app}\Nuclex.Input.dll*"""; StatusMsg: "Copying Nuclex dependancies..."
-Filename: "xcopy.exe"; Parameters: "/Y ""{code:CopyDir}\SpriteSystem.dll"" ""{app}\SpriteSystem.dll*"""; StatusMsg: "Copying SpriteSystem dependancies..."
-Filename: "xcopy.exe"; Parameters: "/Y ""{code:CopyDir}\Tweener.dll"" ""{app}\Tweener.dll*"""; StatusMsg: "Copying Tweener dependancies..."
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent; StatusMsg: "Installing Rogue Legacy Randomizer"
 Filename: "xcopy.exe"; Parameters: "/Y /E /I ""{app}\CustomContent"" ""{app}\Content"""; StatusMsg: "Overwriting content files with custom content..."