Merge remote-tracking branch 'remotes/origin/dev'

Author: BAKAOLC

Const.cs

@@ -4,7 +4,7 @@ public static class Const
     {
         public const string Name = "RitsuLib";
         public const string ModId = "com.ritsukage.sts2-RitsuLib";
-        public const string Version = "0.0.16";
+        public const string Version = "0.0.17";
         public const string SettingsKey = "settings";
         public const string SettingsFileName = "settings.json";
     }

Content/ModContentRegistry.cs

@@ -25,6 +25,7 @@ public sealed partial class ModContentRegistry
         private static readonly HashSet<Type> RegisteredMonsters = [];
         private static readonly HashSet<Type> RegisteredPowers = [];
         private static readonly HashSet<Type> RegisteredOrbs = [];
+        private static readonly HashSet<Type> RegisteredSharedCardPools = [];
         private static readonly HashSet<Type> RegisteredSharedEvents = [];
         private static readonly HashSet<Type> RegisteredSharedAncients = [];
         private static readonly Dictionary<Type, HashSet<Type>> RegisteredActEncounters = [];
@@ -144,6 +145,12 @@ public void RegisterOrb<TOrb>() where TOrb : OrbModel
             RegisterStandaloneModel(RegisteredOrbs, typeof(TOrb), typeof(OrbModel), "orb");
         }
 
+        public void RegisterSharedCardPool<TPool>() where TPool : CardPoolModel
+        {
+            RegisterStandaloneModel(RegisteredSharedCardPools, typeof(TPool), typeof(CardPoolModel),
+                "shared card pool");
+        }
+
         public void RegisterSharedEvent<TEvent>() where TEvent : EventModel
         {
             RegisterStandaloneModel(RegisteredSharedEvents, typeof(TEvent), typeof(EventModel), "shared event");
@@ -230,6 +237,11 @@ internal static IEnumerable<OrbModel> AppendOrbs(IEnumerable<OrbModel> source)
             return AppendResolved(source, ResolveModels<OrbModel>(RegisteredOrbs));
         }
 
+        internal static IEnumerable<CardPoolModel> AppendSharedCardPools(IEnumerable<CardPoolModel> source)
+        {
+            return AppendResolved(source, ResolveModels<CardPoolModel>(RegisteredSharedCardPools));
+        }
+
         internal static IEnumerable<EventModel> AppendActEvents(ActModel act, IEnumerable<EventModel> source)
         {
             return AppendResolved(source, ResolveScopedModels<EventModel>(RegisteredActEvents, act.GetType()));
@@ -265,6 +277,7 @@ internal static void InjectRegisteredModels()
                     .Concat(RegisteredMonsters)
                     .Concat(RegisteredPowers)
                     .Concat(RegisteredOrbs)
+                    .Concat(RegisteredSharedCardPools)
                     .Concat(RegisteredSharedEvents)
                     .Concat(RegisteredSharedAncients)
                     .Concat(RegisteredActEncounters.Values.SelectMany(static set => set))

Content/Patches/ModelDbContentPatches.cs

@@ -93,6 +93,24 @@ public static void Postfix(ref IEnumerable<OrbModel> __result)
         }
     }
 
+    public class AllSharedCardPoolsPatch : IPatchMethod
+    {
+        public static string PatchId => "modeldb_all_shared_card_pools";
+        public static string Description => "Append registered shared card pools to ModelDb.AllSharedCardPools";
+        public static bool IsCritical => true;
+
+        public static ModPatchTarget[] GetTargets()
+        {
+            return [new(typeof(ModelDb), "get_AllSharedCardPools")];
+        }
+
+        // ReSharper disable once InconsistentNaming
+        public static void Postfix(ref IEnumerable<CardPoolModel> __result)
+        {
+            __result = ModContentRegistry.AppendSharedCardPools(__result);
+        }
+    }
+
     public class AllEventsPatch : IPatchMethod
     {
         public static string PatchId => "modeldb_all_events";

RitsuLibFramework.PatcherSetup.cs

@@ -159,6 +159,7 @@ private static void RegisterContentRegistryPatches()
             patcher.RegisterPatch<ActsPatch>();
             patcher.RegisterPatch<AllPowersPatch>();
             patcher.RegisterPatch<AllOrbsPatch>();
+            patcher.RegisterPatch<AllSharedCardPoolsPatch>();
             patcher.RegisterPatch<AllSharedEventsPatch>();
             patcher.RegisterPatch<AllEventsPatch>();
             patcher.RegisterPatch<AllSharedAncientsPatch>();

STS2-RitsuLib.csproj

@@ -10,7 +10,7 @@
         <NoWarn>CS0436</NoWarn>
         <IsPackable>true</IsPackable>
         <PackageId>STS2.RitsuLib</PackageId>
-        <Version>0.0.16</Version>
+        <Version>0.0.17</Version>
         <Authors>OLC</Authors>
         <Description>Shared framework library for Slay the Spire 2 mods.</Description>
         <PackageReadmeFile>README.md</PackageReadmeFile>

Scaffolding/Content/ContentRegistrationEntries.cs

@@ -64,4 +64,13 @@ public void Register(ModContentRegistry registry)
             registry.RegisterPower<TPower>();
         }
     }
+
+    public sealed class SharedCardPoolRegistrationEntry<TPool> : IContentRegistrationEntry
+        where TPool : CardPoolModel
+    {
+        public void Register(ModContentRegistry registry)
+        {
+            registry.RegisterSharedCardPool<TPool>();
+        }
+    }
 }

Scaffolding/Content/ModCardTemplate.cs

@@ -11,10 +11,20 @@ public abstract class ModCardTemplate(
         CardType type,
         CardRarity rarity,
         TargetType target,
-        bool showInCardLibrary = true,
-        bool autoAdd = true) : CardModel(baseCost, type, rarity, target, showInCardLibrary), IModCardAssetOverrides
+        bool showInCardLibrary = true)
+        : CardModel(baseCost, type, rarity, target, showInCardLibrary), IModCardAssetOverrides
     {
-        protected bool AutoAddRequested { get; } = autoAdd;
+        [Obsolete("The autoAdd parameter is no longer used and will be removed in a future version.")]
+        protected ModCardTemplate(
+            int baseCost,
+            CardType type,
+            CardRarity rarity,
+            TargetType target,
+            bool showInCardLibrary,
+            bool autoAdd) : this(baseCost, type, rarity, target, showInCardLibrary)
+        {
+        }
+
         protected virtual IEnumerable<string> RegisteredKeywordIds => [];
         protected virtual IEnumerable<IHoverTip> AdditionalHoverTips => [];
 

Scaffolding/Content/ModContentPackBuilder.cs

@@ -74,6 +74,11 @@ public ModContentPackBuilder Orb<TOrb>() where TOrb : OrbModel
             return AddStep(ctx => ctx.Content.RegisterOrb<TOrb>());
         }
 
+        public ModContentPackBuilder SharedCardPool<TPool>() where TPool : CardPoolModel
+        {
+            return AddStep(ctx => ctx.Content.RegisterSharedCardPool<TPool>());
+        }
+
         public ModContentPackBuilder SharedEvent<TEvent>() where TEvent : EventModel
         {
             return AddStep(ctx => ctx.Content.RegisterSharedEvent<TEvent>());