HistoryHUD(Item) classes, MC_PRE/POST_HISTORYHUD_RENDER, couple other lil things

ConnorForan · ConnorForan · commit 04f4d62d5aaf · 2026-02-12T20:15:40.000-05:00
diff --git a/changelog.txt b/changelog.txt
@@ -37,21 +37,35 @@ Added:
 * EntityPlayer:
 	- [Get/Set]ImExcitedSpeedupCountdown
 	- [Get/Set]DonateLuck
+	- GetErrorTrinketEffect
+* RoomDescriptor
+	- GetErrorTrinketEffect
 * RoomConfig:
 	- LoadStb(StbType, int Mode, string StbFileName)
 * RoomConfigSet:
 	- LoadStb(string StbFileName)
 * CharacterMenu
 	- GetCompletionMarksSprite
+* History
+	- SearchCollectibles(int or table)
+	- SearchTrinkets(int or table)
+* HUD
+	- GetHistoryHUD
+* Added HistoryHUD and HistoryHUDItem classes
 * Backported new enums for GameStateFlag
+* The "Error" and "Modeling Clay" trinkets now use the sprite of the item they are mimicking when smelted, like how they do in later versions of Repentance+.
 /newline/
 Modified:
 * EntityPlayer:
 	- SetControllerIndex(integer ControllerIndex, boolean IncludePlayerOwned = false)
 		If IncludePlayerOwned set to true, then sets ControllerIndex for player's subplayer/twinplayer
+/newline/
 Fixes:
 * ModCallbacks:
 	- Fixed MC_GET_STATUS_EFFECT_TARGET not running for the "shrink" status effect.
+* CharacterMenu:
+	- Fixed GetCharacterMenuIDFromPlayerType not returning the correct value for Tainted Isaac
+* Fixed modded characters' locked/door sprites rendering on the "continue" widget if they are locked behind an achievement.
 /newline/
 /versionseparator/
 v1.1.1a -
diff --git a/libzhl/IsaacRepentance_static.cpp b/libzhl/IsaacRepentance_static.cpp
@@ -554,6 +554,59 @@ bool ItemConfig::IsValidTrinket(unsigned int TrinketType) {
 	return false;
 }
 
+int RoomDescriptor::GetErrorTrinketEffect() {
+	if (this->SpawnSeed != 0) {
+		unsigned int seed = this->SpawnSeed;
+		seed = seed >> 2 ^ seed;
+		seed = seed << 7 ^ seed;
+		seed = seed >> 25 ^ seed;
+		return seed % (NUM_TRINKETS-1) + 1;
+	}
+	return TRINKET_ERROR;
+}
+
+Vector HistoryHUD::GetPosition() const {
+	Vector minimapDisplaySize;
+	g_Game->GetMinimap()->GetDisplayedSize(minimapDisplaySize);
+	const float hudOffset = 1 - g_Manager->GetOptions()->_hudOffset;
+	return Vector(g_WIDTH - 87 + hudOffset * 24, hudOffset * -14 + minimapDisplaySize.y + 32);
+}
+
+bool HistoryHUD::HasTwin() const {
+	return _playerHistoryHuds[1]._player != nullptr;
+}
+
+bool HistoryHUD::IsMini() const {
+	return g_Manager->GetOptions()->_historyHudMode == 2;
+}
+
+float HistoryHUD::GetScale() const {
+	return IsMini() ? 0.5f : 1.0f;
+}
+
+float HistoryHUD::GetIconSize() const {
+	return GetScale() * 32.f;
+}
+
+int HistoryHUD::GetNumRows() const {
+	const float hudOffset = 1 - g_Manager->GetOptions()->_hudOffset;
+	return (int)std::ceil(((hudOffset * 14 + (g_HEIGHT - 64)) - GetPosition().y) / GetIconSize());
+}
+
+// This is per-player, if there are twins.
+int HistoryHUD::GetNumColumns() const {
+	int col = HasTwin() ? 1 : 2;
+	if (IsMini()) {
+		col *= 2;
+	}
+	return col;
+}
+
+// This is per-player, if there are twins.
+int HistoryHUD::GetNumVisibleItems() const {
+	return GetNumRows() * GetNumColumns();
+}
+
 bool Isaac::IsInGame() {
 	return g_Manager->GetState() == 2 && g_Game;
 }
