Even more refactor #411

Mr-Auto · 2025-01-09T21:57:38Z

Looking for way to reduce lua_vm.cpp size. Maybe also rpc.cpp and other things that feel usefull

Continuation of #407

… save/load save state saving/loading from/to slot 5 which is not guaranteed to be the main after online session

…move `read_prng` and some `get_frame_count` from `State`, remove `get_frame_count` from rpc

…quidOutOfBoundsBugfix`

…s`, `set_pause`, `get_offset` from the `State`

…n lua_vm

…o `remove_liquid_oob`, move `API::init` to the end of state.cpp

…nctions in state.hpp to namespace

…d` to `StateMemory::get_entity`, move the rest of the function to the `API` namespace

…d of state

…ude`

Mr-Auto · 2025-01-10T16:03:41Z

src/injected/ui_util.cpp

@@ -472,13 +468,13 @@ void UI::update_floor_at(float x, float y, LAYER l)
    if (uid == -1)
        return;
    auto ent = get_entity_ptr(uid);
-    if ((ent->type->search_flags & 0x100) == 0 || !test_flag(ent->flags, 3))
+    if (!(ent->type->search_flags & ENTITY_MASK::FLOOR) || !test_flag(ent->flags, 3))


Is this fine, or should i be using != ENTITY_MASK::X wherever possible?

Mr-Auto · 2025-01-10T16:05:00Z

src/game_api/entity.cpp


    if (rec_mode == RECURSIVE_MODE::EXCLUSIVE)
    {
-        if (mask.has_value() && (acutal_mask(mask.value()) & ent->type->search_flags) != 0)
+        if (mask.has_value() && !!(actual_mask(mask.value()) & ent->type->search_flags))


This approach !! is very debatable online, so I'm just highlighting it beforehand.
The only alternative I think is using function for it

…function that uses it

…` and the same with state

…on definitions to the `deprecated_lua.cpp`, move some simple function definitions from rpc to entity and state lua

…set_drop_chance`, remove some more functions from rpc, move update_state function to state

…` version for exposing them

…with added warning for online

Mr-Auto · 2025-01-12T22:31:35Z

With this, files are more or less around 1k lines
exceptions:

level_api - mostly due to the community chances and tilecodes adding around 500 lines
search - for obvious reasons
string_hashes - for obvious reasons
lua_backend - due to all the events, i think @SereneRuby12 is working template for this?
lua_vm - is still almost 2k, thou 500 lines just for the ON enum and it's comments (without all the comments the file is just 1400 lines now)
entity_monsters_lua - it's just so many sub-classes to expose, feels weird to split it
gui_lua - about 200 lines of Deprecated functions, plus a lot of stuff in general
level_lua - mostly CustomTheme stuff - should probably move to separate file
info_dump - don't care, thou mostly listing values from one enum
ui.cpp - begs for refactor
don't really care about python scripts or other files

Mr-Auto added 25 commits December 29, 2024 23:33

add is_active method for Online

77febfb

Implement HeapBase struct, change savestate using HeapBase, fix…

8e62788

… save/load save state saving/loading from/to slot 5 which is not guaranteed to be the main after online session

fix overlunky initializing UI to fast @estebanfer

fb730a3

HeapBase get rid of get_local, rename get_local_safe to get, re…

0862cab

…move `read_prng` and some `get_frame_count` from `State`, remove `get_frame_count` from rpc

move API init out of State::get, remove leftover `Spelunky_UpdateLi…

6d7c873

…quidOutOfBoundsBugfix`

move get_correct_liquid_engine to LiquidPhysics

bf47001

simplify refresh_illumination, update doc

b50e2fa

move layer from State to StateMemory, remove flags, `set_flag…

62e872e

…s`, `set_pause`, `get_offset` from the `State`

fix get_frame comment

a24ede2

move copying HeapBase and heap clone hook into thread_utils

7dd2036

some save state changes, exposing prng and frame of the saved state

e993b59

get rid of prng getter, also change seed_prng to use local

e1862a4

Some extra renderer stuff

c4b5e9c

move camera function to Camera, also fold some one line functions i…

320b2f9

…n lua_vm

move lowbias32 to rpc, move and rename fix_liquid_out_of_bounds t…

b711e82

…o `remove_liquid_oob`, move `API::init` to the end of state.cpp

move enum_to_layer declaration to aliases, move last stand alone fu…

d4b6044

…nctions in state.hpp to namespace

move warp, set_seed to StateMemory. Move and rename `State::fin…

36a9dab

…d` to `StateMemory::get_entity`, move the rest of the function to the `API` namespace

remove State::get_frame_count, make event deal with HeapBase instea…

d907986

…d of state

get rid of State

90f4f4f

rename thread_utils to heap_base and mess around with some `#incl…

6a6eda8

…ude`

fix get_global_frame return in doc

bf6c489

move deprecated functions from lua_vm to separate file

7c196f2

move the the stuff for global players from lua_vm to separate file

3617fd0

move spawn functions from lua_vm to new spawn_lua

6d43579

use ENTITY_MASK when possible

1df3ee2

Mr-Auto commented Jan 10, 2025

View reviewed changes

Mr-Auto added 4 commits January 10, 2025 18:16

move RenderInfo to vanilla_render_lua

89c6f06

move HOTKEY_TYPE enum to gui_lua since there is the set_hotkey …

a753728

…function that uses it

move options stuff to options_lua

b3f56db

Deprecate flip_entity, move entity related functions to `entity_lua…

e9f3b93

…` and the same with state

Mr-Auto added 5 commits January 12, 2025 15:56

Deprecate lock_door_at and unlock_door_at, move deprecated functi…

61e7b46

…on definitions to the `deprecated_lua.cpp`, move some simple function definitions from rpc to entity and state lua

add get_target and set_taget for ExitDoor class

7623b09

try to improve clarity of the difference between replace_drop and `…

90c59d8

…set_drop_chance`, remove some more functions from rpc, move update_state function to state

move functions that modyfy game code to game_patches and make `_lua…

9157d8f

…` version for exposing them

make separate category in the docs for the Game patching functions …

7406096

…with added warning for online

move liquid structs to a separate header

b3ae44d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Even more refactor #411

Even more refactor #411

Mr-Auto commented Jan 9, 2025

Mr-Auto Jan 10, 2025

Mr-Auto Jan 10, 2025

Mr-Auto commented Jan 12, 2025

Even more refactor #411

Are you sure you want to change the base?

Even more refactor #411

Conversation

Mr-Auto commented Jan 9, 2025

Mr-Auto Jan 10, 2025

Choose a reason for hiding this comment

Mr-Auto Jan 10, 2025

Choose a reason for hiding this comment

Mr-Auto commented Jan 12, 2025