Clean up

Author: HumabHatterZed

CHANGELOG.md

@@ -3,6 +3,8 @@
 
 # 2.22.2
 - Added GetEnergyConfig method to community patch's EnergyDrone class - retrieves the current Act's EnergyConfigInfo
+- CommunityPatches: Added community config to move pelt price tags to the right of the card
+- Experimental: Changed gemified to only reduce a single cost on a card, with priority of Energy > Bones > Gems > Blood
 - Fixed positioning errors caused by having multiple custom boss challenge icons
 - EnergyConfigInfo's fields can now be modified when initialising a new instance
 - Updated installation guide on the ReadMe to match the wiki, added link to wiki.

InscryptionAPI/Card/CardExtensionsCosts.cs

@@ -35,8 +35,7 @@ public static int BloodCost(this PlayableCard card)
         if (card && card.Info)
         {
             int originalBloodCost = CostProperties.CostProperties.OriginalBloodCost(card.Info);
-
-            if (card.IsUsingBlueGem())
+            if (card.IsUsingBlueGem() && CostProperties.CostProperties.ReduceGemifiedBlood(card, originalBloodCost))
                 originalBloodCost--;
 
             // add adjustments from temp mods
@@ -59,7 +58,7 @@ public static int BonesCost(this PlayableCard card)
         if (card && card.Info)
         {
             int originalBonesCost = CostProperties.CostProperties.OriginalBonesCost(card.Info);
-            if (card.IsUsingBlueGem())
+            if (card.IsUsingBlueGem() && CostProperties.CostProperties.ReduceGemifiedBones(card, originalBonesCost))
                 originalBonesCost--;
 
             // add adjustments from temp mods
@@ -98,7 +97,7 @@ public static List<GemType> GemsCost(this PlayableCard card)
             }
         }
 
-        if (gemsCost.Count > 0 && card.IsUsingBlueGem())
+        if (card.IsUsingBlueGem() && CostProperties.CostProperties.ReduceGemifiedMox(card, gemsCost))
             gemsCost.RemoveAt(0);
 
         return gemsCost;

InscryptionAPI/Card/CostProperties.cs

@@ -78,7 +78,6 @@ public bool GemsChanged<T>(List<T> a, List<T> b)
     [HarmonyReversePatch, HarmonyPatch(typeof(CardInfo), nameof(CardInfo.BloodCost), MethodType.Getter), MethodImpl(MethodImplOptions.NoInlining)]
     public static int OriginalBloodCost(CardInfo __instance) { return 0; }
 
-    
     /// <summary>
     /// ChangeCardCostGetter patches BoneCost so we can change the cost on the fly
     /// This reverse patch gives us access to the original method without any changes.
@@ -87,7 +86,6 @@ public bool GemsChanged<T>(List<T> a, List<T> b)
     [HarmonyReversePatch, HarmonyPatch(typeof(CardInfo), nameof(CardInfo.BonesCost), MethodType.Getter), MethodImpl(MethodImplOptions.NoInlining)]
     public static int OriginalBonesCost(CardInfo __instance) { return 0; }
 
-    
     /// <summary>
     /// ChangeCardCostGetter patches GemsCost so we can change the cost on the fly
     /// This reverse patch gives us access to the original method without any changes.
@@ -96,6 +94,11 @@ public bool GemsChanged<T>(List<T> a, List<T> b)
     [HarmonyReversePatch, HarmonyPatch(typeof(CardInfo), nameof(CardInfo.GemsCost), MethodType.Getter), MethodImpl(MethodImplOptions.NoInlining)]
     public static List<GemType> OriginalGemsCost(CardInfo __instance) { return null; }
 
+    /// <summary>
+    /// Improved version of CardInfo.GemsCost that accounts for addGemCost and RemovedGemsCost().
+    /// </summary>
+    /// <remarks>For consistency's sake, it's recommended you use this method over OriginalGemsCost in most cases.</remarks>
+    /// <param name="instance"></param>
     public static List<GemType> ImprovedGemsCost(CardInfo instance)
     {
         if (instance.Mods.Exists(x => x.nullifyGemsCost))
@@ -123,6 +126,23 @@ public static List<GemType> ImprovedGemsCost(CardInfo instance)
     /// </summary>
     [HarmonyReversePatch, HarmonyPatch(typeof(CardInfo), nameof(CardInfo.EnergyCost), MethodType.Getter), MethodImpl(MethodImplOptions.NoInlining)]
     public static int OriginalEnergyCost(CardInfo __instance) { return 0; }
+
+    public static bool ReduceGemifiedBlood(PlayableCard card, int? bloodCost = null)
+    {
+        return (bloodCost ?? OriginalBloodCost(card.Info)) > 0 && !ReduceGemifiedMox(card) && !ReduceGemifiedBones(card) && !ReduceGemifiedMox(card);
+    }
+    public static bool ReduceGemifiedMox(PlayableCard card, List<GemType> gemsCost = null)
+    {
+        return (gemsCost?.Count ?? ImprovedGemsCost(card.Info).Count) > 0 && !ReduceGemifiedBones(card) && !ReduceGemifiedEnergy(card);
+    }
+    public static bool ReduceGemifiedBones(PlayableCard card, int? bonesCost = null)
+    {
+        return (bonesCost ?? OriginalBonesCost(card.Info)) > 0 && !ReduceGemifiedEnergy(card);
+    }
+    public static bool ReduceGemifiedEnergy(PlayableCard card, int? energyCost = null)
+    {
+        return (energyCost ?? OriginalEnergyCost(card.Info)) > 0;
+    }
 }
 
 [HarmonyPatch]
