From a80063cf7b181920931cbfa6c51d85bd97d2b763 Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:32:59 +0200
Subject: [PATCH 01/12] fix issue with returning self reference not counting as
 lua owned object

---
 src/game_api/math.hpp                        |  5 ++-
 src/game_api/script/sol_helper.hpp           | 39 +++++++++++++++++
 src/game_api/script/usertypes/hitbox_lua.cpp | 45 +++++++++++---------
 3 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/src/game_api/math.hpp b/src/game_api/math.hpp
index 7cf3593ec..bd2a400d5 100644
--- a/src/game_api/math.hpp
+++ b/src/game_api/math.hpp
@@ -442,7 +442,10 @@ struct Quad
         result.bottom = std::min({bottom_left_y, bottom_right_y, top_right_y, top_left_y});
         return result;
     }
-
+    Quad& offset(const Vec2& vec)
+    {
+        return offset(vec.x, vec.y);
+    }
     Quad& offset(float off_x, float off_y)
     {
         bottom_left_x += off_x;
diff --git a/src/game_api/script/sol_helper.hpp b/src/game_api/script/sol_helper.hpp
index d50334f27..668d4b158 100644
--- a/src/game_api/script/sol_helper.hpp
+++ b/src/game_api/script/sol_helper.hpp
@@ -93,3 +93,42 @@ struct usertype_container<ZeroIndexArray<T>>
     }
 };
 } // namespace sol
+
+namespace detail
+{
+template <typename M>
+struct extract;
+template <typename R, class C, typename... Args>
+struct extract<R (C::*)(Args...)>
+{
+    using BaseType = C;
+    using ReturnType = R;
+    using Params = std::tuple<Args...>;
+};
+} // namespace detail
+
+namespace
+{
+template <typename, typename, auto>
+struct proFunc;
+
+template <template <typename...> class C, typename... Ts, typename T, auto fun>
+struct proFunc<C<Ts...>, T, fun>
+{
+    static auto func(sol::object obj, Ts... args)
+    {
+        (obj.as<T&>().*fun)(std::forward<Ts>(args)...);
+        return obj;
+    };
+};
+} // namespace
+
+template <auto fun>
+auto self_return()
+{
+    static_assert(std::is_member_function_pointer_v<decltype(fun)>);
+    using T = typename detail::extract<decltype(fun)>::BaseType;
+    using _tuple = typename detail::extract<decltype(fun)>::Params;
+
+    return proFunc<_tuple, T, fun>::func;
+}
diff --git a/src/game_api/script/usertypes/hitbox_lua.cpp b/src/game_api/script/usertypes/hitbox_lua.cpp
index a581bb568..bfb963ccf 100644
--- a/src/game_api/script/usertypes/hitbox_lua.cpp
+++ b/src/game_api/script/usertypes/hitbox_lua.cpp
@@ -9,9 +9,10 @@
 #include <type_traits> // for move, declval
 #include <utility>     // for min, max, get, pair
 
-#include "entity.hpp" // for get_hitbox
-#include "math.hpp"   // for AABB, Vec2, Quad, AABB::bottom, AABB::left
-#include "rpc.hpp"    // for screen_aabb
+#include "entity.hpp"            // for get_hitbox
+#include "math.hpp"              // for AABB, Vec2, Quad, AABB::bottom, AABB::left
+#include "rpc.hpp"               // for screen_aabb
+#include "script/sol_helper.hpp" // for self_return
 
 namespace NHitbox
 {
@@ -64,18 +65,18 @@ void register_usertypes(sol::state& lua)
         "y",
         &Vec2::y,
         "rotate",
-        &Vec2::rotate,
+        self_return<&Vec2::rotate>(),
         "distance_to",
         &Vec2::distance_to,
         "set",
-        &Vec2::set,
+        self_return<&Vec2::set>(),
         "split",
         // &Vec2::split); // for the autodoc
         &Vec2::operator std::pair<float, float>);
 
     const auto extrude = sol::overload(
-        static_cast<AABB& (AABB::*)(float)>(&AABB::extrude),
-        static_cast<AABB& (AABB::*)(float, float)>(&AABB::extrude));
+        self_return<static_cast<AABB& (AABB::*)(float)>(&AABB::extrude)>(),
+        self_return<static_cast<AABB& (AABB::*)(float, float)>(&AABB::extrude)>());
     const auto is_point_inside = sol::overload(
         static_cast<bool (AABB::*)(const Vec2) const>(&AABB::is_point_inside),
         static_cast<bool (AABB::*)(float, float) const>(&AABB::is_point_inside));
@@ -95,11 +96,11 @@ void register_usertypes(sol::state& lua)
         "overlaps_with",
         &AABB::overlaps_with,
         "abs",
-        &AABB::abs,
+        self_return<&AABB::abs>(),
         "extrude",
         extrude,
         "offset",
-        &AABB::offset,
+        self_return<&AABB::offset>(),
         "area",
         &AABB::area,
         "center",
@@ -111,14 +112,14 @@ void register_usertypes(sol::state& lua)
         "is_point_inside",
         is_point_inside,
         "set",
-        &AABB::set,
+        self_return<&AABB::set>(),
         "split",
         // &Vec2::split); // for the autodoc
         &AABB::operator std::tuple<float, float, float, float>);
 
     auto offset = sol::overload(
-        static_cast<Triangle& (Triangle::*)(const Vec2&)>(&Triangle::offset),
-        static_cast<Triangle& (Triangle::*)(float, float)>(&Triangle::offset));
+        self_return<static_cast<Triangle& (Triangle::*)(const Vec2&)>(&Triangle::offset)>(),
+        self_return < static_cast<Triangle& (Triangle::*)(float, float)>(&Triangle::offset)>());
     auto is_point_inside_triangle = sol::overload(
         static_cast<bool (Triangle::*)(const Vec2) const>(&Triangle::is_point_inside),
         static_cast<bool (Triangle::*)(const Vec2, float) const>(&Triangle::is_point_inside),
@@ -137,19 +138,19 @@ void register_usertypes(sol::state& lua)
         "offset",
         offset,
         "rotate",
-        &Triangle::rotate,
+        self_return<&Triangle::rotate>(),
         "center",
         &Triangle::center,
         "get_angles",
         &Triangle::get_angles,
         "scale",
-        &Triangle::scale,
+        self_return<&Triangle::scale>(),
         "area",
         &Triangle::area,
         "is_point_inside",
         is_point_inside_triangle,
         "set",
-        &Triangle::set,
+        self_return<&Triangle::set>(),
         "split",
         // &Triangle::split); // for the autodoc
         &Triangle::operator std::tuple<Vec2, Vec2, Vec2>);
@@ -160,6 +161,10 @@ void register_usertypes(sol::state& lua)
         static_cast<bool (Quad::*)(float, float) const>(&Quad::is_point_inside),
         static_cast<bool (Quad::*)(float, float, float) const>(&Quad::is_point_inside));
 
+    auto offset_quad = sol::overload(
+        self_return<static_cast<Quad& (Quad::*)(const Vec2&)>(&Quad::offset)>(),
+        self_return<static_cast<Quad& (Quad::*)(float, float)>(&Quad::offset)>());
+
     lua.new_usertype<Quad>(
         "Quad",
         sol::constructors<Quad(), Quad(const Quad&), Quad(const AABB&), Quad(float, float, float, float, float, float, float, float), Quad(const Vec2&, const Vec2&, const Vec2&, const Vec2&)>{},
@@ -182,17 +187,17 @@ void register_usertypes(sol::state& lua)
         "get_AABB",
         &Quad::get_AABB,
         "offset",
-        &Quad::offset,
+        offset_quad,
         "rotate",
-        &Quad::rotate,
+        self_return<&Quad::rotate>(),
         "flip_horizontally",
-        &Quad::flip_horizontally,
+        self_return<&Quad::flip_horizontally>(),
         "flip_vertically",
-        &Quad::flip_vertically,
+        self_return<&Quad::flip_vertically>(),
         "is_point_inside",
         is_point_inside_quad,
         "set",
-        &Quad::set,
+        self_return<&Quad::set>(),
         "split",
         // &Quad::split); // for the autodoc
         &Quad::operator std::tuple<Vec2, Vec2, Vec2, Vec2>);

From 649bee75acff0f4ffe38d29190bb921f280b60e6 Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Tue, 2 Jul 2024 17:34:33 +0200
Subject: [PATCH 02/12] fix self refrence for Color

---
 src/game_api/script/usertypes/entity_lua.cpp | 7 ++++---
 src/game_api/script/usertypes/hitbox_lua.cpp | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/game_api/script/usertypes/entity_lua.cpp b/src/game_api/script/usertypes/entity_lua.cpp
index 7e4e0ec5e..6df2e882d 100644
--- a/src/game_api/script/usertypes/entity_lua.cpp
+++ b/src/game_api/script/usertypes/entity_lua.cpp
@@ -23,6 +23,7 @@
 #include "render_api.hpp"                // for RenderInfo, RenderInfo::flip_horiz...
 #include "script/lua_backend.hpp"        // for LuaBackend
 #include "script/safe_cb.hpp"            // for make_safe_cb
