Small changes on new Item reminder feature
This commit is contained in:
Wofsauge committed
1 parent
2ad2bfff61
commit
3e0233f968
3 files changed
+42
-39
No files matched your search
+4
-3
@@ -283,6 +283,7 @@ EID.UserConfig = {
|
||||
["DisplayVoidStatInfo"] = false,
|
||||
|
||||
---------- Item Reminder Description ------------
|
||||
-- Enable/Disable item reminder feature.
|
||||
-- Hold Map (or the button action chosen below) to show a description of your active item's effect, recently picked up items, and things like Teleport 2.0's destination and Void's absorbed items
|
||||
["ItemReminderEnabled"] = true,
|
||||
-- Set the keybinding that's held to show the Item Reminder description, Flip/Spindown Dice preview descriptions, and interacting with the Bag of Crafting recipe list
|
||||
@@ -308,9 +309,9 @@ EID.UserConfig = {
|
||||
-- Items that grant you items without saying what they are (like Zodiac, Liberty Cap) can have their current granted item revealed in the Item Reminder
|
||||
-- Default = false
|
||||
["ItemReminderShowHiddenInfo"] = false,
|
||||
-- Some items (like Crooked Penny) can have their next result predicted and shown in the Item Reminder
|
||||
-- Some items (like Sanguine Bond) can have their next result predicted and shown in the Item Reminder
|
||||
-- Default = false
|
||||
["ItemReminderShowRNGCheats"] = false,
|
||||
["PredictionSanguineBond"] = false,
|
||||
|
||||
|
||||
---------- Bag of Crafting ------------
|
||||
@@ -537,7 +538,7 @@ EID.DefaultConfig = {
|
||||
["ItemReminderShowTrinketDesc"] = 2,
|
||||
["ItemReminderShowPoopDesc"] = 1,
|
||||
["ItemReminderShowHiddenInfo"] = false,
|
||||
["ItemReminderShowRNGCheats"] = false,
|
||||
["PredictionSanguineBond"] = false,
|
||||
|
||||
["SpindownDiceResults"] = 3,
|
||||
["SpindownDiceDisplayID"] = false,
|
||||
|
||||
+7
-7
@@ -85,7 +85,7 @@ local function sanguinePrediction()
|
||||
local spikes = currentRoom:GetGridEntity(67)
|
||||
if not spikes then return end -- don't display anything if we can't find the spikes!
|
||||
local cheatResult = nil
|
||||
if spikes and EID.Config["ItemReminderShowRNGCheats"] then
|
||||
if spikes and EID.Config["PredictionSanguineBond"] then
|
||||
local spikeSeed = currentRoom:GetGridEntity(67):GetRNG():GetSeed()
|
||||
spikeSeed = RNGNext(spikeSeed, 5, 9, 7)
|
||||
spikeSeed = RNGNext(spikeSeed, 1, 5, 0x13)
|
||||
@@ -208,18 +208,18 @@ function EID:getHoldMapDescription(player, checkingTwin)
|
||||
|
||||
-- Trinket Descriptions
|
||||
if EID.Config["ItemReminderShowTrinketDesc"] > 0 then
|
||||
for i = 0, EID.Config["ItemReminderShowTrinketDesc"]-1 do
|
||||
local heldActive = player:GetTrinket(i)
|
||||
if heldActive > 0 and not blacklist["5.350." .. heldActive] then
|
||||
for t = 0, EID.Config["ItemReminderShowTrinketDesc"]-1 do
|
||||
local heldTrinket = player:GetTrinket(t)
|
||||
if heldTrinket > 0 and not blacklist["5.350." .. heldTrinket] then
|
||||
-- Rainbow Worm
|
||||
if EID.Config["ItemReminderShowHiddenInfo"] and heldActive == 64 then
|
||||
if EID.Config["ItemReminderShowHiddenInfo"] and heldTrinket == 64 then
|
||||
blacklist["5.350.64"] = true
|
||||
local rainbowWormEffect = rainbowWormEffects[math.floor(game.TimeCounter / 30 / 3) % (REPENTANCE and 10 or 8)]
|
||||
addObjectDesc(5, 350, rainbowWormEffect, "{{Trinket64}}")
|
||||
-- 404 Error
|
||||
-- Unfortunately, includes other temporary trinket givers, such as Glitched Items. We'd need to predict 404's result using RNG to actually know which it specifically is granting
|
||||
-- And unfortunately, HasTrinket can't differentiate between real and fake trinkets in AB+
|
||||
elseif EID.Config["ItemReminderShowHiddenInfo"] and REPENTANCE and heldActive == 75 then
|
||||
elseif EID.Config["ItemReminderShowHiddenInfo"] and REPENTANCE and heldTrinket == 75 then
|
||||
blacklist["5.350.75"] = true
|
||||
-- Don't display Mysterious Paper's 1-frame temporary trinket granting
|
||||
local hasPaper = player:HasTrinket(21)
|
||||
@@ -230,7 +230,7 @@ function EID:getHoldMapDescription(player, checkingTwin)
|
||||
end
|
||||
end
|
||||
else
|
||||
addObjectDesc(5, 350, heldActive)
|
||||
addObjectDesc(5, 350, heldTrinket)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
+31
-29
@@ -389,35 +389,6 @@ if MCMLoaded then
|
||||
---------------------------------------------------------------------------
|
||||
---------------------------------Display-----------------------------------
|
||||
|
||||
|
||||
-- Item Reminder Settings --
|
||||
|
||||
EID:AddBooleanSetting("Display", "ItemReminderEnabled", "Item Reminder Description", {offText = "Disabled", onText = "Enabled", infoText = "Hold Map to show your active item's effect, recently picked up items, and much more"})
|
||||
|
||||
local actionToName = { [0] = "Move Left", "Move Right", "Move Up", "Move Down", "Shoot Left", "Shoot Right", "Shoot Up", "Shoot Down", "Bomb", "Item", "Pill/Card", "Drop", "Pause", "Map" }
|
||||
|
||||
EID:AddNumberSetting("Display", "BagOfCraftingToggleKey", "Hold to Show", 8, 13, {displayTable = actionToName,
|
||||
infoText = {"Hold this key to display the Item Reminder description, show Flip/Spindown previews and control the Bag of Crafting recipe list"}})
|
||||
|
||||
local itemSlotReminders = { [0] = "No", "Yes (max 1)", "Yes (max 2)", "Yes (max 3)", "Yes (max 4)", "Yes (max 5)",
|
||||
"Yes (max 6)", "Yes (max 7)", "Yes (max 8)" }
|
||||
|
||||
|
||||
-- should these be organized in the order they're shown in the map desc code?
|
||||
EID:AddNumberSetting("Display", "ItemReminderShowRecentItem", "Recent Item Descriptions", 0, 4, { displayTable = itemSlotReminders, infoText = {"Show recently acquired item descriptions in the Item Reminder (good for Curse of the Blind!)"}})
|
||||
EID:AddNumberSetting("Display", "ItemReminderShowActiveDesc", "Active Item Descriptions", 0, 2, { displayTable = itemSlotReminders, infoText = "Show your active item descriptions in the Item Reminder"})
|
||||
EID:AddNumberSetting("Display", "ItemReminderShowPocketDesc", "Pocket Item Descriptions", 0, 4, { displayTable = itemSlotReminders, infoText = "Show your pocket item (card, pill, active) descriptions in the Item Reminder"})
|
||||
EID:AddNumberSetting("Display", "ItemReminderShowTrinketDesc", "Trinket Descriptions", 0, 2, { displayTable = itemSlotReminders, infoText = "Show your trinket descriptions in the Item Reminder"})
|
||||
|
||||
EID:AddNumberSetting("Display", "ItemReminderShowPoopDesc", "Poop Descriptions", 0, 6, { repOnly = true, displayTable = itemSlotReminders, infoText = "Show Tainted ???'s next Poop Spell descriptions in the Item Reminder"})
|
||||
|
||||
EID:AddBooleanSetting("Display", "ItemReminderShowHiddenInfo", "Show Hidden Information", { infoText = "Items like 404 Error can have their current granted item revealed in the Item Reminder"})
|
||||
EID:AddBooleanSetting("Display", "ItemReminderShowRNGCheats", "Show RNG Predictions", { infoText = "Some items can have their next result predicted and shown in the Item Reminder"})
|
||||
MCM.AddSpace("EID", "Display")
|
||||
|
||||
--
|
||||
|
||||
|
||||
local refreshRateSteps = {1, 2, 3, 4, 6, 10, 12, 15, 20, 30, 60}
|
||||
EID:AddScrollSetting("Display", "RefreshRate", "Description Refresh Rate", refreshRateSteps,
|
||||
{displayingTab = "", infoText = "How many times per second that EID updates what description to show"})
|
||||
@@ -482,6 +453,7 @@ if MCMLoaded then
|
||||
EID:AddBooleanSetting("Display", "DisplayCardInfoOptions?", "'Options?' Card Infos", {repOnly = true})
|
||||
EID:AddBooleanSetting("Display", "DisplayPillInfoOptions?", "'Options?' Pill Infos", {repOnly = true})
|
||||
|
||||
|
||||
---------------------------------------------------------------------------
|
||||
---------------------------------Visuals-----------------------------------
|
||||
-- Font Type
|
||||
@@ -568,6 +540,36 @@ if MCMLoaded then
|
||||
local modIndicatorDisplays = {"Both","Name only","Icon only", "None"}
|
||||
EID:AddNumberSetting("Visuals", "ModIndicatorDisplay", "Display Mod Indicator", 1, #modIndicatorDisplays, {indexOf = modIndicatorDisplays})
|
||||
|
||||
|
||||
|
||||
---------------------------------------------------------------------------
|
||||
------------------------------Item Reminder--------------------------------
|
||||
|
||||
EID:AddBooleanSetting("Reminder", "ItemReminderEnabled", "Item Reminder Description", {offText = "Disabled", onText = "Enabled", infoText = "Hold Map to show your active item's effect, recently picked up items, and much more"})
|
||||
|
||||
local actionToName = { [0] = "Move Left", "Move Right", "Move Up", "Move Down", "Shoot Left", "Shoot Right", "Shoot Up", "Shoot Down", "Bomb", "Item", "Pill/Card", "Drop", "Pause", "Map" }
|
||||
|
||||
EID:AddNumberSetting("Reminder", "BagOfCraftingToggleKey", "Hold to Show", 8, 13, {displayTable = actionToName,
|
||||
infoText = {"Hold this key to display the Item Reminder description, show Flip/Spindown previews and control the Bag of Crafting recipe list"}})
|
||||
|
||||
local itemSlotReminders = { [0] = "No", "Yes (max 1)", "Yes (max 2)", "Yes (max 3)", "Yes (max 4)", "Yes (max 5)",
|
||||
"Yes (max 6)", "Yes (max 7)", "Yes (max 8)" }
|
||||
|
||||
MCM.AddSpace("EID", "Reminder")
|
||||
MCM.AddText("EID", "Reminder", "Item Descriptions")
|
||||
-- should these be organized in the order they're shown in the map desc code?
|
||||
EID:AddNumberSetting("Reminder", "ItemReminderShowRecentItem", "Recent Items", 0, 4, { displayTable = itemSlotReminders, infoText = {"Show recently acquired item descriptions in the Item Reminder (good for Curse of the Blind!)"}})
|
||||
EID:AddNumberSetting("Reminder", "ItemReminderShowActiveDesc", "Active Items", 0, 2, { displayTable = itemSlotReminders, infoText = "Show your active item descriptions in the Item Reminder"})
|
||||
EID:AddNumberSetting("Reminder", "ItemReminderShowPocketDesc", "Pocket Items", 0, 4, { displayTable = itemSlotReminders, infoText = "Show your pocket item (card, pill, active) descriptions in the Item Reminder"})
|
||||
EID:AddNumberSetting("Reminder", "ItemReminderShowTrinketDesc", "Trinkets", 0, 2, { displayTable = itemSlotReminders, infoText = "Show your trinket descriptions in the Item Reminder"})
|
||||
|
||||
EID:AddNumberSetting("Reminder", "ItemReminderShowPoopDesc", "Poop Spells", 0, 6, { repOnly = true, displayTable = itemSlotReminders, infoText = "Show Tainted ???'s next Poop Spell descriptions in the Item Reminder"})
|
||||
|
||||
EID:AddBooleanSetting("Reminder", "ItemReminderShowHiddenInfo", "Show Hidden Information", { infoText = "Items like Error (404) or Rainbow Worm can have their current granted item revealed in the Item Reminder"})
|
||||
EID:AddBooleanSetting("Reminder", "PredictionSanguineBond", "Highlight Sangine Bond Prediction", { infoText = "Highlights the next payout of Sangine Bond"})
|
||||
|
||||
|
||||
|
||||
---------------------------------------------------------------------------
|
||||
-----------------------------BAG OF CRAFTING-------------------------------
|
||||
|
||||
|
||||
Reference in new issue
Block a user