Merge pull request #35 from Icehunter/2.5-fixes

2.5 fixes
FFXIVAPP · Jan 23, 2015 · 3d04861 · 3d04861
2 parents 4adf758 + 2ba9596
commit 3d04861
Show file tree

Hide file tree

Showing 95 changed files with 132 additions and 132 deletions.
diff --git a/FFXIVAPP.Client/App.cs b/FFXIVAPP.Client/App.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // App.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/App.xaml.cs b/FFXIVAPP.Client/App.xaml.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // App.xaml.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/AppBootstrapper.cs b/FFXIVAPP.Client/AppBootstrapper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // AppBootstrapper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/AppException.cs b/FFXIVAPP.Client/AppException.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // AppException.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/AppViewModel.cs b/FFXIVAPP.Client/AppViewModel.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // AppViewModel.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Constants.Application.cs b/FFXIVAPP.Client/Constants.Application.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // Constants.Application.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Constants.Client.cs b/FFXIVAPP.Client/Constants.Client.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // Constants.Client.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Constants.cs b/FFXIVAPP.Client/Constants.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // Constants.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Controls/PluginInfoBox.xaml.cs b/FFXIVAPP.Client/Controls/PluginInfoBox.xaml.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // PluginInfoBox.xaml.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Converters/NameMultiValueConverter.cs b/FFXIVAPP.Client/Converters/NameMultiValueConverter.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // NameMultiValueConverter.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Delegates/ChatLogWorkerDelegate.cs b/FFXIVAPP.Client/Delegates/ChatLogWorkerDelegate.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // ChatLogWorkerDelegate.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Delegates/MonsterWorkerDelegate.cs b/FFXIVAPP.Client/Delegates/MonsterWorkerDelegate.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // MonsterWorkerDelegate.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Delegates/NPCWorkerDelegate.cs b/FFXIVAPP.Client/Delegates/NPCWorkerDelegate.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // NPCWorkerDelegate.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Delegates/PCWorkerDelegate.cs b/FFXIVAPP.Client/Delegates/PCWorkerDelegate.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // PCWorkerDelegate.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Enums/Keys.cs b/FFXIVAPP.Client/Enums/Keys.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // Keys.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs b/FFXIVAPP.Client/Helpers/ActorEntityHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // ActorEntityHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 
@@ -65,32 +65,32 @@ public static ActorEntity ResolveActorFromBytes(byte[] source)
                 entry.ActionStatus = (Actor.ActionStatus) source[0x17C];
                 entry.IsGM = BitConverter.ToBoolean(source, 0x183); // ?
                 entry.Icon = (Actor.Icon) source[0x18C];
-                entry.Status = (Actor.Status) source[0x18E];
-                entry.ClaimedByID = BitConverter.ToUInt32(source, 0x1A0);
-                var targetID = BitConverter.ToUInt32(source, 0x1A8);
-                var pcTargetID = BitConverter.ToUInt32(source, 0xAA8);
-                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.Status = (Actor.Status) source[0x17E]; //0x18E];
+                entry.ClaimedByID = BitConverter.ToUInt32(source, 0x180); // 0x1A0);
+                var targetID = BitConverter.ToUInt32(source, 0x188); // 0x1A8);
+                var pcTargetID = BitConverter.ToUInt32(source, 0x938); // 0xAA8);
+                entry.Job = (Actor.Job) source[0x1540]; // 0x17C0];
+                entry.Level = source[0x1541]; // 0x17C1];
+                entry.GrandCompany = source[0x1543]; // 0x17C3];
+                entry.GrandCompanyRank = source[0x1544]; //0x17C4];
+                entry.Title = source[0x1546]; //0x17C6];
+                entry.HPCurrent = BitConverter.ToInt32(source, 0x1548); // 0x17C8);
+                entry.HPMax = BitConverter.ToInt32(source, 0x154C); // 0x17CC);
+                entry.MPCurrent = BitConverter.ToInt32(source, 0x1550); // 0x17D0);
+                entry.MPMax = BitConverter.ToInt32(source, 0x1554); // 0x17D4);
+                entry.TPCurrent = BitConverter.ToInt16(source, 0x1558); // 0x17D8);
                 entry.TPMax = 1000;
