Merge pull request #10 from Vl4dimyr/develop

Fixed: Skill icons were broken for all survivors
Vl4dimyr · Apr 2, 2021 · bfd74fd · bfd74fd
2 parents 45d2b5e + e57f34d
commit bfd74fd
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ 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.2] - 2021-4-3
+### Fixed
+-  Skill icons were broken for all survivors
+
 ## [1.1.1] - 2020-9-6
 ### Added
 - Patreon

diff --git a/CaptainShotgunModes.csproj b/CaptainShotgunModes.csproj
@@ -6,52 +6,52 @@
 
 	<ItemGroup>
 		<Reference Include="0Harmony">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\0Harmony.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\0Harmony.dll</HintPath>
 		</Reference>
 		<Reference Include="Assembly-CSharp">
 			<HintPath>E:\Games\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\Assembly-CSharp.dll</HintPath>
 		</Reference>
 		<Reference Include="Assembly-CSharp.R2API.mm">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\monomod\tristanmcpherson-R2API\Assembly-CSharp.R2API.mm.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\monomod\tristanmcpherson-R2API\Assembly-CSharp.R2API.mm.dll</HintPath>
 		</Reference>
 		<Reference Include="BepInEx">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\BepInEx.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\BepInEx.dll</HintPath>
 		</Reference>
 		<Reference Include="BepInEx.Harmony">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\BepInEx.Harmony.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\BepInEx.Harmony.dll</HintPath>
 		</Reference>
 		<Reference Include="BepInEx.MonoMod.Loader">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\patchers\BepInEx.MonoMod.Loader\BepInEx.MonoMod.Loader.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\patchers\BepInEx.MonoMod.Loader\BepInEx.MonoMod.Loader.dll</HintPath>
 		</Reference>
 		<Reference Include="BepInEx.Preloader">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\BepInEx.Preloader.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\BepInEx.Preloader.dll</HintPath>
 		</Reference>
 		<Reference Include="MMHOOK_Assembly-CSharp">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\plugins\tristanmcpherson-R2API\R2API\MMHOOK_Assembly-CSharp.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\plugins\tristanmcpherson-R2API\R2API\MMHOOK_Assembly-CSharp.dll</HintPath>
 		</Reference>
 		<Reference Include="Mono.Cecil">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\Mono.Cecil.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\Mono.Cecil.dll</HintPath>
 		</Reference>
 		<Reference Include="Mono.Cecil.Mdb">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\Mono.Cecil.Mdb.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\Mono.Cecil.Mdb.dll</HintPath>
 		</Reference>
 		<Reference Include="Mono.Cecil.Pdb">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\Mono.Cecil.Pdb.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\Mono.Cecil.Pdb.dll</HintPath>
 		</Reference>
 		<Reference Include="Mono.Cecil.Rocks">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\Mono.Cecil.Rocks.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\Mono.Cecil.Rocks.dll</HintPath>
 		</Reference>
 		<Reference Include="MonoMod">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\patchers\BepInEx.MonoMod.Loader\MonoMod.exe</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\patchers\BepInEx.MonoMod.Loader\MonoMod.exe</HintPath>
 		</Reference>
 		<Reference Include="MonoMod.RuntimeDetour">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\MonoMod.RuntimeDetour.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\MonoMod.RuntimeDetour.dll</HintPath>
 		</Reference>
 		<Reference Include="MonoMod.Utils">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\core\MonoMod.Utils.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\core\MonoMod.Utils.dll</HintPath>
 		</Reference>
 		<Reference Include="R2API">
-			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\mods\profiles\CaptainShotgunModes\BepInEx\plugins\tristanmcpherson-R2API\R2API\R2API.dll</HintPath>
+			<HintPath>..\..\..\AppData\Roaming\r2modmanPlus-local\RiskOfRain2\profiles\CaptainShotgunModes\BepInEx\plugins\tristanmcpherson-R2API\R2API\R2API.dll</HintPath>
 		</Reference>
 		<Reference Include="Unity.Postprocessing.Runtime">
 			<HintPath>E:\Games\Steam\steamapps\common\Risk of Rain 2\Risk of Rain 2_Data\Managed\Unity.Postprocessing.Runtime.dll</HintPath>

diff --git a/CaptainShotgunModesPlugin.cs b/CaptainShotgunModesPlugin.cs
@@ -116,7 +116,6 @@ private void InitConfig()
                "When set to true modes can be cycled through using the mouse wheel"
             );
 
-
             EnableModeSelectionWithDPad = Config.Bind<bool>(
                "Settings",
                "EnableModeSelectionWithDPad",
@@ -231,10 +230,7 @@ public void UpdateHook(On.RoR2.UI.SkillIcon.orig_Update orig, SkillIcon self)
 
             if (self.targetSkill && self.targetSkillSlot == SkillSlot.Primary)
             {
-                int bodyIndex = self.targetSkill.characterBody.bodyIndex;
-                SurvivorIndex survivorIndex = SurvivorCatalog.GetSurvivorIndexFromBodyIndex(bodyIndex);
-
-                if (survivorIndex == SurvivorIndex.Captain)
+                if (self.targetSkill.characterBody.baseNameToken == "CAPTAIN_BODY_NAME")
                 {
                     self.stockText.gameObject.SetActive(true);
                     self.stockText.fontSize = 12f;

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.1
+1.1.2
diff --git a/dev/post_build.ps1 b/dev/post_build.ps1
@@ -6,7 +6,7 @@ $outFolder = $args[2] + 'out\'
 
 $version = Get-Content "$($args[2])VERSION"
 
-Copy-Item $dllFilePath -Destination "$env:APPDATA\r2modmanPlus-local\mods\profiles\$($args[3])\BepInEx\plugins\"
+Copy-Item $dllFilePath -Destination "$env:APPDATA\r2modmanPlus-local\RiskOfRain2\profiles\$($args[3])\BepInEx\plugins\"
 
 Remove-Item -Recurse -Force $outFolder