Merge remote-tracking branch 'origin/merge/autosplitterextension'

Author: topeterk

HitCounterManager.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HitCounterManagerWin", "HitCounterManagerWin.csproj", "{8007D948-906F-4F80-8F32-C41EC7CCEFD5}"
 EndProject

HitCounterManagerWin.csproj

@@ -148,6 +148,8 @@
     <Content Include="Sources\HitCounter.template" />
     <Content Include="Sources\HitCounterManagerInit.xml" />
     <None Include="Images\20p_logo_black.png" />
+    <None Include="Images\20p_logo_black_THH.png" />
+    <None Include="Images\icon-autosplitter-32.png" />
     <None Include="Images\icons8-about-20.png" />
     <None Include="Images\icons8-add-20.png" />
     <None Include="Images\icons8-add-list-20.png" />

HitCounterManagerWinInstaller.vdproj

@@ -91,6 +91,12 @@
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_E73481EAB59C480EAACFF94F3334D77E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -493,21 +499,21 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:HitCounterManager"
-        "ProductCode" = "8:{6488984F-0D46-4490-A19A-062539AC5B81}"
-        "PackageCode" = "8:{50C078B6-2223-405F-B9F7-E0A8A9368D11}"
+        "ProductCode" = "8:{96343A68-357C-4FD1-A94A-34945F980237}"
+        "PackageCode" = "8:{8FF4F890-31EF-421F-A3CC-E07F4320959B}"
         "UpgradeCode" = "8:{E37C963F-DDC5-4776-80DD-7B583A48415F}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:FALSE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.20.0"
+        "ProductVersion" = "8:1.21.0"
         "Manufacturer" = "8:GunriderProductions"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
         "Title" = "8:HitCounterManager"
         "Subject" = "8:Manages a hit counter"
-        "ARPCONTACT" = "8:Copyright © Peter Kirmeier 2021"
+        "ARPCONTACT" = "8:Copyright © Peter Kirmeier 2022"
         "Keywords" = "8:"
         "ARPCOMMENTS" = "8:Manages a hit counter"
         "ARPURLINFOABOUT" = "8:"

Images/20p_logo_black_THH.png

@@ -35,16 +35,24 @@ Just add the local HTML file to you broadcasting software and the setup is done.
 ### Pre-defined profiles
 
 * Bloodborne + The old hunters
+* Celeste
+* Crash Bandicoot 1
+* Crash Bandicoot 2
+* Crash Bandicoot 3
+* Crash Bandicoot 4
+* Cuphead
 * Dark Souls 1 Prepare To Die Edition
 * Dark Souls 2
 * Dark Souls 3 + Ashes of Ariandel + The Ringed City
 * Demon's Souls
 * Elden Ring
+* Hades
+* Hollow Knight
+* Mortal Shell
 * Salt and Sanctuary
 * Sekiro
 * The Surge + A walk in the park
 * The Surge 2
-* Mortal Shell
 
 ## Get the software
 All available releases can be found at the [Releases page](../../releases) on GitHub.  

Images/icon-autosplitter-32.png

@@ -129,18 +129,25 @@ DISCLAIMER: Above notice comes without warranty, so please refer to the explicit
 Application
 
 Title: HitCounterManager
-Author: Peter Kirmeier <topeterk@freenet.de>
+Author: Peter Kirmeier (General Gunrider)
 Source: https://github.com/topeterk/HitCounterManager
 Licence: MIT
 
+==============================================================================
+AutoSplitter Extension Support
+
+Title: -
+Author: Ezequiel Medina (Neimex23)
+Contact: <ezequielmedina23@gmail.com>
+Licence: MIT
+
 ==============================================================================
 Application Icon
 
 Title: Pioneer Camp
 Author: Iconka  http://www.iconka.com
 Source: https://iconka.com/en/269/
 License: Linkware
-Licence information:
 
 ==============================================================================
 Application Button Images
@@ -150,6 +157,13 @@ Author: icons8.com
 Source: https://icons8.com/
 Licence: CC BY-ND 3.0  https://creativecommons.org/licenses/by-nd/3.0/
 
+==============================================================================
+AutoSplitter Button Image
+
+Title: icon-autosplitter-32
+Author: Neimex23
+Licence: MIT
+
 ==============================================================================
 Team Hitless Button Image
 
