Update datafiles to version 1885884. Add a manual workaround in the X…

…ML Generator for the missing fleet formation skills.
peterhaneve · Mar 18, 2021 · 7a89038 · 7a89038
1 parent 10aaef3
commit 7a89038
Show file tree

Hide file tree

Showing 10 changed files with 162 additions and 129 deletions.
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("EVEMon Development Team")]
 [assembly: AssemblyProduct("EVEMon")]
-[assembly: AssemblyCopyright("Copyright © 2006-2020, EVEMon Development Team")]
+[assembly: AssemblyCopyright("Copyright © 2006-2021, EVEMon Development Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,9 +29,9 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("4.0.19.0")]
-[assembly: AssemblyFileVersion("4.0.19.4983")]
-[assembly: AssemblyInformationalVersion("4.0.19")]
+[assembly: AssemblyVersion("4.0.20.0")]
+[assembly: AssemblyFileVersion("4.0.20.4986")]
+[assembly: AssemblyInformationalVersion("4.0.20")]
 
 // Neutral Language
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/SharedAssemblyInfo.template.cs b/SharedAssemblyInfo.template.cs
@@ -29,9 +29,9 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("4.0.19.0")]
-[assembly: AssemblyFileVersion("4.0.19.$REVNUM$")]
-[assembly: AssemblyInformationalVersion("4.0.19")]
+[assembly: AssemblyVersion("4.0.20.0")]
+[assembly: AssemblyFileVersion("4.0.20.$REVNUM$")]
+[assembly: AssemblyInformationalVersion("4.0.20")]
 
 // Neutral Language
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/src/EVEMon.Common/Constants/DBConstants.cs b/src/EVEMon.Common/Constants/DBConstants.cs
@@ -733,6 +733,8 @@ public static ReadOnlyCollection<int> StrategicComponentsMarketGroupIDs
         public const int MiningFrigateSkillID = 32918;
         public const int LargeSkillInjectorID = 40520;
         public const int SmallSkillInjectorID = 45635;
+        public const int FleetCoordinationSkillID = 57318;
+        public const int FleetFormationsSkillID = 57317;
 
         public const int AlphaDataAnalyzerIBlueprintID = 22330;
         public const int DaemonDataAnalyzerIBlueprintID = 22326;

diff --git a/src/EVEMon.Common/Resources/MD5Sums.txt b/src/EVEMon.Common/Resources/MD5Sums.txt
@@ -5,4 +5,4 @@ df91ac86ac9954dfaff13ab77681a1cc *eve-blueprints-en-US.xml.gzip
 3668b50996fc40a0c0853fec427b5712 *eve-masteries-en-US.xml.gzip
 1f6ae9f613fd26b08d5ec206d0958d79 *eve-properties-en-US.xml.gzip
 adb83f4fc55f61a58548dcb924a91cfe *eve-reprocessing-en-US.xml.gzip
-84a8c259c438f2735735fc2e32e6bf93 *eve-skills-en-US.xml.gzip
+727a781211b138cf331afed346692962 *eve-skills-en-US.xml.gzip
diff --git a/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip b/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip
diff --git a/tools/PatchXmlCreator/Output/patch-old.xml b/tools/PatchXmlCreator/Output/patch-old.xml
@@ -1,30 +1,26 @@
 <?xml version="1.0"?>
 <evemon xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <newest>
-    <date>05 August 2020</date>
-    <version>4.0.18.4979</version>
-    <md5>eb8aeb27e119bcf4e2f4ff63383d4131</md5>
-    <url>https://forums.eveonline.com/t/evemon-4-0-18-beta-under-new-ownership-conversion-for-esi/75953</url>
-    <autopatchurl>https://github.com/peterhaneve/evemon/releases/download/4.0.18/EVEMon-install-4.0.18.exe</autopatchurl>
+    <date>06 November 2020</date>
+    <version>4.0.19.4983</version>
+    <md5>918ea2a2cbeb51ace24989206a8716fa</md5>
+    <url>https://forums.eveonline.com/t/evemon-4-0-19-beta-under-new-ownership-conversion-for-esi/75953</url>
+    <autopatchurl>https://github.com/peterhaneve/evemon/releases/download/4.0.19/EVEMon-install-4.0.19.exe</autopatchurl>
     <autopatchargs>/S /AUTORUN /SKIPDOTNET</autopatchargs>
     <additionalargs>/D=%EVEMON_EXECUTABLE_PATH%</additionalargs>
-    <message><![CDATA[# Release v4.0.18
+    <message><![CDATA[# Release v4.0.19
 
 ## New Features
-- Omega-only skills are highlighted in gold in the Skill Planner if planned on an Alpha character
+- Manage Plans window now shows the matching character name in the title bar
 
 ## Bug Fixes
-- Invalid weapons and killers in killmail displays will be replaced with appropriate placeholder images
-- Update new character starting skills
-- Remove obsolete and broken Logitech G15 keyboard support
-- Fix an overflow caused when unknown skills are trained with SP rewards
-- ESI url can be copied with SHIFT+click to authenticate on another system or using a different browser / private mode
+- Auto-Updater now uses the correct URL after GitHub migration of branch names due to the United States Black Lives Matter movement
+- Remove outdated and nonfunctional EVE Gate support
+- Logitech G15 support re-enabled as it apparently is still functional on newer models of keyboards
 
 ## Contributors
 - Peter Han
-- wvdvegt
-- ScotSalmon
-- Moto-EMT]]></message>
+- NevarrTivianne]]></message>
   </newest>
   <releases>
     <release>
@@ -53,66 +49,66 @@
   <datafiles>
     <datafile>
       <name>eve-blueprints-en-US.xml.gzip</name>
-      <date>13 October 2020</date>
-      <md5>ca3112169528c302535f65ec924ac0e0</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246</url>
-      <message><![CDATA[Invasion 1.11 (1823246) blueprints data file by the EVEMon Development Team
+      <date>14 December 2020</date>
+      <md5>3a807bb1d48460c57e10ef7fddcaf619</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
+      <message><![CDATA[Invasion 1.12 (1850297) blueprints data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-certificates-en-US.xml.gzip</name>
       <date>05 June 2018</date>
       <md5>540000f7c111354769a54fa31e57d411</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246</url>
-      <message><![CDATA[Invasion 1.11 (1823246) certificates data file by the EVEMon Development Team
+      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
+      <message><![CDATA[Invasion 1.12 (1850297) certificates data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-geography-en-US.xml.gzip</name>
-      <date>13 October 2020</date>
-      <md5>cb42e6759ad462fd8cbf26ccec3ba089</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246</url>
-      <message><![CDATA[Invasion 1.11 (1823246) geography data file by the EVEMon Development Team
+      <date>14 December 2020</date>
+      <md5>3077e700023d84a267b744a6ee44acc7</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
+      <message><![CDATA[Invasion 1.12 (1850297) geography data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-items-en-US.xml.gzip</name>
-      <date>13 October 2020</date>
-      <md5>1d6571bcfaaa994091f9e7f94bac1a41</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246</url>
-      <message><![CDATA[Invasion 1.11 (1823246) items data file by the EVEMon Development Team
+      <date>14 December 2020</date>
+      <md5>0abab62dde07fbf0bc8eafe0811c9d18</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
+      <message><![CDATA[Invasion 1.12 (1850297) items data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-masteries-en-US.xml.gzip</name>
       <date>05 June 2018</date>
       <md5>3668b50996fc40a0c0853fec427b5712</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246</url>
-      <message><![CDATA[Invasion 1.11 (1823246) masteries data file by the EVEMon Development Team
+      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
+      <message><![CDATA[Invasion 1.12 (1850297) masteries data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-properties-en-US.xml.gzip</name>
-      <date>13 October 2020</date>
-      <md5>2b331061389a03daaefbbf05ee397e43</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246</url>
-      <message><![CDATA[Invasion 1.11 (1823246) properties data file by the EVEMon Development Team
+      <date>14 December 2020</date>
+      <md5>93b8499c86acdad46607c697f221970a</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
+      <message><![CDATA[Invasion 1.12 (1850297) properties data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-reprocessing-en-US.xml.gzip</name>
-      <date>13 October 2020</date>
-      <md5>3049ae8679948fa90227f64d88beff64</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246</url>
-      <message><![CDATA[Invasion 1.11 (1823246) reprocessing data file by the EVEMon Development Team
+      <date>14 December 2020</date>
+      <md5>46b56972972a308d90c153770ce46000</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
+      <message><![CDATA[Invasion 1.12 (1850297) reprocessing data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-skills-en-US.xml.gzip</name>
-      <date>13 October 2020</date>
-      <md5>7d0defaa0c43130c920de50478f239fc</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246</url>
-      <message><![CDATA[Invasion 1.11 (1823246) skills data file by the EVEMon Development Team
+      <date>14 December 2020</date>
+      <md5>84843e1f2e8946cb8f7f7588d2c72562</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
+      <message><![CDATA[Invasion 1.12 (1850297) skills data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
   </datafiles>

diff --git a/tools/PatchXmlCreator/Output/patch.xml b/tools/PatchXmlCreator/Output/patch.xml
@@ -24,22 +24,22 @@
   </newest>
   <releases>
     <release>
-      <date>06 November 2020</date>
-      <version>4.0.19.4983</version>
-      <md5>918ea2a2cbeb51ace24989206a8716fa</md5>
-      <url>https://forums.eveonline.com/t/evemon-4-0-19-beta-under-new-ownership-conversion-for-esi/75953</url>
-      <autopatchurl>https://github.com/peterhaneve/evemon/releases/download/4.0.19/EVEMon-install-4.0.19.exe</autopatchurl>
+      <date>17 March 2021</date>
+      <version>4.0.20.4986</version>
+      <md5>76f89e810a199ff0a90aef82571ebfaf</md5>
+      <url>https://forums.eveonline.com/t/evemon-4-0-20-beta-under-new-ownership-conversion-for-esi/75953</url>
+      <autopatchurl>https://github.com/peterhaneve/evemon/releases/download/4.0.20/EVEMon-install-4.0.20.exe</autopatchurl>
       <autopatchargs>/S /AUTORUN /SKIPDOTNET</autopatchargs>
       <additionalargs>/D=%EVEMON_EXECUTABLE_PATH%</additionalargs>
-      <message><![CDATA[# Release v4.0.19
+      <message><![CDATA[# Release v4.0.20
 
 ## New Features
-- Manage Plans window now shows the matching character name in the title bar
+- Skill injector requirements in the Skill Planner now include an estimate of the cost in the tooltip text
 
 ## Bug Fixes
-- Auto-Updater now uses the correct URL after GitHub migration of branch names due to the United States Black Lives Matter movement
-- Remove outdated and nonfunctional EVE Gate support
-- Logitech G15 support re-enabled as it apparently is still functional on newer models of keyboards
+- Manual workaround for missing skill information on new Fleet skills from SDE
+- Fix a potential race condition in asset lookup
+- Greatly improve speed of asset price lookups, and add Fuzzworks Market as an available provider
 
 ## Contributors
 - Peter Han
@@ -49,66 +49,66 @@
   <datafiles>
     <datafile>
       <name>eve-blueprints-en-US.xml.gzip</name>
-      <date>14 December 2020</date>
-      <md5>3a807bb1d48460c57e10ef7fddcaf619</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
-      <message><![CDATA[Invasion 1.12 (1850297) blueprints data file by the EVEMon Development Team
+      <date>17 March 2021</date>
+      <md5>df91ac86ac9954dfaff13ab77681a1cc</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Reign/1885884</url>
+      <message><![CDATA[Reign 1.0 (1885884) blueprints data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-certificates-en-US.xml.gzip</name>
       <date>05 June 2018</date>
       <md5>540000f7c111354769a54fa31e57d411</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
-      <message><![CDATA[Invasion 1.12 (1850297) certificates data file by the EVEMon Development Team
+      <url>https://peterhaneve.github.io/evemon-datafiles/Reign/1885884</url>
+      <message><![CDATA[Reign 1.0 (1885884) certificates data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-geography-en-US.xml.gzip</name>
-      <date>14 December 2020</date>
+      <date>17 March 2021</date>
       <md5>3077e700023d84a267b744a6ee44acc7</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
-      <message><![CDATA[Invasion 1.12 (1850297) geography data file by the EVEMon Development Team
+      <url>https://peterhaneve.github.io/evemon-datafiles/Reign/1885884</url>
+      <message><![CDATA[Reign 1.0 (1885884) geography data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-items-en-US.xml.gzip</name>
-      <date>14 December 2020</date>
-      <md5>0abab62dde07fbf0bc8eafe0811c9d18</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
-      <message><![CDATA[Invasion 1.12 (1850297) items data file by the EVEMon Development Team
+      <date>17 March 2021</date>
+      <md5>4c9cb667e22421fad8ca08777be7fd8a</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Reign/1885884</url>
+      <message><![CDATA[Reign 1.0 (1885884) items data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-masteries-en-US.xml.gzip</name>
       <date>05 June 2018</date>
       <md5>3668b50996fc40a0c0853fec427b5712</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
-      <message><![CDATA[Invasion 1.12 (1850297) masteries data file by the EVEMon Development Team
+      <url>https://peterhaneve.github.io/evemon-datafiles/Reign/1885884</url>
+      <message><![CDATA[Reign 1.0 (1885884) masteries data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-properties-en-US.xml.gzip</name>
-      <date>14 December 2020</date>
-      <md5>93b8499c86acdad46607c697f221970a</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
-      <message><![CDATA[Invasion 1.12 (1850297) properties data file by the EVEMon Development Team
+      <date>17 March 2021</date>
+      <md5>1f6ae9f613fd26b08d5ec206d0958d79</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Reign/1885884</url>
+      <message><![CDATA[Reign 1.0 (1885884) properties data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-reprocessing-en-US.xml.gzip</name>
-      <date>14 December 2020</date>
-      <md5>46b56972972a308d90c153770ce46000</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
-      <message><![CDATA[Invasion 1.12 (1850297) reprocessing data file by the EVEMon Development Team
+      <date>17 March 2021</date>
+      <md5>adb83f4fc55f61a58548dcb924a91cfe</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Reign/1885884</url>
+      <message><![CDATA[Reign 1.0 (1885884) reprocessing data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
     <datafile>
       <name>eve-skills-en-US.xml.gzip</name>
-      <date>14 December 2020</date>
-      <md5>84843e1f2e8946cb8f7f7588d2c72562</md5>
-      <url>https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297</url>
-      <message><![CDATA[Invasion 1.12 (1850297) skills data file by the EVEMon Development Team
+      <date>17 March 2021</date>
+      <md5>727a781211b138cf331afed346692962</md5>
+      <url>https://peterhaneve.github.io/evemon-datafiles/Reign/1885884</url>
+      <message><![CDATA[Reign 1.0 (1885884) skills data file by the EVEMon Development Team
 NOT COMPATIBLE with EVEMon prior to version 2.2.0]]></message>
     </datafile>
   </datafiles>

diff --git a/tools/XmlGenerator/Datafiles/Skills.cs b/tools/XmlGenerator/Datafiles/Skills.cs
@@ -64,14 +64,21 @@ private static IEnumerable<SerializableSkill> ExportSkillsInGroup(IHasID group)
             List<SerializableSkill> listOfSkillsInGroup = new List<SerializableSkill>();
 
             var alphaLimit = HoboleaksAlphaSkills.GetAlphaSkillLimits();
+            var l5 = new SerializableSkillPrerequisite()
+            {
+                ID = 3348, // Leadership
+                Level = 5,
+                Name = Database.InvTypesTable[3348].Name
+            };
 
             foreach (InvTypes skill in Database.InvTypesTable.Where(x => x.GroupID == group.ID))
             {
                 Util.UpdatePercentDone(Database.SkillsTotalCount);
 
+                int skillID = skill.ID;
                 SerializableSkill singleSkill = new SerializableSkill
                 {
-                    ID = skill.ID,
+                    ID = skillID,
                     Name = skill.Name,
                     Description = skill.Description,
                     Public = skill.Published,
@@ -123,6 +130,34 @@ private static IEnumerable<SerializableSkill> ExportSkillsInGroup(IHasID group)
                 // Add prerequesites to skill
                 singleSkill.SkillPrerequisites.AddRange(listOfPrerequisites);
 
+                // Hack: Fleet formation skills have all NULL attributes. CCPlease.
+                if (skillID == DBConstants.FleetCoordinationSkillID)
+                {
+                    singleSkill.Description = "Advanced fleet support skill allowing commanders to increase the size and spread of their fleet formations. Unlocks additional formation scaling options at each level of training.";
+                    singleSkill.Rank = 8;
+                    singleSkill.Cost = 40000000L;
+                    singleSkill.PrimaryAttribute = EveAttribute.Charisma;
+                    singleSkill.SecondaryAttribute = EveAttribute.Willpower;
+                    singleSkill.AlphaLimit = 0;
+                    singleSkill.SkillPrerequisites.Add(l5);
+                    singleSkill.SkillPrerequisites.Add(new SerializableSkillPrerequisite()
+                    {
+                        ID = DBConstants.FleetFormationsSkillID,
+                        Level = 1,
+                        Name = Database.InvTypesTable[DBConstants.FleetFormationsSkillID].Name
+                    });
+                }
+                else if (skillID == DBConstants.FleetFormationsSkillID)
+                {
+                    singleSkill.Description = "Fleet support skill allowing commanders to organize and warp fleets in formation. Unlocks additional formation types at each level of training.";
+                    singleSkill.Rank = 5;
+                    singleSkill.Cost = 40000000L;
+                    singleSkill.PrimaryAttribute = EveAttribute.Charisma;
+                    singleSkill.SecondaryAttribute = EveAttribute.Willpower;
+                    singleSkill.AlphaLimit = 0;
+                    singleSkill.SkillPrerequisites.Add(l5);
+                }
+
                 // Add skill
                 listOfSkillsInGroup.Add(singleSkill);
             }

diff --git a/tools/XmlGenerator/Providers/Database.cs b/tools/XmlGenerator/Providers/Database.cs
@@ -1233,9 +1233,9 @@ private static BagCollection<InvTypes> Types()
             ItemsTotalCount = ReprocessingTotalCount = collection.Items.Count;
 
             // Set skills total count
-            SkillsTotalCount = collection.Items.Count(
-                item => item.GroupID != DBConstants.FakeSkillsGroupID &&
-                        InvGroupsTable[item.GroupID].CategoryID == DBConstants.SkillCategoryID);
+            SkillsTotalCount = collection.Items.Count(item => item.GroupID != DBConstants.
+                FakeSkillsGroupID && InvGroupsTable[item.GroupID].CategoryID ==
+                DBConstants.SkillCategoryID);
 
             return collection.ToBag();
         }