-                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.GPCurrent = BitConverter.ToInt16(source, 0x155A); // 0x17DA);
+                entry.GPMax = BitConverter.ToInt16(source, 0x155C); // 0x17DC);
+                entry.CPCurrent = BitConverter.ToInt16(source, 0x155E); // 0x17DE);
+                entry.CPMax = BitConverter.ToInt16(source, 0x1560); // 0x17E0);
                 entry.Race = source[0x2808]; // ??
                 entry.Sex = (Actor.Sex) source[0x2809]; //?
-                entry.IsCasting = BitConverter.ToBoolean(source, 0x2C90);
-                entry.CastingID = BitConverter.ToInt16(source, 0x2C94);
-                entry.CastingTargetID = BitConverter.ToUInt32(source, 0x2CA0);
-                entry.CastingProgress = BitConverter.ToSingle(source, 0x2CC4);
-                entry.CastingTime = BitConverter.ToSingle(source, 0x2DA8);
+                entry.IsCasting = BitConverter.ToBoolean(source, 0x2A30); // 0x2C90);
+                entry.CastingID = BitConverter.ToInt16(source, 0x2A34); // 0x2C94);
+                entry.CastingTargetID = BitConverter.ToUInt32(source, 0x2A40); // 0x2CA0);
+                entry.CastingProgress = BitConverter.ToSingle(source, 0x2A64); // 0x2CC4);
+                entry.CastingTime = BitConverter.ToSingle(source, 0x2A68); // 0x2DA8);
                 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, 0x2B18, statusesSource, 0, limit * 12);
+                Buffer.BlockCopy(source, 0x28B8, statusesSource, 0, limit * 12);
                 for (var i = 0; i < limit; i++)
                 {
                     var statusSource = new byte[statusSize];

diff --git a/FFXIVAPP.Client/Helpers/AppContextHelper.cs b/FFXIVAPP.Client/Helpers/AppContextHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // AppContextHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/ConstantsHelper.cs b/FFXIVAPP.Client/Helpers/ConstantsHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // ConstantsHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/DateTimeHelper.cs b/FFXIVAPP.Client/Helpers/DateTimeHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // DateTimeHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/LocaleHelper.cs b/FFXIVAPP.Client/Helpers/LocaleHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // LocaleHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/MessageBoxHelper.cs b/FFXIVAPP.Client/Helpers/MessageBoxHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // MessageBoxHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/NotifyIconHelper.cs b/FFXIVAPP.Client/Helpers/NotifyIconHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // NotifyIconHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/PlayerEntityHelper.cs b/FFXIVAPP.Client/Helpers/PlayerEntityHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // PlayerEntityHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/PluginCollectionHelper.cs b/FFXIVAPP.Client/Helpers/PluginCollectionHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // PluginCollectionHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/SavedlLogsHelper.cs b/FFXIVAPP.Client/Helpers/SavedlLogsHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // SavedlLogsHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/SettingsHelper.Application.cs b/FFXIVAPP.Client/Helpers/SettingsHelper.Application.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // SettingsHelper.Application.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/SettingsHelper.Client.cs b/FFXIVAPP.Client/Helpers/SettingsHelper.Client.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // SettingsHelper.Client.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/SettingsHelper.cs b/FFXIVAPP.Client/Helpers/SettingsHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // SettingsHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: 

diff --git a/FFXIVAPP.Client/Helpers/TabItemHelper.cs b/FFXIVAPP.Client/Helpers/TabItemHelper.cs
@@ -1,7 +1,7 @@
 // FFXIVAPP.Client
 // TabItemHelper.cs
 // 
-// Copyright © 2007 - 2014 Ryan Wilson - All Rights Reserved
+// Copyright © 2007 - 2015 Ryan Wilson - All Rights Reserved
 // 
 // Redistribution and use in source and binary forms, with or without 
 // modification, are permitted provided that the following conditions are met: