diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 6ddaea8fc..332413eb8 100644 --- 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 index 0a85c5f2f..00a202c36 100644 --- 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 index 8f066f7c1..1f4b63a9e 100644 --- a/src/EVEMon.Common/Constants/DBConstants.cs +++ b/src/EVEMon.Common/Constants/DBConstants.cs @@ -733,6 +733,8 @@ public static ReadOnlyCollection 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 index fedaa5406..196b247f4 100644 --- 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 index 4a3f00506..29d68f7e7 100644 Binary files a/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip and b/src/EVEMon.Common/Resources/eve-skills-en-US.xml.gzip differ diff --git a/tools/PatchXmlCreator/Output/patch-old.xml b/tools/PatchXmlCreator/Output/patch-old.xml index c43dae9d3..07f008059 100644 --- a/tools/PatchXmlCreator/Output/patch-old.xml +++ b/tools/PatchXmlCreator/Output/patch-old.xml @@ -1,30 +1,26 @@  - 05 August 2020 - 4.0.18.4979 - eb8aeb27e119bcf4e2f4ff63383d4131 - https://forums.eveonline.com/t/evemon-4-0-18-beta-under-new-ownership-conversion-for-esi/75953 - https://github.com/peterhaneve/evemon/releases/download/4.0.18/EVEMon-install-4.0.18.exe + 06 November 2020 + 4.0.19.4983 + 918ea2a2cbeb51ace24989206a8716fa + https://forums.eveonline.com/t/evemon-4-0-19-beta-under-new-ownership-conversion-for-esi/75953 + https://github.com/peterhaneve/evemon/releases/download/4.0.19/EVEMon-install-4.0.19.exe /S /AUTORUN /SKIPDOTNET /D=%EVEMON_EXECUTABLE_PATH% - +- NevarrTivianne]]> @@ -53,66 +49,66 @@ eve-blueprints-en-US.xml.gzip - 13 October 2020 - ca3112169528c302535f65ec924ac0e0 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246 - 14 December 2020 + 3a807bb1d48460c57e10ef7fddcaf619 + https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 + eve-certificates-en-US.xml.gzip 05 June 2018 540000f7c111354769a54fa31e57d411 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 + eve-geography-en-US.xml.gzip - 13 October 2020 - cb42e6759ad462fd8cbf26ccec3ba089 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246 - 14 December 2020 + 3077e700023d84a267b744a6ee44acc7 + https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 + eve-items-en-US.xml.gzip - 13 October 2020 - 1d6571bcfaaa994091f9e7f94bac1a41 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246 - 14 December 2020 + 0abab62dde07fbf0bc8eafe0811c9d18 + https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 + eve-masteries-en-US.xml.gzip 05 June 2018 3668b50996fc40a0c0853fec427b5712 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 + eve-properties-en-US.xml.gzip - 13 October 2020 - 2b331061389a03daaefbbf05ee397e43 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246 - 14 December 2020 + 93b8499c86acdad46607c697f221970a + https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 + eve-reprocessing-en-US.xml.gzip - 13 October 2020 - 3049ae8679948fa90227f64d88beff64 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246 - 14 December 2020 + 46b56972972a308d90c153770ce46000 + https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 + eve-skills-en-US.xml.gzip - 13 October 2020 - 7d0defaa0c43130c920de50478f239fc - https://peterhaneve.github.io/evemon-datafiles/Invasion/1823246 - 14 December 2020 + 84843e1f2e8946cb8f7f7588d2c72562 + https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 + diff --git a/tools/PatchXmlCreator/Output/patch.xml b/tools/PatchXmlCreator/Output/patch.xml index 07f008059..9a056abe3 100644 --- a/tools/PatchXmlCreator/Output/patch.xml +++ b/tools/PatchXmlCreator/Output/patch.xml @@ -24,22 +24,22 @@ - 06 November 2020 - 4.0.19.4983 - 918ea2a2cbeb51ace24989206a8716fa - https://forums.eveonline.com/t/evemon-4-0-19-beta-under-new-ownership-conversion-for-esi/75953 - https://github.com/peterhaneve/evemon/releases/download/4.0.19/EVEMon-install-4.0.19.exe + 17 March 2021 + 4.0.20.4986 + 76f89e810a199ff0a90aef82571ebfaf + https://forums.eveonline.com/t/evemon-4-0-20-beta-under-new-ownership-conversion-for-esi/75953 + https://github.com/peterhaneve/evemon/releases/download/4.0.20/EVEMon-install-4.0.20.exe /S /AUTORUN /SKIPDOTNET /D=%EVEMON_EXECUTABLE_PATH% - eve-blueprints-en-US.xml.gzip - 14 December 2020 - 3a807bb1d48460c57e10ef7fddcaf619 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + df91ac86ac9954dfaff13ab77681a1cc + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-certificates-en-US.xml.gzip 05 June 2018 540000f7c111354769a54fa31e57d411 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-geography-en-US.xml.gzip - 14 December 2020 + 17 March 2021 3077e700023d84a267b744a6ee44acc7 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-items-en-US.xml.gzip - 14 December 2020 - 0abab62dde07fbf0bc8eafe0811c9d18 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + 4c9cb667e22421fad8ca08777be7fd8a + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-masteries-en-US.xml.gzip 05 June 2018 3668b50996fc40a0c0853fec427b5712 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-properties-en-US.xml.gzip - 14 December 2020 - 93b8499c86acdad46607c697f221970a - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + 1f6ae9f613fd26b08d5ec206d0958d79 + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-reprocessing-en-US.xml.gzip - 14 December 2020 - 46b56972972a308d90c153770ce46000 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + adb83f4fc55f61a58548dcb924a91cfe + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-skills-en-US.xml.gzip - 14 December 2020 - 84843e1f2e8946cb8f7f7588d2c72562 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + 727a781211b138cf331afed346692962 + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + diff --git a/tools/XmlGenerator/Datafiles/Skills.cs b/tools/XmlGenerator/Datafiles/Skills.cs index 1ace4cc1c..6f427dea5 100644 --- a/tools/XmlGenerator/Datafiles/Skills.cs +++ b/tools/XmlGenerator/Datafiles/Skills.cs @@ -64,14 +64,21 @@ private static IEnumerable ExportSkillsInGroup(IHasID group) List listOfSkillsInGroup = new List(); 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 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 index 20a475be3..812d3431f 100644 --- a/tools/XmlGenerator/Providers/Database.cs +++ b/tools/XmlGenerator/Providers/Database.cs @@ -1233,9 +1233,9 @@ private static BagCollection 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(); } diff --git a/updates/patch.xml b/updates/patch.xml index 07f008059..9a056abe3 100644 --- a/updates/patch.xml +++ b/updates/patch.xml @@ -24,22 +24,22 @@ - 06 November 2020 - 4.0.19.4983 - 918ea2a2cbeb51ace24989206a8716fa - https://forums.eveonline.com/t/evemon-4-0-19-beta-under-new-ownership-conversion-for-esi/75953 - https://github.com/peterhaneve/evemon/releases/download/4.0.19/EVEMon-install-4.0.19.exe + 17 March 2021 + 4.0.20.4986 + 76f89e810a199ff0a90aef82571ebfaf + https://forums.eveonline.com/t/evemon-4-0-20-beta-under-new-ownership-conversion-for-esi/75953 + https://github.com/peterhaneve/evemon/releases/download/4.0.20/EVEMon-install-4.0.20.exe /S /AUTORUN /SKIPDOTNET /D=%EVEMON_EXECUTABLE_PATH% - eve-blueprints-en-US.xml.gzip - 14 December 2020 - 3a807bb1d48460c57e10ef7fddcaf619 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + df91ac86ac9954dfaff13ab77681a1cc + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-certificates-en-US.xml.gzip 05 June 2018 540000f7c111354769a54fa31e57d411 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-geography-en-US.xml.gzip - 14 December 2020 + 17 March 2021 3077e700023d84a267b744a6ee44acc7 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-items-en-US.xml.gzip - 14 December 2020 - 0abab62dde07fbf0bc8eafe0811c9d18 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + 4c9cb667e22421fad8ca08777be7fd8a + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-masteries-en-US.xml.gzip 05 June 2018 3668b50996fc40a0c0853fec427b5712 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-properties-en-US.xml.gzip - 14 December 2020 - 93b8499c86acdad46607c697f221970a - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + 1f6ae9f613fd26b08d5ec206d0958d79 + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-reprocessing-en-US.xml.gzip - 14 December 2020 - 46b56972972a308d90c153770ce46000 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + adb83f4fc55f61a58548dcb924a91cfe + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 + eve-skills-en-US.xml.gzip - 14 December 2020 - 84843e1f2e8946cb8f7f7588d2c72562 - https://peterhaneve.github.io/evemon-datafiles/Invasion/1850297 - 17 March 2021 + 727a781211b138cf331afed346692962 + https://peterhaneve.github.io/evemon-datafiles/Reign/1885884 +