ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into interface

Browse source
This commit is contained in:
meli 2019-12-21 08:59:18 -08:00
commit 4b43630805
5 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Dalamud.cs
View file

@ -427,12 +427,14 @@ namespace Dalamud {
}); });
} }
#if DEBUG
private void OnDebugZoneDownInjectCommand(string command, string arguments) { private void OnDebugZoneDownInjectCommand(string command, string arguments) {
var data = File.ReadAllBytes(arguments); var data = File.ReadAllBytes(arguments);
Framework.Network.InjectZoneProtoPacket(data); Framework.Network.InjectZoneProtoPacket(data);
Framework.Gui.Chat.Print($"{arguments} OK with {data.Length} bytes"); Framework.Gui.Chat.Print($"{arguments} OK with {data.Length} bytes");
} }
#endif
private void OnRouletteBonusNotifyCommand(string command, string arguments) private void OnRouletteBonusNotifyCommand(string command, string arguments)
{ {

8
Dalamud/Dalamud.csproj
View file

@ -14,9 +14,9 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Feature"> <PropertyGroup Label="Feature">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyVersion>4.1.0.8</AssemblyVersion> <AssemblyVersion>4.3.0.0</AssemblyVersion>
<Version>4.1.0.8</Version> <Version>4.3.0.0</Version>
<FileVersion>4.1.0.8</FileVersion> <FileVersion>4.3.0.0</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Label="Resources"> <ItemGroup Label="Resources">
<None Include="$(SolutionDir)/Resources/**/*" CopyToOutputDirectory="PreserveNewest" Visible="false" /> <None Include="$(SolutionDir)/Resources/**/*" CopyToOutputDirectory="PreserveNewest" Visible="false" />
@ -41,7 +41,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Discord.Net" Version="2.1.0" /> <PackageReference Include="Discord.Net" Version="2.1.0" />
<PackageReference Include="EasyHook" Version="2.7.6270" /> <PackageReference Include="EasyHook" Version="2.7.7097" />
<PackageReference Include="Google.Cloud.Translation.V2" Version="1.1.0" /> <PackageReference Include="Google.Cloud.Translation.V2" Version="1.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="PropertyChanged.Fody" Version="2.6.1" /> <PackageReference Include="PropertyChanged.Fody" Version="2.6.1" />

2
Dalamud/Game/ClientState/ClientStateAddressResolver.cs
View file

@ -15,7 +15,7 @@ namespace Dalamud.Game.ClientState
protected override void Setup64Bit(SigScanner sig) { protected override void Setup64Bit(SigScanner sig) {
ActorTable = sig.Module.BaseAddress + 0x1BFBA38; ActorTable = sig.Module.BaseAddress + 0x1BFBA38;
LocalContentId = sig.Module.BaseAddress + 0x1C2E000; LocalContentId = sig.Module.BaseAddress + 0x1C2E000;
JobGaugeData = sig.Module.BaseAddress + 0x1BF8110; JobGaugeData = sig.Module.BaseAddress + 0x1C00110;
} }
} }
} }

12
Dalamud/Game/Internal/Gui/IconReplacer.cs
View file

@ -35,13 +35,13 @@ namespace Dalamud.Game.Internal.Gui {
this.Address = new IconReplacerAddressResolver(); this.Address = new IconReplacerAddressResolver();
this.Address.Setup(scanner); this.Address.Setup(scanner);
this.byteBase = scanner.Module.BaseAddress; this.byteBase = scanner.Module.BaseAddress;
//this.comboTimer = byteBase + 0x1BB0B50; this.comboTimer = byteBase + 0x1BB8B50;
this.comboTimer = scanner.ScanText("E8 ?? ?? ?? ?? 80 7E 21 00") + 0x178; //this.comboTimer = scanner.ScanText("E8 ?? ?? ?? ?? 80 7E 21 00") + 0x178;
this.lastComboMove = this.comboTimer + 0x4; this.lastComboMove = this.comboTimer + 0x4;
//this.playerLevel = byteBase + 0x1C28FA8 + 0x78; this.playerLevel = byteBase + 0x1C30FA8 + 0x78;
this.playerLevel = scanner.ScanText("E8 ?? ?? ?? ?? 88 45 EF") + 0x4D; //this.playerLevel = scanner.ScanText("E8 ?? ?? ?? ?? 88 45 EF") + 0x4D;
CustomIDs = new HashSet<uint>(); CustomIDs = new HashSet<uint>();
VanillaIDs = new HashSet<uint>(); VanillaIDs = new HashSet<uint>();
@ -849,7 +849,7 @@ namespace Dalamud.Game.Internal.Gui {
private unsafe delegate int* getArray(long* address); private unsafe delegate int* getArray(long* address);
private unsafe IntPtr FindBuffAddress() { private unsafe IntPtr FindBuffAddress() {
IntPtr randomAddress = byteBase + 0x1BFFBE0; IntPtr randomAddress = byteBase + 0x1C07BE0;
IntPtr num = Marshal.ReadIntPtr(randomAddress); IntPtr num = Marshal.ReadIntPtr(randomAddress);
IntPtr step2 = (IntPtr)(Marshal.ReadInt64(num) + 0x248); IntPtr step2 = (IntPtr)(Marshal.ReadInt64(num) + 0x248);
IntPtr step3 = Marshal.ReadIntPtr(step2); IntPtr step3 = Marshal.ReadIntPtr(step2);

8
Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs
View file

@ -10,11 +10,11 @@ namespace Dalamud.Game.Internal.Gui {
public IntPtr IsIconReplaceable { get; private set; } public IntPtr IsIconReplaceable { get; private set; }
protected override void Setup64Bit(SigScanner sig) { protected override void Setup64Bit(SigScanner sig) {
//this.GetIcon = sig.ScanText("48 89 5c 24 08 48 89 6c 24 10 48 89 74 24 18 57 48 83 ec 30 8b da be dd 1c 00 00 bd d3 0d 00 00"); this.GetIcon = sig.ScanText("48 89 5c 24 08 48 89 6c 24 10 48 89 74 24 18 57 48 83 ec 30 8b da be dd 1c 00 00 bd d3 0d 00 00");
this.GetIcon = sig.ScanText("E8 ?? ?? ?? ?? F6 DB 8B C8"); //this.GetIcon = sig.ScanText("E8 ?? ?? ?? ?? F6 DB 8B C8");
//this.IsIconReplaceable = sig.ScanText("81 f9 2e 01 00 00 7f 39 81 f9 2d 01 00 00 0f 8d 11 02 00 00 83 c1 eb"); this.IsIconReplaceable = sig.ScanText("81 f9 2e 01 00 00 7f 39 81 f9 2d 01 00 00 0f 8d 11 02 00 00 83 c1 eb");
this.IsIconReplaceable = sig.ScanText("81 F9 ?? ?? ?? ?? 7F 39 81 F9 ?? ?? ?? ??"); //this.IsIconReplaceable = sig.ScanText("81 F9 ?? ?? ?? ?? 7F 39 81 F9 ?? ?? ?? ??");
} }
} }
} }