[DRAFT] Basic StageHandler

.gitignore

@@ -552,3 +552,4 @@ include/IsaacRepentance.h
 libzhl/IsaacRepentance.cpp
 updater/updater.rc
 updater_rsrc
+updater_rsrc

libzhl/functions/ExtraTypes

@@ -60,6 +60,11 @@ TypeInfo vector_MusicEntry {
     Align 4;
 }; 
 
+TypeInfo vector_FXLayers_FX {
+    Size 12;
+    Align 4;
+}; 
+
 TypeInfo vector_Curse {
     Size 12;
     Align 4;

libzhl/functions/FXLayers.zhl

@@ -0,0 +1,15 @@
+"538bdc83ec0883e4f883c404558b6b??896c24??8bec6aff68????????64a1????????50515351b87c020100e8????????a1????????33c58945??5657508d45??64a3????????8965??8bf1":
+__thiscall void FXLayers::Init(char * fileName, int levelStage, int stageType);
+
+"558bec53568bf18bda":
+static cleanup bool FXLayers::check_fxlayer_match(int stage<ecx>, int altStages<edx>, int compLevelStage, int compStageType);
+
+struct FXLayers depends (Vector, FXParams) {
+	Vector _averagePlayerPos : 0x0;
+	bool _loaded : 0x8;
+	int _levelStage : 0x0c;
+	int _stageType : 0x10;
+	int _backdropType : 0x14;
+	vector_FXLayers_FX _fx : 0x18;
+	FXParams _fxParams : 0x4f8;
+} : 0x584;

libzhl/functions/FXLayers_FX.zhl

@@ -0,0 +1,15 @@
+struct FXLayers_FX depends (Vector) {
+	unsigned int _id : 0x0;
+	KAGE_Graphics_ImagePNG* _image : 0x4;
+	// smartpointer 0x8
+	Vector _min : 0x1c;
+	Vector _max : 0x24;
+	unsigned int _layerType : 0x2c;
+	int _stage : 0x30;
+	int _altStages : 0x34;
+	bool _onlyDefaultBackdrop : 0x38;
+	float _parallax : 0x3c;
+	int _backdrop : 0x40;
+	int _blendMode : 0x44;
+	bool _useBackgroundShader : 0x48;
+} : 0x4c;

libzhl/functions/Game.zhl

@@ -141,6 +141,9 @@ __thiscall bool Game::GetLevelStateFlag(uint32_t LevelStateFlag);
 "568bf18b0d????????8b81????????83f80274??83f80374??8b168d42??83f80577??8b89????????33c081e1000001000bc175??8b46??83f80474??83f80574":
 __thiscall bool Game::LevelHasPhotoDoor();
 
+"8b0148":
+__thiscall bool Game::IsAscent();
+
 "e8????????c745fcffffffffa3(????????)e8":
 reference Game *g_Game;
 
@@ -283,6 +286,7 @@ struct Game depends (Level, RoomDescriptor, RoomConfig, BossPool, PlayerManager,
 	vector_ErasedEntities _erasedEntities : 0x283c14; 
 	bool  _triggerWindowResize : 0x1c3154;
 	unsigned int _gameStateFlags : 0x1c316c;
+	unsigned int _gameStateFlagsH : 0x1c3170;
 	int _donationModGreed : 0x1c318c;
 	int _donationModAngel : 0x1c3190;
 	float _lightningIntensity : 0x283c00;

libzhl/functions/Global.zhl

@@ -50,6 +50,7 @@ struct IntPair {
 
 // When adding typedefs, remember to define them in ExtraTypes!
 typedef std::vector<MusicEntry> vector_MusicEntry;
+typedef std::vector<FXLayers_FX> vector_FXLayers_FX;
 typedef std::vector<SoundEffect> vector_SoundEffect;
 typedef std::vector<RoomConfig_Curse> vector_Curse;
 typedef std::deque<Point> deque_Point;

libzhl/functions/Isaac.zhl

@@ -55,6 +55,9 @@ static __x86_64_output Vector Isaac::GetCollectibleSpawnPosition(Vector* target)
 "56578bfa8bf183ffff":
 static __x86_64_output Vector Isaac::GetAxisAlignedUnitVectorFromDir(int eDir);
 
+"558bec0f1002":
+__fastcall void IsaacRepentance::SwapANM2(ANM2 * left, ANM2 * right);
+
 struct Isaac {
     {{
     LIBZHL_API static bool IsInGame();

libzhl/functions/KAGE_Graphics_Image.zhl

@@ -4,6 +4,7 @@ struct KAGE_Graphics_ImageBase_VertexAttributeDescriptor {
 } : 0x8;
 
 struct KAGE_Graphics_ImageBase depends (SourceQuad, DestinationQuad, KAGE_Graphics_Color) {
+	char* _filepath : 0x3c;
     __vtable {
 		skip; // IsLoaded
 		skip; // IsProcedural
@@ -49,7 +50,7 @@ struct KAGE_Graphics_ImageBase depends (SourceQuad, DestinationQuad, KAGE_Graphi
 		skip; // apply_image
 		skip; // SetTexelData
     };
-} : 0;
+} : 0x78;
 
 struct KAGE_Graphics_ImagePNG : public KAGE_Graphics_ImageBase {
 

libzhl/functions/Level.zhl

@@ -49,6 +49,9 @@ __thiscall bool Level::IsAltPath();
 "558bec83e4f883ec345356576aff":
 __thiscall void Level::InitializeDevilAngelRoom(bool ForceAngel, bool ForceDevil);
 
+"558beca1????????83ec0c83b8????????2c":
+__thiscall unsigned int Level::GetLocalStageType(int idx);
+
 "558bec6aff68????????64a1????????5083ec24535657a1????????33c5508d45??64a3????????8bd9f30f7e05":
 __thiscall int Level::GetRandomRoomIndex(bool IAmErrorRoom, unsigned int Seed);
 

libzhl/functions/RoomConfig.zhl

@@ -2,13 +2,13 @@
 __thiscall void RoomConfig::LoadCurses(char* xmlpath,bool ismod);
 
 "558bec8b45??83f8ff75??a1":
-static cleanup unsigned int RoomConfig::GetStageID(unsigned int LevelStage<ecx>, unsigned int StageType<edx>, unsigned int Mode);
+static cleanup unsigned int RoomConfig::GetStageID(unsigned int LevelStage<ecx>, unsigned int StageType<edx>, int Mode);
 
 "538bdc83ec0883e4f883c404558b6b??896c24??8bec6aff68????????64a1????????50515351b894010100":
 __thiscall void RoomConfig::LoadStages(char *xmlpath);
 
 "538bdc83ec0883e4f883c404558b6b??896c24??8bec6aff68????????64a1????????505383ec6c":
-__thiscall void RoomConfig::LoadStageBinary(unsigned int Stage, unsigned int Mode);
+__thiscall bool RoomConfig::LoadStageBinary(unsigned int Stage, unsigned int Mode);
 
 // RoomConfigHolder
 

libzhl/functions/RoomConfigStage.zhl

@@ -16,4 +16,4 @@ struct RoomConfig_Stage depends (RoomSet) {
 	RoomSet _rooms[2] : 0x64;
 	int _musicId : 0xbc;
 	int _backdrop : 0xc0;
-} : 0xc4;
+} : 0xc4;

libzhl/functions/RoomSet.zhl

@@ -1,10 +1,20 @@
+"558bec6aff68????????64a1????????5083ec085657a1????????33c5508d45??64a3????????8bf9897d??c70700000000c747??00000000c747??0f000000c60700c745??00000000":
+__thiscall RoomSet* RoomSet::constructor();
+
+"56578bf98b47??8d77??8bceff70??56e8????????6a18ff36e8????????83c408":
+__thiscall void RoomSet::destructor();
+
 "558bec6aff68????????64a1????????5083ec10535657a1????????33c5508d45??64a3????????8bd9895d??8b43??85c0":
 __thiscall void RoomSet::unload();
 
-struct RoomSet
-{
+struct RoomSet {
+{{
+    RoomSet() { constructor(); }
+    LIBZHL_API ~RoomSet() { destructor(); }
+}}
 	std_string _filepath : 0x0;
     RoomConfig_Room* _configs : 0x18;
     unsigned int _count : 0x1c;
+    std_set_int _ids : 0x20;
 	bool _loaded : 0x28;
 } : 0x2c;

repentogon/LuaInterfaces/LuaLevel.cpp

@@ -102,6 +102,12 @@ LUA_FUNCTION(Lua_LevelIsAltPath) {
 	return 1;
 }
 
+LUA_FUNCTION(Lua_GetStageId) {
+	Game* level = lua::GetUserdata<Game*>(L, 1, lua::Metatables::LEVEL, "Level");
+	lua_pushinteger(L, level->GetStageID(false));
+	return 1;
+}
+
 /*
 HOOK_METHOD(Level, IsAltPath, () -> bool) {
 	bool ret = false;
@@ -312,8 +318,8 @@ HOOK_METHOD(LuaEngine, RegisterClasses, () -> void) {
 		{ "GetDimension", Lua_GetDimension},
 		{ "GetForceSpecialQuest", Lua_GetForceSpecialQuest },
 		{ "SetForceSpecialQuest", Lua_SetForceSpecialQuest },
+		{ "GetStageId", Lua_GetStageId },
 		{ "GetMyosotisPickups", Lua_GetMyosotisPickups },
-
 		{ "SetGreedWavesClearedWithoutRedHeartDamage", lua_LevelSetGreedWavesClearedWithoutRedHeartDamage },
 		{ "GetGreedWavesClearedWithoutRedHeartDamage", lua_LevelGetGreedWavesClearedWithoutRedHeartDamage },
 

repentogon/LuaInterfaces/LuaSprite.cpp

@@ -284,7 +284,6 @@ LUA_FUNCTION(Lua_SpriteHasCustomChampionShader)
 	return 1;
 }
 
-
 // LayerState from here on out
 
 LUA_FUNCTION(Lua_LayerStateSetCustomShader)

repentogon/LuaInterfaces/Room/LuaRoom.cpp

@@ -2,8 +2,11 @@
 #include "LuaCore.h"
 #include "HookSystem.h"
 #include "Room.h"
+#include "Log.h"
 
+#include "../../Patches/XMLData.h"
 #include "../../Patches/CustomItemPools.h"
+#include "../../Patches/Stages/StageManager.h"
 
 RoomASM roomASM;
 extern uint32_t hookedbackdroptype;
@@ -379,15 +382,15 @@ LUA_FUNCTION(Lua_RoomGetNumRainSpawners) {
 
 LUA_FUNCTION(Lua_RoomGetBackdropTypeHui) { //this is a bad way to replace room.GetBackdropType, I think
 	Room* room = lua::GetUserdata<Room*>(L, 1, lua::Metatables::ROOM, lua::metatables::RoomMT);
-	if (hookedbackdroptype != 0) {
-		lua_pushinteger(L, hookedbackdroptype);
-		return 1;
+	if (XMLStuff.BackdropData->backdropState.first) {
+		lua_pushinteger(L, XMLStuff.BackdropData->backdropState.second);
 	}
 	else {
 		Backdrop* bg = room->GetBackdrop();
 		lua_pushinteger(L, bg->backdropId);
-		return 1;
 	}
+
+	return 1;
 }
 
 LUA_FUNCTION(Lua_RoomSaveState) {
@@ -483,10 +486,24 @@ HOOK_METHOD(Room, Init, (int param_1, RoomDescriptor * desc) -> void) {
 	roomASM.WaterDisabled = false;
 	roomASM.ItemPool = POOL_NULL;
 	super(param_1, desc);
-	//printf("WaterDisabled is %s, stage is %d\n", roomASM.WaterDisabled ? "TRUE" : "FALSE", g_Game->_stage);
-	if (g_Game->_stage == 12 && !roomASM.WaterDisabled && (this->_descriptor->Data->StageId == 27 || this->_descriptor->Data->StageId == 28)) {
-		this->_waterAmount = 1.0f;
-		//printf("setting water\n");
+	//ZHL::Log("WaterDisabled is %s, stage is %d\n", roomASM.WaterDisabled ? "TRUE" : "FALSE", g_Game->_stage);
+	if (!roomASM.WaterDisabled) {
+		unsigned int stbType = this->_descriptor->Data->StageId;
+		if (g_Game->_stage == 12 && (stbType == 27 || stbType == 28)) {
+			this->_waterAmount = 1.0f;
+			//ZHL::Log("setting water\n");
+		}
+		else {
+			StageManager& stageManager = StageManager::GetInstance();
+			stbType = RoomConfig::GetStageID(g_Game->_stage, g_Game->_stageType, g_Game->IsGreedMode());
+			if (stageManager.IsStageOverriden(stbType)) {
+				XMLAttributes xmlData = XMLStuff.StageData->GetNodeById(stageManager.stageForConfigId[stbType]);
+				if (tobool(xmlData["haswater"])) {
+					this->_waterAmount = 1.0f;
+					//ZHL::Log("setting water\n");
+				}
+			}
+		}
 	}
 }