From 13906d81d2565beda0a518885129160c4d37d22c Mon Sep 17 00:00:00 2001 From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com> Date: Tue, 14 Nov 2023 23:03:10 +0100 Subject: [PATCH] fix --- docs/game_data/spel2.lua | 5 +---- docs/src/includes/_types.md | 5 +---- src/game_api/screen.hpp | 2 +- src/game_api/screen_arena.hpp | 8 ++++---- src/game_api/script/usertypes/screen_arena_lua.cpp | 3 --- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua index 2f02e0e44..7fca8460e 100644 --- a/docs/game_data/spel2.lua +++ b/docs/game_data/spel2.lua @@ -5889,7 +5889,7 @@ function Quad:is_point_inside(x, y, epsilon) end ---@field ouroboros_angle number ---@class OnlineLobbyScreenPlayer - ---@field platform_icon integer @16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = Switch, 48 = PS, 49 = PS again? + ---@field platform_icon integer @16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = switch, 48 = PS, 49 = PS again? ---@field character integer @0 - Ana Spelunky, 1 - Margaret Tunnel, 2 - Colin Northward, 3 - Roffy D. Sloth.. and so on. Same order as in ENT_TYPE ---@field ready boolean ---@field searching boolean @@ -6048,8 +6048,6 @@ function Quad:is_point_inside(x, y, epsilon) end ---@field stickers TextureRenderingInfo[] @size: 20 ---@class ScreenArenaMenu : Screen - ---@field brick_background_animation ScreenZoomAnimation - ---@field blurry_border_animation ScreenZoomAnimation ---@field screen_panels MenuScreenPanels ---@field brick_background TextureRenderingInfo ---@field blurry_border TextureRenderingInfo @@ -6076,7 +6074,6 @@ function Quad:is_point_inside(x, y, epsilon) end ---@field bottom_left_bricks TextureRenderingInfo ---@field top_left_esc_panel TextureRenderingInfo ---@field next_panel TextureRenderingInfo - ---@field option_captions ArenaRulesString[] ---@field center_panels_hor_slide_position number ---@field esc_next_panels_slide_timer number ---@field main_panel_vertical_scroll_position number diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md index 60bfbca97..a4b8ff470 100644 --- a/docs/src/includes/_types.md +++ b/docs/src/includes/_types.md @@ -1927,7 +1927,7 @@ bool | [capitalize_scroll_text](https://github.com/spelunky-fyi/overlunky/search Type | Name | Description ---- | ---- | ----------- -int | [platform_icon](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=platform_icon) | 16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = [Switch](#Switch), 48 = PS, 49 = PS again? +int | [platform_icon](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=platform_icon) | 16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = switch, 48 = PS, 49 = PS again? int | [character](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=character) | 0 - Ana Spelunky, 1 - Margaret Tunnel, 2 - Colin Northward, 3 - Roffy D. Sloth.. and so on. Same order as in [ENT_TYPE](#ENT_TYPE) bool | [ready](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ready) | bool | [searching](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=searching) | @@ -2035,8 +2035,6 @@ Derived from [Screen](#Screen) Type | Name | Description ---- | ---- | ----------- -ScreenZoomAnimation | [brick_background_animation](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=brick_background_animation) | -ScreenZoomAnimation | [blurry_border_animation](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=blurry_border_animation) | [MenuScreenPanels](#MenuScreenPanels) | [screen_panels](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=screen_panels) | [TextureRenderingInfo](#TextureRenderingInfo) | [brick_background](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=brick_background) | [TextureRenderingInfo](#TextureRenderingInfo) | [blurry_border](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=blurry_border) | @@ -2063,7 +2061,6 @@ ScreenZoomAnimation | [blurry_border_animation](https://github.com/spelunky-fyi/ [TextureRenderingInfo](#TextureRenderingInfo) | [bottom_left_bricks](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=bottom_left_bricks) | [TextureRenderingInfo](#TextureRenderingInfo) | [top_left_esc_panel](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=top_left_esc_panel) | [TextureRenderingInfo](#TextureRenderingInfo) | [next_panel](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=next_panel) | -vector<ArenaRulesString> | [option_captions](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=option_captions) | float | [center_panels_hor_slide_position](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=center_panels_hor_slide_position) | float | [esc_next_panels_slide_timer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=esc_next_panels_slide_timer) | float | [main_panel_vertical_scroll_position](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=main_panel_vertical_scroll_position) | diff --git a/src/game_api/screen.hpp b/src/game_api/screen.hpp index 89ad8aa04..2200623c2 100644 --- a/src/game_api/screen.hpp +++ b/src/game_api/screen.hpp @@ -761,7 +761,7 @@ class ScreenOnlineLoading : public Screen // ID: 28 struct OnlineLobbyScreenPlayer { - /// 16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = Switch, 48 = PS, 49 = PS again? + /// 16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = switch, 48 = PS, 49 = PS again? uint8_t platform_icon; // werid numbers, anything else results in the startd PC icon, maybe it's some actual id /// 0 - Ana Spelunky, 1 - Margaret Tunnel, 2 - Colin Northward, 3 - Roffy D. Sloth.. and so on. Same order as in ENT_TYPE uint8_t character; diff --git a/src/game_api/screen_arena.hpp b/src/game_api/screen_arena.hpp index faf8aa69b..48b6741a0 100644 --- a/src/game_api/screen_arena.hpp +++ b/src/game_api/screen_arena.hpp @@ -5,10 +5,10 @@ struct ArenaRulesString { - STRINGID text_1_id; // StringsTableID - STRINGID text_2_id; // StringsTableID - STRINGID text_3_id; // StringsTableID - STRINGID text_4_id; // StringsTableID + STRINGID text_1; // StringsTableID + STRINGID text_2; // StringsTableID + STRINGID text_3; // StringsTableID + STRINGID text_4; // StringsTableID uint8_t unknown1; uint8_t unknown2; uint8_t unknown3; diff --git a/src/game_api/script/usertypes/screen_arena_lua.cpp b/src/game_api/script/usertypes/screen_arena_lua.cpp index 2fc2e4655..71717c1a2 100644 --- a/src/game_api/script/usertypes/screen_arena_lua.cpp +++ b/src/game_api/script/usertypes/screen_arena_lua.cpp @@ -17,8 +17,6 @@ namespace NScreenArena void register_usertypes(sol::state& lua) { auto screenarenamenu_type = lua.new_usertype("ScreenArenaMenu", sol::base_classes, sol::bases()); - screenarenamenu_type["brick_background_animation"] = &ScreenArenaMenu::brick_background_animation; - screenarenamenu_type["blurry_border_animation"] = &ScreenArenaMenu::blurry_border_animation; screenarenamenu_type["screen_panels"] = &ScreenArenaMenu::screen_panels; screenarenamenu_type["brick_background"] = &ScreenArenaMenu::brick_background; screenarenamenu_type["blurry_border"] = &ScreenArenaMenu::blurry_border; @@ -45,7 +43,6 @@ void register_usertypes(sol::state& lua) screenarenamenu_type["bottom_left_bricks"] = &ScreenArenaMenu::bottom_left_bricks; screenarenamenu_type["top_left_esc_panel"] = &ScreenArenaMenu::top_left_esc_panel; screenarenamenu_type["next_panel"] = &ScreenArenaMenu::next_panel; - screenarenamenu_type["option_captions"] = &ScreenArenaMenu::option_captions; screenarenamenu_type["center_panels_hor_slide_position"] = &ScreenArenaMenu::center_panels_hor_slide_position; screenarenamenu_type["esc_next_panels_slide_timer"] = &ScreenArenaMenu::esc_next_panels_slide_timer; screenarenamenu_type["main_panel_vertical_scroll_position"] = &ScreenArenaMenu::main_panel_vertical_scroll_position;