From 58dbbf861523b6bcf3ba3b7a7d638bebd9b1560f Mon Sep 17 00:00:00 2001
From: kohashiwakaba <kanade.tinkle@gmail.com>
Date: Thu, 3 Feb 2022 16:47:54 +0900
Subject: [PATCH] Added ID/Name display options for Spindown Dice list

---
 eid_config.lua      | 10 ++++++++++
 eid_modifiers.lua   | 14 +++++++++++++-
 mod_config_menu.lua |  6 ++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/eid_config.lua b/eid_config.lua
index bf1d07ae..1da7fe72 100644
--- a/eid_config.lua
+++ b/eid_config.lua
@@ -323,6 +323,14 @@ EID.UserConfig = {
 	-- REPENTANCE ONLY!!!
 	-- Default = 3
 	["SpindownDiceResults"] = 3,
+	-- Display IDs for Spindown Dice results
+	-- REPENTANCE ONLY!!!
+	-- Default = false
+	["SpindownDiceDisplayID"] = false,
+	-- Display names for Spindown Dice results
+	-- REPENTANCE ONLY!!!
+	-- Default = false
+	["SpindownDiceDisplayName"] = false,
 	-- Spindown Dice preview can skip over locked items, however the method for determining an item's locked status is not perfect
 	-- REPENTANCE ONLY!!!
 	-- Default = false
@@ -429,6 +437,8 @@ EID.DefaultConfig = {
 	["CraftingResultKey"] = Keyboard.KEY_F4,
 	["CraftingResultButton"] = -1,
 	["SpindownDiceResults"] = 3,
+	["SpindownDiceDisplayID"] = false,
+	["SpindownDiceDisplayName"] = false,
 	["SpindownDiceSkipLocked"] = false,
 	["SaveGameNumber"] = 0,
 	["ItemCollectionColor"] = "ColorFade",
diff --git a/eid_modifiers.lua b/eid_modifiers.lua
index d7098c4e..47ac93ce 100644
--- a/eid_modifiers.lua
+++ b/eid_modifiers.lua
@@ -190,6 +190,18 @@ if REPENTANCE then
 				if i == 1 then firstID = refID end
 				EID:appendToDescription(descObj, "{{Collectible"..refID.."}}")
 				if EID.itemUnlockStates[refID] == false then EID:appendToDescription(descObj, "?") end
+				if EID.Config["SpindownDiceDisplayID"] then
+					EID:appendToDescription(descObj, "/".. refID)
+				end
+				if EID.Config["SpindownDiceDisplayName"] then
+					EID:appendToDescription(descObj, "/".. EID:getObjectName(5, 100, refID))
+					if refID == 668 then break end
+					if i ~= EID.Config["SpindownDiceResults"] then
+						EID:appendToDescription(descObj, "#{{Blank}}")
+					end
+				end
+
+				if refID == 668 then break end -- Dad's Note is not affected by Spindown Dice
 				if i ~= EID.Config["SpindownDiceResults"] then
 					EID:appendToDescription(descObj, " ->")
 				end
@@ -427,7 +439,7 @@ if REPENTANCE then
 			if collectiblesOwned[706] or (EID.absorbedItems[706] and collectiblesOwned[477]) then table.insert(callbacks, AbyssCallback) end
 			
 			if collectiblesOwned[711] and EID:getEntityData(descObj.Entity, "EID_FlipItemID") then table.insert(callbacks, FlipCallback) end
-			if collectiblesOwned[723] or (EID.absorbedItems[723] and collectiblesOwned[477]) then table.insert(callbacks, SpindownDiceCallback) end
+			if (collectiblesOwned[723] or (EID.absorbedItems[723] and collectiblesOwned[477])) and descObj.ObjSubType ~= 668 then table.insert(callbacks, SpindownDiceCallback) end
 			
 		-- Card / Rune Callbacks
 		elseif descObj.ObjVariant == PickupVariant.PICKUP_TAROTCARD then
diff --git a/mod_config_menu.lua b/mod_config_menu.lua
index b13ed325..6c43464d 100644
--- a/mod_config_menu.lua
+++ b/mod_config_menu.lua
@@ -624,6 +624,12 @@ if MCMLoaded then
 			}
 		)
 		-- 
+		-- Display IDs for Spindown Dice results
+		EID:AddBooleanSetting("Display", "SpindownDiceDisplayID", "Display IDs",
+		{repOnly = true, infoText = "Display IDs for Spindown Dice results"})
+		-- Display names for Spindown Dice results
+		EID:AddBooleanSetting("Display", "SpindownDiceDisplayName", "Display names",
+		{repOnly = true, infoText = "Display names for Spindown Dice results"})
 		
 		-- Spindown Dice skip locked items
 		EID:AddBooleanSetting("Display", "SpindownDiceSkipLocked", "Skip Locked Items",