+#include "script/sol_helper.hpp"         // for self_return
 
 namespace NEntity
 {
@@ -50,10 +51,10 @@ void register_usertypes(sol::state& lua)
     color_type["fuchsia"] = &Color::fuchsia;
     color_type["purple"] = &Color::purple;
     color_type["get_rgba"] = &Color::get_rgba;
-    color_type["set_rgba"] = &Color::set_rgba;
+    color_type["set_rgba"] = self_return<&Color::set_rgba>();
     color_type["get_ucolor"] = &Color::get_ucolor;
-    color_type["set_ucolor"] = &Color::set_ucolor;
-    color_type["set"] = &Color::set;
+    color_type["set_ucolor"] = self_return<&Color::set_ucolor>();
+    color_type["set"] = self_return<&Color::set>();
 
     /// Used in EntityDB
     lua.new_usertype<Animation>(
diff --git a/src/game_api/script/usertypes/hitbox_lua.cpp b/src/game_api/script/usertypes/hitbox_lua.cpp
index bfb963ccf..19554e4b2 100644
--- a/src/game_api/script/usertypes/hitbox_lua.cpp
+++ b/src/game_api/script/usertypes/hitbox_lua.cpp
@@ -119,7 +119,7 @@ void register_usertypes(sol::state& lua)
 
     auto offset = sol::overload(
         self_return<static_cast<Triangle& (Triangle::*)(const Vec2&)>(&Triangle::offset)>(),
-        self_return < static_cast<Triangle& (Triangle::*)(float, float)>(&Triangle::offset)>());
+        self_return<static_cast<Triangle& (Triangle::*)(float, float)>(&Triangle::offset)>());
     auto is_point_inside_triangle = sol::overload(
         static_cast<bool (Triangle::*)(const Vec2) const>(&Triangle::is_point_inside),
         static_cast<bool (Triangle::*)(const Vec2, float) const>(&Triangle::is_point_inside),

From 46194d0df095d569b88e165ad0d090289de49dcb Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Sat, 6 Jul 2024 15:22:34 +0200
Subject: [PATCH 03/12] fix autodoc, make it detect lamba functions as func
 members, fix some type mistakes

---
 docs/game_data/spel2.lua                      | 81 ++++++++++++-------
 docs/generate_emmylua.py                      |  3 +
 docs/parse_source.py                          | 73 +++++++++++++----
 docs/src/includes/_types.md                   | 45 ++++++-----
 src/game_api/entity.cpp                       |  4 +-
 src/game_api/entity.hpp                       |  2 +-
 src/game_api/items.hpp                        |  3 +-
 src/game_api/math.hpp                         |  6 ++
 src/game_api/script/usertypes/bucket_lua.cpp  |  1 +
 .../script/usertypes/entities_chars_lua.cpp   |  1 +
 src/game_api/script/usertypes/entity_lua.cpp  |  2 +-
 .../script/usertypes/game_manager_lua.cpp     | 33 +++-----
 src/game_api/script/usertypes/gui_lua.cpp     | 57 +++++++------
 src/game_api/script/usertypes/hitbox_lua.cpp  | 10 ++-
 src/game_api/script/usertypes/level_lua.cpp   | 27 +++----
 src/game_api/script/usertypes/player_lua.cpp  |  2 +-
 src/game_api/script/usertypes/state_lua.cpp   |  1 +
 17 files changed, 214 insertions(+), 137 deletions(-)

diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua
index 740da2263..8e6e26ebb 100644
--- a/docs/game_data/spel2.lua
+++ b/docs/game_data/spel2.lua
@@ -2045,7 +2045,7 @@ do
 
 ---@class Items
     ---@field player_count integer
-    ---@field saved_pets_count integer
+    ---@field saved_pets_count integer @Only for the level transition, the actual number is held in player inventory
     ---@field saved_pets ENT_TYPE[] @size: 4 @Pet information for level transition
     ---@field is_pet_cursed boolean[] @size: 4
     ---@field is_pet_poisoned boolean[] @size: 4
@@ -2330,7 +2330,6 @@ do
     ---@field slide_position number
 
 ---@class GameProps
-    ---@field buttons integer[] @size: MAX_PLAYERS @Used for player input and might be used for some menu inputs not found in buttons_menu. You can probably capture and edit this in ON.POST_PROCESS_INPUT. These are raw inputs, without things like autorun applied.
     ---@field input integer[] @size: MAX_PLAYERS @Used for player input and might be used for some menu inputs not found in buttons_menu. You can probably capture and edit this in ON.POST_PROCESS_INPUT. These are raw inputs, without things like autorun applied.
     ---@field input_previous integer[] @size: MAX_PLAYERS
     ---@field input_menu MENU_INPUT @Inputs used to control all the menus, separate from player inputs. You can probably capture and edit this in ON.POST_PROCESS_INPUT
@@ -2360,8 +2359,8 @@ do
     ---@field random_chance fun(self, inverse_chance: integer, type: PRNG_CLASS): boolean @Returns true with a chance of `1/inverse_chance`
     ---@field random_index fun(self, i: integer, type: PRNG_CLASS): integer? @Generate a integer number in the range `[1, i]` or `nil` if `i < 1`
     ---@field random_int fun(self, min: integer, max: integer, type: PRNG_CLASS): integer? @Generate a integer number in the range `[min, max]` or `nil` if `max < min`
-    ---@field get_pair fun(self, type: PRNG_CLASS): integer, integer
-    ---@field set_pair fun(self, type: PRNG_CLASS, first: integer, second: integer): nil
+    ---@field get_pair any @PRNG::get_tuple
+    ---@field set_pair any @PRNG::set_tuple
 local PRNG = nil
 ---Drop-in replacement for `math.random()`
 ---@return number
@@ -2446,8 +2445,6 @@ function PRNG:random(min, max) end
     ---@field texture_num integer
     ---@field get_entity fun(self): Entity
     ---@field set_normal_map_texture fun(self, texture_id: TEXTURE): boolean @Sets second_texture to the texture specified, then sets third_texture to SHINE_0 and texture_num to 3. You still have to change shader to 30 to render with normal map (same as COG normal maps)
-    ---@field get_second_texture TEXTURE?
-    ---@field get_third_texture TEXTURE?
     ---@field set_second_texture fun(self, texture_id: TEXTURE): boolean
     ---@field set_third_texture fun(self, texture_id: TEXTURE): boolean
     ---@field set_texture_num fun(self, texture_id: integer): boolean @Set the number of textures that may be used, need to have them set before for it to work
@@ -2649,7 +2646,7 @@ function Entity:destroy_recursive() end
     ---@field set_position fun(self, to_x: number, to_y: number): nil @Set the absolute position of an entity and offset all rendering related things accordingly to teleport without any interpolation or graphical glitches. If the camera is focused on the entity, it is also moved.
     ---@field process_input fun(self): nil
     ---@field cutscene CutsceneBehavior
-    ---@field clear_cutscene any @[](Movable&movable){deletemovable.cutscene_behavior
+    ---@field clear_cutscene fun(self): nil
     ---@field get_base_behavior fun(self, state_id: integer): VanillaMovableBehavior @Gets a vanilla behavior from this movable, needs to be called before `clear_behaviors`<br/>but the returned values are still valid after a call to `clear_behaviors`
     ---@field add_behavior fun(self, behavior: MovableBehavior): nil @Add a behavior to this movable, can be either a `VanillaMovableBehavior` or a<br/>`CustomMovableBehavior`
     ---@field clear_behavior fun(self, behavior: MovableBehavior): nil @Clear a specific behavior of this movable, can be either a `VanillaMovableBehavior` or a<br/>`CustomMovableBehavior`, a behavior with this behaviors `state_id` may be required to<br/>run this movables statemachine without crashing, so add a new one if you are not sure
@@ -2751,6 +2748,7 @@ function Movable:generic_update_world(move, sprint_factor, disable_gravity, on_r
     ---@field time_of_death integer @Is set to state.time_total when player dies in coop (to determinate who should be first to re-spawn from coffin)
     ---@field held_item ENT_TYPE @Used to transfer information to transition/next level. Is not updated during a level<br/>You can use `ON.PRE_LEVEL_GENERATION` to access/edit this
     ---@field held_item_metadata integer @Metadata of the held item (health, is cursed etc.)<br/>Used to transfer information to transition/next level. Is not updated during a level<br/>You can use `ON.PRE_LEVEL_GENERATION` to access/edit this
+    ---@field saved_pets_count integer
     ---@field mount_type ENT_TYPE @Used to transfer information to transition/next level (player rading a mout). Is not updated during a level<br/>You can use `ON.PRE_LEVEL_GENERATION` to access/edit this
     ---@field mount_metadata integer @Metadata of the mount (health, is cursed etc.)<br/>Used to transfer information to transition/next level (player rading a mout). Is not updated during a level<br/>You can use `ON.PRE_LEVEL_GENERATION` to access/edit this
     ---@field kills_level integer
@@ -4017,7 +4015,7 @@ function Movable:generic_update_world(move, sprint_factor, disable_gravity, on_r
     ---@field smoke2 ParticleEmitterInfo
 
 ---@class CookFire : Torch
-    ---@field lit any @&Torch::is_lit
+    ---@field lit any @Torch::is_lit
     ---@field emitted_light Illumination
     ---@field particles_smoke ParticleEmitterInfo
     ---@field particles_flames ParticleEmitterInfo
@@ -4713,11 +4711,10 @@ function MovableBehavior:get_state_id() end
 ---@class CustomTheme : ThemeInfo
     ---@field level_file string @Level file to load. Probably doesn't do much in custom themes, especially if you're forcing them in PRE_LOAD_LEVEL_FILES.
     ---@field theme integer @Theme index. Probably shouldn't collide with the vanilla ones. Purpose unknown.
-    ---@field base_theme integer @Base THEME to load enabled functions from, when no other theme is specified.
     ---@field textures table<DYNAMIC_TEXTURE, integer> @Add TEXTUREs here to override different dynamic textures.
-    ---@field override any @theme_override
     ---@field pre fun(self, index: THEME_OVERRIDE, func_: function): nil @Set a callback to be called before this theme function.
     ---@field post fun(self, index: THEME_OVERRIDE, func_: function): nil @Set a callback to be called after this theme function, to fix some changes it did for example.
+    ---@field base_theme integer @Base THEME to load enabled functions from, when no other theme is specified.
     ---@field reset_theme_flags fun(self): nil
     ---@field init_flags fun(self): nil
     ---@field init_level fun(self): nil
@@ -4729,7 +4726,7 @@ function MovableBehavior:get_state_id() end
     ---@field add_idol fun(self): nil
     ---@field add_vault fun(self): nil
     ---@field add_coffin fun(self): nil
-    ---@field add_feeling any @&CustomTheme::add_feeling
+    ---@field add_special_feeling fun(self): nil
     ---@field spawn_level fun(self): nil
     ---@field spawn_border fun(self): nil
     ---@field post_process_level fun(self): nil
@@ -4769,6 +4766,22 @@ function MovableBehavior:get_state_id() end
     ---@field spawn_decoration2 fun(self): nil
     ---@field spawn_extra fun(self): nil
     ---@field do_procedural_spawn fun(self, info: SpawnInfo): nil
+local CustomTheme = nil
+---To disable or enable theme functions using the base_theme.
+---@param index THEME_OVERRIDE
+---@param enabled_ boolean
+---@return nil
+function CustomTheme:override(index, enabled_) end
+---To override a theme function with another theme.
+---@param index THEME_OVERRIDE
+---@param theme_ integer
+---@return nil
+function CustomTheme:override(index, theme_) end
+---To override a theme function with a lua function.
+---@param index THEME_OVERRIDE
+---@param func_ function
+---@return nil
+function CustomTheme:override(index, func_) end
 
 ---@class PreLoadLevelFilesContext
     ---@field override_level_files fun(self, levels: string[]): nil @Block all loading `.lvl` files and instead load the specified `.lvl` files. This includes `generic.lvl` so if you need it specify it here.<br/>All `.lvl` files are loaded relative to `Data/Levels`, but they can be completely custom `.lvl` files that ship with your mod so long as they are in said folder.<br/>Use at your own risk, some themes/levels expect a certain level file to be loaded.
@@ -5117,8 +5130,8 @@ function GuiDrawContext:win_pushid(id) end
 ---@class ImGuiIO
     ---@field displaysize Vec2
     ---@field framerate number
-    ---@field wantkeyboard any @wantkeyboard
-    ---@field keys boolean[] @size: ImGuiKey_COUNT
+    ---@field wantkeyboard boolean
+    ---@field keys boolean[652]
     ---@field keydown fun(key: number | string): boolean
     ---@field keypressed fun(key: number | string, repeat?: boolean ): boolean
     ---@field keyreleased fun(key: number | string): boolean
@@ -5126,16 +5139,16 @@ function GuiDrawContext:win_pushid(id) end
     ---@field keyshift boolean
     ---@field keyalt boolean
     ---@field keysuper boolean
-    ---@field modifierdown any @modifierdown
-    ---@field wantmouse any @wantmouse
+    ---@field modifierdown fun(self, chord: integer): boolean
+    ---@field wantmouse boolean
     ---@field mousepos Vec2
-    ---@field mousedown boolean[] @size: 5
-    ---@field mouseclicked boolean[] @size: 5
-    ---@field mousedoubleclicked boolean[] @size: 5
-    ---@field mousereleased boolean[] @size: 5
+    ---@field mousedown boolean[5]
+    ---@field mouseclicked boolean[5]
+    ---@field mousedoubleclicked boolean[5]
+    ---@field mousereleased boolean[5]
     ---@field mousewheel number
     ---@field gamepad Gamepad
-    ---@field gamepads any @[](unsignedintindex){g_WantUpdateHasGamepad=true
+    ---@field gamepads fun(self, index: integer): Gamepad
     ---@field showcursor boolean
 
 ---@class VanillaRenderContext
@@ -5363,7 +5376,7 @@ function VanillaRenderContext:draw_world_poly_filled(points, color) end
 function VanillaRenderContext:draw_world_poly_filled(points, color) end
 
 ---@class TextureRenderingInfo
-    ---@field new any @sol::constructors<TextureRenderingInfo()
+    ---@field new any @constructors<TextureRenderingInfo()
     ---@field x number
     ---@field y number
     ---@field destination_bottom_left_x number @destination is relative to the x,y centerpoint
@@ -5396,7 +5409,7 @@ function VanillaRenderContext:draw_world_poly_filled(points, color) end
     ---@field center fun(self): Vec2 @Get's approximated center of a letter by finding the highest and lowest values, then finding the center of a rectangle build from those values
 
 ---@class TextRenderingInfo
-    ---@field new any @sol::initializers(&TextRenderingInfo_ctor
+    ---@field new any @initializers(TextRenderingInfo_ctor, TextRenderingInfo_ctor2)
     ---@field x number
     ---@field y number
     ---@field text_length integer @You can also just use `#` operator on the whole TextRenderingInfo to get the text lenght
@@ -5475,10 +5488,19 @@ function VanillaRenderContext:draw_world_poly_filled(points, color) end
 ---@class Vec2
     ---@field x number
     ---@field y number
-    ---@field rotate fun(self, angle: number, px: number, py: number): Vec2
     ---@field distance_to fun(self, other: Vec2): number @Just simple pythagoras theorem
     ---@field set fun(self, other: Vec2): Vec2
     ---@field split fun(self): number, number
+local Vec2 = nil
+---@param angle number
+---@param px number
+---@param py number
+---@return Vec2
+function Vec2:rotate(angle, px, py) end
+---@param angle number
+---@param p Vec2
+---@return Vec2
+function Vec2:rotate(angle, p) end
 
 ---@class AABB
     ---@field left number
@@ -5556,13 +5578,19 @@ function Triangle:is_point_inside(x, y, epsilon) end
     ---@field top_left_x number
     ---@field top_left_y number
     ---@field get_AABB fun(self): AABB @Returns the max/min values of the Quad
-    ---@field offset fun(self, off_x: number, off_y: number): Quad
     ---@field rotate fun(self, angle: number, px: number, py: number): Quad @Rotates a Quad by an angle, px/py are not offsets, use `:get_AABB():center()` to get approximated center for simetrical quadrangle
     ---@field flip_horizontally fun(self): Quad
     ---@field flip_vertically fun(self): Quad
     ---@field set fun(self, other: Quad): Quad
     ---@field split fun(self): Vec2, Vec2, Vec2, Vec2 @Returns the corners in order: bottom_left, bottom_right, top_right, top_left
 local Quad = nil
+---@param off Vec2
+---@return Quad
+function Quad:offset(off) end
+---@param off_x number
+---@param off_y number
+---@return Quad
+function Quad:offset(off_x, off_y) end
 ---Check if point lies inside of triangle
 ---Because of the imprecise nature of floating point values, the `epsilon` value is needed to compare the floats, the default value is `0.00001`
 ---@param p Vec2
@@ -5931,7 +5959,7 @@ function Quad:is_point_inside(x, y, epsilon) end
     ---@field sequence_state integer
     ---@field animation_timer integer
     ---@field constellation_text_opacity number
-    ---@field constellation_text number
+    ---@field constellation_text string
     ---@field explosion_and_loop SoundMeta
     ---@field music SoundMeta
 
@@ -6000,7 +6028,7 @@ function Quad:is_point_inside(x, y, epsilon) end
     ---@field entire_book TextureRenderingInfo
     ---@field fade_timer integer
     ---@field page_timer integer
-    ---@field opacity integer
+    ---@field opacity number
     ---@field pages JournalPage[] @Stores pages loaded into memeory. It's not cleared after the journal is closed or when you go back to the main (menu) page.<br/>Use `:get_type()` to chcek page type and cast it correctly (see ON.[RENDER_PRE_JOURNAL_PAGE](#ON-RENDER_PRE_JOURNAL_PAGE))
 
 ---@class JournalPage
@@ -6422,7 +6450,6 @@ function LogicMagmamanSpawn:remove_spawn(ms) end
 
 ---@class PauseAPI
     ---@field pause PAUSE_TYPE @Current pause state bitmask. Use custom PAUSE_TYPE.PRE_✱ (or multiple) to freeze the game at the specified callbacks automatically. Checked after the matching ON update callbacks, so can be set on the same callback you want to block at the latest. Vanilla PAUSE flags will be forwarded to state.pause, but use of vanilla PAUSE flags is discouraged and might not work with other PauseAPI features.
-    ---@field pause any @sol::property(&PauseAPI::get_pause
     ---@field pause_type PAUSE_TYPE @Pause mask to toggle when using the PauseAPI methods to set or get pause state.
     ---@field pause_trigger PAUSE_TRIGGER @Bitmask for conditions when the current `pause_type` should be automatically enabled in `pause`, can have multiple conditions.
     ---@field pause_screen PAUSE_SCREEN @Bitmask to only enable PAUSE_TRIGGER.SCREEN during specific SCREEN, or any screen when NONE.
diff --git a/docs/generate_emmylua.py b/docs/generate_emmylua.py
index 665ea88df..e52f4b924 100644
--- a/docs/generate_emmylua.py
+++ b/docs/generate_emmylua.py
@@ -29,9 +29,12 @@
     "pair": "tuple",
     "std::": "",
     "sol::": "",
+    "unsigned": "",
     " = nullopt": "",
     "void": "",
     "constexpr": "",
+    "self_return<&": "",
+    ">()": "",
     "...va:": "...ent_type:",
     "set<": "Array<",
     "span<": "Array<",
diff --git a/docs/parse_source.py b/docs/parse_source.py
index a1e399cb8..8630c63b8 100644
--- a/docs/parse_source.py
+++ b/docs/parse_source.py
@@ -51,8 +51,12 @@
     "sol::": "",
     "void": "",
     "constexpr": "",
-    "const": "",
+    "const ": "",
     "static": "",
+    "self_return<&": "",
+    ">()": "",
+    "unsigned": "",
+    "sol::no_constructor": "",
     # special
     "variadic_args va": "ENT_TYPE, ENT_TYPE...",
     "EmittedParticlesInfo": "array<Particle>",
@@ -207,6 +211,22 @@ def cb_signature_dict(ret, param):
         "param": param,
     }
 
+def custom_split(var):
+    result = []
+    level = 0
+    current = ""
+    for char in var:
+        if char == ',' and level == 0:
+            result.append(current.strip())
+            current = ""
+        else:
+            current += char
+            if char == '[' or char == '(':
+                level += 1
+            elif char == ']' or char == ')':
+                level -= 1
+    result.append(current.strip())
+    return result
 
 def get_cb_signature(text):
     signature_ms = reSignature.findall(text)
@@ -611,22 +631,23 @@ def run_parse():
     for file in api_files:
         data = open(file, "r").read()
         data = data.replace("\n", "")
-        data = re.sub(r" ", "", data)
+        data = fix_spaces(data)
+        #data = re.sub(r" ", "", data)
         reParticleHelper = re.compile(r"MakeParticleMemberAccess<(.+?)>\(\)")
         data = reParticleHelper.sub(r"\1", data)
         m = re.findall(
-            r'(auto([a-z]+_type)=)?lua\.new_usertype\<([^\>]*?)\>\s*\(\s*"([^"]*)",?(.*?)\);',
+            r'(auto ([a-z]+_type) =)? lua\.new_usertype\<([^\>]*?)\>\s*\(\s*"([^"]*)",?(.*?)\);',
             data,
         )
         for type in m:
-            container = type[1]
-            cpp_type = type[2]
-            name = type[3]
-            attr = type[4]
+            container = type[1].strip()
+            cpp_type = type[2].strip()
+            name = type[3].strip()
+            attr = type[4].strip()
             if container:
                 extra = []
                 n = re.findall(
-                    r"(?<!NoDoc)" + container + r'\[("[^"]+")\]=([^;]+);', data
+                    r"(?<! NoDoc )" + container + r'\[("[^"]+")\] = ([^;]+);', data
                 )
                 for var in n:
                     extra.append(",".join(var))
@@ -639,7 +660,7 @@ def run_parse():
             base = ""
             bm = re.search(r"sol::bases<([^\]]*)>", attr)
             if bm:
-                base = bm.group(1)
+                base = bm.group(1).replace(" ", "")
             attr = attr.replace('",', ",")
             attr = attr.split('"')
             vars = []
@@ -669,9 +690,11 @@ def run_parse():
                     continue
                 if not var:
                     continue
-                var = var.split(",")
+                var = custom_split(var)
                 if len(var) < 2:
                     continue
+                var[0] = var[0].strip()
+                var[1] = var[1].strip()
                 if var[0] == "sol::base_classes" or var[0] == "sol::no_constructor":
                     continue
                 if "NoDoc" in var[0]:
@@ -687,11 +710,11 @@ def run_parse():
                     var[1] = var[1][:-1]
 
                 var_name = var[0]
-                cpp = var[1]
+                cpp = replace_fun(var[1])
 
-                if var[1].startswith("sol::property"):
+                if var[1].startswith("property"):
                     param_match = re.match(
-                        rf"sol::property\(\[\]\({underlying_cpp_type['name']}&(\w+)\)",
+                        rf"property\(\[\]\({underlying_cpp_type['name']}&(\w+)\)",
                         cpp,
                     )
                     if param_match:
@@ -721,6 +744,28 @@ def run_parse():
                                 "comment": fun["comment"],
                             }
                         )
+                elif cpp.startswith("[]("):
+                    param_match = re.match(r"\[\]\(([\w &*:,]+)?\) -> ([\w.*&<>\[\]:]+)?(?: )?{", cpp)
+                    if param_match:
+                        ret = param_match.group(2)
+                        if ret is None:
+                            ret = "nil"
+                            
+                        sig = param_match.group(1)
+                        if sig.startswith(cpp_type):
+                            first_param_end = sig.find(",") + 1
+                            if first_param_end == 0:
+                                first_param_end = len(")")
+                            sig = ""
+                        vars.append(
+                            {
+                                "name": var_name,
+                                "type": cpp,
+                                "signature": f"{ret} {var_name}({sig})",
+                                "function": True,
+                            }
+                        )
+                        
                 elif cpp_name in underlying_cpp_type["member_funs"]:
                     for fun in underlying_cpp_type["member_funs"][cpp_name]:
                         ret = fun["return"] or "nil"
@@ -775,7 +820,7 @@ def run_parse():
                         )
                     else:
                         m_return_type = re.search(
-                            r"->([:<>\w*]+){", var[1]
+                            r"-> ([:<>\w\[\]*]+) {", var[1]
                         )  # Use var[1] instead of cpp because it could be replaced on the sol::property stuff
                         if m_return_type:
                             type = replace_fun(m_return_type[1])
diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md
index 01bf3445b..206fe1774 100644
--- a/docs/src/includes/_types.md
+++ b/docs/src/includes/_types.md
@@ -526,6 +526,7 @@ int | [kapala_blood_amount](https://github.com/spelunky-fyi/overlunky/search?l=L
 int | [time_of_death](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=time_of_death) | Is set to state.time_total when player dies in coop (to determinate who should be first to re-spawn from coffin)
 [ENT_TYPE](#ENT_TYPE) | [held_item](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=held_item) | Used to transfer information to transition/next level. Is not updated during a level<br/>You can use `ON.PRE_LEVEL_GENERATION` to access/edit this
 int | [held_item_metadata](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=held_item_metadata) | Metadata of the held item (health, is cursed etc.)<br/>Used to transfer information to transition/next level. Is not updated during a level<br/>You can use `ON.PRE_LEVEL_GENERATION` to access/edit this
+int | [saved_pets_count](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=saved_pets_count) | 
 [ENT_TYPE](#ENT_TYPE) | [mount_type](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mount_type) | Used to transfer information to transition/next level (player rading a mout). Is not updated during a level<br/>You can use `ON.PRE_LEVEL_GENERATION` to access/edit this
 int | [mount_metadata](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mount_metadata) | Metadata of the mount (health, is cursed etc.)<br/>Used to transfer information to transition/next level (player rading a mout). Is not updated during a level<br/>You can use `ON.PRE_LEVEL_GENERATION` to access/edit this
 int | [kills_level](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=kills_level) | 
@@ -841,7 +842,6 @@ Control the pause API
 Type | Name | Description
 ---- | ---- | -----------
 [PAUSE_TYPE](#PAUSE_TYPE) | [pause](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=pause) | Current pause state bitmask. Use custom [PAUSE_TYPE](#PAUSE_TYPE).PRE_✱ (or multiple) to freeze the game at the specified callbacks automatically. Checked after the matching [ON](#ON) update callbacks, so can be set on the same callback you want to block at the latest. Vanilla [PAUSE](#PAUSE) flags will be forwarded to state.pause, but use of vanilla [PAUSE](#PAUSE) flags is discouraged and might not work with other [PauseAPI](#PauseAPI) features.
- | [pause](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=pause) | 
 [PAUSE_TYPE](#PAUSE_TYPE) | [pause_type](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=pause_type) | Pause mask to toggle when using the [PauseAPI](#PauseAPI) methods to set or get pause state.
 [PAUSE_TRIGGER](#PAUSE_TRIGGER) | [pause_trigger](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=pause_trigger) | Bitmask for conditions when the current `pause_type` should be automatically enabled in `pause`, can have multiple conditions.
 [PAUSE_SCREEN](#PAUSE_SCREEN) | [pause_screen](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=pause_screen) | Bitmask to only enable [PAUSE_TRIGGER](#PAUSE_TRIGGER).[SCREEN](#SCREEN) during specific [SCREEN](#SCREEN), or any screen when NONE.
@@ -886,6 +886,7 @@ float | [top_right_y](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=t
 float | [top_left_x](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=top_left_x) | 
 float | [top_left_y](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=top_left_y) | 
 [AABB](#AABB) | [get_AABB()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_AABB) | Returns the max/min values of the [Quad](#Quad)
+[Quad](#Quad) | [offset(Vec2 off)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=offset) | 
 [Quad](#Quad) | [offset(float off_x, float off_y)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=offset) | 
 [Quad](#Quad) | [rotate(float angle, float px, float py)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=rotate) | Rotates a [Quad](#Quad) by an angle, px/py are not offsets, use `:get_AABB():center()` to get approximated center for simetrical quadrangle
 [Quad](#Quad) | [flip_horizontally()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=flip_horizontally) | 
@@ -927,8 +928,8 @@ bool | [render_inactive](https://github.com/spelunky-fyi/overlunky/search?l=Lua&
 int | [texture_num](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=texture_num) | 
 [Entity](#Entity) | [get_entity()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_entity) | 
 bool | [set_normal_map_texture(TEXTURE texture_id)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_normal_map_texture) | Sets second_texture to the texture specified, then sets third_texture to SHINE_0 and texture_num to 3. You still have to change shader to 30 to render with normal map (same as COG normal maps)
-optional&lt;[TEXTURE](#TEXTURE)&gt; | [get_second_texture](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_second_texture) | 
-optional&lt;[TEXTURE](#TEXTURE)&gt; | [get_third_texture](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_third_texture) | 
+optional&lt;[TEXTURE](#TEXTURE)&gt; | [get_second_texture()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_second_texture) | 
+optional&lt;[TEXTURE](#TEXTURE)&gt; | [get_third_texture()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_third_texture) | 
 bool | [set_second_texture(TEXTURE texture_id)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_second_texture) | 
 bool | [set_third_texture(TEXTURE texture_id)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_third_texture) | 
 bool | [set_texture_num(int texture_id)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_texture_num) | Set the number of textures that may be used, need to have them set before for it to work
@@ -1048,6 +1049,7 @@ Type | Name | Description
 float | [x](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=x) | 
 float | [y](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=y) | 
 [Vec2](#Vec2) | [rotate(float angle, float px, float py)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=rotate) | 
+[Vec2](#Vec2) | [rotate(float angle, Vec2 p)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=rotate) | 
 float | [distance_to(Vec2 other)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=distance_to) | Just simple pythagoras theorem
 [Vec2](#Vec2) | [set(Vec2 other)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set) | 
 tuple&lt;float, float&gt; | [split()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=split) | 
@@ -1096,8 +1098,8 @@ Type | Name | Description
 ---- | ---- | -----------
 [Vec2](#Vec2) | [displaysize](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=displaysize) | 
 float | [framerate](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=framerate) | 
- | [wantkeyboard](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=wantkeyboard) | True if anyone else (i.e. some input box, OL hotkey) is already capturing keyboard or reacted to this keypress and you probably shouldn't.<br/>Set this to true every GUIFRAME while you want to capture keyboard and disable UI key bindings and game keys. Won't affect UI or game keys on this frame though, that train has already sailed. Also see [Bucket](#Bucket)::[Overlunky](#Overlunky) for other ways to override key bindings.<br/>Do not set this to false, unless you want the player input to bleed through input fields.<br/> 
-bool | [keys[ImGuiKey_COUNT]](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keys) | ZeroIndexArray<bool> of currently held keys, indexed by [KEY](#KEY) <= 0xFF<br/> 
+bool | [wantkeyboard](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=wantkeyboard) | True if anyone else (i.e. some input box, OL hotkey) is already capturing keyboard or reacted to this keypress and you probably shouldn't.<br/>Set this to true every GUIFRAME while you want to capture keyboard and disable UI key bindings and game keys. Won't affect UI or game keys on this frame though, that train has already sailed. Also see [Bucket](#Bucket)::[Overlunky](#Overlunky) for other ways to override key bindings.<br/>Do not set this to false, unless you want the player input to bleed through input fields.<br/> 
+bool[652] | [keys](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keys) | ZeroIndexArray<bool> of currently held keys, indexed by [KEY](#KEY) <= 0xFF<br/> 
  | [keydown](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keydown) | Returns true if key or chord is down.<br/>bool keydown([KEY](#KEY) keychord)<br/>bool keydown(char key)<br/> 
  | [keypressed](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keypressed) | Returns true if key or chord was pressed this GUIFRAME.<br/>bool keypressed([KEY](#KEY) keychord, bool repeat = false)<br/>bool keypressed(char key, bool repeat = false)<br/> 
  | [keyreleased](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keyreleased) | Returns true if key or chord was released this GUIFRAME.<br/>bool keyreleased([KEY](#KEY) keychord)<br/>bool keyreleased(char key)<br/> 
@@ -1105,16 +1107,16 @@ bool | [keyctrl](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keyctr
 bool | [keyshift](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keyshift) | 
 bool | [keyalt](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keyalt) | 
 bool | [keysuper](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keysuper) | 
- | [modifierdown](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=modifierdown) | bool modifierdown([KEY](#KEY) keychord)<br/>Returns true if modifiers in chord are down, ignores other keys in chord.<br/> 
- | [wantmouse](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=wantmouse) | True if anyone else (i.e. hovering some window) is already capturing mouse and you probably shouldn't.<br/>Set this to true if you want to capture mouse and override UI mouse binding.<br/> 
+bool | [modifierdown(int chord)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=modifierdown) | bool modifierdown([KEY](#KEY) keychord)<br/>Returns true if modifiers in chord are down, ignores other keys in chord.<br/> 
+bool | [wantmouse](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=wantmouse) | True if anyone else (i.e. hovering some window) is already capturing mouse and you probably shouldn't.<br/>Set this to true if you want to capture mouse and override UI mouse binding.<br/> 
 [Vec2](#Vec2) | [mousepos](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousepos) | 
-bool | [mousedown[5]](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousedown) | 
-bool | [mouseclicked[5]](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mouseclicked) | 
-bool | [mousedoubleclicked[5]](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousedoubleclicked) | 
-bool | [mousereleased[5]](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousereleased) | 
+bool[5] | [mousedown](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousedown) | 
+bool[5] | [mouseclicked](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mouseclicked) | 
+bool[5] | [mousedoubleclicked](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousedoubleclicked) | 
+bool[5] | [mousereleased](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousereleased) | 
 float | [mousewheel](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousewheel) | 
 [Gamepad](#Gamepad) | [gamepad](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=gamepad) | 
- | [gamepads](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=gamepads) | [Gamepad](#Gamepad) gamepads(int index)<br/>This is the XInput index 1..4, might not be the same as the player slot.<br/> 
+[Gamepad](#Gamepad) | [gamepads(int index)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=gamepads) | [Gamepad](#Gamepad) gamepads(int index)<br/>This is the XInput index 1..4, might not be the same as the player slot.<br/> 
 bool | [showcursor](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=showcursor) | True when the cursor is visible.<br/>Set to true to force the cursor visible.<br/> 
 
 ### InputMapping
@@ -1967,7 +1969,7 @@ int | [max_page_count](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=
 [TextureRenderingInfo](#TextureRenderingInfo) | [entire_book](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=entire_book) | 
 int | [fade_timer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=fade_timer) | 
 int | [page_timer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=page_timer) | 
-int | [opacity](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=opacity) | 
+float | [opacity](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=opacity) | 
 vector&lt;[JournalPage](#JournalPage)&gt; | [pages](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=pages) | Stores pages loaded into memeory. It's not cleared after the journal is closed or when you go back to the main (menu) page.<br/>Use `:get_type()` to chcek page type and cast it correctly (see ON.[RENDER_PRE_JOURNAL_PAGE](#ON-RENDER_PRE_JOURNAL_PAGE))
 
 ### MenuScreenPanels
@@ -2366,7 +2368,7 @@ Type | Name | Description
 int | [sequence_state](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=sequence_state) | 
 int | [animation_timer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=animation_timer) | 
 float | [constellation_text_opacity](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=constellation_text_opacity) | 
-float | [constellation_text](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=constellation_text) | 
+string | [constellation_text](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=constellation_text) | 
 [SoundMeta](#SoundMeta) | [explosion_and_loop](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=explosion_and_loop) | 
 [SoundMeta](#SoundMeta) | [music](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=music) | 
 
@@ -2871,7 +2873,6 @@ array&lt;int, MAX_PLAYERS&gt; | [buttons_movement](https://github.com/spelunky-f
 
 Type | Name | Description
 ---- | ---- | -----------
-array&lt;int, MAX_PLAYERS&gt; | [buttons](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=buttons) | Used for player input and might be used for some menu inputs not found in buttons_menu. You can probably capture and edit this in [ON](#ON).POST_PROCESS_INPUT. These are raw inputs, without things like autorun applied.
 array&lt;int, MAX_PLAYERS&gt; | [input](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=input) | Used for player input and might be used for some menu inputs not found in buttons_menu. You can probably capture and edit this in [ON](#ON).POST_PROCESS_INPUT. These are raw inputs, without things like autorun applied.
 array&lt;int, MAX_PLAYERS&gt; | [input_previous](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=input_previous) | 
 [MENU_INPUT](#MENU_INPUT) | [input_menu](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=input_menu) | Inputs used to control all the menus, separate from player inputs. You can probably capture and edit this in [ON](#ON).POST_PROCESS_INPUT
@@ -2887,7 +2888,7 @@ Used in [StateMemory](#StateMemory)
 Type | Name | Description
 ---- | ---- | -----------
 int | [player_count](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=player_count) | 
-int | [saved_pets_count](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=saved_pets_count) | 
+int | [saved_pets_count](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=saved_pets_count) | Only for the level transition, the actual number is held in player inventory
 array&lt;[ENT_TYPE](#ENT_TYPE), 4&gt; | [saved_pets](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=saved_pets) | [Pet](#Pet) information for level transition
 array&lt;bool, 4&gt; | [is_pet_cursed](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=is_pet_cursed) | 
 array&lt;bool, 4&gt; | [is_pet_poisoned](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=is_pet_poisoned) | 
@@ -3209,11 +3210,13 @@ Type | Name | Description
 [CustomTheme](#CustomTheme) | [new()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=CustomTheme) | Create a new theme with base dwelling and id 100.
 string | [level_file](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=level_file) | Level file to load. Probably doesn't do much in custom themes, especially if you're forcing them in PRE_LOAD_LEVEL_FILES.
 int | [theme](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=theme) | Theme index. Probably shouldn't collide with the vanilla ones. Purpose unknown.
-int | [base_theme](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=base_theme) | Base [THEME](#THEME) to load enabled functions from, when no other theme is specified.
 map&lt;[DYNAMIC_TEXTURE](#DYNAMIC_TEXTURE), int&gt; | [textures](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=textures) | Add TEXTUREs here to override different dynamic textures.
- | [override](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=override) | `override(THEME_OVERRIDE override, bool enabled)` To disable or enable theme functions using the base_theme.<br/>`override(THEME_OVERRIDE override, THEME theme)` To override a theme function with another theme.<br/>`override(THEME_OVERRIDE override, function func)` To override a theme function with a lua function.<br/> 
+nil | [override(THEME_OVERRIDE index, bool enabled_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=override) | To disable or enable theme functions using the base_theme.
+nil | [override(THEME_OVERRIDE index, int theme_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=override) | To override a theme function with another theme.
+nil | [override(THEME_OVERRIDE index, function func_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=override) | To override a theme function with a lua function.
 nil | [pre(THEME_OVERRIDE index, function func_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=pre) | Set a callback to be called before this theme function.
 nil | [post(THEME_OVERRIDE index, function func_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=post) | Set a callback to be called after this theme function, to fix some changes it did for example.
+int | [base_theme](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=base_theme) | Base [THEME](#THEME) to load enabled functions from, when no other theme is specified.
 nil | [reset_theme_flags()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=reset_theme_flags) | 
 nil | [init_flags()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=init_flags) | 
 nil | [init_level()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=init_level) | 
@@ -3225,7 +3228,7 @@ nil | [add_dirk_coffin()](https://github.com/spelunky-fyi/overlunky/search?l=Lua
 nil | [add_idol()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=add_idol) | 
 nil | [add_vault()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=add_vault) | 
 nil | [add_coffin()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=add_coffin) | 
- | [add_feeling](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=add_feeling) | 
+nil | [add_special_feeling()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=add_special_feeling) | 
 nil | [spawn_level()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=spawn_level) | 
 nil | [spawn_border()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=spawn_border) | 
 nil | [post_process_level()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=post_process_level) | 
@@ -4196,7 +4199,7 @@ bool | [trigger_action(Entity user)](https://github.com/spelunky-fyi/overlunky/s
 int | [get_metadata()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_metadata) | e.g. for turkey: stores health, poison/curse state, for mattock: remaining swings (returned value is transferred)
 nil | [apply_metadata(int metadata)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=apply_metadata) | 
 nil | [set_invisible(bool value)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_invisible) | 
-span&lt;int&gt; | [get_items()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_items) | 
+vector&lt;int&gt; | [get_items()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_items) | 
 bool | [is_in_liquid()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=is_in_liquid) | Returns true if entity is in water/lava
 bool | [is_cursed()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=is_cursed) | 
 nil | [kill_recursive(bool destroy_corpse, Entity responsible, optional<int> mask, array<ENT_TYPE> ent_types, RECURSIVE_MODE rec_mode)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=kill_recursive) | Kill entity along with all entities attached to it. Be aware that for example killing push block with this function will also kill anything on top of it, any items, players, monsters etc.<br/>To avoid that, you can inclusively or exclusively limit certain [MASK](#MASK) and [ENT_TYPE](#ENT_TYPE). Note: the function will first check mask, if the entity doesn't match, it will look in the provided [ENT_TYPE](#ENT_TYPE)'s<br/>destroy_corpse and responsible are the standard parameters for the kill funciton
@@ -6861,7 +6864,7 @@ nil | [reset_gravity()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q
 nil | [set_position(float to_x, float to_y)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_position) | Set the absolute position of an entity and offset all rendering related things accordingly to teleport without any interpolation or graphical glitches. If the camera is focused on the entity, it is also moved.
 nil | [process_input()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=process_input) | 
 [CutsceneBehavior](#CutsceneBehavior) | [cutscene](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=cutscene) | 
- | [clear_cutscene](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=clear_cutscene) | 
+nil | [clear_cutscene()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=clear_cutscene) | 
 [VanillaMovableBehavior](#VanillaMovableBehavior) | [get_base_behavior(int state_id)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_base_behavior) | Gets a vanilla behavior from this movable, needs to be called before `clear_behaviors`<br/>but the returned values are still valid after a call to `clear_behaviors`
 nil | [add_behavior(MovableBehavior behavior)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=add_behavior) | Add a behavior to this movable, can be either a `VanillaMovableBehavior` or a<br/>`CustomMovableBehavior`
 nil | [clear_behavior(MovableBehavior behavior)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=clear_behavior) | Clear a specific behavior of this movable, can be either a `VanillaMovableBehavior` or a<br/>`CustomMovableBehavior`, a behavior with this behaviors `state_id` may be required to<br/>run this movables statemachine without crashing, so add a new one if you are not sure
diff --git a/src/game_api/entity.cpp b/src/game_api/entity.cpp
index 4d0f09f38..00847b44e 100644
--- a/src/game_api/entity.cpp
+++ b/src/game_api/entity.cpp
@@ -377,10 +377,10 @@ void Entity::set_enable_turning(bool enabled)
     set_entity_turning(this, enabled);
 }
 
-std::span<uint32_t> Entity::get_items()
+std::vector<uint32_t> Entity::get_items()
 {
     if (items.size)
-        return std::span<uint32_t>(items.uids().begin(), items.uids().end());
+        return std::vector<uint32_t>(items.uids().begin(), items.uids().end());
 
     return {};
 }
diff --git a/src/game_api/entity.hpp b/src/game_api/entity.hpp
index 5a90e0137..7414c6dd8 100644
--- a/src/game_api/entity.hpp
+++ b/src/game_api/entity.hpp
@@ -218,7 +218,7 @@ class Entity
 
     void set_enable_turning(bool enabled);
 
-    std::span<uint32_t> get_items();
+    std::vector<uint32_t> get_items();
 
     /// Kill entity along with all entities attached to it. Be aware that for example killing push block with this function will also kill anything on top of it, any items, players, monsters etc.
     /// To avoid that, you can inclusively or exclusively limit certain MASK and ENT_TYPE. Note: the function will first check mask, if the entity doesn't match, it will look in the provided ENT_TYPE's
diff --git a/src/game_api/items.hpp b/src/game_api/items.hpp
index e8e4c88d4..5fed89fd1 100644
--- a/src/game_api/items.hpp
+++ b/src/game_api/items.hpp
@@ -37,7 +37,7 @@ struct Inventory
     /// Used to transfer information to transition/next level. Is not updated during a level
     /// You can use `ON.PRE_LEVEL_GENERATION` to access/edit this
     int16_t held_item_metadata;
-    uint8_t unknown5c; // padding?
+    uint8_t saved_pets_count;
 
     int8_t player_slot;
     /// Used to transfer information to transition/next level (player rading a mout). Is not updated during a level
@@ -121,6 +121,7 @@ struct Items
     std::array<ENT_TYPE, 4> saved_pets;
     std::array<bool, 4> is_pet_cursed;
     std::array<bool, 4> is_pet_poisoned;
+    /// Only for the level transition, the actual number is held in player inventory
     uint8_t saved_pets_count;
 
     uint8_t player_count;
diff --git a/src/game_api/math.hpp b/src/game_api/math.hpp
index bd2a400d5..a2d8681d2 100644
--- a/src/game_api/math.hpp
+++ b/src/game_api/math.hpp
@@ -34,6 +34,10 @@ struct Vec2
         *this += p;
         return *this;
     }
+    Vec2& rotate(float angle, const Vec2& p)
+    {
+        return rotate(angle, p.x, p.y);
+    }
     /// Just simple pythagoras theorem
     float distance_to(const Vec2 other) const
     {
@@ -551,6 +555,8 @@ struct Quad
     /// Because of the imprecise nature of floating point values, the `epsilon` value is needed to compare the floats, the default value is `0.00001`
     bool is_point_inside_quad(Vec2 p, std::optional<float> epsilon);
     bool is_point_inside_quad(float x, float y, std::optional<float> epsilon);
+    Quad& offset_quad(const Vec2& off);
+    Quad& offset_quad(float off_x, float off_y);
     */
 
     /// Returns the corners in order: bottom_left, bottom_right, top_right, top_left
diff --git a/src/game_api/script/usertypes/bucket_lua.cpp b/src/game_api/script/usertypes/bucket_lua.cpp
index 484452109..b324a23f9 100644
--- a/src/game_api/script/usertypes/bucket_lua.cpp
+++ b/src/game_api/script/usertypes/bucket_lua.cpp
@@ -23,6 +23,7 @@ void register_usertypes(sol::state& lua)
     /// Control the pause API
     auto pauseapi_type = lua.new_usertype<PauseAPI>("PauseAPI", sol::no_constructor);
     // pauseapi_type["pause"] = &PauseAPI::pause;
+    /// NoDoc
     pauseapi_type["pause"] = sol::property(&PauseAPI::get_pause, &PauseAPI::set_pause);
     pauseapi_type["pause_type"] = &PauseAPI::pause_type;
     pauseapi_type["pause_trigger"] = &PauseAPI::pause_trigger;
diff --git a/src/game_api/script/usertypes/entities_chars_lua.cpp b/src/game_api/script/usertypes/entities_chars_lua.cpp
index cbc810894..fca2f327f 100644
--- a/src/game_api/script/usertypes/entities_chars_lua.cpp
+++ b/src/game_api/script/usertypes/entities_chars_lua.cpp
@@ -68,6 +68,7 @@ void register_usertypes(sol::state& lua)
     inventory_type["time_of_death"] = &Inventory::time_of_death;
     inventory_type["held_item"] = &Inventory::held_item;
     inventory_type["held_item_metadata"] = &Inventory::held_item_metadata;
+    inventory_type["saved_pets_count"] = &Inventory::saved_pets_count;
     inventory_type["mount_type"] = &Inventory::mount_type;
     inventory_type["mount_metadata"] = &Inventory::mount_metadata;
     inventory_type["kills_level"] = &Inventory::kills_level;
diff --git a/src/game_api/script/usertypes/entity_lua.cpp b/src/game_api/script/usertypes/entity_lua.cpp
index 6df2e882d..17852ba09 100644
--- a/src/game_api/script/usertypes/entity_lua.cpp
+++ b/src/game_api/script/usertypes/entity_lua.cpp
@@ -364,7 +364,7 @@ void register_usertypes(sol::state& lua)
     movable_type["set_position"] = &Movable::set_position;
     movable_type["process_input"] = &Movable::process_input;
     movable_type["cutscene"] = sol::readonly(&Movable::cutscene_behavior);
-    movable_type["clear_cutscene"] = [](Movable& movable)
+    movable_type["clear_cutscene"] = [](Movable& movable) -> void
     {
         delete movable.cutscene_behavior;
         movable.cutscene_behavior = nullptr;
diff --git a/src/game_api/script/usertypes/game_manager_lua.cpp b/src/game_api/script/usertypes/game_manager_lua.cpp
index 69d29b7ee..ebfd36923 100644
--- a/src/game_api/script/usertypes/game_manager_lua.cpp
+++ b/src/game_api/script/usertypes/game_manager_lua.cpp
@@ -100,27 +100,18 @@ void register_usertypes(sol::state& lua)
         &JournalPopupUI::timer,
         "slide_position",
         &JournalPopupUI::slide_position);
-    lua.new_usertype<GameProps>(
-        "GameProps",
-        /// NoDoc
-        "buttons",
-        sol::property([](GameProps& gp) -> uint32_t
-                      { return gp.buttons[0]; }),
-        "input",
-        &GameProps::buttons,
-        "input_previous",
-        &GameProps::buttons_previous,
-        "input_menu",
-        &GameProps::buttons_menu,
-        "input_menu_previous",
-        &GameProps::buttons_menu_previous,
-        "game_has_focus",
-        &GameProps::game_has_focus,
-        "menu_open", // -> bool
-        sol::property([](GameProps& gp) -> bool
-                      { return gp.menu_icon_slot != -1; }),
-        "input_index",
-        &GameProps::input_index);
+    auto gameprops_type = lua.new_usertype<GameProps>("GameProps");
+    /// NoDoc
+    gameprops_type["buttons"] = sol::property([](GameProps& gp) -> uint32_t
+                                              { return gp.buttons[0]; });
+    gameprops_type["input"] = &GameProps::buttons;
+    gameprops_type["input_previous"] = &GameProps::buttons_previous;
+    gameprops_type["input_menu"] = &GameProps::buttons_menu;
+    gameprops_type["input_menu_previous"] = &GameProps::buttons_menu_previous;
+    gameprops_type["game_has_focus"] = &GameProps::game_has_focus;
+    gameprops_type["menu_open"] = sol::property([](GameProps& gp) -> bool
+                                                { return gp.menu_icon_slot != -1; });
+    gameprops_type["input_index"] = &GameProps::input_index;
 
     lua.new_usertype<RawInput>(
         "RawInput",
diff --git a/src/game_api/script/usertypes/gui_lua.cpp b/src/game_api/script/usertypes/gui_lua.cpp
index 5ca776824..c15f203f3 100644
--- a/src/game_api/script/usertypes/gui_lua.cpp
+++ b/src/game_api/script/usertypes/gui_lua.cpp
@@ -1072,26 +1072,6 @@ void register_usertypes(sol::state& lua)
             return ImGui::IsKeyReleased((ImGuiKey)(int)key);
         });
 
-    auto wantmouse = sol::property([](ImGuiIO& io) -> bool
-                                   {
-                        ImGuiContext& g = *GImGui;
-                        if (ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow) && g.HoveredWindow && strcmp(g.HoveredWindow->Name, "Clickhandler") == 0)
-                            return Bucket::get()->io->WantCaptureMouse.value_or(io.WantCaptureMouse) /**/;
-                        return io.WantCaptureMouse; },
-                                   [](ImGuiIO& io, bool want)
-                                   {
-                                       Bucket::get()->io->WantCaptureMouse = want;
-                                       io.WantCaptureMouse = want;
-                                   });
-
-    auto wantkeyboard = sol::property([](ImGuiIO& io) -> bool
-                                      { return io.WantCaptureKeyboard; },
-                                      [](ImGuiIO& io, bool want)
-                                      {
-                                          Bucket::get()->io->WantCaptureKeyboard = want;
-                                          io.WantCaptureKeyboard = want;
-                                      });
-
     /// Used in [get_io](#get_io), also see [set_hotkey](#set_hotkey) and GuiDrawContext::key_picker.
     ///
     /// - Functions are static, not class methods expecting `self` (call with `get_io().keydown(key)`, not `:`)
@@ -1109,11 +1089,17 @@ void register_usertypes(sol::state& lua)
         sol::property([](ImGuiIO& io) -> Vec2
                       { return Vec2(io.DisplaySize) /**/; });
     imguiio_type["framerate"] = &ImGuiIO::Framerate;
-    imguiio_type["wantkeyboard"] = std::move(wantkeyboard);
+    imguiio_type["wantkeyboard"] = sol::property([](ImGuiIO& io) -> bool
+                                                 { return io.WantCaptureKeyboard; },
+                                                 [](ImGuiIO& io, bool want)
+                                                 {
+                                                     Bucket::get()->io->WantCaptureKeyboard = want;
+                                                     io.WantCaptureKeyboard = want;
+                                                 });
     /// NoDoc
     imguiio_type["keysdown"] = sol::property([](ImGuiIO& io)
                                              { return std::ref(io.KeysDown) /**/; });
-    imguiio_type["keys"] = sol::property([](ImGuiIO& io)
+    imguiio_type["keys"] = sol::property([](ImGuiIO& io) // -> bool[652]
                                          { return ZeroIndexArray<bool>(io.KeysDown) /**/; });
     imguiio_type["keydown"] = keydown;
     imguiio_type["keypressed"] = keypressed;
@@ -1122,24 +1108,37 @@ void register_usertypes(sol::state& lua)
     imguiio_type["keyshift"] = &ImGuiIO::KeyShift;
     imguiio_type["keyalt"] = &ImGuiIO::KeyAlt;
     imguiio_type["keysuper"] = &ImGuiIO::KeySuper;
-    imguiio_type["modifierdown"] = modifierdown;
-    imguiio_type["wantmouse"] = std::move(wantmouse);
+    imguiio_type["modifierdown"] = [](int chord) -> bool
+    {
+        return modifierdown(chord);
+    };
+    imguiio_type["wantmouse"] = sol::property([](ImGuiIO& io) -> bool
+                                              {
+                                                  ImGuiContext& g = *GImGui;
+                                                  if (ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow) && g.HoveredWindow && strcmp(g.HoveredWindow->Name, "Clickhandler") == 0)
+                                                      return Bucket::get()->io->WantCaptureMouse.value_or(io.WantCaptureMouse) /**/;
+                                                  return io.WantCaptureMouse; },
+                                              [](ImGuiIO& io, bool want)
+                                              {
+                                                  Bucket::get()->io->WantCaptureMouse = want;
+                                                  io.WantCaptureMouse = want;
+                                              });
     imguiio_type["mousepos"] = sol::property([](ImGuiIO& io) -> Vec2
                                              { return Vec2(io.MousePos); });
-    imguiio_type["mousedown"] = sol::property([](ImGuiIO& io)
+    imguiio_type["mousedown"] = sol::property([](ImGuiIO& io) // -> bool[5]
                                               { return std::ref(io.MouseDown); });
-    imguiio_type["mouseclicked"] = sol::property([](ImGuiIO& io)
+    imguiio_type["mouseclicked"] = sol::property([](ImGuiIO& io) // -> bool[5]
                                                  { return std::ref(io.MouseClicked); });
-    imguiio_type["mousedoubleclicked"] = sol::property([](ImGuiIO& io)
+    imguiio_type["mousedoubleclicked"] = sol::property([](ImGuiIO& io) // -> bool[5]
                                                        { return std::ref(io.MouseDoubleClicked); });
-    imguiio_type["mousereleased"] = sol::property([](ImGuiIO& io)
+    imguiio_type["mousereleased"] = sol::property([](ImGuiIO& io) // -> bool[5]
                                                   { return std::ref(io.MouseReleased); });
     imguiio_type["mousewheel"] = &ImGuiIO::MouseWheel;
     imguiio_type["gamepad"] = sol::property([]() -> Gamepad
                                             {
         g_WantUpdateHasGamepad = true;
         return get_gamepad(1); });
-    imguiio_type["gamepads"] = [](unsigned int index)
+    imguiio_type["gamepads"] = [](unsigned int index) -> Gamepad
     {
         g_WantUpdateHasGamepad = true;
         return get_gamepad(index);
diff --git a/src/game_api/script/usertypes/hitbox_lua.cpp b/src/game_api/script/usertypes/hitbox_lua.cpp
index 19554e4b2..82d670826 100644
--- a/src/game_api/script/usertypes/hitbox_lua.cpp
+++ b/src/game_api/script/usertypes/hitbox_lua.cpp
@@ -46,6 +46,10 @@ void register_usertypes(sol::state& lua)
         return AABB{sx1, sy1, sx2, sy2};
     };
 
+    auto rotate = sol::overload(
+        self_return<static_cast<Vec2& (Vec2::*)(float, float, float)>(&Vec2::rotate)>(),
+        self_return<static_cast<Vec2& (Vec2::*)(float, const Vec2&)>(&Vec2::rotate)>());
+
     /// Simple object to hold pair of coordinates
     lua.new_usertype<Vec2>(
         "Vec2",
@@ -65,7 +69,7 @@ void register_usertypes(sol::state& lua)
         "y",
         &Vec2::y,
         "rotate",
-        self_return<&Vec2::rotate>(),
+        rotate,
         "distance_to",
         &Vec2::distance_to,
         "set",
@@ -74,10 +78,10 @@ void register_usertypes(sol::state& lua)
         // &Vec2::split); // for the autodoc
         &Vec2::operator std::pair<float, float>);
 
-    const auto extrude = sol::overload(
+    auto extrude = sol::overload(
         self_return<static_cast<AABB& (AABB::*)(float)>(&AABB::extrude)>(),
         self_return<static_cast<AABB& (AABB::*)(float, float)>(&AABB::extrude)>());
-    const auto is_point_inside = sol::overload(
+    auto is_point_inside = sol::overload(
         static_cast<bool (AABB::*)(const Vec2) const>(&AABB::is_point_inside),
         static_cast<bool (AABB::*)(float, float) const>(&AABB::is_point_inside));
 
diff --git a/src/game_api/script/usertypes/level_lua.cpp b/src/game_api/script/usertypes/level_lua.cpp
index 0799be3ba..a147df90d 100644
--- a/src/game_api/script/usertypes/level_lua.cpp
+++ b/src/game_api/script/usertypes/level_lua.cpp
@@ -242,7 +242,7 @@ class CustomTheme : public ThemeInfo
     std::map<THEME_OVERRIDE, std::unique_ptr<ThemeOverride>> overrides;
     /// Add TEXTUREs here to override different dynamic textures.
     std::map<DYNAMIC_TEXTURE, uint32_t> textures;
-
+    /// To disable or enable theme functions using the base_theme.
     void override(THEME_OVERRIDE index, bool enabled_)
     {
         if (overrides.find(index) == overrides.end())
@@ -250,7 +250,7 @@ class CustomTheme : public ThemeInfo
         else
             overrides[index]->enabled = enabled_;
     }
-
+    /// To override a theme function with another theme.
     void override(THEME_OVERRIDE index, uint8_t theme_)
     {
         if (overrides.find(index) == overrides.end())
@@ -258,7 +258,7 @@ class CustomTheme : public ThemeInfo
         else
             overrides[index]->theme = theme_;
     }
-
+    /// To override a theme function with a lua function.
     void override(THEME_OVERRIDE index, sol::function func_)
     {
         if (overrides.find(index) == overrides.end())
@@ -1236,7 +1236,7 @@ void register_usertypes(sol::state& lua)
     themeinfo_type["spawn_extra"] = &ThemeInfo::spawn_extra;
     themeinfo_type["do_procedural_spawn"] = &ThemeInfo::do_procedural_spawn;
 
-    auto theme_override = sol::overload(
+    auto override = sol::overload(
         static_cast<void (CustomTheme::*)(THEME_OVERRIDE, bool)>(&CustomTheme::override),
         static_cast<void (CustomTheme::*)(THEME_OVERRIDE, uint8_t)>(&CustomTheme::override),
         static_cast<void (CustomTheme::*)(THEME_OVERRIDE, sol::function)>(&CustomTheme::override));
@@ -1245,11 +1245,12 @@ void register_usertypes(sol::state& lua)
     auto customtheme_type = lua.new_usertype<CustomTheme>("CustomTheme", sol::constructors<CustomTheme(), CustomTheme(uint8_t, uint8_t), CustomTheme(uint8_t, uint8_t, bool)>(), sol::base_classes, sol::bases<ThemeInfo>());
     customtheme_type["level_file"] = &CustomTheme::level_file;
     customtheme_type["theme"] = &CustomTheme::theme;
+    // NoDoc
     customtheme_type["base_theme"] = sol::property([](CustomTheme& ct) -> uint8_t
                                                    {
-                          if (ct.base_theme < UINT8_MAX)
-                              return ct.base_theme + 1;
-                          return UINT8_MAX; },
+                                                       if (ct.base_theme < UINT8_MAX)
+                                                           return ct.base_theme + 1;
+                                                       return UINT8_MAX; },
                                                    [](CustomTheme& ct, uint8_t bt)
                                                    {
                                                        if (bt > 0 && bt < UINT8_MAX)
@@ -1258,11 +1259,12 @@ void register_usertypes(sol::state& lua)
                                                            ct.base_theme = 0;
                                                    });
     customtheme_type["textures"] = &CustomTheme::textures;
-    customtheme_type["override"] = theme_override;
+    customtheme_type["override"] = override;
     customtheme_type["pre"] = &CustomTheme::pre;
     customtheme_type["post"] = &CustomTheme::post;
 
     /*
+    customtheme_type["base_theme"] = &CustomTheme::base_theme;
     customtheme_type["reset_theme_flags"] = &CustomTheme::reset_theme_flags;
     customtheme_type["init_flags"] = &CustomTheme::init_flags;
     customtheme_type["init_level"] = &CustomTheme::init_level;
@@ -1274,7 +1276,7 @@ void register_usertypes(sol::state& lua)
     customtheme_type["add_idol"] = &CustomTheme::add_idol;
     customtheme_type["add_vault"] = &CustomTheme::add_vault;
     customtheme_type["add_coffin"] = &CustomTheme::add_coffin;
-    customtheme_type["add_feeling"] = &CustomTheme::add_feeling;
+    customtheme_type["add_special_feeling"] = &CustomTheme::add_special_feeling;
     customtheme_type["spawn_level"] = &CustomTheme::spawn_level;
     customtheme_type["spawn_border"] = &CustomTheme::spawn_border;
     customtheme_type["post_process_level"] = &CustomTheme::post_process_level;
@@ -1316,13 +1318,6 @@ void register_usertypes(sol::state& lua)
     customtheme_type["do_procedural_spawn"] = &CustomTheme::do_procedural_spawn;
     */
 
-    /* CustomTheme
-    // override
-    // `override(THEME_OVERRIDE override, bool enabled)` To disable or enable theme functions using the base_theme.
-    // `override(THEME_OVERRIDE override, THEME theme)` To override a theme function with another theme.
-    // `override(THEME_OVERRIDE override, function func)` To override a theme function with a lua function.
-    */
-
     lua.create_named_table("DYNAMIC_TEXTURE", "INVISIBLE", DYNAMIC_TEXTURE::INVISIBLE, "BACKGROUND", DYNAMIC_TEXTURE::BACKGROUND, "FLOOR", DYNAMIC_TEXTURE::FLOOR, "DOOR", DYNAMIC_TEXTURE::DOOR, "DOOR_LAYER", DYNAMIC_TEXTURE::DOOR_LAYER, "BACKGROUND_DECORATION", DYNAMIC_TEXTURE::BACKGROUND_DECORATION, "KALI_STATUE", DYNAMIC_TEXTURE::KALI_STATUE, "COFFIN", DYNAMIC_TEXTURE::COFFIN);
 
     /// Force a theme in PRE_LOAD_LEVEL_FILES, POST_ROOM_GENERATION or PRE_LEVEL_GENERATION to change different aspects of the levelgen. You can pass a CustomTheme, ThemeInfo or THEME.
diff --git a/src/game_api/script/usertypes/player_lua.cpp b/src/game_api/script/usertypes/player_lua.cpp
index 0e7b77b6c..53875183a 100644
--- a/src/game_api/script/usertypes/player_lua.cpp
+++ b/src/game_api/script/usertypes/player_lua.cpp
@@ -34,7 +34,7 @@ void register_usertypes(sol::state& lua)
     playerslot_type["input_mapping_controller"] = sol::readonly(&PlayerSlot::input_mapping_controller);
     /// NoDoc
     playerslot_type["player_id"] = sol::readonly(&PlayerSlot::player_slot);
-    playerslot_type["player_slot"] = sol::property([](PlayerSlot& p)
+    playerslot_type["player_slot"] = sol::property([](PlayerSlot& p) -> uint8_t
                                                    { return p.player_slot < 0 ? p.player_slot : p.player_slot + 1; });
     playerslot_type["is_participating"] = sol::readonly(&PlayerSlot::is_participating);
 
diff --git a/src/game_api/script/usertypes/state_lua.cpp b/src/game_api/script/usertypes/state_lua.cpp
index 1b4a5615a..0636eeca4 100644
--- a/src/game_api/script/usertypes/state_lua.cpp
+++ b/src/game_api/script/usertypes/state_lua.cpp
@@ -219,6 +219,7 @@ void register_usertypes(sol::state& lua)
         "is_pet_poisoned",
         &Items::is_pet_poisoned,
         "leader",
+        // &Items::leader,
         sol::property([](Items& s) -> uint8_t
                       { return s.leader + 1; },
                       [](Items& s, uint8_t leader)

From 0304045179a08c1045b0b4d3326d638851854711 Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Sat, 6 Jul 2024 22:49:12 +0200
Subject: [PATCH 04/12] more fixing and cleaning up

---
 docs/game_data/spel2.lua                      |  9 ++---
 docs/generate_emmylua.py                      |  5 +--
 docs/parse_source.py                          | 39 ++++++++++---------
 docs/src/includes/_types.md                   |  3 +-
 src/game_api/render_api.hpp                   |  2 +-
 .../script/usertypes/entities_items_lua.cpp   | 26 +++++--------
 6 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua
index 8e6e26ebb..c81c85191 100644
--- a/docs/game_data/spel2.lua
+++ b/docs/game_data/spel2.lua
@@ -2359,8 +2359,8 @@ do
     ---@field random_chance fun(self, inverse_chance: integer, type: PRNG_CLASS): boolean @Returns true with a chance of `1/inverse_chance`
     ---@field random_index fun(self, i: integer, type: PRNG_CLASS): integer? @Generate a integer number in the range `[1, i]` or `nil` if `i < 1`
     ---@field random_int fun(self, min: integer, max: integer, type: PRNG_CLASS): integer? @Generate a integer number in the range `[min, max]` or `nil` if `max < min`
-    ---@field get_pair any @PRNG::get_tuple
-    ---@field set_pair any @PRNG::set_tuple
+    ---@field get_pair fun(self, type: PRNG_CLASS): integer, integer
+    ---@field set_pair fun(self, type: PRNG_CLASS, first: integer, second: integer): nil
 local PRNG = nil
 ---Drop-in replacement for `math.random()`
 ---@return number
@@ -2447,7 +2447,7 @@ function PRNG:random(min, max) end
     ---@field set_normal_map_texture fun(self, texture_id: TEXTURE): boolean @Sets second_texture to the texture specified, then sets third_texture to SHINE_0 and texture_num to 3. You still have to change shader to 30 to render with normal map (same as COG normal maps)
     ---@field set_second_texture fun(self, texture_id: TEXTURE): boolean
     ---@field set_third_texture fun(self, texture_id: TEXTURE): boolean
-    ---@field set_texture_num fun(self, texture_id: integer): boolean @Set the number of textures that may be used, need to have them set before for it to work
+    ---@field set_texture_num fun(self, num: integer): boolean @Set the number of textures that may be used, need to have them set before for it to work
     ---@field set_pre_virtual fun(self, entry: RENDER_INFO_OVERRIDE, fun: function): CallbackId @Hooks before the virtual function at index `entry`.
     ---@field set_post_virtual fun(self, entry: RENDER_INFO_OVERRIDE, fun: function): CallbackId @Hooks after the virtual function at index `entry`.
     ---@field clear_virtual fun(self, callback_id: CallbackId): nil @Clears the hook given by `callback_id`, alternatively use `clear_callback()` inside the hook.
@@ -4015,7 +4015,6 @@ function Movable:generic_update_world(move, sprint_factor, disable_gravity, on_r
     ---@field smoke2 ParticleEmitterInfo
 
 ---@class CookFire : Torch
-    ---@field lit any @Torch::is_lit
     ---@field emitted_light Illumination
     ---@field particles_smoke ParticleEmitterInfo
     ---@field particles_flames ParticleEmitterInfo
@@ -5376,7 +5375,7 @@ function VanillaRenderContext:draw_world_poly_filled(points, color) end
 function VanillaRenderContext:draw_world_poly_filled(points, color) end
 
 ---@class TextureRenderingInfo
-    ---@field new any @constructors<TextureRenderingInfo()
+    ---@field new any @constructors<TextureRenderingInfo(), TextureRenderingInfo(TextureRenderingInfo)>{}
     ---@field x number
     ---@field y number
     ---@field destination_bottom_left_x number @destination is relative to the x,y centerpoint
diff --git a/docs/generate_emmylua.py b/docs/generate_emmylua.py
index e52f4b924..b2e0cf0b7 100644
--- a/docs/generate_emmylua.py
+++ b/docs/generate_emmylua.py
@@ -26,7 +26,7 @@
     "u16string": "string",
     "char16_t*": "string",
     "string_view": "string",
-    "pair": "tuple",
+    "std::pair": "tuple",
     "std::": "",
     "sol::": "",
     "unsigned": "",
@@ -464,13 +464,10 @@ def main():
 
     # Replace some things
     final_replace_stuff = {
-        "    ---@field menu_text_opacity number\n    ---@field menu_text_opacity number": "---@field menu_text_opacity number",
         "---@field find_all_short_tile_codes fun(self, layer: LAYER, short_tile_code: SHORT_TILE_CODE): Array<tuple<integer, integer, LAYER>>": "---@field find_all_short_tile_codes fun(self, layer: LAYER, short_tile_code: SHORT_TILE_CODE): integer[][]",
-        "---@field keysdown boolean       [] @size: ImGuiKey_COUNT": "---@field keysdown boolean[] @size: ImGuiKey_COUNT. Note: lua starts indexing at 1, you need `keysdown[string.byte('A') + 1]` to find the A key.",
         "---@field keydown any @keydown": "---@field keydown fun(key: number | string): boolean",
         "---@field keypressed any @keypressed": "---@field keypressed fun(key: number | string, repeat?: boolean ): boolean",
         "---@field keyreleased any @keyreleased": "---@field keyreleased fun(key: number | string): boolean",
-        "---@field gamepad any @sol::property([](){g_WantUpdateHasGamepad=true;returnget_gamepad()/**/;})": "---@field gamepad Gamepad",
         "---@field user_data fun(self): nil": "---@field user_data table?",
         """---@param number> p tuple<number,
 ---@return Vec2
diff --git a/docs/parse_source.py b/docs/parse_source.py
index 8630c63b8..e0e47edfa 100644
--- a/docs/parse_source.py
+++ b/docs/parse_source.py
@@ -221,9 +221,9 @@ def custom_split(var):
             current = ""
         else:
             current += char
-            if char == '[' or char == '(':
+            if char == '[' or char == '(' or char == '<':
                 level += 1
-            elif char == ']' or char == ')':
+            elif char == ']' or char == ')' or char == '>':
                 level -= 1
     result.append(current.strip())
     return result
@@ -632,7 +632,6 @@ def run_parse():
         data = open(file, "r").read()
         data = data.replace("\n", "")
         data = fix_spaces(data)
-        #data = re.sub(r" ", "", data)
         reParticleHelper = re.compile(r"MakeParticleMemberAccess<(.+?)>\(\)")
         data = reParticleHelper.sub(r"\1", data)
         m = re.findall(
@@ -640,14 +639,14 @@ def run_parse():
             data,
         )
         for type in m:
-            container = type[1].strip()
-            cpp_type = type[2].strip()
-            name = type[3].strip()
-            attr = type[4].strip()
+            container = type[1]
+            cpp_type = type[2]
+            name = type[3]
+            attr = type[4]
             if container:
                 extra = []
                 n = re.findall(
-                    r"(?<! NoDoc )" + container + r'\[("[^"]+")\] = ([^;]+);', data
+                    r"(?<! NoDoc )" + container + r'\[([\w":]+)\] = ([^;]+);', data
                 )
                 for var in n:
                     extra.append(",".join(var))
@@ -693,9 +692,7 @@ def run_parse():
                 var = custom_split(var)
                 if len(var) < 2:
                     continue
-                var[0] = var[0].strip()
-                var[1] = var[1].strip()
-                if var[0] == "sol::base_classes" or var[0] == "sol::no_constructor":
+                if var[0] == "sol::no_constructor":
                     continue
                 if "NoDoc" in var[0]:
                     skip = True
@@ -712,7 +709,7 @@ def run_parse():
                 var_name = var[0]
                 cpp = replace_fun(var[1])
 
-                if var[1].startswith("property"):
+                if var[1].startswith("sol::property"):
                     param_match = re.match(
                         rf"property\(\[\]\({underlying_cpp_type['name']}&(\w+)\)",
                         cpp,
@@ -730,8 +727,8 @@ def run_parse():
                         cpp_name = cpp
                 else:
                     cpp_name = cpp[cpp.find("::") + 2 :] if cpp.find("::") >= 0 else cpp
-
-                if var[0].startswith("sol::constructors"):
+                
+                if var_name.startswith("sol::constructors"):
                     for fun in underlying_cpp_type["member_funs"][cpp_type]:
                         param = fun["param"]
 
@@ -752,20 +749,26 @@ def run_parse():
                             ret = "nil"
                             
                         sig = param_match.group(1)
-                        if sig.startswith(cpp_type):
+                        if sig.startswith(cpp_type): # remove the self parameter if present
                             first_param_end = sig.find(",") + 1
                             if first_param_end == 0:
-                                first_param_end = len(")")
-                            sig = ""
+                                sig = ""
+                            else:
+                                sig = sig[first_param_end:].strip()
                         vars.append(
                             {
                                 "name": var_name,
                                 "type": cpp,
                                 "signature": f"{ret} {var_name}({sig})",
+                                "comment": "",
                                 "function": True,
+                                "cb_signature": "",
                             }
                         )
-                        
+                elif var_name.startswith("sol::base_classes"):
+                    bm = re.search(r"bases<([^\]]*)", cpp)
+                    if bm:
+                        base = bm.group(1).replace(" ", "")
                 elif cpp_name in underlying_cpp_type["member_funs"]:
                     for fun in underlying_cpp_type["member_funs"][cpp_name]:
                         ret = fun["return"] or "nil"
diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md
index 206fe1774..689290170 100644
--- a/docs/src/includes/_types.md
+++ b/docs/src/includes/_types.md
@@ -932,7 +932,7 @@ optional&lt;[TEXTURE](#TEXTURE)&gt; | [get_second_texture()](https://github.com/
 optional&lt;[TEXTURE](#TEXTURE)&gt; | [get_third_texture()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=get_third_texture) | 
 bool | [set_second_texture(TEXTURE texture_id)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_second_texture) | 
 bool | [set_third_texture(TEXTURE texture_id)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_third_texture) | 
-bool | [set_texture_num(int texture_id)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_texture_num) | Set the number of textures that may be used, need to have them set before for it to work
+bool | [set_texture_num(int num)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_texture_num) | Set the number of textures that may be used, need to have them set before for it to work
 [CallbackId](#Aliases) | [set_pre_virtual(RENDER_INFO_OVERRIDE entry, function fun)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_pre_virtual) | Hooks before the virtual function at index `entry`.
 [CallbackId](#Aliases) | [set_post_virtual(RENDER_INFO_OVERRIDE entry, function fun)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_post_virtual) | Hooks after the virtual function at index `entry`.
 nil | [clear_virtual(CallbackId callback_id)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=clear_virtual) | Clears the hook given by `callback_id`, alternatively use `clear_callback()` inside the hook.
@@ -6025,7 +6025,6 @@ Derived from [Entity](#Entity) [Movable](#Movable) [Torch](#Torch)
 
 Type | Name | Description
 ---- | ---- | -----------
- | [lit](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=lit) | 
 [Illumination](#Illumination) | [emitted_light](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=emitted_light) | 
 [ParticleEmitterInfo](#ParticleEmitterInfo) | [particles_smoke](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=particles_smoke) | 
 [ParticleEmitterInfo](#ParticleEmitterInfo) | [particles_flames](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=particles_flames) | 
diff --git a/src/game_api/render_api.hpp b/src/game_api/render_api.hpp
index d0c90d1f7..89c805c82 100644
--- a/src/game_api/render_api.hpp
+++ b/src/game_api/render_api.hpp
@@ -356,7 +356,7 @@ struct RenderInfo
     bool set_second_texture(TEXTURE texture_id);
     bool set_third_texture(TEXTURE texture_id);
     /// Set the number of textures that may be used, need to have them set before for it to work
-    bool set_texture_num(uint32_t texture_id);
+    bool set_texture_num(uint32_t num);
     /// Sets second_texture to the texture specified, then sets third_texture to SHINE_0 and texture_num to 3. You still have to change shader to 30 to render with normal map (same as COG normal maps)
     bool set_normal_map_texture(TEXTURE texture_id);
 };
diff --git a/src/game_api/script/usertypes/entities_items_lua.cpp b/src/game_api/script/usertypes/entities_items_lua.cpp
index 1748576f1..8bd8a222b 100644
--- a/src/game_api/script/usertypes/entities_items_lua.cpp
+++ b/src/game_api/script/usertypes/entities_items_lua.cpp
@@ -862,23 +862,15 @@ void register_usertypes(sol::state& lua)
         sol::base_classes,
         sol::bases<Entity, Movable>());
 
-    lua.new_usertype<CookFire>(
-        "CookFire",
-        /// NoDoc
-        "lit",
-        &Torch::is_lit, // left to not break backwards compatibility
-        "emitted_light",
-        &CookFire::emitted_light,
-        "particles_smoke",
-        &CookFire::particles_smoke,
-        "particles_flames",
-        &CookFire::particles_flames,
-        "particles_warp",
-        &CookFire::particles_warp,
-        "sound",
-        &CookFire::sound,
-        sol::base_classes,
-        sol::bases<Entity, Movable, Torch>());
+    auto cookfire_type = lua.new_usertype<CookFire>("CookFire");
+    /// NoDoc
+    cookfire_type["lit"] = &Torch::is_lit; // left to not break backwards compatibility
+    cookfire_type["emitted_light"] = &CookFire::emitted_light;
+    cookfire_type["particles_smoke"] = &CookFire::particles_smoke;
+    cookfire_type["particles_flames"] = &CookFire::particles_flames;
+    cookfire_type["particles_warp"] = &CookFire::particles_warp;
+    cookfire_type["sound"] = &CookFire::sound;
+    cookfire_type[sol::base_classes] = sol::bases<Entity, Movable, Torch>();
 
     lua.new_usertype<Orb>(
         "Orb",

From b739ee4259f5e3a470326827dd9b7720bf295164 Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Sat, 6 Jul 2024 23:19:59 +0200
Subject: [PATCH 05/12] fix return type better

---
 docs/game_data/spel2.lua                  | 10 +++++-----
 docs/parse_source.py                      |  2 +-
 docs/src/includes/_types.md               | 10 +++++-----
 src/game_api/script/usertypes/gui_lua.cpp | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua
index c81c85191..1a6287398 100644
--- a/docs/game_data/spel2.lua
+++ b/docs/game_data/spel2.lua
@@ -5130,7 +5130,7 @@ function GuiDrawContext:win_pushid(id) end
     ---@field displaysize Vec2
     ---@field framerate number
     ---@field wantkeyboard boolean
-    ---@field keys boolean[652]
+    ---@field keys boolean[] @size: 652
     ---@field keydown fun(key: number | string): boolean
     ---@field keypressed fun(key: number | string, repeat?: boolean ): boolean
     ---@field keyreleased fun(key: number | string): boolean
@@ -5141,10 +5141,10 @@ function GuiDrawContext:win_pushid(id) end
     ---@field modifierdown fun(self, chord: integer): boolean
     ---@field wantmouse boolean
     ---@field mousepos Vec2
-    ---@field mousedown boolean[5]
-    ---@field mouseclicked boolean[5]
-    ---@field mousedoubleclicked boolean[5]
-    ---@field mousereleased boolean[5]
+    ---@field mousedown boolean[] @size: 5
+    ---@field mouseclicked boolean[] @size: 5
+    ---@field mousedoubleclicked boolean[] @size: 5
+    ---@field mousereleased boolean[] @size: 5
     ---@field mousewheel number
     ---@field gamepad Gamepad
     ---@field gamepads fun(self, index: integer): Gamepad
diff --git a/docs/parse_source.py b/docs/parse_source.py
index e0e47edfa..017f7224a 100644
--- a/docs/parse_source.py
+++ b/docs/parse_source.py
@@ -823,7 +823,7 @@ def run_parse():
                         )
                     else:
                         m_return_type = re.search(
-                            r"-> ([:<>\w\[\]*]+) {", var[1]
+                            r"-> ([:<>\w\[\], *]+) {", var[1]
                         )  # Use var[1] instead of cpp because it could be replaced on the sol::property stuff
                         if m_return_type:
                             type = replace_fun(m_return_type[1])
diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md
index 689290170..41cc19919 100644
--- a/docs/src/includes/_types.md
+++ b/docs/src/includes/_types.md
@@ -1099,7 +1099,7 @@ Type | Name | Description
 [Vec2](#Vec2) | [displaysize](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=displaysize) | 
 float | [framerate](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=framerate) | 
 bool | [wantkeyboard](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=wantkeyboard) | True if anyone else (i.e. some input box, OL hotkey) is already capturing keyboard or reacted to this keypress and you probably shouldn't.<br/>Set this to true every GUIFRAME while you want to capture keyboard and disable UI key bindings and game keys. Won't affect UI or game keys on this frame though, that train has already sailed. Also see [Bucket](#Bucket)::[Overlunky](#Overlunky) for other ways to override key bindings.<br/>Do not set this to false, unless you want the player input to bleed through input fields.<br/> 
-bool[652] | [keys](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keys) | ZeroIndexArray<bool> of currently held keys, indexed by [KEY](#KEY) <= 0xFF<br/> 
+array&lt;bool, 652&gt; | [keys](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keys) | ZeroIndexArray<bool> of currently held keys, indexed by [KEY](#KEY) <= 0xFF<br/> 
  | [keydown](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keydown) | Returns true if key or chord is down.<br/>bool keydown([KEY](#KEY) keychord)<br/>bool keydown(char key)<br/> 
  | [keypressed](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keypressed) | Returns true if key or chord was pressed this GUIFRAME.<br/>bool keypressed([KEY](#KEY) keychord, bool repeat = false)<br/>bool keypressed(char key, bool repeat = false)<br/> 
  | [keyreleased](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keyreleased) | Returns true if key or chord was released this GUIFRAME.<br/>bool keyreleased([KEY](#KEY) keychord)<br/>bool keyreleased(char key)<br/> 
@@ -1110,10 +1110,10 @@ bool | [keysuper](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=keysu
 bool | [modifierdown(int chord)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=modifierdown) | bool modifierdown([KEY](#KEY) keychord)<br/>Returns true if modifiers in chord are down, ignores other keys in chord.<br/> 
 bool | [wantmouse](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=wantmouse) | True if anyone else (i.e. hovering some window) is already capturing mouse and you probably shouldn't.<br/>Set this to true if you want to capture mouse and override UI mouse binding.<br/> 
 [Vec2](#Vec2) | [mousepos](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousepos) | 
-bool[5] | [mousedown](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousedown) | 
-bool[5] | [mouseclicked](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mouseclicked) | 
-bool[5] | [mousedoubleclicked](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousedoubleclicked) | 
-bool[5] | [mousereleased](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousereleased) | 
+array&lt;bool, 5&gt; | [mousedown](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousedown) | 
+array&lt;bool, 5&gt; | [mouseclicked](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mouseclicked) | 
+array&lt;bool, 5&gt; | [mousedoubleclicked](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousedoubleclicked) | 
+array&lt;bool, 5&gt; | [mousereleased](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousereleased) | 
 float | [mousewheel](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=mousewheel) | 
 [Gamepad](#Gamepad) | [gamepad](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=gamepad) | 
 [Gamepad](#Gamepad) | [gamepads(int index)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=gamepads) | [Gamepad](#Gamepad) gamepads(int index)<br/>This is the XInput index 1..4, might not be the same as the player slot.<br/> 
diff --git a/src/game_api/script/usertypes/gui_lua.cpp b/src/game_api/script/usertypes/gui_lua.cpp
index c15f203f3..30651a7d6 100644
--- a/src/game_api/script/usertypes/gui_lua.cpp
+++ b/src/game_api/script/usertypes/gui_lua.cpp
@@ -1099,7 +1099,7 @@ void register_usertypes(sol::state& lua)
     /// NoDoc
     imguiio_type["keysdown"] = sol::property([](ImGuiIO& io)
                                              { return std::ref(io.KeysDown) /**/; });
-    imguiio_type["keys"] = sol::property([](ImGuiIO& io) // -> bool[652]
+    imguiio_type["keys"] = sol::property([](ImGuiIO& io) // -> std::array<bool, 652>
                                          { return ZeroIndexArray<bool>(io.KeysDown) /**/; });
     imguiio_type["keydown"] = keydown;
     imguiio_type["keypressed"] = keypressed;
@@ -1125,13 +1125,13 @@ void register_usertypes(sol::state& lua)
                                               });
     imguiio_type["mousepos"] = sol::property([](ImGuiIO& io) -> Vec2
                                              { return Vec2(io.MousePos); });
-    imguiio_type["mousedown"] = sol::property([](ImGuiIO& io) // -> bool[5]
+    imguiio_type["mousedown"] = sol::property([](ImGuiIO& io) // -> std::array<bool, 5>
                                               { return std::ref(io.MouseDown); });
-    imguiio_type["mouseclicked"] = sol::property([](ImGuiIO& io) // -> bool[5]
+    imguiio_type["mouseclicked"] = sol::property([](ImGuiIO& io) // -> std::array<bool, 5>
                                                  { return std::ref(io.MouseClicked); });
-    imguiio_type["mousedoubleclicked"] = sol::property([](ImGuiIO& io) // -> bool[5]
+    imguiio_type["mousedoubleclicked"] = sol::property([](ImGuiIO& io) // -> std::array<bool, 5>
                                                        { return std::ref(io.MouseDoubleClicked); });
-    imguiio_type["mousereleased"] = sol::property([](ImGuiIO& io) // -> bool[5]
+    imguiio_type["mousereleased"] = sol::property([](ImGuiIO& io) // -> std::array<bool, 5>
                                                   { return std::ref(io.MouseReleased); });
     imguiio_type["mousewheel"] = &ImGuiIO::MouseWheel;
     imguiio_type["gamepad"] = sol::property([]() -> Gamepad

From 8318422f3542be5d88bf21fc04f56f344755933b Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Sun, 7 Jul 2024 16:35:26 +0200
Subject: [PATCH 06/12] last fix?

---
 docs/game_data/spel2.lua       |  4 ++--
 docs/generate.py               | 10 +++++-----
 docs/generate_emmylua.py       |  4 ----
 docs/parse_source.py           |  2 +-
 docs/src/includes/_enums.md    |  2 +-
 docs/src/includes/_events.md   |  2 +-
 docs/src/includes/_globals.md  | 10 +++++-----
 src/game_api/script/lua_vm.cpp |  2 +-
 8 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua
index 1a6287398..a4d50f213 100644
--- a/docs/game_data/spel2.lua
+++ b/docs/game_data/spel2.lua
@@ -2445,6 +2445,8 @@ function PRNG:random(min, max) end
     ---@field texture_num integer
     ---@field get_entity fun(self): Entity
     ---@field set_normal_map_texture fun(self, texture_id: TEXTURE): boolean @Sets second_texture to the texture specified, then sets third_texture to SHINE_0 and texture_num to 3. You still have to change shader to 30 to render with normal map (same as COG normal maps)
+    ---@field get_second_texture fun(self): TEXTURE?
+    ---@field get_third_texture fun(self): TEXTURE?
     ---@field set_second_texture fun(self, texture_id: TEXTURE): boolean
     ---@field set_third_texture fun(self, texture_id: TEXTURE): boolean
     ---@field set_texture_num fun(self, num: integer): boolean @Set the number of textures that may be used, need to have them set before for it to work
@@ -11436,12 +11438,10 @@ YANG = {
 ---@alias YANG integer
 local MAX_PLAYERS = 4
 
----@alias in_port_t number
 ---@class Logic
 
 ---@alias OnlinePlayerShort any
 ---@alias UdpServer any
----@alias Texture any
 ---@alias SpearDanglerAnimFrames any
 ---@alias OnlineLobbyScreenPlayer any
 ---@alias SoundCallbackFunction function
diff --git a/docs/generate.py b/docs/generate.py
index 74f6e5e07..1191d690d 100644
--- a/docs/generate.py
+++ b/docs/generate.py
@@ -365,20 +365,20 @@ def print_lf(lf):
 
 print("int | vector:find(any value) | Searches for the value in vector, returns index of the item in vector or nil if not found, only available for simple values that are comparable")
 print("int | span:find(any value) | Searches for the value in span, returns index of the item in span or nil if not found, only available for simple values that are comparable")
-print("any | set:find(any value) | Searches for the value in set, returns the value itself or nil if not found, only available for simple values that are comparable")
+print("any | set:find(any key) | Searches for the value in set, returns the value itself or nil if not found, only available for simple values that are comparable")
 print("any | map:find(any key) | Searches for the key in map, returns the value itself or nil if not found, only available for simple keys that are comparable")
 
 print("nil | vector:erase(int index) | Removes element at given index, the rest of elements shift down so that the vector stays contiguous")
-print("nil | set:erase(any value) | Removes element from set")
-print("nil | map:erase(any key) | Removes element from map by key")
+print("nil | set:erase(any key) | Removes element from set")
+print("nil | map:erase(any key) | Removes element from map")
 
 print("nil | vector:clear() | Removes all elements from vector")
 print("nil | set:clear() | Removes all elements from set")
 print("nil | map:clear() | Removes all elements from map")
 
 print("nil | vector:insert(int index, any element) | Inserts element at given index, the rest of elements shift up in index")
-print("nil | set:insert(int order, any element) | The order param doesn't acutally matter and can be set to nil")
-print("nil | map:insert(any key, any value) | unsure, probably easier to just use `map[key] = value`")
+print("nil | set:insert(int order, any key) | The order param doesn't acutally matter and can be set to nil")
+print("nil | map:insert(any key, any value)? | unsure, probably easier to just use `map[key] = value`")
 
 
 print("# Functions")
diff --git a/docs/generate_emmylua.py b/docs/generate_emmylua.py
index b2e0cf0b7..d434bda71 100644
--- a/docs/generate_emmylua.py
+++ b/docs/generate_emmylua.py
@@ -297,8 +297,6 @@ def main():
                 else ""
             )
             if "function" in var and var["function"]:
-                # if var["name"] == "clear_behaviors":
-                #    gu.breakpoint()
                 signature = var["signature"]
                 m = re.search(r"\s*(.*)\s+([^\(]*)\((.*)\)", signature)
                 if m:
@@ -442,12 +440,10 @@ def main():
     print(
         """local MAX_PLAYERS = 4
 
----@alias in_port_t number
 ---@class Logic
 
 ---@alias OnlinePlayerShort any
 ---@alias UdpServer any
----@alias Texture any
 ---@alias SpearDanglerAnimFrames any
 ---@alias OnlineLobbyScreenPlayer any
 ---@alias SoundCallbackFunction function"""
diff --git a/docs/parse_source.py b/docs/parse_source.py
index 017f7224a..b6b4b8638 100644
--- a/docs/parse_source.py
+++ b/docs/parse_source.py
@@ -742,7 +742,7 @@ def run_parse():
                             }
                         )
                 elif cpp.startswith("[]("):
-                    param_match = re.match(r"\[\]\(([\w &*:,]+)?\) -> ([\w.*&<>\[\]:]+)?(?: )?{", cpp)
+                    param_match = re.match(r"\[\]\(([\w &*:,]+)?\) -> ([\w.*&<>\?\[\]:]+)?(?: )?{", cpp)
                     if param_match:
                         ret = param_match.group(2)
                         if ret is None:
diff --git a/docs/src/includes/_enums.md b/docs/src/includes/_enums.md
index c2b7f0caf..564b3b0b3 100644
--- a/docs/src/includes/_enums.md
+++ b/docs/src/includes/_enums.md
@@ -845,7 +845,7 @@ Name | Data | Description
 [DEATH](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.DEATH) | ON::DEATH | Runs when entering the death screen.<br/>
 [SPACESHIP](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.SPACESHIP) | ON::SPACESHIP | Runs when entering the olmecship cutscene after [Tiamat](#Tiamat).<br/>
 [WIN](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.WIN) | ON::WIN | Runs when entering any winning cutscene, including the constellation.<br/>
-[CREDITS](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.CREDITS) | ON::CREDITS | Runs when entering the credits.<br/>
+[CREDITS](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.CREDITS) | ON::CREDITS | Runs when entering the credits screen.<br/>
 [SCORES](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.SCORES) | ON::SCORES | Runs when entering the final score celebration screen of a normal or hard ending.<br/>
 [CONSTELLATION](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.CONSTELLATION) | ON::CONSTELLATION | Runs when entering the turning into constellation cutscene after cosmic ocean.<br/>
 [RECAP](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.RECAP) | ON::RECAP | Runs when entering the Dear Journal screen after final scores.<br/>
diff --git a/docs/src/includes/_events.md b/docs/src/includes/_events.md
index d03a84b5c..41fa08125 100644
--- a/docs/src/includes/_events.md
+++ b/docs/src/includes/_events.md
@@ -130,7 +130,7 @@ Runs when entering any winning cutscene, including the constellation.<br/>
 
 > Search script examples for [ON.CREDITS](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ON.CREDITS)
 
-Runs when entering the credits.<br/>
+Runs when entering the credits screen.<br/>
 
 ## ON.SCORES
 
diff --git a/docs/src/includes/_globals.md b/docs/src/includes/_globals.md
index 9d3a08b74..3ec1908b4 100644
--- a/docs/src/includes/_globals.md
+++ b/docs/src/includes/_globals.md
@@ -165,17 +165,17 @@ any | set:at(int order) | Returns elements in order, it's not an index as sets d
 any | map:at(int order) | Returns elements in order, it's not an index as maps don't have one
 int | vector:find(any value) | Searches for the value in vector, returns index of the item in vector or nil if not found, only available for simple values that are comparable
 int | span:find(any value) | Searches for the value in span, returns index of the item in span or nil if not found, only available for simple values that are comparable
-any | set:find(any value) | Searches for the value in set, returns the value itself or nil if not found, only available for simple values that are comparable
+any | set:find(any key) | Searches for the value in set, returns the value itself or nil if not found, only available for simple values that are comparable
 any | map:find(any key) | Searches for the key in map, returns the value itself or nil if not found, only available for simple keys that are comparable
 nil | vector:erase(int index) | Removes element at given index, the rest of elements shift down so that the vector stays contiguous
-nil | set:erase(any value) | Removes element from set
-nil | map:erase(any key) | Removes element from map by key
+nil | set:erase(any key) | Removes element from set
+nil | map:erase(any key) | Removes element from map
 nil | vector:clear() | Removes all elements from vector
 nil | set:clear() | Removes all elements from set
 nil | map:clear() | Removes all elements from map
 nil | vector:insert(int index, any element) | Inserts element at given index, the rest of elements shift up in index
-nil | set:insert(int order, any element) | The order param doesn't acutally matter and can be set to nil
-nil | map:insert(any key, any value) | unsure, probably easier to just use `map[key] = value`
+nil | set:insert(int order, any key) | The order param doesn't acutally matter and can be set to nil
+nil | map:insert(any key, any value)? | unsure, probably easier to just use `map[key] = value`
 # Functions
 The game functions like `spawn` use [level coordinates](#get_position). Draw functions use normalized [screen coordinates](#screen_position) from `-1.0 .. 1.0` where `0.0, 0.0` is the center of the screen.
 
diff --git a/src/game_api/script/lua_vm.cpp b/src/game_api/script/lua_vm.cpp
index f6845ecc9..af85c1da5 100644
--- a/src/game_api/script/lua_vm.cpp
+++ b/src/game_api/script/lua_vm.cpp
@@ -2492,7 +2492,7 @@ end
     // WIN
     // Runs when entering any winning cutscene, including the constellation.
     // CREDITS
-    // Runs when entering the credits.
+    // Runs when entering the credits screen.
     // SCORES
     // Runs when entering the final score celebration screen of a normal or hard ending.
     // CONSTELLATION

From ad24b1fd54a51e22defa6854ba29edbf0b669c6b Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Sun, 7 Jul 2024 17:26:32 +0200
Subject: [PATCH 07/12] one last comment

---
 docs/parse_source.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/parse_source.py b/docs/parse_source.py
index b6b4b8638..efd109f07 100644
--- a/docs/parse_source.py
+++ b/docs/parse_source.py
@@ -707,7 +707,7 @@ def run_parse():
                     var[1] = var[1][:-1]
 
                 var_name = var[0]
-                cpp = replace_fun(var[1])
+                cpp = replace_fun(var[1]) # should probably be done later, so the regex doesn't have to relay on some of the changes, also generate_emmylua.py uses some unique formats replacements
 
                 if var[1].startswith("sol::property"):
                     param_match = re.match(

From 7ade2d602f42f46a094758abdad6ccf3ab4dcc98 Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Wed, 10 Jul 2024 19:28:30 +0200
Subject: [PATCH 08/12] doc - no such thing as `define_entity_texture`

---
 docs/src/includes/_types.md                   | 2 +-
 src/game_api/script/usertypes/texture_lua.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md
index 41cc19919..6a38b9ee9 100644
--- a/docs/src/includes/_types.md
+++ b/docs/src/includes/_types.md
@@ -3111,7 +3111,7 @@ bool | [set_font(TEXTURE id)](https://github.com/spelunky-fyi/overlunky/search?l
 
 ### TextureDefinition
 
-Use `TextureDefinition.new()` to get a new instance to this and pass it to define_entity_texture.
+Use `TextureDefinition.new()` to get a new instance to this and pass it to [define_texture](#define_texture).
 `width` and `height` always have to be the size of the image file. They should be divisible by `tile_width` and `tile_height` respectively.
 `tile_width` and `tile_height` define the size of a single tile, the image will automatically be divided into these tiles.
 Tiles are labeled in sequence starting at the top left, going right and down at the end of the image (you know, like sentences work in the English language). Use those numbers in `Entity::animation_frame`.
diff --git a/src/game_api/script/usertypes/texture_lua.cpp b/src/game_api/script/usertypes/texture_lua.cpp
index bca48d312..67eb64d10 100644
--- a/src/game_api/script/usertypes/texture_lua.cpp
+++ b/src/game_api/script/usertypes/texture_lua.cpp
@@ -97,7 +97,7 @@ void register_usertypes(sol::state& lua)
             clear_cache(path);
         });
 
-    /// Use `TextureDefinition.new()` to get a new instance to this and pass it to define_entity_texture.
+    /// Use `TextureDefinition.new()` to get a new instance to this and pass it to [define_texture](#define_texture).
     /// `width` and `height` always have to be the size of the image file. They should be divisible by `tile_width` and `tile_height` respectively.
     /// `tile_width` and `tile_height` define the size of a single tile, the image will automatically be divided into these tiles.
     /// Tiles are labeled in sequence starting at the top left, going right and down at the end of the image (you know, like sentences work in the English language). Use those numbers in `Entity::animation_frame`.

From fd2d7b97d510773f1e82c6279b7679f33761de8a Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Thu, 11 Jul 2024 17:30:39 +0200
Subject: [PATCH 09/12] update doc

---
 docs/game_data/spel2.lua                    | 4 ++--
 docs/generate_emmylua.py                    | 2 +-
 docs/parse_source.py                        | 2 +-
 docs/src/includes/_types.md                 | 4 ++--
 src/game_api/script/usertypes/level_lua.cpp | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua
index e2568c38b..66d717529 100644
--- a/docs/game_data/spel2.lua
+++ b/docs/game_data/spel2.lua
@@ -2430,7 +2430,7 @@ function PRNG:random(min, max) end
     ---@field hitboxy number
     ---@field draw_depth integer
     ---@field collision2_mask integer @MASK, will only call collision2 when colliding with entities that match this mask.
-    ---@field collision_mask integer @MASK used for collision with floors.
+    ---@field collision_mask integer @MASK used for collision with floors, walls etc.
     ---@field friction number
     ---@field elasticity number
     ---@field weight number
@@ -4831,7 +4831,7 @@ function CustomTheme:override(index, func_) end
     ---@field flags integer
     ---@field flags2 integer
     ---@field flags3 integer
-    ---@field level_config integer[]
+    ---@field level_config integer[] @size: 17
 
 ---@class PostRoomGenerationContext
     ---@field set_room_template fun(self, x: integer, y: integer, layer: LAYER, room_template: ROOM_TEMPLATE): boolean @Set the room template at the given index and layer, returns `false` if the index is outside of the level.
diff --git a/docs/generate_emmylua.py b/docs/generate_emmylua.py
index b6954234e..d7d73e036 100644
--- a/docs/generate_emmylua.py
+++ b/docs/generate_emmylua.py
@@ -33,7 +33,7 @@
     " = nullopt": "",
     "void": "",
     "constexpr": "",
-    "inline": "",
+    "inline ": "",
     "[[nodiscard]]": "",
     "[[maybe_unused]]": "",
     "self_return<&": "",
diff --git a/docs/parse_source.py b/docs/parse_source.py
index 57a7be1cd..d06271649 100644
--- a/docs/parse_source.py
+++ b/docs/parse_source.py
@@ -55,7 +55,7 @@
     "static": "",
     "[[nodiscard]]": "",
     "[[maybe_unused]]": "",
-    "inline": "",
+    "inline ": "",
     "self_return<&": "",
     ">()": "",
     "unsigned": "",
diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md
index 91aac2636..ea5b33c1f 100644
--- a/docs/src/includes/_types.md
+++ b/docs/src/includes/_types.md
@@ -462,7 +462,7 @@ float | [hitboxx](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=hitbo
 float | [hitboxy](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=hitboxy) | 
 int | [draw_depth](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=draw_depth) | 
 int | [collision2_mask](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=collision2_mask) | [MASK](#MASK), will only call collision2 when colliding with entities that match this mask.
-int | [collision_mask](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=collision_mask) | [MASK](#MASK) used for collision with floors.
+int | [collision_mask](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=collision_mask) | [MASK](#MASK) used for collision with floors, walls etc.
 float | [friction](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=friction) | 
 float | [elasticity](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=elasticity) | 
 float | [weight](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=weight) | 
@@ -1378,7 +1378,7 @@ array&lt;[ThemeInfo](#ThemeInfo), 18&gt; | [themes](https://github.com/spelunky-
 int | [flags](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=flags) | 
 int | [flags2](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=flags2) | 
 int | [flags3](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=flags3) | 
-array&lt;int&gt; | [level_config](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=level_config) | 
+array&lt;int, 17&gt; | [level_config](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=level_config) | 
 
 ## Lighting types
 
diff --git a/src/game_api/script/usertypes/level_lua.cpp b/src/game_api/script/usertypes/level_lua.cpp
index 791ce7b84..b38fd9f3b 100644
--- a/src/game_api/script/usertypes/level_lua.cpp
+++ b/src/game_api/script/usertypes/level_lua.cpp
@@ -1368,8 +1368,8 @@ void register_usertypes(sol::state& lua)
     ///  kept for backward compatibility, don't use, check LevelGenSystem.exit_doors
     lua.new_usertype<DoorCoords>("DoorCoords", sol::no_constructor, "door1_x", &DoorCoords::door1_x, "door1_y", &DoorCoords::door1_y, "door2_x", &DoorCoords::door2_x, "door2_y", &DoorCoords::door2_y);
 
-    auto level_config = [](LevelGenSystem& level_gen)
-    { return ZeroIndexArray<uint32_t>(level_gen.data->level_config); };
+    // auto level_config = [](LevelGenSystem& level_gen)
+    //{ return ZeroIndexArray<uint32_t>(level_gen.data->level_config); };
 
     /// Data relating to level generation, changing anything in here from ON.LEVEL or later will likely have no effect, used in StateMemory
     lua.new_usertype<LevelGenSystem>(
@@ -1404,8 +1404,8 @@ void register_usertypes(sol::state& lua)
         "flags3",
         &LevelGenSystem::flags3,
         "level_config",
-        sol::property([&level_config](LevelGenSystem& lg) // -> array<int>
-                      { return level_config(lg) /**/; }));
+        sol::property([](LevelGenSystem& lg) // -> array<int, 17>
+                      { return ZeroIndexArray<uint32_t>(lg.data->level_config) /**/; }));
 
     /// Context received in ON.POST_ROOM_GENERATION.
     /// Used to change the room templates in the level and other shenanigans that affect level gen.

From fc14110cb57ccef26b61749c4c818319105ad146 Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Thu, 11 Jul 2024 19:03:39 +0200
Subject: [PATCH 10/12] move color.cpp

---
 src/game_api/{script/usertypes => }/color.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/game_api/{script/usertypes => }/color.cpp (100%)

diff --git a/src/game_api/script/usertypes/color.cpp b/src/game_api/color.cpp
similarity index 100%
rename from src/game_api/script/usertypes/color.cpp
rename to src/game_api/color.cpp

From 1d1b5ef17efc83ff76219b13d961ce6c822489b1 Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Thu, 11 Jul 2024 20:16:35 +0200
Subject: [PATCH 11/12] fix build, update doc

---
 docs/game_data/spel2.lua                     |  2 --
 docs/src/includes/_types.md                  |  5 +--
 src/game_api/color.hpp                       |  6 ++--
 src/game_api/math.hpp                        | 36 ++++++++++----------
 src/game_api/script/sol_helper.hpp           |  1 +
 src/game_api/script/usertypes/color_lua.cpp  |  7 ++--
 src/game_api/script/usertypes/entity_lua.cpp |  1 -
 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua
index 14ca43a51..d9a632325 100644
--- a/docs/game_data/spel2.lua
+++ b/docs/game_data/spel2.lua
@@ -4732,9 +4732,7 @@ function MovableBehavior:get_state_id() end
 ---@class CustomTheme : ThemeInfo
     ---@field level_file string @Level file to load. Probably doesn't do much in custom themes, especially if you're forcing them in PRE_LOAD_LEVEL_FILES.
     ---@field theme integer @Theme index. Probably shouldn't collide with the vanilla ones. Purpose unknown.
-    ---@field base_theme integer @Base THEME to load enabled functions from, when no other theme is specified.
     ---@field textures table<DYNAMIC_TEXTURE, TEXTURE> @Add TEXTUREs here to override different dynamic textures.
-    ---@field override any @theme_override
     ---@field pre fun(self, index: THEME_OVERRIDE, func_: function): nil @Set a callback to be called before this theme function.
     ---@field post fun(self, index: THEME_OVERRIDE, func_: function): nil @Set a callback to be called after this theme function, to fix some changes it did for example.
     ---@field base_theme integer @Base THEME to load enabled functions from, when no other theme is specified.
diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md
index 71e978b89..fea7b567e 100644
--- a/docs/src/includes/_types.md
+++ b/docs/src/includes/_types.md
@@ -3213,9 +3213,10 @@ Type | Name | Description
 [CustomTheme](#CustomTheme) | [new()](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=CustomTheme) | Create a new theme with base dwelling and id 100.
 string | [level_file](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=level_file) | Level file to load. Probably doesn't do much in custom themes, especially if you're forcing them in PRE_LOAD_LEVEL_FILES.
 int | [theme](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=theme) | Theme index. Probably shouldn't collide with the vanilla ones. Purpose unknown.
-int | [base_theme](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=base_theme) | Base [THEME](#THEME) to load enabled functions from, when no other theme is specified.
 map&lt;[DYNAMIC_TEXTURE](#DYNAMIC_TEXTURE), [TEXTURE](#TEXTURE)&gt; | [textures](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=textures) | Add TEXTUREs here to override different dynamic textures.
- | [override](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=override) | `override(THEME_OVERRIDE override, bool enabled)` To disable or enable theme functions using the base_theme.<br/>`override(THEME_OVERRIDE override, THEME theme)` To override a theme function with another theme.<br/>`override(THEME_OVERRIDE override, function func)` To override a theme function with a lua function.<br/> 
+nil | [override(THEME_OVERRIDE index, bool enabled_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=override) | To disable or enable theme functions using the base_theme.
+nil | [override(THEME_OVERRIDE index, int theme_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=override) | To override a theme function with another theme.
+nil | [override(THEME_OVERRIDE index, function func_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=override) | To override a theme function with a lua function.
 nil | [pre(THEME_OVERRIDE index, function func_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=pre) | Set a callback to be called before this theme function.
 nil | [post(THEME_OVERRIDE index, function func_)](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=post) | Set a callback to be called after this theme function, to fix some changes it did for example.
 int | [base_theme](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=base_theme) | Base [THEME](#THEME) to load enabled functions from, when no other theme is specified.
diff --git a/src/game_api/color.hpp b/src/game_api/color.hpp
index a81e561a6..adebbd022 100644
--- a/src/game_api/color.hpp
+++ b/src/game_api/color.hpp
@@ -129,7 +129,7 @@ struct Color
         return {toRGB(r), toRGB(g), toRGB(b), toRGB(a)};
     }
     /// Changes color based on given RGBA colors in 0..255 range
-    Color& set_rgba(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha) noexcept
+    Color& set_rgba(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha)
     {
         r = red / 255.0f;
         g = green / 255.0f;
@@ -143,7 +143,7 @@ struct Color
         return (toRGB(a) << 24) + (toRGB(b) << 16) + (toRGB(g) << 8) + (toRGB(r));
     }
     /// Changes color based on given uColor
-    Color& set_ucolor(const uColor color) noexcept
+    Color& set_ucolor(const uColor color)
     {
         uint8_t red = color & 0xFF;
         uint8_t green = (color >> 8U) & 0xFF;
@@ -153,7 +153,7 @@ struct Color
     }
 
     /// Copies the values of different Color to this one
-    Color& set(Color& other) noexcept
+    Color& set(Color& other)
     {
         *this = other;
         return *this;
diff --git a/src/game_api/math.hpp b/src/game_api/math.hpp
index 514726660..90a80d278 100644
--- a/src/game_api/math.hpp
+++ b/src/game_api/math.hpp
@@ -21,7 +21,7 @@ struct Vec2
     /// NoDoc
     Vec2(const ImVec2&) noexcept;
 
-    Vec2& rotate(float angle, float px, float py) noexcept
+    Vec2& rotate(float angle, float px, float py)
     {
         const float sin_a{std::sin(angle)};
         const float cos_a{std::cos(angle)};
@@ -45,7 +45,7 @@ struct Vec2
         diff *= diff; // pow
         return (float)std::sqrt(diff.x + diff.y);
     }
-    Vec2& set(const Vec2& other) noexcept
+    Vec2& set(const Vec2& other)
     {
         *this = other;
         return *this;
@@ -181,7 +181,7 @@ struct AABB
     }
 
     /// Fixes the AABB if any of the sides have negative length
-    AABB& abs() noexcept
+    AABB& abs()
     {
         if (left > right)
             std::swap(left, right);
@@ -192,13 +192,13 @@ struct AABB
 
     /// Grows or shrinks the AABB by the given amount in all directions.
     /// If `amount < 0` and `abs(amount) > right/top - left/bottom` the respective dimension of the AABB will become `0`.
-    AABB& extrude(float amount) noexcept
+    AABB& extrude(float amount)
     {
         return extrude(amount, amount);
     }
     /// Grows or shrinks the AABB by the given amount in each direction.
     /// If `amount_x/y < 0` and `abs(amount_x/y) > right/top - left/bottom` the respective dimension of the AABB will become `0`.
-    AABB& extrude(float amount_x, float amount_y) noexcept
+    AABB& extrude(float amount_x, float amount_y)
     {
         left -= amount_x;
         right += amount_x;
@@ -218,7 +218,7 @@ struct AABB
         return *this;
     }
     /// Offsets the AABB by the given offset.
-    AABB& offset(float off_x, float off_y) noexcept
+    AABB& offset(float off_x, float off_y)
     {
         left += off_x;
         bottom += off_y;
@@ -280,7 +280,7 @@ struct AABB
 
         return false;
     }
-    AABB& set(const AABB& other) noexcept
+    AABB& set(const AABB& other)
     {
         *this = other;
         return *this;
@@ -309,14 +309,14 @@ struct Triangle
     Triangle(float ax, float ay, float bx, float by, float cx, float cy) noexcept
         : A(ax, ay), B(bx, by), C(cx, cy){};
 
-    Triangle& offset(const Vec2& off) noexcept
+    Triangle& offset(const Vec2& off)
     {
         A += off;
         B += off;
         C += off;
         return *this;
     }
-    Triangle& offset(float x, float y) noexcept
+    Triangle& offset(float x, float y)
     {
         return offset({x, y});
     }
@@ -334,7 +334,7 @@ struct Triangle
     }
     Triangle& operator=(const Triangle& a) = default;
     /// Rotate triangle by an angle, the px/py are just coordinates, not offset from the center
-    Triangle& rotate(float angle, float px, float py) noexcept
+    Triangle& rotate(float angle, float px, float py)
     {
         const float sin_a{std::sin(angle)};
         const float cos_a{std::cos(angle)};
@@ -371,7 +371,7 @@ struct Triangle
         float a_cab = std::abs(std::atan2(ab.y * ac.x - ab.x * ac.y, ab.x * ac.x + ab.y * ac.y));
         return {a_abc, a_cab, a_bca};
     }
-    Triangle& scale(float scale) noexcept
+    Triangle& scale(float scale)
     {
         Vec2 centroid = center();
         A = (A - centroid) * scale + centroid;
@@ -396,7 +396,7 @@ struct Triangle
     {
         return is_point_inside(Vec2{x, y}, epsilon);
     }
-    Triangle& set(const Triangle& other) noexcept
+    Triangle& set(const Triangle& other)
     {
         *this = other;
         return *this;
@@ -446,11 +446,11 @@ struct Quad
         result.bottom = std::min({bottom_left_y, bottom_right_y, top_right_y, top_left_y});
         return result;
     }
-    Quad& offset(const Vec2& vec) noexcept
+    Quad& offset(const Vec2& vec)
     {
         return offset(vec.x, vec.y);
     }
-    Quad& offset(float off_x, float off_y) noexcept
+    Quad& offset(float off_x, float off_y)
     {
         bottom_left_x += off_x;
         bottom_right_x += off_x;
@@ -485,7 +485,7 @@ struct Quad
     }
 
     /// Rotates a Quad by an angle, px/py are not offsets, use `:get_AABB():center()` to get approximated center for simetrical quadrangle
-    Quad& rotate(float angle, float px, float py) noexcept
+    Quad& rotate(float angle, float px, float py)
     {
         const float sin_a{std::sin(angle)};
         const float cos_a{std::cos(angle)};
@@ -509,7 +509,7 @@ struct Quad
         return *this;
     }
 
-    Quad& flip_horizontally() noexcept
+    Quad& flip_horizontally()
     {
         std::swap(top_left_x, top_right_x);
         std::swap(top_left_y, top_right_y);
@@ -519,7 +519,7 @@ struct Quad
         return *this;
     }
 
-    Quad& flip_vertically() noexcept
+    Quad& flip_vertically()
     {
         std::swap(top_left_x, bottom_left_x);
         std::swap(top_left_y, bottom_left_y);
@@ -542,7 +542,7 @@ struct Quad
     {
         return is_point_inside(Vec2{x, y}, epsilon);
     }
-    Quad& set(const Quad& other) noexcept
+    Quad& set(const Quad& other)
     {
         *this = other;
         return *this;
diff --git a/src/game_api/script/sol_helper.hpp b/src/game_api/script/sol_helper.hpp
index 668d4b158..439de3c44 100644
--- a/src/game_api/script/sol_helper.hpp
+++ b/src/game_api/script/sol_helper.hpp
@@ -5,6 +5,7 @@
 #include <cstdint>
 #include <span>
 #include <stdexcept>
+#include <tuple>
 
 template <class T>
 struct ZeroIndexArray
diff --git a/src/game_api/script/usertypes/color_lua.cpp b/src/game_api/script/usertypes/color_lua.cpp
index 80a67c95e..07a00949a 100644
--- a/src/game_api/script/usertypes/color_lua.cpp
+++ b/src/game_api/script/usertypes/color_lua.cpp
@@ -5,6 +5,7 @@
 
 #include "aliases.hpp"
 #include "color.hpp"
+#include "script/sol_helper.hpp" // for self_return
 
 namespace NColor
 {
@@ -43,9 +44,9 @@ void register_usertypes(sol::state& lua)
     color_type["fuchsia"] = &Color::fuchsia;
     color_type["purple"] = &Color::purple;
     color_type["get_rgba"] = &Color::get_rgba;
-    color_type["set_rgba"] = &Color::set_rgba;
+    color_type["set_rgba"] = self_return<&Color::set_rgba>();
     color_type["get_ucolor"] = &Color::get_ucolor;
-    color_type["set_ucolor"] = &Color::set_ucolor;
-    color_type["set"] = &Color::set;
+    color_type["set_ucolor"] = self_return<&Color::set_ucolor>();
+    color_type["set"] = self_return<&Color::set>();
 }
 } // namespace NColor
diff --git a/src/game_api/script/usertypes/entity_lua.cpp b/src/game_api/script/usertypes/entity_lua.cpp
index 0b72d1d41..948b95a56 100644
--- a/src/game_api/script/usertypes/entity_lua.cpp
+++ b/src/game_api/script/usertypes/entity_lua.cpp
@@ -23,7 +23,6 @@
 #include "render_api.hpp"                // for RenderInfo, RenderInfo::flip_horiz...
 #include "script/lua_backend.hpp"        // for LuaBackend
 #include "script/safe_cb.hpp"            // for make_safe_cb
-#include "script/sol_helper.hpp"         // for self_return
 
 namespace NEntity
 {

From 81137f596fe2f049f37fe47147967038f651ffa7 Mon Sep 17 00:00:00 2001
From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com>
Date: Thu, 11 Jul 2024 20:33:41 +0200
Subject: [PATCH 12/12] remove the commended out code

---
 src/game_api/script/usertypes/level_lua.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/game_api/script/usertypes/level_lua.cpp b/src/game_api/script/usertypes/level_lua.cpp
index 6a7240d12..d52dcb06b 100644
--- a/src/game_api/script/usertypes/level_lua.cpp
+++ b/src/game_api/script/usertypes/level_lua.cpp
@@ -1368,9 +1368,6 @@ void register_usertypes(sol::state& lua)
     ///  kept for backward compatibility, don't use, check LevelGenSystem.exit_doors
     lua.new_usertype<DoorCoords>("DoorCoords", sol::no_constructor, "door1_x", &DoorCoords::door1_x, "door1_y", &DoorCoords::door1_y, "door2_x", &DoorCoords::door2_x, "door2_y", &DoorCoords::door2_y);
 
-    // auto level_config = [](LevelGenSystem& level_gen)
-    //{ return ZeroIndexArray<uint32_t>(level_gen.data->level_config); };
-
     /// Data relating to level generation, changing anything in here from ON.LEVEL or later will likely have no effect, used in StateMemory
     lua.new_usertype<LevelGenSystem>(
         "LevelGenSystem",