MC_EVALUATE_FAMILIAR_MULTIPLIER + WIP CustomCache system

TeamREPENTOGON · Jul 14, 2024 · a8d7d6d · a8d7d6d
1 parent ff75d0f
commit a8d7d6d
Show file tree

Hide file tree

Showing 13 changed files with 311 additions and 41 deletions.
diff --git a/libzhl/functions/EntityFamiliar.zhl b/libzhl/functions/EntityFamiliar.zhl
@@ -50,6 +50,9 @@ __thiscall void Entity_Familiar::RemoveFromPlayer(bool UnusedRemoveFamiliar);
 "8b41??3d84030000":
 __thiscall bool Entity_Familiar::CanCharm();
 
+"538bdc83ec0883e4f883c404558b6b??896c24??8bec6aff68????????64a1????????505381ece800000056":
+__thiscall void Entity_Familiar::WispInit();
+
 
 struct Entity_Familiar depends (ColorMod, ItemConfig_Item) : public Entity {
 {{

diff --git a/libzhl/functions/TemporaryEffects.zhl b/libzhl/functions/TemporaryEffects.zhl
@@ -53,6 +53,7 @@ __thiscall void TemporaryEffects::AddEffect(TemporaryEffect* Effect, bool addcos
 struct TemporaryEffects
 {
     vector_TemporaryEffect _effects : 0x4;
-    bool _disabled: 0x11;
+    bool _shouldEvaluateCache : 0x10;
+    bool _disabled : 0x11;
     Entity_Player* _player : 0x14;
 } : 0x18;
diff --git a/repentogon/LuaInterfaces/Entities/LuaEntityFamiliar.cpp b/repentogon/LuaInterfaces/Entities/LuaEntityFamiliar.cpp
@@ -2,6 +2,7 @@
 #include "LuaCore.h"
 #include "HookSystem.h"
 #include "../../Patches/FamiliarTags.h"
+#include "../../Patches/EntityPlus.h"
 
 LUA_FUNCTION(Lua_FamiliarGetFollowerPriority)
 {
@@ -153,6 +154,15 @@ LUA_FUNCTION(Lua_FamiliarGetItemConfig) {
 	return 1;
 }
 
+LUA_FUNCTION(Lua_FamiliarEvaluateMultiplier) {
+	auto* fam = lua::GetUserdata<Entity_Familiar*>(L, 1, lua::Metatables::ENTITY_FAMILIAR, "EntityFamiliar");
+	EntityFamiliarPlus* famPlus = GetEntityFamiliarPlus(fam);
+	if (famPlus) {
+		famPlus->cachedMultiplier = std::nullopt;
+	}
+	return 0;
+}
+
 HOOK_METHOD(LuaEngine, RegisterClasses, () -> void) {
 	super();
 
@@ -175,6 +185,7 @@ HOOK_METHOD(LuaEngine, RegisterClasses, () -> void) {
 		{ "GetMoveDelayNum", Lua_FamiliarGetMoveDelayNum },
 		{ "SetMoveDelayNum", Lua_FamiliarSetMoveDelayNum },
 		{ "GetItemConfig", Lua_FamiliarGetItemConfig },
+		{ "EvaluateMultiplier", Lua_FamiliarEvaluateMultiplier },
 		{ NULL, NULL }
 	};
 

diff --git a/repentogon/LuaInterfaces/Entities/LuaEntityPlayer.cpp b/repentogon/LuaInterfaces/Entities/LuaEntityPlayer.cpp
@@ -5,6 +5,8 @@
 #include "../LuaWeapon.h"
 #include "../../Patches/ASMPatches/ASMPlayer.h"
 #include "../../Patches/ExtraLives.h"
+#include "../../Patches/EntityPlus.h"
+#include "../../Patches/XmlData.h"
 
 
 /*
@@ -2366,6 +2368,54 @@ LUA_FUNCTION(Lua_PlayerGetBombVariant) {
 	return 1;
 }
 
+LUA_FUNCTION(Lua_PlayerAddCustomCacheTag) {
+	Entity_Player* player = lua::GetUserdata<Entity_Player*>(L, 1, lua::Metatables::ENTITY_PLAYER, "EntityPlayer");
+
+	EntityPlayerPlus* playerPlus = GetEntityPlayerPlus(player);
+
+	const int type = lua_type(L, 2);
+
+	if (type == LUA_TTABLE) {
+		std::set<std::string> customcaches;
+
+		auto tableLength = lua_rawlen(L, 2);
+		for (auto i = 1; i <= tableLength; ++i) {
+			lua_pushinteger(L, i);
+			lua_gettable(L, 2);
+			if (lua_type(L, -1) == LUA_TNIL)
+				break;
+			playerPlus->customCacheTags.insert(stringlower(luaL_checkstring(L, -1)));
+			lua_pop(L, 1);
+		}
+	}
+	else {
+		playerPlus->customCacheTags.insert(stringlower(luaL_checkstring(L, 2)));
+	}
+
+	const bool evalItems = lua::luaL_optboolean(L, 3, false);
+
+	if (evalItems) {
+		player->EvaluateItems();
+	}
+
+	return 0;
+}
+
+LUA_FUNCTION(Lua_PlayerGetCustomCacheValue) {
+	Entity_Player* player = lua::GetUserdata<Entity_Player*>(L, 1, lua::Metatables::ENTITY_PLAYER, "EntityPlayer");
+
+	const std::string layerName = luaL_checkstring(L, 2);
+
+	EntityPlayerPlus* playerPlus = GetEntityPlayerPlus(player);
+
+	if (playerPlus && playerPlus->customCacheResults.find(layerName) != playerPlus->customCacheResults.end()) {
+		lua_pushnumber(L, playerPlus->customCacheResults[layerName]);
+	}
+	lua_pushnumber(L, 0);
+
+	return 1;
+}
+
 HOOK_METHOD(LuaEngine, RegisterClasses, () -> void) {
 	super();
 
@@ -2579,6 +2629,8 @@ HOOK_METHOD(LuaEngine, RegisterClasses, () -> void) {
 		{ "SetBlackHeart", Lua_PlayerSetBlackHeart },
 		{ "AddNullCostume", Lua_PlayerAddNullCostumeOverride },
 		{ "GetBombVariant", Lua_PlayerGetBombVariant },
+		{ "AddCustomCacheTag", Lua_PlayerAddCustomCacheTag },
+		{ "GetCustomCacheValue", Lua_PlayerGetCustomCacheValue },
 		{ NULL, NULL }
 	};
 	lua::RegisterFunctions(_state, lua::Metatables::ENTITY_PLAYER, functions);

diff --git a/repentogon/Patches/ASMPatches.cpp b/repentogon/Patches/ASMPatches.cpp
@@ -3,6 +3,7 @@
 
 #include "../LuaInterfaces/LuaRender.h"
 #include "NullItemsAndCostumes.h"
+#include "CustomCache.h"
 #include "FamiliarTags.h"
 #include "GetCoinValue.h"
 #include "PocketItems.h"
@@ -149,6 +150,7 @@ void PerformASMPatches() {
 	ASMPatchesForGetCoinValue();
 	ASMPatchesForAddRemovePocketItemCallbacks();
 	ASMPatchesForEntityPlus();
+	ASMPatchesForCustomCache();
 	HookImGui();
 
 	// Sprite