Merge pull request #26 from Tobi-Mob/BepInEx5

v 1.0.4: BepInEx5

Docs/Full-Installation-Guide.md

@@ -7,11 +7,10 @@ This is a more detailed description of things I did to get the mod working. If y
 Long general installation guide for BepInEx can be found [here](https://docs.bepinex.dev/master/articles/user_guide/installation/index.html).  
 Shorter description for Skul below:
 
-At the time of writing, BepInEx 6 has no stable release.  
-The current builds can be found here: [BepisBuilds](https://builds.bepis.io/projects/bepinex_be).  
+The current builds can be found here: [BepInEx 5.4.21](https://github.com/BepInEx/BepInEx/releases/tag/v5.4.21).  
 
-For Windows use: BepInEx_UnityMono_x64  
-For Linux use: BepInEx_UnityMono_unix  
+For Windows use: BepInEx_x64
+For Linux use: BepInEx_unix
 
 Extract the content of the archive into the Root folder of your Skul Installation. So that the Root folder of the game contains a "BepInEx" folder
 
@@ -36,8 +35,8 @@ The `Managed` folder can be backed up in case something goes wrong. Alternativel
 Long Description: [Guide by ghorsington](https://hackmd.io/@ghorsington/rJuLdZTzK)
 
 Short Description:
-- download https://unity.bepinex.dev/libraries/2020.3.22.zip and extract the content into `$(SkulDirectory)\Skul_Data\Managed\`
-- go to the [Unity Download Archives](https://unity3d.com/get-unity/download/archive) and download the Unity [UnitySetup64-2020.3.22f1.exe](https://download.unity3d.com/download_unity/e1a7f79fd887/Windows64EditorInstaller/UnitySetup64-2020.3.22f1.exe) (Linux users should download the Windows Version)
+- download https://unity.bepinex.dev/libraries/2020.3.34.zip and extract the content into `$(SkulDirectory)\Skul_Data\Managed\`
+- go to the [Unity Download Archives](https://unity3d.com/get-unity/download/archive) and download the Unity [UnitySetup64-2020.3.34.exe](https://download.unity3d.com/download_unity/e1a7f79fd887/Windows64EditorInstaller/UnitySetup64-2020.3.34.exe) (Linux users should download the Windows Version)
 - Install the Unity Editor and copy `$(UnityDirectory)/Editor/Data/MonoBleedingEdge/lib/mono/4.5` into `$(SkulDirectory)\Skul_Data\Managed\`.
 
 ## Run the game

README.md

@@ -24,7 +24,7 @@ Compability
 ===
 - Skul Version 1.7.1
 - Skul Unity Version 2020.3.34
-- BepInEx Version 6.0.0.549
+- BepInEx Version 5.4.21
 
 Installation
 ===
@@ -36,11 +36,13 @@ For Windows it usually is: `C:\Program Files (x86)\Steam\steamapps\common\Skul`
 
 * Extract [Unstripped corelibs 2020.3.34](https://unity.bepinex.dev/corlibs/2020.3.34.zip) into `$(SkulDirectory)\Skul_Data\Managed\`
 
-* Extract [BepInEx 6.0.0.549](https://builds.bepinex.dev/projects/bepinex_be/549/BepInEx_UnityMono_x64_f2c0e0f_6.0.0-be.549.zip) into `$(SkulDirectory)`
+* Extract [BepInEx 5.4.21](https://github.com/BepInEx/BepInEx/releases/tag/v5.4.21) into `$(SkulDirectory)`
+   * for Windows: [x64](https://github.com/BepInEx/BepInEx/releases/download/v5.4.21/BepInEx_x64_5.4.21.0.zip)
+   * for Linux: [unix](https://github.com/BepInEx/BepInEx/releases/download/v5.4.21/BepInEx_unix_5.4.21.0.zip)
 
 * Extract [Skul.Mod.zip](https://github.com/Tobi-Mob/Skul.Mod/releases) into `$(SkulDirectory)`
 
-* Run the game via Steam. If the mod is running correclty, pressing F1 while in the game will display a message above the player character.
+* Run the game via Steam. If the mod is running correctly, pressing F1 while in the game will display a message above the player character.
 
 There are more detailed Instructions available here: [Full Installation Guide](Docs/Full-Installation-Guide.md)
 

Skul.Mod/Patches/DropRatePatch.cs

@@ -255,15 +255,19 @@ static Rarity GetChapterRarity()
             switch (chapterType)
             {
                 case Chapter.Type.Chapter2:
+                case Chapter.Type.HardmodeChapter2:
                     rarity = Rarity.Rare;
                     break;
                 case Chapter.Type.Chapter3:
+                case Chapter.Type.HardmodeChapter3:
                     rarity = Rarity.Unique;
                     break;
                 case Chapter.Type.Chapter4:
+                case Chapter.Type.HardmodeChapter4:
                     rarity = Rarity.Legendary;
                     break;
                 case Chapter.Type.Chapter5:
+                case Chapter.Type.HardmodeChapter5:
                     rarity = Rarity.Legendary;
                     break;
             }

Skul.Mod/Plugin.cs

@@ -9,8 +9,6 @@
 using BepInEx;
 using BepInEx.Bootstrap;
 using BepInEx.Logging;
-using BepInEx.Unity;
-using BepInEx.Unity.Bootstrap;
 using Characters.Controllers;
 using Data;
 using HarmonyLib;

Skul.Mod/Skul.Mod.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net472</TargetFramework>
     <PackageId>Skul.Mod</PackageId>
     <Description>Tobi-Mob Skul Mod</Description>
-    <Version>1.0.3</Version>
+    <Version>1.0.4</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>9.0</LangVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -18,21 +18,21 @@
   <!-- Enter the path to your Skul Installation here -->
   <PropertyGroup Condition="'$(OS)' == 'Unix'">
     <SkulDirectory>$(HOME)/.steam/debian-installation/steamapps/common/Skul/</SkulDirectory>
-    <OutputPath>$(SkulDirectory)BepInEx/plugins/</OutputPath>
+    <OutputPath>$(SkulDirectory)BepInEx/plugins/Tobi.Mob-Skul.Mod/</OutputPath>
     <RestoreSources>$(RestoreSources);../Packages/</RestoreSources>
   </PropertyGroup>
 
   <!-- Enter the path to your Skul Installation here -->
   <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
     <SkulDirectory>C:\Program Files\Steam\steamapps\common\Skul\</SkulDirectory>
     <SkulDirectory Condition="Exists('C:\Program Files (x86)\Steam\steamapps\common\Skul\')">C:\Program Files (x86)\Steam\steamapps\common\Skul\</SkulDirectory>
-    <OutputPath>$(SkulDirectory)BepInEx\plugins\</OutputPath>
+    <OutputPath>$(SkulDirectory)BepInEx\plugins\Tobi.Mob-Skul.Mod\</OutputPath>
     <RestoreSources>$(RestoreSources);..\Packages\</RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="BepInEx.Analyzers" Version="1.*" PrivateAssets="all" />
-    <PackageReference Include="BepInEx.Unity" Version="6.0.0-*" IncludeAssets="compile" />
+    <PackageReference Include="BepInEx.Core" Version="5.4.21" IncludeAssets="compile" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
 	  <PackageReference Include="UnityEngine.Modules" Version="2020.3.24" IncludeAssets="compile" />
   </ItemGroup>