Skip to content

Commit 98ca72a

Browse files
author
CapitaineToinon
committed
Renamed solution and added PTDE Loaded
- From WPF.Gadgetlemage to Gadgetlemage - Loaded now works for PTDE
1 parent b58fe79 commit 98ca72a

23 files changed

+75
-58
lines changed

‎WPF.Gadgetlemage.sln‎ renamed to ‎Gadgetlemage.sln‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.28307.438
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF.Gadgetlemage", "WPF.Gadgetlemage\WPF.Gadgetlemage.csproj", "{E1892EF2-6542-4B25-B706-A9E016636DC6}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gadgetlemage", "Gadgetlemage\Gadgetlemage.csproj", "{E1892EF2-6542-4B25-B706-A9E016636DC6}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|Any CPU = Debug|Any CPU
1110
Debug|x64 = Debug|x64
12-
Release|Any CPU = Release|Any CPU
1311
Release|x64 = Release|x64
1412
EndGlobalSection
1513
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{E1892EF2-6542-4B25-B706-A9E016636DC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{E1892EF2-6542-4B25-B706-A9E016636DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
1814
{E1892EF2-6542-4B25-B706-A9E016636DC6}.Debug|x64.ActiveCfg = Debug|x64
1915
{E1892EF2-6542-4B25-B706-A9E016636DC6}.Debug|x64.Build.0 = Debug|x64
20-
{E1892EF2-6542-4B25-B706-A9E016636DC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
21-
{E1892EF2-6542-4B25-B706-A9E016636DC6}.Release|Any CPU.Build.0 = Release|Any CPU
2216
{E1892EF2-6542-4B25-B706-A9E016636DC6}.Release|x64.ActiveCfg = Release|x64
2317
{E1892EF2-6542-4B25-B706-A9E016636DC6}.Release|x64.Build.0 = Release|x64
2418
EndGlobalSection

‎WPF.Gadgetlemage/App.config‎ renamed to ‎Gadgetlemage/App.config‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<configuration>
33
<configSections>
44
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="WPF.Gadgetlemage.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
5+
<section name="Gadgetlemage.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
66
</sectionGroup>
77
</configSections>
88
<startup>
99
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
1010
</startup>
1111
<userSettings>
12-
<WPF.Gadgetlemage.Properties.Settings>
12+
<Gadgetlemage.Properties.Settings>
1313
<setting name="HotkeyCreate" serializeAs="String">
1414
<value>27</value>
1515
</setting>
@@ -25,6 +25,9 @@
2525
<setting name="Auto" serializeAs="String">
2626
<value>False</value>
2727
</setting>
28-
</WPF.Gadgetlemage.Properties.Settings>
28+
<setting name="SelectedIndex" serializeAs="String">
29+
<value>0</value>
30+
</setting>
31+
</Gadgetlemage.Properties.Settings>
2932
</userSettings>
3033
</configuration>

‎WPF.Gadgetlemage/App.xaml‎ renamed to ‎Gadgetlemage/App.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Application x:Class="WPF.Gadgetlemage.App"
1+
<Application x:Class="Gadgetlemage.App"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:local="clr-namespace:WPF.Gadgetlemage"
4+
xmlns:local="clr-namespace:Gadgetlemage"
55
StartupUri="MainWindow.xaml">
66
<Application.Resources>
77

‎WPF.Gadgetlemage/App.xaml.cs‎ renamed to ‎Gadgetlemage/App.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Windows;
22

3-
namespace WPF.Gadgetlemage
3+
namespace Gadgetlemage
44
{
55
/// <summary>
66
/// Logique d'interaction pour App.xaml

‎WPF.Gadgetlemage/Assembly.cs‎ renamed to ‎Gadgetlemage/Assembly.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using System.Text.RegularExpressions;
44

5-
namespace WPF.Gadgetlemage
5+
namespace Gadgetlemage
66
{
77
public static class Assembly
88
{

‎WPF.Gadgetlemage/DarkSoulsHook.cs‎ renamed to ‎Gadgetlemage/DarkSoulsHook.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Collections.Generic;
44
using System.Diagnostics;
55

6-
namespace WPF.Gadgetlemage
6+
namespace Gadgetlemage
77
{
88
public enum Version
99
{
@@ -40,9 +40,11 @@ public class DarkSoulsHook : PHook
4040
private const string PTDEBasePtrAOB = "8B 0D ? ? ? ? 8B 7E 1C 8B 49 08 8B 46 20";
4141
private const string PTDEInventoryDataAOB = "A1 ? ? ? ? 53 55 8B 6C 24 10 56 8B 70 08 32 DB 85 F6";
4242
private const string PTDEFlagsAOB = "56 8B F1 8B 46 1C 50 A1 ? ? ? ? 32 C9";
43+
private const string PTDEChrFollowCamAOB = "8B 15 ? ? ? ? F3 0F 10 44 24 30 52 E8 ? ? ? ? 8B 06 8B 50 2C 8B CE FF D2";
4344
private PHPointer PTDEBasePtr;
4445
private PHPointer PTDEInventoryData;
4546
private PHPointer PTDEFlags;
47+
private PHPointer PTDEChrFollowCam;
4648
private uint PTDEInventoryIndexStart = 0x1B8;
4749
private uint PTDEFuncItemGetPtr = 0xC0B6DA;
4850

@@ -105,7 +107,7 @@ public bool Loaded
105107
{
106108
return (Version == Version.DarkSoulsRemastered)
107109
? (RemasterChrFollowCam.Resolve() != IntPtr.Zero)
108-
: true;
110+
: (PTDEChrFollowCam.Resolve() != IntPtr.Zero);
109111
}
110112
}
111113

@@ -132,6 +134,7 @@ public DarkSoulsHook() : base(_refreshInterval, _minLifetime, processSelector)
132134
PTDEBasePtr = RegisterAbsoluteAOB(PTDEBasePtrAOB, 2);
133135
PTDEInventoryData = RegisterAbsoluteAOB(PTDEInventoryDataAOB, 1);
134136
PTDEFlags = RegisterAbsoluteAOB(PTDEFlagsAOB, 8, 0, 0);
137+
PTDEChrFollowCam = RegisterAbsoluteAOB(PTDEChrFollowCamAOB, 2, 0x4, 0x0);
135138

136139
// Remastered Pointers
137140
RemasterBasePtr = RegisterRelativeAOB(RemasterBasePtrAOB, 3, 7);

‎WPF.Gadgetlemage/Flags.cs‎ renamed to ‎Gadgetlemage/Flags.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22

3-
namespace WPF.Gadgetlemage
3+
namespace Gadgetlemage
44
{
55
/// <summary>
66
/// Flags magic

‎WPF.Gadgetlemage/WPF.Gadgetlemage.csproj‎ renamed to ‎Gadgetlemage/Gadgetlemage.csproj‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{E1892EF2-6542-4B25-B706-A9E016636DC6}</ProjectGuid>
88
<OutputType>WinExe</OutputType>
9-
<RootNamespace>WPF.Gadgetlemage</RootNamespace>
10-
<AssemblyName>WPF.Gadgetlemage</AssemblyName>
9+
<RootNamespace>Gadgetlemage</RootNamespace>
10+
<AssemblyName>Gadgetlemage</AssemblyName>
1111
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -56,6 +56,9 @@
5656
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5757
<Prefer32Bit>true</Prefer32Bit>
5858
</PropertyGroup>
59+
<PropertyGroup>
60+
<ApplicationIcon>icon.ico</ApplicationIcon>
61+
</PropertyGroup>
5962
<ItemGroup>
6063
<Reference Include="LowLevelHooking, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
6164
<HintPath>..\packages\LowLevelHooking.1.0.1\lib\net20\LowLevelHooking.dll</HintPath>
@@ -65,6 +68,7 @@
6568
</Reference>
6669
<Reference Include="System" />
6770
<Reference Include="System.Data" />
71+
<Reference Include="System.Drawing" />
6872
<Reference Include="System.Xml" />
6973
<Reference Include="Microsoft.CSharp" />
7074
<Reference Include="System.Core" />
@@ -88,6 +92,11 @@
8892
<Compile Include="Flags.cs" />
8993
<Compile Include="Hotkey.cs" />
9094
<Compile Include="InventoryItem.cs" />
95+
<Compile Include="Properties\Resources.Designer.cs">
96+
<AutoGen>True</AutoGen>
97+
<DesignTime>True</DesignTime>
98+
<DependentUpon>Resources.resx</DependentUpon>
99+
</Compile>
91100
<Compile Include="User32.cs" />
92101
<Compile Include="Weapon.cs" />
93102
<Page Include="MainWindow.xaml">
@@ -107,11 +116,6 @@
107116
<Compile Include="Properties\AssemblyInfo.cs">
108117
<SubType>Code</SubType>
109118
</Compile>
110-
<Compile Include="Properties\Resources.Designer.cs">
111-
<AutoGen>True</AutoGen>
112-
<DesignTime>True</DesignTime>
113-
<DependentUpon>Resources.resx</DependentUpon>
114-
</Compile>
115119
<Compile Include="Properties\Settings.Designer.cs">
116120
<AutoGen>True</AutoGen>
117121
<DependentUpon>Settings.settings</DependentUpon>
@@ -135,10 +139,11 @@
135139
</None>
136140
</ItemGroup>
137141
<ItemGroup>
138-
<Resource Include="Ressources\PTDE.txt" />
142+
<Resource Include="icon.ico" />
139143
</ItemGroup>
140144
<ItemGroup>
141-
<Resource Include="Ressources\REMASTERED.txt" />
145+
<Resource Include="Resources\PTDE.txt" />
146+
<Resource Include="Resources\REMASTERED.txt" />
142147
</ItemGroup>
143148
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
144149
</Project>

‎WPF.Gadgetlemage/Hotkey.cs‎ renamed to ‎Gadgetlemage/Hotkey.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Windows.Input;
88
using LowLevelHooking;
99

10-
namespace WPF.Gadgetlemage
10+
namespace Gadgetlemage
1111
{
1212
public class Hotkey
1313
{

‎WPF.Gadgetlemage/InventoryItem.cs‎ renamed to ‎Gadgetlemage/InventoryItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace WPF.Gadgetlemage
3+
namespace Gadgetlemage
44
{
55
public struct InventoryItem
66
{

0 commit comments

Comments
 (0)