Merge branch 'repentance-plus'

Author: ConnorForan

.gitignore

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

.gitmodules

@@ -41,3 +41,6 @@
 [submodule "Launcher"]
 	path = Launcher
 	url = https://github.com/TeamREPENTOGON/Launcher.git
+[submodule "libs/injector"]
+	path = libs/injector
+	url = https://github.com/TeamREPENTOGON/injector.git

CMakeLists.txt

@@ -60,8 +60,12 @@ option(CURL_DISABLE_SMB "" ON)
 option(CURL_DISABLE_SMTP "" ON)
 option(CURL_DISABLE_TELNET "" ON)
 option(CURL_DISABLE_TFTP "" ON)
+option(CURL_ZLIB "" OFF)
 add_subdirectory("libs/curl")
 
+# General logger
+add_library(logger STATIC ${CMAKE_SOURCE_DIR}/logger/logger.cpp)
+
 # Crypto++
 option(CRYPTOPP_BUILD_TESTING "" OFF)
 add_subdirectory("libs/cryptopp-cmake")
@@ -71,7 +75,7 @@ target_compile_options(cryptopp PUBLIC "/MD" "/wd4996")
 # Parser
 FILE(GLOB PARSER_SRC ${CMAKE_SOURCE_DIR}/libzhlgen/*.cpp)
 add_executable(zhlparser ${PARSER_SRC})
-target_link_libraries(zhlparser antlr4_shared)
+target_link_libraries(zhlparser antlr4_shared logger)
 target_compile_options(zhlparser PUBLIC "/wd4251" "/wd4275")
 # wd4251 ignore warning C4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
 # wd4275 ignore warning C4275: non - DLL-interface class 'class_1' used as base for DLL-interface class 'class_2'
@@ -98,6 +102,7 @@ add_compile_definitions(GLAD_GLAPI_EXPORT GLAD_GLAPI_EXPORT_BUILD)
 add_library(libzhl SHARED ${ZHL_SRC})
 target_compile_options(libzhl PUBLIC "/MD" "/wd4251" "/wd4996")
 target_compile_definitions(libzhl PRIVATE CMAKE_ZHL_VERSION="${CMAKE_ZHL_VERSION}")
+add_custom_command(TARGET libzhl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/include/hooks.json" "$<TARGET_FILE_DIR:zhlparser>")
 # wd4251 ignore warning C4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
 # wd4996 ignores warning C4996: using a depricated function
 
@@ -217,6 +222,12 @@ add_custom_command(TARGET zhlREPENTOGON POST_BUILD COMMAND ${CMAKE_COMMAND} -E c
 add_custom_command(TARGET zhlREPENTOGON POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/repentogon/resources-repentogon" "$<TARGET_FILE_DIR:zhlREPENTOGON>/resources-repentogon")
 # add_custom_command(TARGET zhlDelirium POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/delirium/resources-delirium" "$<TARGET_FILE_DIR:zhlDelirium>/resources-delirium")
 
+add_subdirectory("libs/injector")
+add_executable(offline_scanner "${CMAKE_SOURCE_DIR}/offline_scanner/offline_scanner.cpp")
+target_include_directories(offline_scanner PRIVATE "${CMAKE_SOURCE_DIR}/libzhl" "${CMAKE_SOURCE_DIR}/libs/injector/include")
+target_link_libraries(offline_scanner injector)
+
+
 if(NOT ISAAC_DIRECTORY STREQUAL "")
     message (STATUS "Files will be installed to " ${ISAAC_DIRECTORY})
     add_custom_command(TARGET Lua5.4 POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE_DIR:dsound>/Lua5.4.dll" "${ISAAC_DIRECTORY}")
@@ -226,7 +237,7 @@ if(NOT ISAAC_DIRECTORY STREQUAL "")
     add_custom_command(TARGET zhlREPENTOGON POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE_DIR:zhlREPENTOGON>/zhlREPENTOGON.dll" "${ISAAC_DIRECTORY}")
 	add_custom_command(TARGET zhlREPENTOGON POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/repentogon/resources" "${ISAAC_DIRECTORY}/resources")
     add_custom_command(TARGET zhlREPENTOGON POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/repentogon/resources-repentogon" "${ISAAC_DIRECTORY}/resources-repentogon")
-    add_custom_command(TARGET zhlDelirium POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE_DIR:zhlDelirium>/zhlDelirium.dll" "${ISAAC_DIRECTORY}")
+    # add_custom_command(TARGET zhlDelirium POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE_DIR:zhlDelirium>/zhlDelirium.dll" "${ISAAC_DIRECTORY}")
     # add_custom_command(TARGET zhlDelirium POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/delirium/resources-delirium" "${ISAAC_DIRECTORY}/resources-delirium")
 endif()
 

changelog.txt

@@ -10,6 +10,12 @@ Additions:
 * EntityPlayer:
 	- [Get/Set]ActionHoldDrop - how long player holds action drop button.
 	- [Get/Set]ForgottenSwapFormCooldown
+	- [Get/Set]RockBottomMoveSpeed
+	- [Get/Set]RockBottomMaxFireDelay
+	- [Get/Set]RockBottomDamage
+	- [Get/Set]RockBottomTearRange
+	- [Get/Set]RockBottomShotSpeed
+	- [Get/Set]RockBottomLuck
 * EntityFamiliar:
 	- IsLilDelirium
 	- SetLilDelirium
@@ -19,10 +25,9 @@ Additions:
 	- MC_PRE_PLAYER_POCKET_ITEMS_SWAP(EntityPlayer player)
 		Triggers when the player swaps their pocket items using the action drop button (even if they are empty).
 		Return true to cancel pocket item swap.
-	- MC_PRE_TRIGGER_BED_SLEEP_EFFECT(EntityPlayer player, EntityPickup bed)
-		Triggers if Bed target (bed.Target) is set to player and "SleepFillHP" item overlay sprite's event is triggered, and before the hearts addition is applied.
+	- MC_PRE_TRIGGER_BED_SLEEP_EFFECT(EntityPlayer player)
+		Triggers if "SleepFillHP" item overlay sprite's event is triggered, and before the hearts addition is applied.
 		Return true to cancel vanilla behavior.
-	- MC_POST_TRIGGER_BED_SLEEP_EFFECT(EntityPlayer player, EntityPickup bed)
 	- MC_PRE_BED_SLEEP(EntityPlayer player, EntityPickup bed)
 		Triggers on bed collision and before playing sleep sequence.
 		Return true to cancel vanilla behavior.
@@ -67,15 +72,16 @@ Modified:
 * EntityPlayer:
 	- DropCollectible now returns the spawned pedestal if one was spawned, as intended 
 	- SwapForgottenForm returns boolean, depending if Forgotten/Soul form was switched or not.
+* Level:
+	- TryPlaceRoom(AtDoor) no longer plays the key unlock sound if a room is created that connects to the player's current room.
 * ImGui:
 	- Adding an element with the same id as an existing one will now replace the existing element instead of throwing an error.
 	- If an error is caused by a callback, imgui will now properly throw an error
-* Level:
-	- TryPlaceRoom(AtDoor) no longer plays the key unlock sound if a room is created that connects to the player's current room.
 * ModCallbacks:
 	- MC_POST_PLAYER_TRIGGER_EFFECT_REMOVED(EntityPlayer Player, int Count)
 		Added Count argument (how many instances of this effect were removed)
 * Vanilla daily run leaderboard will now mark the submitted run entry with a transparent color if the run was cheated.
+* Daily goal path icon will now be displayed on Mega Satan daily runs.
 Fixes:
 * ImGui:
 	- Fixed RemoveElement not working on elements created with AddInputColor.

docs/docs/enums/EventCounter.md

@@ -502,4 +502,29 @@ tags:
 |493 |BABY_PLUM_KILLS {: .copyable } |  |
 |494 |BATTERY_BUMS_KILLED {: .copyable } |  |
 |495 |BATTERY_BUM_COLLECTIBLE_PAYOUTS {: .copyable } | counts how often the battery bum paid out with a collectible item |
-|496 |NUM_EVENT_COUNTERS {: .copyable } |  |
+|496 |UNKNOWN_EVENT_496 {: .copyable } | TODO: Currently Unknown. Maybe Daily Multiplayer run Streak? |
+|497 |ONLINE_CURRENT_STREAK {: .copyable } | Current Online Mode streak |
+|498 |ONLINE_BEST_STREAK {: .copyable } | Best streak in Online Gameplay |
+|499 |UNKNOWN_EVENT_499 {: .copyable } | TODO: Currently Unknown. Maybe Daily Multiplayer run Streak? |
+|500 |ONLINE_SIN_ETERNAL {: .copyable } |  |
+|501 |ONLINE_SIN_HEARTLESS {: .copyable } |  |
+|502 |ONLINE_SIN_ENVIOUS {: .copyable } |  |
+|503 |ONLINE_SIN_DRESSED_UP {: .copyable } |  |
+|504 |ONLINE_SIN_PRIDEFUL {: .copyable } |  |
+|505 |ONLINE_SIN_SAVIOR {: .copyable } |  |
+|506 |ONLINE_SIN_WRATHFUL {: .copyable } |  |
+|507 |ONLINE_SIN_BIG_BOSS {: .copyable } |  |
+|508 |ONLINE_SIN_EXPLORER {: .copyable } |  |
+|509 |ONLINE_SIN_EXPRESSIVE {: .copyable } |  |
+|510 |ONLINE_SIN_GLUTTONOUS {: .copyable } |  |
+|511 |ONLINE_SIN_RECKLESS {: .copyable } |  |
+|512 |ONLINE_SIN_ESCAPE_ARTIST {: .copyable } |  |
+|513 |ONLINE_SIN_GAMBLER {: .copyable } |  |
+|514 |ONLINE_SIN_GREEDY {: .copyable } |  |
+|515 |ONLINE_SIN_MYSTIC {: .copyable } |  |
+|516 |ONLINE_SIN_PILL_POPPER {: .copyable } |  |
+|517 |ONLINE_SIN_BIG_SPENDER {: .copyable } |  |
+|518 |ONLINE_SIN_JANITOR {: .copyable } |  |
+|519 |ONLINE_SIN_LUSTFUL {: .copyable } |  |
+|520 |ONLINE_SIN_SLOTHFUL {: .copyable } |  |
+|521 |NUM_EVENT_COUNTERS {: .copyable } |  |

dsound/dllmain.cpp

@@ -176,7 +176,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReser
 			sLogger->Info("dsound: Update checking done\n");
 		}
 
-		if (version != "1.7.9b.J835") {
+		if (version != "1.9.7.8.J181") {
 			sLogger->Info("This Version of Isaac is not compatible!!\n");
 			return TRUE;
 		}

dsound/version.cpp

@@ -19,12 +19,14 @@ int GetIsaacVersion()
 		else
 		{
 			unsigned int sz = pe->OptionalHeader.SizeOfImage;
-			if(sz == 2760704)
+			if (sz == 2760704)
 				g_Version = ISAAC_REBIRTH;
-			else if(sz == 3825664)
+			else if (sz == 3825664)
 				g_Version = ISAAC_AFTERBIRTH;
-			else if(sz == 8820440)
+			else if (sz == 8820440)
 				g_Version = ISAAC_REPENTANCE;
+			else if (sz == 8671696)
+				g_Version = ISAAC_REPENTANCEP;
 			else
 				g_Version = ISAAC_UNKNOWN;
 		}

dsound/version.h

@@ -5,5 +5,6 @@
 #define ISAAC_AFTERBIRTH 2
 //#define ISAAC_AFTERBIRTHP 3 fuck you
 #define ISAAC_REPENTANCE 4
+#define ISAAC_REPENTANCEP 5
 
 int GetIsaacVersion();

include/HookSystem.h

@@ -3,9 +3,11 @@
 #pragma warning (disable: 4530)
 
 #include "libzhl.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <typeinfo>
 
+#include <string>
+
 //=================================================================================================
 
 namespace ZHL

include/logger/logger.h

@@ -0,0 +1,67 @@
+#pragma once
+
+#include <cstdarg>
+#include <cstdio>
+#include <initializer_list>
+#include <string>
+#include <vector>
+
+enum LogLevel {
+    LOG_TRACE,
+    LOG_DEBUG,
+    LOG_INFO,
+    LOG_WARN,
+    LOG_ERROR,
+    LOG_FATAL,
+    LOG_ABORT
+};
+
+class ILogOutput {
+public:
+    virtual void Log(LogLevel level, const char* text) = 0;
+    virtual void Close() = 0;
+};
+
+class StdoutLogOutput : public ILogOutput {
+public:
+    void Log(LogLevel level, const char* text) override;
+    void Close() override;
+};
+
+class StderrLogOutput : public ILogOutput {
+public:
+    void Log(LogLevel level, const char* text) override;
+    void Close() override { }
+};
+
+class FileLogOutput : public ILogOutput {
+public:
+    FileLogOutput(const char* file, const char* mode, bool flush = false);
+    void Log(LogLevel level, const char* text) override;
+    void Close() override;
+
+private:
+    FILE* _file;
+    bool _flush;
+};
+
+class Logger {
+public:
+    Logger(LogLevel level, const char* prefix, std::initializer_list<ILogOutput*> outputs);
+    ~Logger();
+
+    void Trace(const char* fmt, ...);
+    void Debug(const char* fmt, ...);
+    void Info(const char* fmt, ...);
+    void Warn(const char* fmt, ...);
+    void Error(const char* fmt, ...);
+    void Fatal(const char* fmt, ...);
+    void Abort(const char* fmt, ...);
+
+private:
+    void Log(LogLevel level, const char* fmt, va_list va);
+
+    LogLevel _level = LOG_INFO;
+    std::string _prefix = "";
+    std::vector<ILogOutput*> _outputs;
+};