Fix small quirks with adding/removing innate (or wisp) Book of Virtues

(cherry picked from commit 5d29483)

Author: ConnorForan

libzhl/functions/EntityPlayer.zhl

@@ -403,6 +403,9 @@ __thiscall void Entity_Player::AddUrnSouls(unsigned int amount);
 "558bec83e4f8518b0d????????568b75":
 __thiscall bool Entity_Player::CanAddCollectibleToInventory(int id);
 
+"558bec83e4f8565733ff":
+__thiscall void Entity_Player::UpdateBookOfVirtues(bool addedBookOfVirtues);
+
 "558bec568b75??83fe03":
 __thiscall bool Entity_Player::CanOverrideActiveItem(unsigned int slot);
 

repentogon/LuaInterfaces/CustomCallbacks.cpp

@@ -58,11 +58,19 @@ HOOK_STATIC(Isaac, GetBuiltInCallbackState, (const int callbackid)-> bool, __cde
 // MC_POST_TRIGGER_COLLECTIBLE_ADDED (1053)
 // (Runs for normal items, wisps, and innate collectibles)
 void CustomCallbacks::TriggerCollectibleAdded(Entity_Player& player, int collectibleID, bool firsttime, bool wispOrInnate) {
-	// Fixes a minor bug where the effect/costume for the charge being ready may not trigger.
-	if (wispOrInnate && collectibleID == COLLECTIBLE_MARS) {
-		player._marsCooldown = 0;
-		player._marsUnk2 = -1;
-		player._marsUnkBool = true;
+	if (wispOrInnate) {
+		switch (collectibleID) {
+			// Fixes a minor bug where the effect/costume for the charge being ready may not trigger.
+			case COLLECTIBLE_MARS:
+				player._marsCooldown = 0;
+				player._marsUnk2 = -1;
+				player._marsUnkBool = true;
+				break;
+			// Properly updates the active hud stuff.
+			case COLLECTIBLE_BOOK_OF_VIRTUES:
+				player.UpdateBookOfVirtues(true);
+				break;
+		}
 	}
 
     const int callbackid = 1053;
@@ -3024,6 +3032,16 @@ HOOK_METHOD(Entity_Player, TriggerCollectibleRemoved, (int collectibleID) -> voi
 		this->RemoveCostume(g_Manager->GetItemConfig()->GetNullItem(58));
 	}
 
+	// Properly updates the active hud stuff.
+	if (collectibleID == COLLECTIBLE_BOOK_OF_VIRTUES && wispOrInnate) {
+		auto* activeDesc = this->GetActiveItemDesc(0);
+		if (activeDesc->_item == COLLECTIBLE_BOOK_OF_VIRTUES) {
+			activeDesc->_item = COLLECTIBLE_NULL;
+			activeDesc->_batteryCharge = 0;
+		}
+		this->UpdateBookOfVirtues(false);
+	}
+
     super(collectibleID);
 
     const int callbackid = 1095;