ItemReminder: fixed issue with handling multiplayer +J&E

eid_holdmapdesc.lua

@@ -444,12 +444,19 @@ function EID:IsCategorySelected(categoryID)
 	return EID.ItemReminderCategories[EID.ItemReminderSelectedCategory + 1].id == categoryID
 end
 
-function EID:ItemReminderHandleInitHoldTab(playerNumHoldingTab)
+function EID:ItemReminderHandleInitHoldTab()
 	local oldDisplayPlayer = EID.ItemReminderSelectedPlayer
-	EID.ItemReminderSelectedPlayer = playerNumHoldingTab - 1
+
+	-- set currently displayed player to the one who is now holding tab
+	for i = 1, #EID.coopAllPlayers do
+		if EID.coopAllPlayers[i] == EID.holdTabPlayer then
+			EID.ItemReminderSelectedPlayer = i - 1
+			break
+		end
+	end
 
 	local updatedPlayers = EID:UpdateAllPlayerPassiveItems()
-	if updatedPlayers[playerNumHoldingTab] or oldDisplayPlayer ~= EID.ItemReminderSelectedPlayer then
+	if updatedPlayers[EID.ItemReminderSelectedPlayer + 1] or oldDisplayPlayer ~= EID.ItemReminderSelectedPlayer then
 		EID.ItemReminderSelectedItem = 0
 	end
 end
@@ -463,19 +470,20 @@ function EID:ItemReminderGetTitle()
 		translatedTitleEnglish and translatedTitleEnglish[category.id] or category.id
 
 	local combinedText = EID.ButtonToIconMap[EID.Config["ItemReminderNavigateLeftButton"]] ..
-	"{{ColorText}} " .. title .. " {{CR}}" .. EID.ButtonToIconMap[EID.Config["ItemReminderNavigateRightButton"]]
+	 title .. EID.ButtonToIconMap[EID.Config["ItemReminderNavigateRightButton"]]
 
 	-- add player toggle when more than 1 player is present
 	if #EID.coopAllPlayers > 1 then
-		local currentPlayer = EID.coopAllPlayers[EID.ItemReminderSelectedPlayer + 1]
+		local curPlayerID = EID.ItemReminderSelectedPlayer + 1
-		local playerIcon = EID:GetPlayerIcon(currentPlayer:GetPlayerType())
+		local currentPlayer = EID.coopAllPlayers[curPlayerID]
+		local playerIcon = EID:GetPlayerIcon(currentPlayer:GetPlayerType(), "P" .. curPlayerID )
 
 		local playerSelectWidget = playerIcon .. " "
 		if not EID:IsCategorySelected("Passives") then
-			playerSelectWidget = EID.ButtonToIconMap[EID.Config["ItemReminderNavigateDownButton"]] .. " " ..
+			playerSelectWidget = EID.ButtonToIconMap[EID.Config["ItemReminderNavigateDownButton"]] ..
-				playerIcon .. " " .. EID.ButtonToIconMap[EID.Config["ItemReminderNavigateUpButton"]] .. "  "
+				playerIcon .. EID.ButtonToIconMap[EID.Config["ItemReminderNavigateUpButton"]] .. "|"
 		end
-		combinedText = playerSelectWidget .. combinedText
+		combinedText = "{{ColorText}}" .. playerSelectWidget .. combinedText
 	end
 	return combinedText
 end

main.lua

@@ -1284,7 +1284,7 @@ function EID:OnRender()
 	if tabHeld then
 		EID.holdTabPlayer = EID.coopMainPlayers[playerNumHoldingTab]
 		if EID.holdTabCounter == 0 then -- update item reminder player selection
-			EID:ItemReminderHandleInitHoldTab(playerNumHoldingTab)
+			EID:ItemReminderHandleInitHoldTab()
 		end
 		EID.holdTabCounter = EID.holdTabCounter + 1
 	else