Add np.GetGameModeCount and np.GetGameModeName

Author: dextercd

Documentation/noitapatcher.lua

@@ -216,6 +216,13 @@ function noitapatcher.MagicNumbersGetList() end
 ---@return integer
 function noitapatcher.GetGameModeNr() end
 
+---@return integer
+function noitapatcher.GetGameModeCount() end
+
+---@param idx integer?
+---@return string
+function noitapatcher.GetGameModeCount(idx) end
+
 ---Discard and then reload all material files.
 ---You should call ComponentSetValue(world_state, "changed_materials", "") after calling this.
 function noitapatcher.ReloadMaterials() end

src/game_mode.cpp

@@ -3,18 +3,16 @@
 namespace np {
 
 int* game_mode_nr;
-void* game_modes_begin;
+vs13::vector<game_mode>* game_modes_vec;
 
 int lua_SetGameModeDeterministic(lua_State* L)
 {
-    if (!game_mode_nr || !game_modes_begin)
+    if (!game_mode_nr || !game_modes_vec)
         return 0;
 
     auto deterministic = (bool)lua_toboolean(L, 1);
 
-    auto game_modes = *(char**)game_modes_begin;
-    auto game_mode = game_modes + 0xc0 * *game_mode_nr;
-    *(int*)(game_mode + 0x64) = deterministic ? 1 : 0;
+    (*game_modes_vec)[*game_mode_nr].deterministic = deterministic;
 
     return 0;
 }
@@ -28,4 +26,27 @@ int lua_GetGameModeNr(lua_State* L)
     return 1;
 }
 
+int lua_GetGameModeCount(lua_State* L)
+{
+    lua_pushinteger(L, game_modes_vec->size());
+    return 1;
+}
+
+int lua_GetGameModeName(lua_State* L)
+{
+    int nr{};
+    if (lua_gettop(L) == 0) {
+        nr = *game_mode_nr;
+    } else {
+        nr = luaL_checkinteger(L, 1);
+    }
+
+    if (nr < 0 || nr >= game_modes_vec->size()) {
+        return luaL_error(L, "Game mode number out of range");
+    }
+
+    lua_pushstring(L, (*game_modes_vec)[nr].name.c_str());
+    return 1;
+}
+
 }

src/game_mode.hpp

@@ -6,14 +6,31 @@ extern "C" {
 #include <lauxlib.h>
 }
 
+#include <vs2013/string.hpp>
+#include <vs2013/vector.hpp>
+
 namespace np {
 
+struct game_mode {
+    char padding[0x64];
+    int deterministic;
+    char padding2[0x10];
+    vs13::string name;
+    char padding3[48];
+};
+
+static_assert(offsetof(game_mode, deterministic) == 0x64);
+static_assert(offsetof(game_mode, name) == 0x78);
+static_assert(sizeof(game_mode) == 0xc0);
+
 extern int* game_mode_nr;
-extern void* game_modes_begin;
+extern vs13::vector<game_mode>* game_modes_vec;
 
 
 int lua_SetGameModeDeterministic(lua_State*);
 int lua_GetGameModeNr(lua_State* L);
+int lua_GetGameModeCount(lua_State* L);
+int lua_GetGameModeName(lua_State* L);
 
 }
 

src/lua_util.cpp

@@ -32,7 +32,7 @@ std::vector<stack_entry> get_stack_trace(lua_State* L, int start_level, int coun
     std::vector<stack_entry> trace;
 
     for (int level = start_level; true; ++level) {
-        if (count != -1 && count-- != 0)
+        if (count != -1 && count-- == 0)
             break;
 
         auto stack = get_stack_entry(L, level);

src/main.cpp

@@ -448,7 +448,7 @@ void find_game_mode()
         Bytes{0x8b, 0x0d},
         Capture{"game_modes_end", 4},
         Bytes{0xb8, 0xab, 0xaa, 0xaa, 0x2a, 0x56, 0x57, 0x8b, 0x3d},
-        Capture{"game_modes_begin", 4},
+        Capture{"game_modes_vec", 4},
         Bytes{0x2b, 0xcf, 0xf7, 0xe9, 0x8b, 0x0d},
         Capture{"game_mode_nr", 4}
     );
@@ -460,11 +460,11 @@ void find_game_mode()
     }
 
     np::game_mode_nr = result.get<int*>("game_mode_nr");
-    np::game_modes_begin = result.get<void*>("game_modes_begin");
+    np::game_modes_vec = result.get<vs13::vector<np::game_mode>*>("game_modes_vec");
 
     std::cout << "Found game mode items: " << '\n';
     std::cout << "  game_mode_nr: " << np::game_mode_nr << '\n';
-    std::cout << "  game_modes_begin: " << np::game_modes_begin << '\n';
+    std::cout << "  game_modes_vec: " << np::game_modes_vec << '\n';
 }
 
 struct ShootProjectileFiredHooksCreator {
@@ -883,6 +883,8 @@ static const luaL_Reg nplib[] = {
     {"PhysBodyGetTransform", np::PhysBodyGetTransform},
     {"SetGameModeDeterministic", np::lua_SetGameModeDeterministic},
     {"GetGameModeNr", np::lua_GetGameModeNr},
+    {"GetGameModeName", np::lua_GetGameModeName},
+    {"GetGameModeCount", np::lua_GetGameModeCount},
     {"SetPauseState", SetPauseState},
     {"GetPauseState", GetPauseState},
     {"GetWorldInfo", GetWorldInfo},

src/noita.hpp

@@ -76,6 +76,7 @@ struct SystemManager {
     vs13::vector<void*> mSystemAutoCreators;
     vs13::vector<ComponentUpdator*> mSystems;
 };
+extern SystemManager* system_manager;
 
 
 // Note: It's really a mix between __fastcall (uses registers) and