From e96021818d55ff7720e7046abb519fa1290e0b1a Mon Sep 17 00:00:00 2001
From: Nebby <78170922+Nebby1999@users.noreply.github.com>
Date: Thu, 26 Sep 2024 20:24:52 -0300
Subject: [PATCH] DirectorAPI: Fixing an issue on my previous PR (#551)

* Light Overrides

* Fixes for family dccs

* Fixes for the Fix

* Another fix for DirectorAPI
---
 R2API.Director/AddressableDCCSPool.cs | 2 +-
 R2API.Director/README.md              | 4 ++++
 R2API.Director/thunderstore.toml      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/R2API.Director/AddressableDCCSPool.cs b/R2API.Director/AddressableDCCSPool.cs
index e9a8b871..83fda5b1 100644
--- a/R2API.Director/AddressableDCCSPool.cs
+++ b/R2API.Director/AddressableDCCSPool.cs
@@ -83,7 +83,7 @@ internal override DccsPool.PoolEntry Upgrade()
         {
             return new DccsPool.ConditionalPoolEntry
             {
-                dccs = dccs.targetCardCategorySelection,
+                dccs = familyDccs.AssetExists ? familyDccs.Asset : dccs.targetCardCategorySelection,
                 requiredExpansions = requiredExpansions.Select(x => x.Asset).ToArray(),
                 weight = weight
             };
diff --git a/R2API.Director/README.md b/R2API.Director/README.md
index 8c4162e7..daa40b65 100644
--- a/R2API.Director/README.md
+++ b/R2API.Director/README.md
@@ -18,6 +18,10 @@ Alongside this, R2API.Director also comes bundled with DirectorAPIHelpers, which
 
 ## Changelog
 
+### '2.3.1'
+
+* Fixed the AddressableDCCSPool's ConditionalPool class not upgrading properly when it was using the new FamilyDCCSOption
+
 ### '2.3.0'
 
 * Added an "AddressReferencedFamilyDirectorCardCategorySelection" class, which is used to reference the FamilyDCCS from the base game
diff --git a/R2API.Director/thunderstore.toml b/R2API.Director/thunderstore.toml
index 58a99eb0..10a100c3 100644
--- a/R2API.Director/thunderstore.toml
+++ b/R2API.Director/thunderstore.toml
@@ -5,7 +5,7 @@ schemaVersion = "0.0.1"
 [package]
 namespace = "RiskofThunder"
 name = "R2API_Director"
-versionNumber = "2.3.0"
+versionNumber = "2.3.1"
 description = "API for easily modifiying the Director (RoR2 monster / interactable spawner) behaviour"
 websiteUrl = "https://github.com/risk-of-thunder/R2API"
 containsNsfwContent = false