Skip to content

Commit b484abf

Browse files
distrohelenadistrohelena
committed
Commit didnt go
1 parent f9bbe58 commit b484abf

File tree

10 files changed

+82
-17
lines changed

10 files changed

+82
-17
lines changed

‎Master/Games/games/Borderlands.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Game.ExecutableContext = [ // need to add these or it might conflict with Tales
3030
"binkw32.dll"
3131
];
3232

33-
Game.SymlinkExe = true;
33+
Game.SymlinkExe = false;
3434
Game.SupportsKeyboard = true;
3535
Game.ExecutableName = "borderlands.exe";
3636
Game.SteamID = "8980";

‎Master/Games/games/Borderlands2.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Game.Options = [
2626
"saveid3")
2727
];
2828

29-
Game.SymlinkExe = true;
29+
Game.SymlinkExe = false;
3030
Game.SupportsKeyboard = true;
3131
Game.ExecutableName = "borderlands2.exe";
3232
Game.SteamID = "49520";

‎Master/Games/games/BorderlandsPreSequel.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Game.Options = [
2626
"saveid3")
2727
];
2828

29-
Game.SymlinkExe = true;
29+
Game.SymlinkExe = false;
3030
Game.SupportsKeyboard = true;
3131
Game.ExecutableName = "borderlandspresequel.exe";
3232
Game.SteamID = "261640";

‎Master/NucleusCoopTool/New/MainForm.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,8 @@ private void btn_Play_Click(object sender, EventArgs e)
291291
{
292292
handler = null;
293293
}
294+
295+
this.WindowState = FormWindowState.Minimized;
294296
}
295297

296298
private void SetBtnToPlay()

‎Master/NucleusGaming/Coop/Generic/GenericGameHandler.cs‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@ public void End()
5151
hasEnded = true;
5252
GameManager.Instance.ExecuteBackup(this.userGame.Game);
5353

54+
string backupDir = GameManager.Instance.GetBackupFolder(this.userGame.Game);
55+
56+
// delete symlink folder
57+
for (int i = 0; i < profile.PlayerCount; i++)
58+
{
59+
string linkFolder = Path.Combine(backupDir, "Instance" + i);
60+
if (Directory.Exists(linkFolder))
61+
{
62+
Directory.Delete(linkFolder);
63+
}
64+
}
65+
5466
if (Ended != null)
5567
{
5668
Ended();
@@ -241,7 +253,6 @@ public string Play()
241253
File.Copy(userGame.ExePath, exePath, true);
242254
}
243255

244-
245256
// some games have save files inside their game folder, so we need to access them inside the loop
246257
this.data[Folder.GameFolder.ToString()] = linkFolder;
247258

@@ -263,9 +274,7 @@ public string Play()
263274
}
264275

265276
string startArgs = context.StartArguments;
266-
267277
byte[] xdata = null;
268-
269278
if (context.SupportsKeyboard && i == ((KeyboardPlayer)profile.Options["KeyboardPlayer"]).Value)
270279
{
271280
// TODO: need to make an xinput that answers to no gamepad?
@@ -294,12 +303,36 @@ public string Play()
294303
}
295304
gamePadId++;
296305
}
297-
298306
using (Stream str = File.OpenWrite(Path.Combine(linkBin, "xinput1_3.dll")))
299307
{
300308
str.Write(xdata, 0, xdata.Length);
301309
}
302310

