Merge branch 'development'

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.3.0.0")]
-[assembly: AssemblyFileVersion("0.3.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

ActualMop/Resources/changelog.txt

@@ -1,5 +1,5 @@
-Changes:
-- Player has to hold the mop in hand, in order for it to work (press Use to grab the mop)
+Added:
+- Player can now open the doors while holding the mop, without dropping it
 
-Bug Fixes:
-- Mop should now always load back where you left it
+Changes:
+- The key binded to urinating will not be clicked anymore, if you Alt+Tab from the game

ActualMop/src/ActualMop.cs

@@ -22,9 +22,9 @@ namespace ActualMop
     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 Name => "Actual Mop"; //You mod name
         public override string Author => "Athlon"; //Your Username
-        public override string Version => "0.3"; //Version
+        public override string Version => "1.0"; //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.

ActualMop/src/MopBehaviour.cs

@@ -14,7 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.If not, see<http://www.gnu.org/licenses/>.
 
+using HutongGames.PlayMaker;
+using HutongGames.PlayMaker.Actions;
 using System.Collections;
+using System.Linq;
 using System.Runtime.InteropServices;
 using UnityEngine;
 
@@ -55,6 +58,11 @@ class MopBehaviour : MonoBehaviour
         const int KEYEVENTF_KEYUP = 0x0002; //Key up flag
         byte virtualKey = 0x50;
 
+        FsmState itemPickedState;
+        FsmEvent equipEvent, proceedDropEvent, proceedThrowEvent;
+
+        bool isPaused;
+
         public MopBehaviour()
         {
             // Clone this game object to be used later for in hand object
@@ -63,7 +71,7 @@ public MopBehaviour()
             // Initialize the game object
             gameObject.name = "mop(Clone)";
             gameObject.layer = LayerMask.NameToLayer("Parts");
-            gameObject.tag = "PART";
+            gameObject.tag = "ITEM";
             gameObject.transform.parent = null;
 
             // Get this object's renderer
@@ -96,6 +104,13 @@ public MopBehaviour()
             mopInHand.transform.localPosition = new Vector3(0.25f, -0.4f, 1);
             mopInHand.transform.localRotation = Quaternion.Euler(-80, -720, -720);
             mopInHand.SetActive(false);
+
+            // Setting up "anti-drop" script
+            itemPickedState = player.transform.Find("Pivot/AnimPivot/Camera/FPSCamera/1Hand_Assemble/Hand")
+                            .GetComponents<PlayMakerFSM>()[0].FsmStates.FirstOrDefault(state => state.Name == "Item picked");
+            equipEvent = (itemPickedState.Actions[5] as GetButtonDown).sendEvent;
+            proceedDropEvent = (itemPickedState.Actions[1] as GetMouseButtonDown).sendEvent;
+            proceedThrowEvent = (itemPickedState.Actions[2] as GetMouseButtonDown).sendEvent;
         }
 
         public void Initialize(MopSaveData mopSaveData)
@@ -116,20 +131,23 @@ void Update()
 
             // If is equipped, equip the mop
             if (isEquipped)
-            { 
+            {
                 ToggleCleaningMode(true);
 
                 // Simulate the P key press
                 // Player HAS to have pissing button binded to P
-                keybd_event(virtualKey, 0, KEYEVENTF_EXTENDEDKEY, 0);
-                keybd_event(virtualKey, 0, KEYEVENTF_KEYUP, 0);
+                if (!isPaused)
+                {
+                    keybd_event(virtualKey, 0, KEYEVENTF_EXTENDEDKEY, 0);
+                    keybd_event(virtualKey, 0, KEYEVENTF_KEYUP, 0);
+                }
 
                 // Hold the urine level
                 PlayMakerGlobals.Instance.Variables.FindFsmFloat("PlayerUrine").Value = lastUrineValue <= 0 ? 1 : lastUrineValue;
                 pissAreas.FsmVariables.FindFsmFloat("PissRate").Value = -400;
             }
             else
-            { 
+            {
                 ToggleCleaningMode(false);
             }
 
@@ -167,6 +185,12 @@ void ToggleCleaningMode(bool enabled)
                 // Enable in hand model and disable this object's renderer
                 mopInHand.SetActive(true);
                 renderer.SetActive(false);
+
+                // This piece of code prevents player from dropping the mop and lets him open doors, etc.
+                (itemPickedState.Actions[1] as GetMouseButtonDown).sendEvent = equipEvent;
+                (itemPickedState.Actions[2] as GetMouseButtonDown).sendEvent = equipEvent;
+                (itemPickedState.Actions[3] as GetKeyDown).sendEvent = equipEvent;
+                (itemPickedState.Actions[4] as GetKeyDown).sendEvent = equipEvent;
             }
             else
             {
@@ -175,6 +199,12 @@ void ToggleCleaningMode(bool enabled)
                 // Disable in hand model and toggle back on this object's renderer
                 mopInHand.SetActive(false);
                 renderer.SetActive(true);
+
+                // Deactivate the previos script
+                (itemPickedState.Actions[1] as GetMouseButtonDown).sendEvent = proceedDropEvent;
+                (itemPickedState.Actions[2] as GetMouseButtonDown).sendEvent = proceedThrowEvent;
+                (itemPickedState.Actions[3] as GetKeyDown).sendEvent = proceedDropEvent;
+                (itemPickedState.Actions[4] as GetKeyDown).sendEvent = proceedDropEvent;
             }
         }
 
@@ -205,5 +235,15 @@ public MopSaveData GetSaveInfo()
         {
             return new MopSaveData(transform.position, transform.rotation);
         }
+
+        void OnApplicationFocus(bool hasFocus)
+        {
+            isPaused = !hasFocus;
+        }
+
+        void OnApplicationPause(bool pauseStatus)
+        {
+            isPaused = pauseStatus;
+        }
     }
-}
+}

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.0 (11.02.2020)
+
+### Added
+
+- Player can now open the doors while holding the mop, without dropping it
+
+### Changes
+
+- The key binded to urinating will not be clicked anymore, if you Alt+Tab from the game
+
 ## Beta 0.3 (10.02.2020)
 
 ### Changes

PleaseReadMe.txt

@@ -25,5 +25,10 @@ You can find your mop in the washing machine room (between kitchen and bathroom)
 - BrennFuchS (https://www.racedepartment.com/downloads/authors/brennfuchs-yt.257537/) - 3D model of the mop
 
 
+# CREDITS #
+- BrennFuchS (https://www.racedepartment.com/downloads/authors/brennfuchs-yt.257537/) - 3D model of the mop
+- People at MSC Modding Discord for a help with an anti-drop script
+
+
 # CONTACT #
 Discord: Athlon#5974

README.md

@@ -20,17 +20,14 @@ Grab the mod from [NexusMods](https://www.nexusmods.com/mysummercar/mods/163), [
 
 You can find your mop in the washing machine room (between kitchen and bathroom).
 
-## Known issues
-
-* Player may need to drop and grab the mop again, in order to it work when moving between rooms
-
 ## License
 
 This program is distributed under GNU General Public License v3. Feel free to use its source code as long as you mention the author and state the changes. You can also modify, share and distribute it, as long as you state changes. For more, see [LICENSE](LICENSE.md) file.
 
 ## Credits
 
 - [BrennFuchS](https://www.racedepartment.com/downloads/authors/brennfuchs-yt.257537/) - 3D model of the mop
+- People at MSC Modding Discord for a help with an anti-drop script
 
 ## Support