diff --git a/libzhl/LuaCore.cpp b/libzhl/LuaCore.cpp
@@ -788,6 +788,8 @@ namespace lua {
 		const char* GridWebMT = "GridEntityWeb";
 		const char* HistoryMT = "History";
 		const char* HistoryItemMT = "HistoryItem";
+		const char* HistoryHUDMT = "HistoryHUD";
+		const char* HistoryHUDItemMT = "HistoryHUDItem";
 		const char* HUDMessageMT = "HUDMessage";
 		const char* ImGuiMT = "ImGui";
 		const char* ItemOverlayMT = "ItemOverlay";
diff --git a/libzhl/LuaCore.h b/libzhl/LuaCore.h
@@ -207,6 +207,8 @@ namespace lua {
         extern LIBZHL_API const char* GridWebMT;
         extern LIBZHL_API const char* HistoryMT;
         extern LIBZHL_API const char* HistoryItemMT;
+        extern LIBZHL_API const char* HistoryHUDMT;
+        extern LIBZHL_API const char* HistoryHUDItemMT;
         extern LIBZHL_API const char* HUDMessageMT;
         extern LIBZHL_API const char* ImGuiMT;
         extern LIBZHL_API const char* ItemOverlayMT;
diff --git a/libzhl/functions/ASM.zhl b/libzhl/functions/ASM.zhl
@@ -25,6 +25,14 @@ asm RenderPocketItemPillIdentifiedCheck "3bc10f42c880bc??????????000f84????????5
 asm UsePillIdentifyPill "3bc80f42c1c684??????????01c785????????00000000";
 asm ItemPoolGetPillEffect "8bb4??????????85ff";
 
+asm HistoryHudRecomputeGfx "84c074??a1????????8bfa";
+asm HistoryHudRecomputeGfx_Jump "897d??85ff0f84????????833f03";
+asm HistoryHudRecomputeGfx_RefreshCheck "0f84????????8b45??83c0f8";
+asm PreRenderHistoryItem "0f294424??85c9";
+asm PreRenderHistoryItemStackOffsets "8d9424????????528d5424??528b40??8d9424";
+asm PreRenderHistoryItemColorModOffset "8d8c24????????e8????????f30f107c24";
+asm PostRenderHistoryItem "8b4c24??83c628";
+
 asm GreedDonationBreakChanceForModdedCharacters "f30f1005????????59";
 asm GreedDonationCoinCountForModdedCharacters "83f8297d??6a01";
 
diff --git a/libzhl/functions/EntityPlayer.zhl b/libzhl/functions/EntityPlayer.zhl
@@ -814,6 +814,7 @@ struct Entity_Player depends (Vector, ANM2, ColorMod, KColor, PlayerCostumeMap,
 	char _poopSpellQueue[6] : 0x1f30;
 	int _eveSumptoriumCharge : 0x1f58;
 	std_map_int_int _itemWispsList : 0x1f5c;
+	int _modelingClayEffect : 0x1f94;
 	int _keepersSackBonus : 0x1f98;
 	ConsumableData _consumablesBackup : 0x2014;
 	uint8_t _wildCardItemType : 0x2064;
diff --git a/libzhl/functions/ExtraTypes b/libzhl/functions/ExtraTypes
@@ -159,6 +159,11 @@ TypeInfo std_vector_history_historyitem {
     Align 4;
 };
 
+TypeInfo std_vector_HistoryHUDItem {
+    Size 12;
+    Align 4;
+};
+
 TypeInfo vector_ModEntryPointer {
     Size 12;
     Align 4;
diff --git a/libzhl/functions/GameState.zhl b/libzhl/functions/GameState.zhl
@@ -23,6 +23,8 @@ struct GameState depends (RoomDescriptor, GameStateRoomConfig, GameStatePlayer,
     uint32_t _roomCount : 0x19c;
     RoomDescriptor _rooms[527] : 0x1a0;
     GameStateRoomConfig _roomConfigs[527] : 0x17c68;
+    int _roomIdx : 0x19d1c;
+    int _lastRoomIdx : 0x19d20;
     uint32_t _playerCount : 0x19d70;
     GameStatePlayer _players[8] : 0x19d74;
     GameStatePlayer _esauJrStates[4] : 0x1cb54;
diff --git a/libzhl/functions/Global.zhl b/libzhl/functions/Global.zhl
@@ -68,6 +68,7 @@ typedef std::deque<std::string> deque_string;
 typedef std::vector<int> std_vector_int;
 typedef std::vector<Vector> std_vector_vector2;
 typedef std::vector<History_HistoryItem> std_vector_history_historyitem;
+typedef std::vector<HistoryHUD_Item> std_vector_HistoryHUDItem;
 typedef std::vector<unsigned int> std_vector_uint;
 typedef std::set<uint32_t> std_set_uint32t;
 typedef std::vector<EntitySaveState> vector_EntitySaveState;
diff --git a/libzhl/functions/HUD.zhl b/libzhl/functions/HUD.zhl
@@ -44,7 +44,7 @@ __thiscall int HUD::GetPlayerHUDLayout(int playerHudIndex, Entity_Player* player
 
 
 
-struct HUD depends (PlayerHUD, ANM2, StatHUD, HUD_Message) { {{
+struct HUD depends (PlayerHUD, ANM2, StatHUD, HUD_Message, HistoryHUD) { {{
 	inline PlayerHUD* GetPlayerHUD(int index) {
 		if (index < 0 || index > 7) {
 			return nullptr;
@@ -71,4 +71,5 @@ struct HUD depends (PlayerHUD, ANM2, StatHUD, HUD_Message) { {{
 	ANM2 _craftingTableSprite : 0x571c;
 	ANM2 _poopSpellsSprite : 0x5830;
 	StatHUD _statHUD : 0x59b4;
+	HistoryHUD _historyHUD : 0x5c64;
 } : 0x5c90;
diff --git a/libzhl/functions/HistoryHUD.zhl b/libzhl/functions/HistoryHUD.zhl
@@ -0,0 +1,25 @@
+"558bec83e4f081ec18010000a1":
+__thiscall void HistoryHUD::Render(Vector* pos, bool mini);
+
+"558bec538bd98b0d????????81c1b8af0400578b7d??8b013b41??74??ffb7????????e8????????84c074??837f??0075??83bf????????0075??83bf????????2874??83c8ff":
+__thiscall int HistoryHUD::GetPlayerIdx(Entity_Player* player);  // aka GetPlayerPartID
+
+"538bdc83ec0883e4f883c404558b6b??896c24??8bec6aff68????????64a1????????505381ec2801000056":
+__thiscall void HistoryHUD::Recompute(int idx, bool immediate);
+
+"558bec6aff68????????64a1????????5083ec38535657a1????????33c5508d45??64a3????????894d":
+__thiscall void HistoryHUD::RecomputeAll(bool immediate);
+
+struct HistoryHUD depends (HistoryHUD_Player) {
+	{{
+		Vector LIBZHL_API HistoryHUD::GetPosition() const;
+		bool LIBZHL_API HistoryHUD::HasTwin() const;
+		bool LIBZHL_API HistoryHUD::IsMini() const;
+		float LIBZHL_API HistoryHUD::GetScale() const;
+		float LIBZHL_API HistoryHUD::GetIconSize() const;
+		int LIBZHL_API HistoryHUD::GetNumRows() const;
+		int LIBZHL_API HistoryHUD::GetNumColumns() const;
+		int LIBZHL_API HistoryHUD::GetNumVisibleItems() const;
+	}}
+	HistoryHUD_Player _playerHistoryHuds[2] : 0x0;
+} : 0x2C;
diff --git a/libzhl/functions/HistoryHUDItem.zhl b/libzhl/functions/HistoryHUDItem.zhl
@@ -0,0 +1,4 @@
+struct HistoryHUD_Item depends (History_HistoryItem) {
+	KAGE_Graphics_ImageBase* _image : 0x4;
+	History_HistoryItem _historyItem : 0xC;
+} : 0x28;
diff --git a/libzhl/functions/HistoryHUDPlayer.zhl b/libzhl/functions/HistoryHUDPlayer.zhl
@@ -0,0 +1,4 @@
+struct HistoryHUD_Player {
+	Entity_Player* _player : 0x0;
+	std_vector_HistoryHUDItem _historyHudItems : 0x8;
+} : 0x14;
diff --git a/libzhl/functions/RoomDescriptor.zhl b/libzhl/functions/RoomDescriptor.zhl
@@ -3,6 +3,9 @@ __thiscall void RoomDescriptor::InitSeeds(RNG * rng);
 
 struct RoomDescriptor depends (RoomConfig_Room)
 {
+	{{
+		int LIBZHL_API RoomDescriptor::GetErrorTrinketEffect();
+	}}
     int32_t GridIndex : 0x0;
     int32_t SafeGridIndex : 0x4;
     int32_t ListIndex : 0x8;
diff --git a/libzhlgen/ParserDefinitions.cpp b/libzhlgen/ParserDefinitions.cpp
@@ -507,7 +507,7 @@ size_t Type::alignment() const {
     else if (_array) {
         return _base->alignment();
     } else {
-        throw std::runtime_error("Unable to compute alignment constraint");
+        throw std::runtime_error("Unable to compute alignment constraint for type " + type->GetFullName());
         return 0;
     }
 }
diff --git a/repentogon/LuaInterfaces/Entities/LuaEntityPlayer.cpp b/repentogon/LuaInterfaces/Entities/LuaEntityPlayer.cpp
@@ -3294,6 +3294,11 @@ LUA_FUNCTION(Lua_PlayerSetDonateLuck) {
 	return 0;
 }
 
+LUA_FUNCTION(Lua_PlayerGetErrorTrinketEffect) {
+	lua_pushinteger(L, g_Game->GetCurrentRoomDesc()->GetErrorTrinketEffect());
+	return 1;
+}
+
 HOOK_METHOD(LuaEngine, RegisterClasses, () -> void) {
 	super();
 
@@ -3593,6 +3598,7 @@ HOOK_METHOD(LuaEngine, RegisterClasses, () -> void) {
 		{ "SetImExcitedSpeedupCountdown", Lua_PlayerSetImExcitedSpeedupCountdown },
 		{ "GetDonateLuck", Lua_PlayerGetDonateLuck },
 		{ "SetDonateLuck", Lua_PlayerSetDonateLuck },
+		{ "GetErrorTrinketEffect", Lua_PlayerGetErrorTrinketEffect },
 
 		{ NULL, NULL }
 	};
diff --git a/repentogon/LuaInterfaces/HUD/LuaHistoryHUD.cpp b/repentogon/LuaInterfaces/HUD/LuaHistoryHUD.cpp
diff --git a/repentogon/LuaInterfaces/LuaHistory.cpp b/repentogon/LuaInterfaces/LuaHistory.cpp
diff --git a/repentogon/LuaInterfaces/Room/LuaRoomDescriptor.cpp b/repentogon/LuaInterfaces/Room/LuaRoomDescriptor.cpp
diff --git a/repentogon/Patches/ASMPatches.cpp b/repentogon/Patches/ASMPatches.cpp
diff --git a/repentogon/Patches/ASMPatches/ASMHud.cpp b/repentogon/Patches/ASMPatches/ASMHud.cpp
diff --git a/repentogon/Patches/ASMPatches/ASMHud.h b/repentogon/Patches/ASMPatches/ASMHud.h
diff --git a/repentogon/resources/scripts/enums_ex.lua b/repentogon/resources/scripts/enums_ex.lua
diff --git a/repentogon/resources/scripts/main_ex.lua b/repentogon/resources/scripts/main_ex.lua
