fixed bug when original mutators were purchasable for 0 nuggets

Chasmical · Aug 5, 2020 · 751d803 · 751d803
1 parent aa4b131
commit 751d803
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/.vs/RogueLibs/v16/.suo b/.vs/RogueLibs/v16/.suo
diff --git a/RogueLibs.Test/bin/Debug/RogueLibs.dll b/RogueLibs.Test/bin/Debug/RogueLibs.dll
diff --git a/RogueLibs.Test/bin/Debug/RogueLibs.pdb b/RogueLibs.Test/bin/Debug/RogueLibs.pdb
diff --git a/RogueLibs.Test/obj/Debug/RogueLibs.Test.csprojAssemblyReference.cache b/RogueLibs.Test/obj/Debug/RogueLibs.Test.csprojAssemblyReference.cache
diff --git a/RogueLibs/Properties/AssemblyInfo.cs b/RogueLibs/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.2.0")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyVersion("2.0.3.0")]
+[assembly: AssemblyFileVersion("2.0.3.0")]
diff --git a/RogueLibs/RogueLibs.cs b/RogueLibs/RogueLibs.cs
@@ -22,7 +22,7 @@ public static class RogueLibs
 		/// <summary>
 		///   <para><see cref="RogueLibs"/>' version. Do not use this value in your <see cref="BepInDependency"/> attribute!</para>
 		/// </summary>
-		public const string pluginVersion = "2.0.2";
+		public const string pluginVersion = "2.0.3";
 
 		/// <summary>
 		///   <para>Main <see cref="RogueLibsPlugin"/> instance.</para>

diff --git a/RogueLibs/RogueLibsPlugin.cs b/RogueLibs/RogueLibsPlugin.cs
@@ -465,7 +465,7 @@ protected static bool ScrollingMenu_Setup(ScrollingMenu __instance, ButtonData m
 				myButtonData.scrollingHighlighted4 = (__instance.menuType == "Items" || __instance.menuType == "TraitUnlocks") && myUnlock.notActive; // gray 'not active' highlight
 				myButtonData.highlightedSprite = __instance.solidObjectButton;
 			}
