diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua index 7fca8460e..4cfe36cf0 100644 --- a/docs/game_data/spel2.lua +++ b/docs/game_data/spel2.lua @@ -6078,7 +6078,7 @@ function Quad:is_point_inside(x, y, epsilon) end ---@field esc_next_panels_slide_timer number ---@field main_panel_vertical_scroll_position number ---@field selected_option_index integer - ---@field contols ScreenControls + ---@field controls ScreenControls ---@class ScreenArenaStagesSelect : Screen ---@field screen_panels MenuScreenPanels @@ -6108,11 +6108,11 @@ function Quad:is_point_inside(x, y, epsilon) end ---@field players_turn_scroll TextureRenderingInfo ---@field players_turn_scroll_handle TextureRenderingInfo ---@field grid_player_icon TextureRenderingInfo - ---@field stages_to_gay_out table + ---@field stages_to_gray_out table ---@field panels_slide_from_both_sides number ---@field visibility_all_stages number ---@field selected_stage_index integer - ---@field contols ScreenControls + ---@field controls ScreenControls ---@class ScreenArenaItems : Screen ---@field screen_panels MenuScreenPanels @@ -6131,7 +6131,7 @@ function Quad:is_point_inside(x, y, epsilon) end ---@field item_equipped_badge TextureRenderingInfo ---@field item_off_gray_overlay TextureRenderingInfo ---@field esc_woodpanel TextureRenderingInfo - ---@field items_to_gay_out table + ---@field items_to_gray_out table ---@field center_panels_horizontal_slide_position number ---@field esc_panel_slide_timer number ---@field selected_item_index integer diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md index a4b8ff470..064906e50 100644 --- a/docs/src/includes/_types.md +++ b/docs/src/includes/_types.md @@ -2010,7 +2010,7 @@ Type | Name | Description [TextureRenderingInfo](#TextureRenderingInfo) | [item_equipped_badge](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=item_equipped_badge) | [TextureRenderingInfo](#TextureRenderingInfo) | [item_off_gray_overlay](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=item_off_gray_overlay) | [TextureRenderingInfo](#TextureRenderingInfo) | [esc_woodpanel](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=esc_woodpanel) | -map<int, float> | [items_to_gay_out](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=items_to_gay_out) | +map<int, float> | [items_to_gray_out](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=items_to_gray_out) | float | [center_panels_horizontal_slide_position](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=center_panels_horizontal_slide_position) | float | [esc_panel_slide_timer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=esc_panel_slide_timer) | int | [selected_item_index](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=selected_item_index) | @@ -2065,7 +2065,7 @@ float | [center_panels_hor_slide_position](https://github.com/spelunky-fyi/overl 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) | int | [selected_option_index](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=selected_option_index) | -[ScreenControls](#ScreenControls) | [contols](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=contols) | +[ScreenControls](#ScreenControls) | [controls](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=controls) | ### ScreenArenaScore @@ -2152,11 +2152,11 @@ int | [buttons](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=buttons [TextureRenderingInfo](#TextureRenderingInfo) | [players_turn_scroll](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=players_turn_scroll) | [TextureRenderingInfo](#TextureRenderingInfo) | [players_turn_scroll_handle](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=players_turn_scroll_handle) | [TextureRenderingInfo](#TextureRenderingInfo) | [grid_player_icon](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=grid_player_icon) | -map<int, float> | [stages_to_gay_out](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=stages_to_gay_out) | +map<int, float> | [stages_to_gray_out](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=stages_to_gray_out) | float | [panels_slide_from_both_sides](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=panels_slide_from_both_sides) | float | [visibility_all_stages](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=visibility_all_stages) | int | [selected_stage_index](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=selected_stage_index) | -[ScreenControls](#ScreenControls) | [contols](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=contols) | +[ScreenControls](#ScreenControls) | [controls](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=controls) | ### ScreenCamp diff --git a/src/game_api/screen_arena.hpp b/src/game_api/screen_arena.hpp index 48b6741a0..7079169c0 100644 --- a/src/game_api/screen_arena.hpp +++ b/src/game_api/screen_arena.hpp @@ -56,7 +56,7 @@ class ScreenArenaMenu : public Screen // ID: 21 float esc_next_panels_slide_timer; float main_panel_vertical_scroll_position; uint32_t selected_option_index; // more like highlighted - ScreenControls contols; + ScreenControls controls; uint8_t unknown57[3]; // some states, like screen depth }; @@ -91,8 +91,8 @@ class ScreenArenaStagesSelect : public Screen // ID: 22 and 24 TextureRenderingInfo players_turn_scroll; TextureRenderingInfo players_turn_scroll_handle; TextureRenderingInfo grid_player_icon; - float unknown30; // padding probably - custom_unordered_map stages_to_gay_out; // key is the stage, float is how gray out it is + float unknown30; // padding probably + custom_unordered_map stages_to_gray_out; // key is the stage, float is how gray out it is uint32_t unknown47; // load state? uint32_t unknown48; @@ -101,7 +101,7 @@ class ScreenArenaStagesSelect : public Screen // ID: 22 and 24 float panels_slide_from_both_sides; float visibility_all_stages; uint32_t selected_stage_index; // more like highlighted - ScreenControls contols; + ScreenControls controls; uint8_t unknown57[3]; // some states, like screen depth }; @@ -125,7 +125,7 @@ class ScreenArenaItems : public Screen // ID: 23 TextureRenderingInfo item_off_gray_overlay; TextureRenderingInfo esc_woodpanel; - custom_unordered_map items_to_gay_out; + custom_unordered_map items_to_gray_out; float unknown33; float center_panels_horizontal_slide_position; diff --git a/src/game_api/script/usertypes/screen_arena_lua.cpp b/src/game_api/script/usertypes/screen_arena_lua.cpp index 71717c1a2..03f9f23d8 100644 --- a/src/game_api/script/usertypes/screen_arena_lua.cpp +++ b/src/game_api/script/usertypes/screen_arena_lua.cpp @@ -47,7 +47,7 @@ void register_usertypes(sol::state& lua) 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; screenarenamenu_type["selected_option_index"] = &ScreenArenaMenu::selected_option_index; - screenarenamenu_type["contols"] = &ScreenArenaMenu::contols; + screenarenamenu_type["controls"] = &ScreenArenaMenu::controls; auto screenarenastagesselect_type = lua.new_usertype("ScreenArenaStagesSelect", sol::base_classes, sol::bases()); screenarenastagesselect_type["screen_panels"] = &ScreenArenaStagesSelect::screen_panels; @@ -77,11 +77,11 @@ void register_usertypes(sol::state& lua) screenarenastagesselect_type["players_turn_scroll"] = &ScreenArenaStagesSelect::players_turn_scroll; screenarenastagesselect_type["players_turn_scroll_handle"] = &ScreenArenaStagesSelect::players_turn_scroll_handle; screenarenastagesselect_type["grid_player_icon"] = &ScreenArenaStagesSelect::grid_player_icon; - screenarenastagesselect_type["stages_to_gay_out"] = &ScreenArenaStagesSelect::stages_to_gay_out; + screenarenastagesselect_type["stages_to_gray_out"] = &ScreenArenaStagesSelect::stages_to_gray_out; screenarenastagesselect_type["panels_slide_from_both_sides"] = &ScreenArenaStagesSelect::panels_slide_from_both_sides; screenarenastagesselect_type["visibility_all_stages"] = &ScreenArenaStagesSelect::visibility_all_stages; screenarenastagesselect_type["selected_stage_index"] = &ScreenArenaStagesSelect::selected_stage_index; - screenarenastagesselect_type["contols"] = &ScreenArenaStagesSelect::contols; + screenarenastagesselect_type["controls"] = &ScreenArenaStagesSelect::controls; auto screenarenaitems_type = lua.new_usertype("ScreenArenaItems", sol::base_classes, sol::bases()); screenarenaitems_type["screen_panels"] = &ScreenArenaItems::screen_panels; @@ -100,7 +100,7 @@ void register_usertypes(sol::state& lua) screenarenaitems_type["item_equipped_badge"] = &ScreenArenaItems::item_equipped_badge; screenarenaitems_type["item_off_gray_overlay"] = &ScreenArenaItems::item_off_gray_overlay; screenarenaitems_type["esc_woodpanel"] = &ScreenArenaItems::esc_woodpanel; - screenarenaitems_type["items_to_gay_out"] = &ScreenArenaItems::items_to_gay_out; + screenarenaitems_type["items_to_gray_out"] = &ScreenArenaItems::items_to_gray_out; screenarenaitems_type["center_panels_horizontal_slide_position"] = &ScreenArenaItems::center_panels_horizontal_slide_position; screenarenaitems_type["esc_panel_slide_timer"] = &ScreenArenaItems::esc_panel_slide_timer; screenarenaitems_type["selected_item_index"] = &ScreenArenaItems::selected_item_index;