311+
// new x360ce
312+
//using (Stream str = File.OpenWrite(Path.Combine(linkBin, "xinput1_3.dll")))
313+
//{
314+
// byte[] xdata = Properties.Resources.xinput1_3_x86;
315+
// str.Write(xdata, 0, xdata.Length);
316+
//}
317+
//string x360ceini = Path.Combine(linkBin, "x360ce.ini");
318+
//using (Stream str = File.OpenWrite(x360ceini))
319+
//{
320+
// byte[] xdata = Properties.Resources.x360ce;
321+
// str.Write(xdata, 0, xdata.Length);
322+
//}
323+
//IniFile x360ce = new IniFile(x360ceini);
324+
//if (context.SupportsKeyboard && i == ((KeyboardPlayer)profile.Options["KeyboardPlayer"]).Value)
325+
//{
326+
// // TODO: need to make an xinput that answers to no gamepad?
327+
// x360ce.IniWriteValue("Gamepad", "PassThroughIndex", "4");
328+
// player.IsKeyboardPlayer = true;
329+
//}
330+
//else
331+
//{
332+
// x360ce.IniWriteValue("Gamepad", "PassThroughIndex", (gamePadId + 1).ToString());
333+
// gamePadId++;
334+
//}
335+
303336
Process proc;
304337
if (context.NeedsSteamEmulation)
305338
{

‎Master/NucleusGaming/Nucleus.Gaming.csproj‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,12 @@
187187
<Compile Include="New\Utils\ScreenUtil.cs" />
188188
<Compile Include="Player\PlayerInfo.cs" />
189189
<Compile Include="Properties\AssemblyInfo.cs" />
190+
<Compile Include="Coop\Generic\ProcessData.cs" />
190191
<Compile Include="Properties\Resources.Designer.cs">
191192
<AutoGen>True</AutoGen>
192193
<DesignTime>True</DesignTime>
193194
<DependentUpon>Resources.resx</DependentUpon>
194195
</Compile>
195-
<Compile Include="Coop\Generic\ProcessData.cs" />
196196
<Compile Include="Util\CmdUtil.cs" />
197197
<Compile Include="Util\FileUtil.cs" />
198198
<Compile Include="Util\FormUtil.cs" />
@@ -231,6 +231,7 @@
231231
<ItemGroup>
232232
<None Include="GamingKey.snk" />
233233
<None Include="packages.config" />
234+
<None Include="Resources\x360ce.ini" />
234235
</ItemGroup>
235236
<ItemGroup>
236237
<Folder Include="User\" />
@@ -248,6 +249,15 @@
248249
<None Include="Resources\SmartSteamEmu.zip" />
249250
<None Include="Resources\vertical.png" />
250251
</ItemGroup>
252+
<ItemGroup>
253+
<ProjectReference Include="..\ThirdParty\WindowScrape\WindowScrape.csproj">
254+
<Project>{d9716550-921d-44e8-a289-c297950db1f7}</Project>
255+
<Name>WindowScrape</Name>
256+
</ProjectReference>
257+
</ItemGroup>
258+
<ItemGroup>
259+
<None Include="Resources\xinput1_3.dll" />
260+
</ItemGroup>
251261
<ItemGroup>
252262
<None Include="Resources\xinput1.dll" />
253263
</ItemGroup>
@@ -260,12 +270,6 @@
260270
<ItemGroup>
261271
<None Include="Resources\xinput4.dll" />
262272
</ItemGroup>
263-
<ItemGroup>
264-
<ProjectReference Include="..\ThirdParty\WindowScrape\WindowScrape.csproj">
265-
<Project>{d9716550-921d-44e8-a289-c297950db1f7}</Project>
266-
<Name>WindowScrape</Name>
267-
</ProjectReference>
268-
</ItemGroup>
269273
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
270274
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
271275
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎Master/NucleusGaming/Properties/Resources.Designer.cs‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Master/NucleusGaming/Properties/Resources.resx‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,15 @@
130130
<data name="_4players" type="System.Resources.ResXFileRef, System.Windows.Forms">
131131
<value>..\Resources\4players.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
132132
</data>
133+
<data name="SmartSteamEmu" type="System.Resources.ResXFileRef, System.Windows.Forms">
134+
<value>..\Resources\SmartSteamEmu.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
135+
</data>
136+
<data name="xinput1_3_x86" type="System.Resources.ResXFileRef, System.Windows.Forms">
137+
<value>..\Resources\xinput1_3.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
138+
</data>
139+
<data name="x360ce" type="System.Resources.ResXFileRef, System.Windows.Forms">
140+
<value>..\Resources\x360ce.ini;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
141+
</data>
133142
<data name="xinput1" type="System.Resources.ResXFileRef, System.Windows.Forms">
134143
<value>..\Resources\xinput1.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
135144
</data>
@@ -142,7 +151,4 @@
142151
<data name="xinput4" type="System.Resources.ResXFileRef, System.Windows.Forms">
143152
<value>..\Resources\xinput4.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
144153
</data>
145-
<data name="SmartSteamEmu" type="System.Resources.ResXFileRef, System.Windows.Forms">
146-
<value>..\Resources\SmartSteamEmu.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
147-
</data>
148154
</root>

‎Master/NucleusGaming/Resources/x360ce.ini‎

840 Bytes
Binary file not shown.

‎Master/NucleusGaming/Resources/xinput1_3.dll‎

124 KB
Binary file not shown.

0 commit comments

Comments
 (0)