@@ -158,6 +172,14 @@ Author: AronTheBaron
 Source: Provided by the Discord user for this project
 Licence: MIT
 
+==============================================================================
+No Hit Hispano Button Image
+
+Title: -
+Author: ParaBellum
+Source: Provided by the Discord user for this project
+Licence: MIT
+
 ==============================================================================
 Check Mark Image
 

README.md

@@ -103,6 +103,18 @@ public class SettingsRoot
         public int ShortcutTimerStartKeyCode;
         public bool ShortcutTimerStopEnable;
         public int ShortcutTimerStopKeyCode;
+        #region AutoSplitter
+        public bool ShortcutPracticeEnable; 
+        public int ShortcutPracticeKeyCode;
+        public bool ShortcutHitBossPrevEnable;
+        public int ShortcutHitBossPrevKeyCode;
+        public bool ShortcutHitWayPrevEnable;
+        public int ShortcutHitWayPrevKeyCode;
+        public bool ShortcutBossHitUndoPrevEnable;
+        public int ShortcutBossHitUndoPrevKeyCode;
+        public bool ShortcutWayHitUndoPrevEnable;
+        public int ShortcutWayHitUndoPrevKeyCode;
+        #endregion
         public string Inputfile;
         public string OutputFile;
         public bool ShowAttemptsCounter;
@@ -171,7 +183,6 @@ private bool LoadHotKeySettings(Shortcuts.SC_Type Type, int KeyCode, bool Enable
             return true;
         }
 
-        /// <summary>
         /// Loads user data from XML
         /// </summary>
         private void LoadSettings()
@@ -334,6 +345,22 @@ private void LoadSettings()
                 _settings.StyleSubscriptPB = _settings.StyleSuperscriptPB;
                 //_settings.ColWidths added but no default is needed
             }
+            if (_settings.Version == 9) // Coming from version 1.21
+            {
+                _settings.Version = 10;
+                #region AutoSplitter
+                _settings.ShortcutPracticeEnable = false;
+                _settings.ShortcutPracticeKeyCode = 0;
+                _settings.ShortcutHitBossPrevEnable = false;
+                _settings.ShortcutHitBossPrevKeyCode = 0;
+                _settings.ShortcutHitWayPrevEnable = false;
+                _settings.ShortcutHitWayPrevKeyCode = 0;
+                _settings.ShortcutBossHitUndoPrevEnable = false;
+                _settings.ShortcutBossHitUndoPrevKeyCode = 0;
+                _settings.ShortcutWayHitUndoPrevEnable = false;
+                _settings.ShortcutWayHitUndoPrevKeyCode = 0;
+                #endregion
+            }
 
             // Check for updates..
             if (_settings.CheckUpdatesOnStartup)
@@ -400,6 +427,23 @@ private void LoadSettings()
                 MessageBox.Show("Not all enabled hot keys could be registered successfully!", "Error setting up hot keys!");
         }
 
+        #region AutoSplitter
+        /// <summary>
+        /// Load AutoSplitter HotKeys from XML
+        /// </summary>
+        public void LoadAutoSplitterHotKeys()
+        {
+            bool isKeyInvalid = false;
+            if (!LoadHotKeySettings(Shortcuts.SC_Type.SC_Type_Practice, _settings.ShortcutPracticeKeyCode, _settings.ShortcutPracticeEnable)) isKeyInvalid = true;
+            if (!LoadHotKeySettings(Shortcuts.SC_Type.SC_Type_HitBossPrev, _settings.ShortcutHitBossPrevKeyCode, _settings.ShortcutHitBossPrevEnable)) isKeyInvalid = true;
+            if (!LoadHotKeySettings(Shortcuts.SC_Type.SC_Type_HitWayPrev, _settings.ShortcutHitWayPrevKeyCode, _settings.ShortcutHitWayPrevEnable)) isKeyInvalid = true;
+            if (!LoadHotKeySettings(Shortcuts.SC_Type.SC_Type_BossHitUndoPrev, _settings.ShortcutBossHitUndoPrevKeyCode, _settings.ShortcutBossHitUndoPrevEnable)) isKeyInvalid = true;
+            if (!LoadHotKeySettings(Shortcuts.SC_Type.SC_Type_WayHitUndoPrev, _settings.ShortcutWayHitUndoPrevKeyCode, _settings.ShortcutWayHitUndoPrevEnable)) isKeyInvalid = true;
+            if (isKeyInvalid)
+                MessageBox.Show("Error setting up hot keys of AutoSplitterCore!");
+        }
+        #endregion
+
         /// <summary>
         /// Stores user data in XML
         /// </summary>