-			else if (custom == null || custom.UnlockCost != null)
+			else if ((custom == null && myUnlock.cost != 0) || custom.UnlockCost != null)
 			{ // not unlocked, original mutator OR custom and can be purchased
 				myButtonData.buttonText += " - $" + myUnlock.cost;
 				myButtonData.scrollingHighlighted2 = true; // blue 'purchasable' highlight
@@ -559,7 +559,7 @@ protected static bool ScrollingMenu_PushedButton(ScrollingMenu __instance, Butto
 						__instance.gc.SetDailyRunText();
 						__instance.UpdateOtherVisibleMenus(__instance.menuType);
 					}
-					else if (u.nowAvailable && (custom == null || custom.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
+					else if (u.nowAvailable && ((custom == null && u.cost != 0) || custom?.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
 					{ // not unlocked, is a custom mutator, can be purchased and affordable
 						__instance.gc.unlocks.SubtractNuggets(u.cost);
 						__instance.gc.unlocks.DoUnlock(u.unlockName, u.unlockType);
@@ -605,7 +605,7 @@ protected static bool ScrollingMenu_PushedButton(ScrollingMenu __instance, Butto
 							__instance.gc.unlocks.SaveUnlockData(true);
 						}
 					}
-					else if (u.nowAvailable && (custom == null || custom.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
+					else if (u.nowAvailable && ((custom == null && u.cost != 0) || custom?.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
 					{ // not unlocked, can be purchased and affordable
 						__instance.gc.unlocks.SubtractNuggets(u.cost);
 						__instance.gc.unlocks.DoUnlock(u.unlockName, u.unlockType);
@@ -651,7 +651,7 @@ protected static bool ScrollingMenu_PushedButton(ScrollingMenu __instance, Butto
 							__instance.gc.unlocks.SaveUnlockData(true);
 						}
 					}
-					else if (u.nowAvailable && (custom == null || custom.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
+					else if (u.nowAvailable && ((custom == null && u.cost != 0) || custom?.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
 					{ // not unlocked, can be purchased and affordable
 						__instance.gc.unlocks.SubtractNuggets(u.cost);
 						__instance.gc.unlocks.DoUnlock(u.unlockName, u.unlockType);
@@ -693,7 +693,7 @@ protected static bool ScrollingMenu_PushedButton(ScrollingMenu __instance, Butto
 						}
 						__instance.agent.inventory.DontPlayPickupSounds(false);
 					}
-					else if (u.nowAvailable && (custom == null || custom.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
+					else if (u.nowAvailable && ((custom == null && u.cost != 0) || custom?.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
 					{ // not unlocked, can be purchased and affordable
 						__instance.gc.unlocks.SubtractNuggets(u.cost);
 						__instance.gc.unlocks.DoUnlock(u.unlockName, u.unlockType);
@@ -857,7 +857,7 @@ protected static bool CharacterCreation_Setup(CharacterCreation __instance, Butt
 				myButtonData.scrollingHighlighted4 = false;
 				myButtonData.highlightedSprite = __instance.solidObjectButton;
 			}
-			else if (custom == null || custom.UnlockCost != null) // not unlocked, original mutator OR custom and can be purchased
+			else if ((custom == null && myUnlock.cost != 0) || custom.UnlockCost != null) // not unlocked, original mutator OR custom and can be purchased
 			{
 				myButtonData.buttonText = __instance.gc.nameDB.GetName(myUnlock.unlockName, myUnlock.unlockNameType) + " - $" + myUnlock.cost;
 				myButtonData.scrollingHighlighted2 = true; // blue 'purchasable' highlight
@@ -968,7 +968,7 @@ protected static bool CharacterCreation_PushedButton(CharacterCreation __instanc
 							__instance.gc.audioHandler.PlayMust(__instance.gc.playerAgent, "ClickButtonMenu");
 						}
 					}
-					else if (u.nowAvailable && (custom == null || custom.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
+					else if (u.nowAvailable && ((custom == null && u.cost != 0) || custom?.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
 					{ // not unlocked, can be purchased and affordable
 						__instance.gc.unlocks.SubtractNuggets(u.cost);
 						__instance.gc.unlocks.DoUnlock(u.unlockName, u.unlockType);
@@ -1022,7 +1022,7 @@ protected static bool CharacterCreation_PushedButton(CharacterCreation __instanc
 
 						__instance.gc.audioHandler.PlayMust(__instance.gc.playerAgent, "ClickButtonMenu");
 					}
-					else if (u.nowAvailable && (custom == null || custom.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
+					else if (u.nowAvailable && ((custom == null && u.cost != 0) || custom?.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
 					{ // not unlocked, can be purchased and affordable
 						__instance.gc.unlocks.SubtractNuggets(u.cost);
 						__instance.gc.unlocks.DoUnlock(u.unlockName, u.unlockType);
@@ -1080,7 +1080,7 @@ protected static bool CharacterCreation_PushedButton(CharacterCreation __instanc
 							__instance.gc.audioHandler.PlayMust(__instance.gc.playerAgent, "ClickButtonMenu");
 						}
 					}
-					else if (u.nowAvailable && (custom == null || custom.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
+					else if (u.nowAvailable && ((custom == null && u.cost != 0) || custom?.UnlockCost != null) && u.cost <= __instance.gc.sessionDataBig.nuggets)
 					{  // not unlocked, can be purchased and affordable
 						__instance.gc.unlocks.SubtractNuggets(u.cost);
 						__instance.gc.unlocks.DoUnlock(u.unlockName, u.unlockType);

diff --git a/RogueLibs/bin/Debug/RogueLibs.dll b/RogueLibs/bin/Debug/RogueLibs.dll
diff --git a/RogueLibs/bin/Debug/RogueLibs.pdb b/RogueLibs/bin/Debug/RogueLibs.pdb
diff --git a/RogueLibs/obj/Debug/RogueLibs.csprojAssemblyReference.cache b/RogueLibs/obj/Debug/RogueLibs.csprojAssemblyReference.cache
diff --git a/RogueLibs/obj/Debug/RogueLibs.dll b/RogueLibs/obj/Debug/RogueLibs.dll
diff --git a/RogueLibs/obj/Debug/RogueLibs.pdb b/RogueLibs/obj/Debug/RogueLibs.pdb