2.5 updates

FFXIVAPP · Jan 23, 2015 · 2ba9596 · 2ba9596
1 parent 07f94cd
commit 2ba9596
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/FFXIVAPP.Client/Initializer.cs b/FFXIVAPP.Client/Initializer.cs
@@ -612,8 +612,8 @@ public static void SetSignatures()
             AppViewModel.Instance.Signatures.Add(new Signature
             {
                 Key = "CHARMAP",
-                Value = "403F00000000000000000000000000000000????0000????000000000000??000000????????DB0FC93FDB0F49416F12833A",
-                Offset = 326
+                Value = "FFFFFFFF????????DB0FC93FDB0F49416F12833A00000000????????DB0FC93FDB0F49416F12833A00000000",
+                Offset = 44
             });
             AppViewModel.Instance.Signatures.Add(new Signature
             {
@@ -630,8 +630,8 @@ public static void SetSignatures()
             AppViewModel.Instance.Signatures.Add(new Signature
             {
                 Key = "PARTYMAP",
-                Value = "DB0F49416F1283??FFFFFFFF0000000000000000DB0FC93FDB0F49416F1283??00",
-                Offset = 52
+                Value = "DB0F49416F12833A0000000000000000000000000000000000000000000000000000000000000000????????DB0FC93F",
+                Offset = 92
             });
             AppViewModel.Instance.Signatures.Add(new Signature
             {
@@ -642,20 +642,20 @@ public static void SetSignatures()
             AppViewModel.Instance.Signatures.Add(new Signature
             {
                 Key = "MAP",
-                Value = "F783843E????????????????FFFFFFFFDB0FC93FDB0F49416F12833A",
-                Offset = 896
+                Value = "F783843E????????????????FFFFFFFF????????DB0FC93FDB0F49416F12833A",
+                Offset = 820
             });
             AppViewModel.Instance.Signatures.Add(new Signature
             {
                 Key = "TARGET",
-                Value = "DB0FC93FDB0F49416F1283????FFFFFFDB0FC940920A063F",
-                Offset = 172
+                Value = "403F00000000000000000000000000000000????0000????000000000000??000000????????DB0FC93FDB0F49416F12833A",
+                Offset = 218
             });
             AppViewModel.Instance.Signatures.Add(new Signature
             {
                 Key = "INVENTORY",
-                Value = "DB0FC93FDB0F49416F1283??FFFFFFFF00000000??00??00??00??00??00??00??00????DB0FC93FDB0F49416F12833AFFFFFFFF",
-                Offset = 56
+                Value = "DB0FC93FDB0F49416F1283??FFFFFFFF00000000??00??00??00??00??????00??00????0000????????????DB0FC93FDB0F49416F12833A",
+                Offset = 60
             });
         }
 

diff --git a/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs b/FFXIVAPP.Client/Memory/PlayerInfoWorker.cs
@@ -119,8 +119,8 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e)
                         }
                         try
                         {
-                            var enmityCount = MemoryHandler.Instance.GetInt16(MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] + 5688);
-                            var enmityStructure = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] + 3380;
+                            var enmityCount = MemoryHandler.Instance.GetInt16(MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] - 116032); // + 5688
+                            var enmityStructure = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] - 118340; // + 3380
                             var enmityEntries = new List<EnmityEntry>();
                             if (enmityCount > 0 && enmityCount < 32 && enmityStructure > 0)
                             {
@@ -129,9 +129,9 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e)
                                     var address = enmityStructure + (i * 72);
                                     var enmityEntry = new EnmityEntry
                                     {
-                                        Name = MemoryHandler.Instance.GetString(address),
-                                        ID = (uint) MemoryHandler.Instance.GetInt32(address + 64),
-                                        Enmity = (uint) MemoryHandler.Instance.GetInt16(address + 68)
+                                        ID = (uint) MemoryHandler.Instance.GetInt32(address),
+                                        Name = MemoryHandler.Instance.GetString(address + 4),
+                                        Enmity = (uint)MemoryHandler.Instance.GetInt16(address + 72)
                                     };
                                     if (enmityEntry.ID > 0)
                                     {
@@ -179,7 +179,7 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e)
                     {
                         try
                         {
-                            PlayerInfoMap = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] + 5724;
+                            PlayerInfoMap = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] - 115996; // + 5724;
                             MemoryHandler.Instance.SigScanner.Locations.Add("PLAYERINFO", PlayerInfoMap);
                         }
                         catch (Exception ex)

diff --git a/FFXIVAPP.Client/Memory/TargetWorker.cs b/FFXIVAPP.Client/Memory/TargetWorker.cs
@@ -113,7 +113,7 @@ private void ScanTimerElapsed(object sender, ElapsedEventArgs e)
                     {
                         try
                         {
-                            var targetHateStructure = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] + 1136;
+                            var targetHateStructure = MemoryHandler.Instance.SigScanner.Locations["CHARMAP"] - 120584;// + 1136;
                             var enmityEntries = new List<EnmityEntry>();
                             var targetEntity = new TargetEntity();
                             if (MemoryHandler.Instance.SigScanner.Locations.ContainsKey("TARGET"))

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.IPluginInterface.dll b/distribution/FFXIVAPP.IPluginInterface.dll
diff --git a/distribution/FFXIVAPP.Localization.dll b/distribution/FFXIVAPP.Localization.dll
diff --git a/distribution/FFXIVAPP.Updater.exe b/distribution/FFXIVAPP.Updater.exe