Merge pull request #10 from Icehunter/2.28-fixes

new mahapps, 2.28 fixes
FFXIVAPP · Jun 6, 2014 · 13e2173 · 13e2173
2 parents 54b478f + 020f3e7
commit 13e2173
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs b/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs
@@ -69,28 +69,28 @@ public static ActorEntity ResolveActorFromBytes(byte[] source)
                 entry.ClaimedByID = BitConverter.ToUInt32(source, 0x1A0);
                 var targetID = BitConverter.ToUInt32(source, 0x1A8);
                 var pcTargetID = BitConverter.ToUInt32(source, 0xAA8);
-                entry.Job = (Actor.Job) source[0x1830];
-                entry.Level = source[0x1831];
-                entry.GrandCompany = source[0x1833];
-                entry.GrandCompanyRank = source[0x1834];
-                entry.Title = source[0x1836];
-                entry.HPCurrent = BitConverter.ToInt32(source, 0x1838);
-                entry.HPMax = BitConverter.ToInt32(source, 0x183C);
-                entry.MPCurrent = BitConverter.ToInt32(source, 0x1840);
-                entry.MPMax = BitConverter.ToInt32(source, 0x1844);
-                entry.TPCurrent = BitConverter.ToInt16(source, 0x1848);
+                entry.Job = (Actor.Job) source[0x17C0];
+                entry.Level = source[0x17C1];
+                entry.GrandCompany = source[0x17C3];
+                entry.GrandCompanyRank = source[0x17C4];
+                entry.Title = source[0x17C6];
+                entry.HPCurrent = BitConverter.ToInt32(source, 0x17C8);
+                entry.HPMax = BitConverter.ToInt32(source, 0x17CC);
+                entry.MPCurrent = BitConverter.ToInt32(source, 0x17D0);
+                entry.MPMax = BitConverter.ToInt32(source, 0x17D4);
+                entry.TPCurrent = BitConverter.ToInt16(source, 0x17D8);
                 entry.TPMax = 1000;
-                entry.GPCurrent = BitConverter.ToInt16(source, 0x184A);
-                entry.GPMax = BitConverter.ToInt16(source, 0x184C);
-                entry.CPCurrent = BitConverter.ToInt16(source, 0x184E);
-                entry.CPMax = BitConverter.ToInt16(source, 0x1850);
+                entry.GPCurrent = BitConverter.ToInt16(source, 0x17DA);
+                entry.GPMax = BitConverter.ToInt16(source, 0x17DC);
+                entry.CPCurrent = BitConverter.ToInt16(source, 0x17DE);
+                entry.CPMax = BitConverter.ToInt16(source, 0x17E0);
                 entry.Race = source[0x2E58]; // ??
                 entry.Sex = (Actor.Sex) source[0x2E59]; //?
-                entry.IsCasting = BitConverter.ToBoolean(source, 0x3330);
-                entry.CastingID = BitConverter.ToInt16(source, 0x3334);
-                entry.CastingTargetID = BitConverter.ToUInt32(source, 0x3340);
-                entry.CastingProgress = BitConverter.ToSingle(source, 0x3364);
-                entry.CastingTime = BitConverter.ToSingle(source, 0x3368);
+                entry.IsCasting = BitConverter.ToBoolean(source, 0x32C0);
+                entry.CastingID = BitConverter.ToInt16(source, 0x32C4);
+                entry.CastingTargetID = BitConverter.ToUInt32(source, 0x32D0);
+                entry.CastingProgress = BitConverter.ToSingle(source, 0x32F4);
+                entry.CastingTime = BitConverter.ToSingle(source, 0x33D8);
                 entry.Coordinate = new Coordinate(entry.X, entry.Z, entry.Y);
                 if (targetID > 0)
                 {
@@ -118,7 +118,7 @@ public static ActorEntity ResolveActorFromBytes(byte[] source)
                 entry.StatusEntries = new List<StatusEntry>();
                 const int statusSize = 12;
                 var statusesSource = new byte[limit * statusSize];
-                Buffer.BlockCopy(source, 0x31B8, statusesSource, 0, limit * 12);
+                Buffer.BlockCopy(source, 0x3148, statusesSource, 0, limit * 12);
                 for (var i = 0; i < limit; i++)
                 {
                     var statusSource = new byte[statusSize];

diff --git a/FFXIVAPP.Client/Initializer.cs b/FFXIVAPP.Client/Initializer.cs
@@ -618,7 +618,7 @@ public static void SetSignatures()
             {
                 Key = "GAMEMAIN",
                 Value = "47616D654D61696E000000",
-                Offset = 1184
+                Offset = 1180
             });
             AppViewModel.Instance.Signatures.Add(new Signature
             {
@@ -630,19 +630,19 @@ public static void SetSignatures()
             {
                 Key = "NPCMAP",
                 Value = "3E000000????????4000000001000000000000000001000000",
-                Offset = 2548
+                Offset = 2564
             });
             AppViewModel.Instance.Signatures.Add(new Signature
             {
                 Key = "ACTORMAP",
                 Value = "3E000000????????4000000001000000000000000001000000",
-                Offset = 1164
+                Offset = 1332
             });
             AppViewModel.Instance.Signatures.Add(new Signature
             {
                 Key = "PARTYMAP",
-                Value = "0000DB0FC93FDB0F49416F1283??FFFFFFFFDB0FC93FDB0F49416F1283??00000000??0000",
-                Offset = 50
+                Value = "0000DB0FC93FDB0F49416F1283??FFFFFFFF00000000DB0FC93FDB0F49416F1283??000000",
+                Offset = 54
             });
             AppViewModel.Instance.Signatures.Add(new Signature
             {
@@ -654,7 +654,7 @@ public static void SetSignatures()
             {
                 Key = "MAP",
                 Value = "F783843E????????????????DB0FC93FDB0F49416F1283??",
-                Offset = 820
+                Offset = 1040
             });
             AppViewModel.Instance.Signatures.Add(new Signature
             {

diff --git a/distribution/FFXIVAPP.Client.exe b/distribution/FFXIVAPP.Client.exe
diff --git a/distribution/FFXIVAPP.Common.dll b/distribution/FFXIVAPP.Common.dll
diff --git a/distribution/FFXIVAPP.Updater.exe b/distribution/FFXIVAPP.Updater.exe
diff --git a/distribution/MahApps.Metro.dll b/distribution/MahApps.Metro.dll