Merge branch 'main' of ssh://gitea.mpb-server.de:222/marc/Better-Stuff

.gitignore

@@ -1,5 +1,5 @@
-.git/
-.vs/
-bin/
-obj/
+.git/
+.vs/
+bin/
+obj/
 *.sln

BetterStuff.csproj

@@ -1,46 +1,46 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyName>BetterStuff</AssemblyName>
-    <Product>Better Stuff</Product>
-    <Version>1.1.0</Version>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>latest</LangVersion>
-    <RestoreAdditionalProjectSources>
-      https://api.nuget.org/v3/index.json;
-      https://nuget.bepinex.dev/v3/index.json;
-      https://nuget.samboy.dev/v3/index.json
-    </RestoreAdditionalProjectSources>
-    <RootNamespace>BetterStuff</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.*" IncludeAssets="compile" />
-    <PackageReference Include="BepInEx.PluginInfoProps" Version="2.*" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Assembly-CSharp" Publicize="true">
-      <HintPath>..\lib\Assembly-CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="MyBox" Publicize="true">
-      <HintPath>..\lib\MyBox.dll</HintPath>
-    </Reference>
-    <Reference Include="Il2Cppmscorlib" Publicize="true">
-      <HintPath>..\lib\Il2Cppmscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.PhysicsModule" Publicize="true">
-      <HintPath>..\lib\UnityEngine.PhysicsModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule" Publicize="true">
-      <HintPath>..\lib\UnityEngine.CoreModule.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.InputSystem" Publicize="true">
-      <HintPath>..\lib\Unity.InputSystem.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.AIModule" Publicize="true">
-      <HintPath>..\lib\UnityEngine.AIModule.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <AssemblyName>BetterStuff</AssemblyName>
+    <Product>Better Stuff</Product>
+    <Version>1.1.0</Version>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
+    <RestoreAdditionalProjectSources>
+      https://api.nuget.org/v3/index.json;
+      https://nuget.bepinex.dev/v3/index.json;
+      https://nuget.samboy.dev/v3/index.json
+    </RestoreAdditionalProjectSources>
+    <RootNamespace>BetterStuff</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.*" IncludeAssets="compile" />
+    <PackageReference Include="BepInEx.PluginInfoProps" Version="2.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Assembly-CSharp" Publicize="true">
+      <HintPath>..\lib\Assembly-CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="MyBox" Publicize="true">
+      <HintPath>..\lib\MyBox.dll</HintPath>
+    </Reference>
+    <Reference Include="Il2Cppmscorlib" Publicize="true">
+      <HintPath>..\lib\Il2Cppmscorlib.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.PhysicsModule" Publicize="true">
+      <HintPath>..\lib\UnityEngine.PhysicsModule.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.CoreModule" Publicize="true">
+      <HintPath>..\lib\UnityEngine.CoreModule.dll</HintPath>
+    </Reference>
+    <Reference Include="Unity.InputSystem" Publicize="true">
+      <HintPath>..\lib\Unity.InputSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.AIModule" Publicize="true">
+      <HintPath>..\lib\UnityEngine.AIModule.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+</Project>

CHANGELOG

@@ -1,22 +1,22 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [1.1.0] - 2026-01-25
-
-### Added
-- Increased the walk speed of janitors, security guards and customer helpers
-- Increased the scanning speed of customer helpers, customers and player on self checkouts
-- Config contains the default gamevalues of each option
-
-## [1.0.0] - 2026-01-09
-
-### Added
-- Initial release
-- Increased the scanning speed of cashiers
-- Increased the time until the paymentprocess is finished
-- Increased the time between scanningprocess an paymentprocess
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.1.0] - 2026-01-25
+
+### Added
+- Increased the walk speed of janitors, security guards and customer helpers
+- Increased the scanning speed of customer helpers, customers and player on self checkouts
+- Config contains the default gamevalues of each option
+
+## [1.0.0] - 2026-01-09
+
+### Added
+- Initial release
+- Increased the scanning speed of cashiers
+- Increased the time until the paymentprocess is finished
+- Increased the time between scanningprocess an paymentprocess
 - Increased the walk speed of Restockers

LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2025 Marc Philipp Burgmann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2025 Marc Philipp Burgmann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Plugin.cs