@@ -162,12 +182,13 @@ public static bool EnergyCost(CardInfo __instance, ref int __result)
         __result = card?.EnergyCost ?? CostProperties.OriginalEnergyCost(__instance);
         return false;
     }
+
     [HarmonyPatch(typeof(PlayableCard), nameof(PlayableCard.EnergyCost), MethodType.Getter), HarmonyPrefix]
     public static bool DisableVanillaEnergyCost(PlayableCard __instance, ref int __result)
     {
         // patch this to follow the same pattern as the other cost methods
         int energyCost = CostProperties.OriginalEnergyCost(__instance.Info);
-        if (__instance.IsUsingBlueGem())
+        if (__instance.IsUsingBlueGem() && CostProperties.ReduceGemifiedEnergy(__instance, energyCost))
             energyCost--;
 
         foreach (CardModificationInfo mod in __instance.TemporaryMods)

InscryptionCommunityPatch/InscryptionCommunityPatchPlugin.cs

@@ -44,6 +44,7 @@ public class PatchPlugin : BaseUnityPlugin
     internal static ConfigEntry<bool> configRemovePatches;
 
     internal static ConfigEntry<bool> configSmallPricetags;
+    internal static ConfigEntry<bool> configMovePricetags;
 
     internal static ConfigEntry<bool> configTestState;
 
@@ -93,6 +94,7 @@ private void Awake()
         configMergeOnBottom = Config.Bind("Sigil Display", "Merge_On_Botom", false, "Makes it so if enabled, merged sigils will display on the bottom of the card instead of on the artwork. In extreme cases, this can cause some visual bugs.");
         configRemovePatches = Config.Bind("Sigil Display", "Remove_Patches", false, "Makes it so if enabled, merged sigils will not have a patch behind them anymore and will instead be glowing yellow (only works with Merge_On_Bottom).");
         configSmallPricetags = Config.Bind("Act 1", "Smaller Pricetags", false, "If enabled, the price tags placed on cards while buying from the Trapper will be scaled down.");
+        configMovePricetags = Config.Bind("Act 1", "Move Pricetags", false, "If enabled, the price tags placed on cards while buying from the Trapper will be moved to the right.");
         act2StackIconType = Config.Bind("Sigil Display", "Act 2 Sigil icon type", true, "If true, stacking icons are a cream outline with a black center. If false, stacking icons are a black outline with a cream center. Act 2");
         act2TutorCenterRows = Config.Bind("Act 2", "Centred Hoarder UI", true, "If true, centres displayed cards in each row during the Hoarder selection sequence.");
         configFullDebug = Config.Bind("General", "Full Debug", true, "If true, displays all debug logs in the console.");

InscryptionCommunityPatch/Sequencers/BuyPeltsSmallTags.cs

@@ -15,13 +15,20 @@ internal class BuyPeltsSmallTags
     [HarmonyPostfix, HarmonyPatch(typeof(BuyPeltsSequencer), nameof(BuyPeltsSequencer.AddPricetagToCard))]
     private static void ReducePricetagSize(SelectableCard card)
     {
-        if (!PatchPlugin.configSmallPricetags.Value)
-            return;
-
-        Transform t = card.transform.Find("pricetag");
-        if (t != null)
+        if (PatchPlugin.configSmallPricetags.Value || PatchPlugin.configMovePricetags.Value)
         {
-            t.localScale = new(0.75f, 1f, 0.75f);
+            Transform t = card.transform.Find("pricetag");
+            if (t == null)
+                return;
+
+            if (PatchPlugin.configSmallPricetags.Value)
+            {
+                t.localScale = new(0.75f, 1f, 0.75f);
+            }
+            if (PatchPlugin.configMovePricetags.Value)
+            {
+                t.localPosition = new(t.localPosition.x * -1, t.localPosition.y, t.localPosition.z);
+            }
         }
     }
 }