Beta 0.2

Author: Athlon007

ActualMop/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyVersion("0.2.0.0")]
+[assembly: AssemblyFileVersion("0.2.0.0")]

ActualMop/Resources/changelog.txt

@@ -1,2 +1,9 @@
+Added:
+- New mop model thanks to BrennFuchS!
+- Added settings
+  - Added changelog
+  - Added "Reset Mop Position" button
+- Urinating button can now be binded under any key (as long as it's one of the letters, or digit)
+
 Changes:
-- New mop model thanks to BrennFuchS!
+- Stain removal rate is now a constant value

ActualMop/src/ActualMop.cs

@@ -24,7 +24,7 @@ public class ActualMop : Mod
         public override string ID => "ActualMop"; //Your mod ID (unique)
         public override string Name => "Actual Mop (Beta)"; //You mod name
         public override string Author => "Athlon"; //Your Username
-        public override string Version => "0.1"; //Version
+        public override string Version => "0.2"; //Version
 
         // Set this to true if you will be load custom assets from Assets folder.
         // This will create subfolder in Assets folder for your mod.
@@ -61,7 +61,6 @@ public override void OnSave()
         }
 
         // ayy, lmao
-
         Settings resetPosition = new Settings("resetMopPosition", "Reset Mop Positon", ResetMopPosition);
 
         // Default header color
@@ -83,9 +82,9 @@ static void ResetMopPosition()
             if (Application.loadedLevelName == "GAME")
             {
                 GameObject mop = GameObject.Find("mop(Clone)");
+                mop.GetComponent<Rigidbody>().velocity = Vector3.zero;
                 mop.transform.position = MopBehaviour.DefaultPosition;
                 mop.transform.rotation = new Quaternion();
-                mop.GetComponent<Rigidbody>().velocity = Vector3.zero;
             }
         }
     }

ActualMop/src/MopBehaviour.cs