@@ -1,146 +1,144 @@
-using __Project__.Scripts.Janitor;
-using BepInEx;
-using BepInEx.Configuration;
-using BepInEx.Logging;
-using BepInEx.Unity.IL2CPP;
-using HarmonyLib;
-
-namespace BetterStuff;
-
-[BepInPlugin(PLUGIN_GUID, PLUGIN_NAME, PLUGIN_VERSION)]
-public class Plugin : BasePlugin
-{
-    public const string PLUGIN_GUID = "de.mpburgmann.BetterStuff";
-    public const string PLUGIN_NAME = "Better Stuff";
-    public const string PLUGIN_VERSION = "1.1.1";
-    internal static new ManualLogSource Log;
-
-    private static ConfigEntry<float> scanTime;
-    private static ConfigEntry<float> finishDuration;
-    private static ConfigEntry<float> timeAfterScans;
-    private static ConfigEntry<float> restockerSpeed;
-    private static ConfigEntry<float> selfcheckoutCustomerSpeed;
-    private static ConfigEntry<float> selfcheckoutPlayerSpeed;
-    private static ConfigEntry<float> customerHelperScanningSpeed;
-    private static ConfigEntry<float> customerHelperSpeed;
-    private static ConfigEntry<float> securityGuardSpeed;
-    private static ConfigEntry<float> janitorSpeed;
-
-
-    public override void Load()
-    {
-        // Plugin startup logic
-        Log = base.Log;
-        Log.LogInfo($"Plugin {MyPluginInfo.PLUGIN_GUID} is loaded!");
-
-        scanTime = Config.Bind("Cashier", "Scanning Speed", 0.7f, "Default vanilla value is 1.5.");
-        finishDuration = Config.Bind("Cashier", "FinishingDuration", 1f, "Default vanilla value is 2.");
-        timeAfterScans = Config.Bind("Cashier", "TimeAfterAllScans", 0.5f, "Default vanilla value is 1.");
-
-        restockerSpeed = Config.Bind("Restocker", "Speed", 5f, "Default value is 2.");
-
-        selfcheckoutCustomerSpeed = Config.Bind("Selfcheckout", "Customer Speed", 0.6f, "Default vanilla value is 1.8.");
-        selfcheckoutPlayerSpeed = Config.Bind("Selfcheckout", "Player Speed", 0.3f, "Default vanilla value is 0.6.");
-
-        customerHelperScanningSpeed = Config.Bind("Customer Helper", "Scanning Speed", 0.5f, "Default vanilla value is 1.5.");
-        customerHelperSpeed = Config.Bind("Customer Helper", "Speed", 5f, "Default value is 2.");
-
-        securityGuardSpeed = Config.Bind("Security Guard", "Speed", 5f, "Default value is 2.");
-
-        janitorSpeed = Config.Bind("Janitor", "Speed", 5f, "Default value is 2.");
-
-
-        Harmony harmony = new(PLUGIN_GUID);
-        harmony.PatchAll();
-    }
-
-    [HarmonyPatch(typeof(Cashier), "Start")]
-    public static class Cashier_Start_Patch
-    {
-        [HarmonyPostfix]
-        public static void Postfix(Cashier __instance)
-        {
-            __instance.ScanningInterval = scanTime.Value;
-        }  
-    }
-
-    [HarmonyPatch(typeof(Checkout), "FinishedScanning")]
-    public static class Cashier_Checkout_Patch
-    {
-        [HarmonyPostfix]
-        public static void Postfix(Checkout __instance)
-        {
-            if(!__instance.m_IsSelfCheckout)
-            {
-                __instance.m_AutomatedCheckout.m_FinishingPaymentDuration = finishDuration.Value;
-                __instance.m_AutomatedCheckout.m_IntervalAfterScanningAll = timeAfterScans.Value;
-            }
-        }
-    }
-
-    [HarmonyPatch(typeof(Restocker), "Start")]
-    public static class Restocker_Start_Patch
-    {
-        [HarmonyPostfix]
-        public static void Postfix(Restocker __instance)
-        {
-            __instance.m_Agent.speed = restockerSpeed.Value;
-            __instance.m_Agent.acceleration *= 200f;
-            __instance.m_Agent.angularSpeed *= 200f;
-        }
-    }
-
-    [HarmonyPatch(typeof(Checkout), "Start")]
-    public static class Selfcheckout_Start_Patch
-    {
-        [HarmonyPostfix]
-        public static void Postfix(Checkout __instance)
-        {
-            if (__instance.m_IsSelfCheckout)
-            {
-                __instance.m_SelfCheckout.m_CustomerScanningInterval = selfcheckoutCustomerSpeed.Value;
-                __instance.m_SelfCheckout.m_PlayerScanningInterval = selfcheckoutPlayerSpeed.Value;
-            }
-        }
-    }
-
-    [HarmonyPatch(typeof(CustomerHelper), "Start")]
-    public static class CustomerHelper_Start_Patch
-    {
-        [HarmonyPostfix]
-        public static void Postfix(CustomerHelper __instance)
-        {
-            __instance.ScanningInterval = customerHelperScanningSpeed.Value;
-            __instance.m_CustomerHelperScanIntervals = new Il2CppSystem.Collections.Generic.List<float>(1);
-            __instance.m_CustomerHelperScanIntervals.Add(customerHelperScanningSpeed.Value);
-            __instance.m_Agent.speed = customerHelperSpeed.Value;
-            __instance.m_Agent.acceleration *= 200f;
-            __instance.m_Agent.angularSpeed *= 200f;
-        }
-    }
-
-    [HarmonyPatch(typeof(SecurityGuard), "Start")]
-    public static class SecurityGuard_Start_Patch
-    {
-        [HarmonyPostfix]
-        public static void Postfix(SecurityGuard __instance)
-        {
-            __instance.m_AnimController.m_Agent.speed = securityGuardSpeed.Value;
-            __instance.m_AnimController.m_Agent.acceleration *= 200f;
-            __instance.m_AnimController.m_Agent.angularSpeed *= 200f;
-        }
-    }
-
-     [HarmonyPatch(typeof(Janitor), "Start")]
-    public static class Janitor_Start_Patch
-    {
-        [HarmonyPostfix]
-        public static void Postfix(Janitor __instance)
-        {
-            __instance.m_Agent.speed = janitorSpeed.Value;
-            __instance.m_Agent.acceleration *= 200f;
-            __instance.m_Agent.angularSpeed *= 200f;
-        }
-    }
-
+using BepInEx;
+using BepInEx.Configuration;
+using BepInEx.Logging;
+using BepInEx.Unity.IL2CPP;
+using HarmonyLib;
+
+namespace BetterStuff;
+
+[BepInPlugin(PLUGIN_GUID, PLUGIN_NAME, PLUGIN_VERSION)]
+public class Plugin : BasePlugin
+{
+    public const string PLUGIN_GUID = "de.mpburgmann.BetterStuff";
+    public const string PLUGIN_NAME = "Better Stuff";
+    public const string PLUGIN_VERSION = "1.1.0";
+    internal static new ManualLogSource Log;
+
+    private static ConfigEntry<float> scanTime;
+    private static ConfigEntry<float> finishDuration;
+    private static ConfigEntry<float> timeAfterScans;
+    private static ConfigEntry<float> restockerSpeed;
+    private static ConfigEntry<float> selfcheckoutCustomerSpeed;
+    private static ConfigEntry<float> selfcheckoutPlayerSpeed;
+    private static ConfigEntry<float> customerHelperScanningSpeed;
+    private static ConfigEntry<float> customerHelperSpeed;
+    private static ConfigEntry<float> securityGuardSpeed;
+    private static ConfigEntry<float> janitorSpeed;
+
+
+    public override void Load()
+    {
+        // Plugin startup logic
+        Log = base.Log;
+        Log.LogInfo($"Plugin {MyPluginInfo.PLUGIN_GUID} is loaded!");
+
+        scanTime = Config.Bind("Cashier", "Scanning Speed", 0.7f, "Default vanilla value is 1.5.");
+        finishDuration = Config.Bind("Cashier", "FinishingDuration", 1f, "Default vanilla value is 2.");
+        timeAfterScans = Config.Bind("Cashier", "TimeAfterAllScans", 0.5f, "Default vanilla value is 1.");
+
+        restockerSpeed = Config.Bind("Restocker", "Speed", 5f, "Default value is 2.");
+
+        selfcheckoutCustomerSpeed = Config.Bind("Selfcheckout", "Customer Speed", 0.6f, "Default vanilla value is 1.8.");
+        selfcheckoutPlayerSpeed = Config.Bind("Selfcheckout", "Player Speed", 0.3f, "Default vanilla value is 0.6.");
+
+        customerHelperScanningSpeed = Config.Bind("Customer Helper", "Scanning Speed", 0.5f, "Default vanilla value is 1.5.");
+        customerHelperSpeed = Config.Bind("Customer Helper", "Speed", 5f, "Default value is 2.");
+
+        securityGuardSpeed = Config.Bind("Security Guard", "Speed", 5f, "Default value is 2.");
+
+        janitorSpeed = Config.Bind("Janitor", "Speed", 5f, "Default value is 2.");
+
+
+        Harmony harmony = new(PLUGIN_GUID);
+        harmony.PatchAll();
+    }
+
+    [HarmonyPatch(typeof(Cashier), "Start")]
+    public static class Cashier_Start_Patch
+    {
+        [HarmonyPostfix]
+        public static void Postfix(Cashier __instance)
+        {
+            __instance.ScanningInterval = scanTime.Value;
+        }  
+    }
+
+    [HarmonyPatch(typeof(Checkout), "FinishedScanning")]
+    public static class Cashier_Checkout_Patch
+    {
+        [HarmonyPostfix]
+        public static void Postfix(Checkout __instance)
+        {
+            if(!__instance.m_IsSelfCheckout)
+            {
+                __instance.m_AutomatedCheckout.m_FinishingPaymentDuration = finishDuration.Value;
+                __instance.m_AutomatedCheckout.m_IntervalAfterScanningAll = timeAfterScans.Value;
+            }
+        }
+    }
+
+    [HarmonyPatch(typeof(Restocker), "Start")]
+    public static class Restocker_Start_Patch
+    {
+        [HarmonyPostfix]
+        public static void Postfix(Restocker __instance)
+        {
+            __instance.m_Agent.speed = restockerSpeed.Value;
+            __instance.m_Agent.acceleration *= 200f;
+            __instance.m_Agent.angularSpeed *= 200f;
+        }
+    }
+
+    [HarmonyPatch(typeof(Checkout), "Start")]
+    public static class Selfcheckout_Start_Patch
+    {
+        [HarmonyPostfix]
+        public static void Postfix(Checkout __instance)
+        {
+            if (__instance.m_IsSelfCheckout)
+            {
+                __instance.m_SelfCheckout.m_CustomerScanningInterval = selfcheckoutCustomerSpeed.Value;
+                __instance.m_SelfCheckout.m_PlayerScanningInterval = selfcheckoutPlayerSpeed.Value;
+            }
+        }
+    }
+
+    [HarmonyPatch(typeof(CustomerHelper), "Start")]
+    public static class CustomerHelper_Start_Patch
+    {
+        [HarmonyPostfix]
+        public static void Postfix(CustomerHelper __instance)
+        {
+            __instance.ScanningInterval = customerHelperScanningSpeed.Value;
+            __instance.m_CustomerHelperScanIntervals = new Il2CppSystem.Collections.Generic.List<float>(1);
+            __instance.m_CustomerHelperScanIntervals.Add(customerHelperScanningSpeed.Value);
+            __instance.m_Agent.speed = customerHelperSpeed.Value;
+            __instance.m_Agent.acceleration *= 200f;
+            __instance.m_Agent.angularSpeed *= 200f;
+        }
+    }
+
+    [HarmonyPatch(typeof(SecurityGuard), "Start")]
+    public static class SecurityGuard_Start_Patch
+    {
+        [HarmonyPostfix]
+        public static void Postfix(SecurityGuard __instance)
+        {
+            __instance.m_AnimController.m_Agent.speed = securityGuardSpeed.Value;
+            __instance.m_AnimController.m_Agent.acceleration *= 200f;
+            __instance.m_AnimController.m_Agent.angularSpeed *= 200f;
+        }
+    }
+
+    [HarmonyPatch(typeof(Janitor), "Start")]
+    public static class Janitor_Start_Patch
+    {
+        [HarmonyPostfix]
+        public static void Postfix(Janitor __instance)
+        {
+            __instance.m_Agent.speed = janitorSpeed.Value;
+            __instance.m_Agent.acceleration *= 200f;
+            __instance.m_Agent.angularSpeed *= 200f;
+        }
+    }
 }