Update 1.2

Athlon007 · Apr 4, 2022 · da6ffd6 · da6ffd6
1 parent e38dd77
commit da6ffd6
Show file tree

Hide file tree

Showing 10 changed files with 252 additions and 154 deletions.
diff --git a/.gitignore b/.gitignore
@@ -413,4 +413,6 @@ crashlytics-build.properties
 
 /MopAsset/Temp
 
-ActualMop.zip
+ActualMop.zip
+
+.DS_Store
diff --git a/ActualMop.sln b/ActualMop.sln
@@ -1,25 +1,28 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ActualMop", "ActualMop\ActualMop.csproj", "{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C9A4680E-2583-4D26-9222-4D7642A5AE17}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32210.238
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ActualMop", "ActualMop\ActualMop.csproj", "{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		ProRelease|Any CPU = ProRelease|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.ProRelease|Any CPU.ActiveCfg = ProRelease|Any CPU
+		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.ProRelease|Any CPU.Build.0 = ProRelease|Any CPU
+		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C9A4680E-2583-4D26-9222-4D7642A5AE17}
+	EndGlobalSection
+EndGlobal
diff --git a/ActualMop/ActualMop.csproj b/ActualMop/ActualMop.csproj
@@ -1,97 +1,106 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ActualMop</RootNamespace>
-    <AssemblyName>ActualMop</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\Desktop\MSC\Assembly-CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="cInput">
-      <HintPath>..\..\..\..\Desktop\mschah\mysummercar_Data\Managed\cInput.dll</HintPath>
-    </Reference>
-    <Reference Include="MSCLoader">
-      <HintPath>..\..\..\..\Desktop\MSC\MSCLoader.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Desktop\MSC\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="PlayMaker">
-      <HintPath>..\..\..\..\Desktop\MSC\PlayMaker.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\Desktop\MSC\UnityEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>..\..\..\..\Desktop\MSC\UnityEngine.UI.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="src\ActualMop.cs" />
-    <Compile Include="src\MopBehaviour.cs" />
-    <Compile Include="src\MopOptimization.cs" />
-    <Compile Include="src\MopSaveData.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\changelog.txt" />
-    <None Include="Resources\icon" />
-    <None Include="Resources\mop" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>exit
-if "$(ConfigurationName)" == "Debug" (
-copy "$(TargetPath)" "D:\SteamLibrary\steamapps\common\My Summer Car\ModsTest" /y
-copy "$(TargetDir)$(TargetName).pdb" "D:\SteamLibrary\steamapps\common\My Summer Car\ModsTest" /y
-cd "D:\SteamLibrary\steamapps\common\My Summer Car\ModsTest"
-) ELSE (
-copy $(TargetPath) "D:\SteamLibrary\steamapps\common\My Summer Car\Mods" /y
-)</PostBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{2CEAE666-CBA5-4FA6-AEE3-D6C5CFB2DE20}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ActualMop</RootNamespace>
+    <AssemblyName>ActualMop</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ProRelease|AnyCPU'">
+    <OutputPath>bin\ProRelease\</OutputPath>
+    <DefineConstants>TRACE;PRO</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\My Summer Car\mysummercar_Data\Managed\Assembly-CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="cInput">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\My Summer Car\mysummercar_Data\Managed\cInput.dll</HintPath>
+    </Reference>
+    <Reference Include="MSCLoader" Condition="'$(Configuration)'=='ProRelease'">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\My Summer Car ProLoader\mysummercar_Data\Managed\MSCLoader.dll</HintPath>
+    </Reference>
+    <Reference Include="MSCLoader" Condition="'$(Configuration)'=='Debug' OR '$(Configuration)'=='Release'">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\My Summer Car\mysummercar_Data\Managed\MSCLoader.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\My Summer Car\mysummercar_Data\Managed\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="PlayMaker">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\My Summer Car\mysummercar_Data\Managed\PlayMaker.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="UnityEngine">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\My Summer Car\mysummercar_Data\Managed\UnityEngine.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\My Summer Car\mysummercar_Data\Managed\UnityEngine.UI.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="src\ActualMop.cs" />
+    <Compile Include="src\CompatibilityLayer.cs" />
+    <Compile Include="src\MopBehaviour.cs" />
+    <Compile Include="src\MopOptimization.cs" />
+    <Compile Include="src\MopSaveData.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\changelog.txt" />
+    <None Include="Resources\icon" />
+    <None Include="Resources\mop" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/ActualMop/Resources/changelog.txt b/ActualMop/Resources/changelog.txt
@@ -1,6 +1,13 @@
 WARNING: Position of the mop will be reset!
-MSCLoader is now required to run this mod.
+
+### Added
+
+- Added a version for MSCLoader
 
 ### Changes
 
-- Ported (back) to MSCLoader
+- Mod settings are now saved into .JSON file
+
+### Bug Fixes
+
+- Fixed an error happening during game save
diff --git a/ActualMop/src/ActualMop.cs b/ActualMop/src/ActualMop.cs
@@ -1,5 +1,5 @@
 // Actual Mop
-// Copyright(C) 2020-2021 Athlon
+// Copyright(C) 2020-2022 Athlon
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -38,9 +38,13 @@ public class ActualMop : Mod
 
         // Called once, when mod is loading after game is fully loaded
         public override void OnLoad()
-        {
-            // Load dem assets
+        {
+            // Load dem assets
+#if PRO
+            AssetBundle ab = ModAssets.LoadBundle(Properties.Resources.mop);
+#else
             AssetBundle ab = LoadAssets.LoadBundle(Properties.Resources.mop);
+#endif
             GameObject originalMop = ab.LoadAsset<GameObject>("mop.prefab");
             mop = GameObject.Instantiate<GameObject>(originalMop);
             ab.Unload(false);
@@ -73,7 +77,7 @@ public override void OnNewGame()
         }
 
         public override void ModSettings()
-        {
+        { 
             Settings.AddButton(this, "resetMopPosition", "RESET MOP POSITION", ResetMopPosition);
 
             Settings.AddHeader(this, "LINKS");

diff --git a/ActualMop/src/CompatibilityLayer.cs b/ActualMop/src/CompatibilityLayer.cs
@@ -0,0 +1,49 @@
+// Actual Mop
+// Copyright(C) 2020-2022 Athlon
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+// GNU General Public License for more details.
+
+// 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 MSCLoader;
+using UnityEngine;
+
+namespace ActualMop
+{
+#if PRO
+    // This class' purpose is to add a settings compatibility for mods
+    sealed class Settings : MSCLoader.Settings
+    {
+        public Settings(string id, string name, object value) : base(id, name, value) { }
+
+        public static void AddButton(Mod mod, string id, string name, UnityEngine.Events.UnityAction onClick)
+        {
+            mod.modSettings.AddButton(id, name, onClick);
+        }
+
+        public static void AddButton(Mod mod, string id, string name, UnityEngine.Events.UnityAction onClick, Color32 foreground, Color32 background)
+        {
+            mod.modSettings.AddButton(id, name, onClick);
+        }
+
+        public new static void AddHeader(Mod mod, string text)
+        {
+            mod.modSettings.AddHeader(text);
+        }
+
+        public new static void AddText(Mod mod, string text)
+        {
+            mod.modSettings.AddText(text);
+        }
+    }
+#endif
+}