@@ -22,23 +22,25 @@ namespace ActualMop
 {
     class MopBehaviour : MonoBehaviour
     {
-        public static Vector3 DefaultPosition =new Vector3(-13.5f, -0.6f, 2.8f);
+        public static Vector3 DefaultPosition = new Vector3(-13.5f, -0.6f, 2.8f);
 
         PlayMakerFSM pissAreas;
         ParticleRenderer pissRenderer;
         Transform itemPivot;
 
         float lastUrineValue;
+        float lastPissRate;
 
         // Import the user32.dll
+        // We're using keybd_event function in Win32 API to simulate the keyboard click
+        // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-keybd_event
         [DllImport("user32.dll", SetLastError = true)]
         static extern void keybd_event(byte bVk, byte bScan, int dwFlags, int dwExtraInfo);
 
         // Declare some keyboard keys as constants with its respective code
         // See Virtual Code Keys: https://msdn.microsoft.com/en-us/library/dd375731(v=vs.85).aspx
         const int KEYEVENTF_EXTENDEDKEY = 0x0001; //Key down flag
         const int KEYEVENTF_KEYUP = 0x0002; //Key up flag
-        const int VK_P = 0x50; // P key
         byte virtualKey = 0x50;
 
         public MopBehaviour()
@@ -83,6 +85,7 @@ void Update()
 
                 // Hold the urine level
                 PlayMakerGlobals.Instance.Variables.FindFsmFloat("PlayerUrine").Value = lastUrineValue <= 0 ? 1 : lastUrineValue;
+                pissAreas.FsmVariables.FindFsmFloat("PissRate").Value = -400;
             }
             else
             { 
@@ -100,11 +103,12 @@ void ToggleCleaningMode(bool enabled)
             if (!enabled && pissAreas.FsmVariables.FindFsmFloat("PissRate").Value > 0)
                 return;
 
-            // Multiple the PissRate by -1, so it will decrease/increase the piss stain.
-            pissAreas.FsmVariables.FindFsmFloat("PissRate").Value *= -1;
-
             if (enabled)
             {
+                // Get current key binded to urinating
+                virtualKey = HexManager.instance.GetHex();
+
+                lastPissRate = pissAreas.FsmVariables.FindFsmFloat("PissRate").Value;
                 lastUrineValue = PlayMakerGlobals.Instance.Variables.FindFsmFloat("PlayerUrine").Value;
                 pissRenderer.enabled = !enabled;
             }
@@ -129,6 +133,8 @@ IEnumerator DisableRoutine()
 
             // Remove the dirtiness given by the game for finishing pissing
             PlayMakerGlobals.Instance.Variables.FindFsmFloat("PlayerDirtiness").Value -= 5;
+            // Restore last PissRate value
+            pissAreas.FsmVariables.FindFsmFloat("PissRate").Value = lastPissRate;
         }
 
         /// <summary>

ActualMop/src/Utilities/HexManager.cs

@@ -21,15 +21,19 @@ namespace ActualMop
 {
     class HexManager
     {
+        // This class manages the hexadecimal values corresponding to appropriate keyboard keys.
+        // See Virtual Code Keys: https://msdn.microsoft.com/en-us/library/dd375731(v=vs.85).aspx
+
         public static HexManager instance;
 
         Dictionary<string, byte> keys;
+        const byte VK_DEFAULT = 0x50; // P key
 
         public HexManager()
         {
             instance = this;
 
-            // Initialize the list
+            // Initialize and populate the dictionary
             keys = new Dictionary<string, byte>();
             keys.Add("0", 0x30);
             keys.Add("1", 0x31);
@@ -70,9 +74,8 @@ public HexManager()
         }
 
         /// <summary>
-        /// Finds and returns currently binded key to urinating
+        /// Returns currently binded key to urinating
         /// </summary>
-        /// <returns></returns>
         string GetCurrentlyBindedButton()
         {
             return cInput.GetText("Urinate");
@@ -81,28 +84,33 @@ string GetCurrentlyBindedButton()
         /// <summary>
         /// Returns the hexadecimal value corresponding to currently binded button for urinating
         /// </summary>
-        /// <returns></returns>
         public byte GetHex()
         {
-            string letter = GetCurrentlyBindedButton();
-            if (!IsValidKey(letter))
+            string bind = GetCurrentlyBindedButton();
+            
+            // Test if binded is valid 
+            // Return default value (P) if invalid
+            if (!IsValidKey(bind))
             {
                 MSCLoader.ModConsole.Print("[Actual Mop] Urinate key has to be binded to letter or a number on the keyboard!");
-                // Return default value (P) if invalid
-                return 0x50;
+                return VK_DEFAULT;
             }
 
-            return keys.First(t => t.Key == letter).Value;
+            return keys.First(t => t.Key == bind).Value;
         }
 
-        bool IsValidKey(string text)
+        /// <summary>
+        /// Checks if the bind is a valid key.
+        /// Bind has to be not longer than 1 character, and has to be digit or letter.
+        /// </summary>
+        bool IsValidKey(string bind)
         {
             // Binded key is too long for a number or character
-            if (text.Length > 1)
+            if (bind.Length > 1)
                 return false;
 
             // Char has to be a digit or letter
-            char c = text.ToCharArray()[0];
+            char c = bind.ToCharArray()[0];
             return char.IsLetter(c) || char.IsDigit(c);
         }
     }

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Beta 0.2 (tba)
+## Beta 0.2 (08.02.2020)
 
 ### Added
 
@@ -10,6 +10,14 @@
   - Added "Reset Mop Position" button
 - Urinating button can now be binded under any key (as long as it's one of the letters, or digit)
 
+### Changes
+
+- Stain removal rate is now a constant value
+
+### Bug Fixes
+
+- Improved in hand rotation and holding
+
 ## Beta 0.1 (07.02.2020)
 
 - Initial release

Media/images/1080p.png

@@ -19,7 +19,6 @@ You can find your mop in the washing machine room (between kitchen and bathroom)
 
 
 # KNOWN ISSUES #
-  - Player haas to have the pissing button binded to P, otherwise the mod will not work
   - Player may need to drop and grab the mop again, in order to it work when moving between rooms
 
 

Media/images/1080p.xcf

@@ -4,15 +4,15 @@
 [![](https://img.shields.io/github/v/release/Athlon007/ActualMop?include_prereleases&label=Development&style=for-the-badge)](https://github.com/Athlon007/MOP/releases)
 [![](https://img.shields.io/github/license/Athlon007/ActualMop?style=for-the-badge)](LICENSE.md)
 
-<img align="right" src="Media/images/icon_small.png" alt="icon" width=128 />
+<img align="right" src="Media/images/icon_transparent.png" alt="icon" width=128 />
 
 Actual Mop adds a... Mop to My Summer Car, which lets you clean the urine stains in your home!
 
 ## Requirements
 
 - My Summer Car (newest release)
 - [MSC Mod Loader 1.1.5](https://www.racedepartment.com/downloads/msc-mod-loader.15339/)
-- Windows operating system (this mod will not work on macOS or Linux, due to required Windows API)
+- Windows operating system (this mod will not work on macOS or Linux, due to required Win32 API)
 
 ## Installation
 
@@ -22,7 +22,6 @@ You can find your mop in the washing machine room (between kitchen and bathroom)
 
 ## Known issues
 
-* Player has to have the pissing button binded to P, otherwise the mod will not work
 * Player may need to drop and grab the mop again, in order to it work when moving between rooms
 
 ## License