@@ -460,6 +504,39 @@ private void SaveSettings()
             key = sc.Key_Get(Shortcuts.SC_Type.SC_Type_TimerStop);
             _settings.ShortcutTimerStopEnable = key.used;
             _settings.ShortcutTimerStopKeyCode = (int)key.key.KeyData;
+            #region AutoSplitter
+            if (AutoSplitterLoaded)
+            {
+                key = sc.Key_Get(Shortcuts.SC_Type.SC_Type_Practice);
+                _settings.ShortcutPracticeEnable = key.used;
+                _settings.ShortcutPracticeKeyCode = (int)key.key.KeyData;
+                key = sc.Key_Get(Shortcuts.SC_Type.SC_Type_HitBossPrev);
+                _settings.ShortcutHitBossPrevEnable = key.used;
+                _settings.ShortcutHitBossPrevKeyCode = (int)key.key.KeyData;
+                key = sc.Key_Get(Shortcuts.SC_Type.SC_Type_HitWayPrev);
+                _settings.ShortcutHitWayPrevEnable = key.used;
+                _settings.ShortcutHitWayPrevKeyCode = (int)key.key.KeyData;
+                key = sc.Key_Get(Shortcuts.SC_Type.SC_Type_BossHitUndoPrev);
+                _settings.ShortcutBossHitUndoPrevEnable = key.used;
+                _settings.ShortcutBossHitUndoPrevKeyCode = (int)key.key.KeyData;
+                key = sc.Key_Get(Shortcuts.SC_Type.SC_Type_WayHitUndoPrev);
+                _settings.ShortcutWayHitUndoPrevEnable = key.used;
+                _settings.ShortcutWayHitUndoPrevKeyCode = (int)key.key.KeyData;
+            }
+            else
+            {
+                _settings.ShortcutPracticeEnable = false;
+                _settings.ShortcutPracticeKeyCode = 0;
+                _settings.ShortcutHitBossPrevEnable = false;
+                _settings.ShortcutHitBossPrevKeyCode = 0;
+                _settings.ShortcutHitWayPrevEnable = false;
+                _settings.ShortcutHitWayPrevKeyCode = 0;
+                _settings.ShortcutBossHitUndoPrevEnable = false;
+                _settings.ShortcutBossHitUndoPrevKeyCode = 0;
+                _settings.ShortcutWayHitUndoPrevEnable = false;
+                _settings.ShortcutWayHitUndoPrevKeyCode = 0;
+            }
+            #endregion
 
             // Store customizing..
             int TotalSplits, TotalActiveSplit, SuccessionHits, SuccessionHitsWay, SuccessionHitsPB;

Sources/About.Designer.cs

@@ -1,6 +1,6 @@
 //MIT License
 
-//Copyright (c) 2016-2021 Peter Kirmeier
+//Copyright (c) 2016-2022 Peter Kirmeier
 
 //Permission is hereby granted, free of charge, to any person obtaining a copy
 //of this software and associated documentation files (the "Software"), to deal
@@ -21,12 +21,8 @@
 //SOFTWARE.
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// Allgemeine Informationen über eine Assembly werden über die folgenden 
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die einer Assembly zugeordnet sind.
 [assembly: AssemblyTitle("HitCounterManager")]
 [assembly: AssemblyDescription("Manages a hit counter")]
 [assembly: AssemblyConfiguration("")]
@@ -36,20 +32,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
-// für COM-Komponenten.  Wenn Sie auf einen Typ in dieser Assembly von 
-// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
-[assembly: ComVisible(false)]
+[assembly: AssemblyVersion("1.21.0.0")]
+[assembly: AssemblyFileVersion("1.21.0.0")]
 
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+[assembly: ComVisible(false)]
 [assembly: Guid("348b28b3-0290-4274-93aa-aa52be387120")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion 
-//      Buildnummer
-//      Revision
-//
-[assembly: AssemblyVersion("1.20.0.0")]
-[assembly: AssemblyFileVersion("1.20.0.0")]