Random stuff, again

docs/examples/set_camera_layer_control_enabled.lua

@@ -0,0 +1,23 @@
+set_camera_layer_control_enabled(false)
+
+g_current_timer = nil
+-- default load_time 36
+function change_layer(layer_to, load_time)
+
+    if state.camera_layer == layer_to then
+        return
+    end
+    if g_current_timer ~= nil then
+        clear_callback(g_current_timer)
+        g_current_timer = nil
+    end
+    -- if we don't want the load time, we can just change the actual layer
+    if load_time == nil or load_time == 0 then
+        state.camera_layer = layer_to
+        return
+    end
+
+    state.layer_transition_timer = load_time
+    state.transition_to_layer = layer_to
+    state.camera_layer = layer_to
+end

docs/generate.py

@@ -400,7 +400,7 @@ def print_lf(lf):
 ---- | ---- | -----------"""
 )
 print("bool | all:empty() | Returns true if container is empty, false otherwise")
-print("int | aLL:size() | Same as `#container`")
+print("int | all:size() | Same as `#container`")
 
 print("any | vector:at(int index) | Same as `vector[index]`")
 print("any | span:at(int index) | Same as `span[index]`")

docs/parse_source.py

@@ -27,6 +27,7 @@
     "../src/game_api/game_manager.hpp",
     "../src/game_api/state.hpp",
     "../src/game_api/state_structs.hpp",
+    "../src/game_api/illumination.hpp",
     "../src/game_api/prng.hpp",
     "../src/game_api/entities_floors.hpp",
     "../src/game_api/entities_activefloors.hpp",

docs/src/includes/_enums.md

@@ -654,6 +654,20 @@ Name | Data | Description
 [MAX_LIQUID_PARTICLES](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LEVEL_CONFIG.MAX_LIQUID_PARTICLES) | 15 | 
 [FLAGGED_LIQUID_ROOMS](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LEVEL_CONFIG.FLAGGED_LIQUID_ROOMS) | 16 | 
 
+## LIGHT_TYPE
+
+
+> Search script examples for [LIGHT_TYPE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LIGHT_TYPE)
+
+
+
+Name | Data | Description
+---- | ---- | -----------
+[NONE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LIGHT_TYPE.NONE) | LIGHT_TYPE::NONE | Normal static light, position can be edited to move it around<br/>
+[FOLLOW_CAMERA](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LIGHT_TYPE.FOLLOW_CAMERA) | LIGHT_TYPE::FOLLOW_CAMERA | Position is updated to the camera position, can be moved around via offset<br/>
+[FOLLOW_ENTITY](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LIGHT_TYPE.FOLLOW_ENTITY) | LIGHT_TYPE::FOLLOW_ENTITY | Position is updated to the entity position (from the uid field), if the uid is not found it will behave as [LIGHT_TYPE](#LIGHT_TYPE).NONE, can be moved around via offset<br/>
+[ROOM_LIGHT](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LIGHT_TYPE.ROOM_LIGHT) | LIGHT_TYPE::ROOM_LIGHT | Rectangle, full brightness always uses light1, disabling light1 does nothing<br/>
+
 ## LIQUID_POOL
 
 

docs/src/includes/_globals.md

@@ -158,7 +158,7 @@ They come with some extra functionality:
 Type | Name | Description
 ---- | ---- | -----------
 bool | all:empty() | Returns true if container is empty, false otherwise
-int | aLL:size() | Same as `#container`
+int | all:size() | Same as `#container`
 any | vector:at(int index) | Same as `vector[index]`
 any | span:at(int index) | Same as `span[index]`
 any | set:at(int order) | Returns elements in order, it's not an index as sets don't have one
@@ -1710,6 +1710,46 @@ Seed the game prng.
 
 Set the current adventure seed pair
 
+### set_camera_layer_control_enabled
+
+
+```lua
+set_camera_layer_control_enabled(false)
+
+g_current_timer = nil
+-- default load_time 36
+function change_layer(layer_to, load_time)
+
+    if state.camera_layer == layer_to then
+        return
+    end
+    if g_current_timer ~= nil then
+        clear_callback(g_current_timer)
+        g_current_timer = nil
+    end
+    -- if we don't want the load time, we can just change the actual layer
+    if load_time == nil or load_time == 0 then
+        state.camera_layer = layer_to
+        return
+    end
+
+    state.layer_transition_timer = load_time
+    state.transition_to_layer = layer_to
+    -- actual layer change after time delay
+    set_timeout(function() state.camera_layer = layer_to end, load_time)
+end
+
+```
+
+
+> Search script examples for [set_camera_layer_control_enabled](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=set_camera_layer_control_enabled)
+
+#### nil set_camera_layer_control_enabled(bool enable)
+
+This disables the `state.camera_layer` to be forced to the `(leader player).layer` and setting of the `state.layer_transition_timer` & `state.transition_to_layer` when player enters layer door.
+Letting you control those manually.
+Look at the example on how to mimic game layer switching behavior
+
 ### set_character_heart_color
 
 
@@ -2042,11 +2082,13 @@ Steal input from a [Player](#Player), HiredHand or [PlayerGhost](#PlayerGhost)
 
 > Search script examples for [create_illumination](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=create_illumination)
 
+#### [Illumination](#Illumination) create_illumination([Vec2](#Vec2) pos, [Color](#Color) color, [LIGHT_TYPE](#LIGHT_TYPE) type, float size, int flags, int uid, [LAYER](#LAYER) layer)
+
 #### [Illumination](#Illumination) create_illumination([Color](#Color) color, float size, float x, float y)
 
 #### [Illumination](#Illumination) create_illumination([Color](#Color) color, float size, int uid)
 
-Creates a new [Illumination](#Illumination). Don't forget to continuously call [refresh_illumination](#refresh_illumination), otherwise your light emitter fades out! Check out the [illumination.lua](https://github.com/spelunky-fyi/overlunky/blob/main/examples/illumination.lua) script for an example
+Creates a new [Illumination](#Illumination). Don't forget to continuously call [refresh_illumination](#refresh_illumination), otherwise your light emitter fades out! Check out the [illumination.lua](https://github.com/spelunky-fyi/overlunky/blob/main/examples/illumination.lua) script for an example.
 
 ### refresh_illumination
 
@@ -2055,7 +2097,7 @@ Creates a new [Illumination](#Illumination). Don't forget to continuously call [
 
 #### nil refresh_illumination([Illumination](#Illumination) illumination)
 
-Refreshes an [Illumination](#Illumination), keeps it from fading out
+Refreshes an [Illumination](#Illumination), keeps it from fading out (updates the timer, keeping it in sync with the game render)
 
 ## Message functions
 

docs/src/includes/_types.md

@@ -1287,8 +1287,9 @@ float | [offset_x](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=offs
 float | [offset_y](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=offset_y) | 
 float | [distortion](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=distortion) | 
 int | [entity_uid](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=entity_uid) | 
+int | [timer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=timer) | 
 int | [flags](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=flags) | see [flags.hpp](https://github.com/spelunky-fyi/overlunky/blob/main/src/game_api/flags.hpp) illumination_flags
-int | [type_flags](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=type_flags) | Only one can be set: 1 - Follow camera, 2 - Follow [Entity](#Entity), 3 - Rectangle, full brightness<br/>Rectangle always uses light1, even when it's disabled in flags
+[LIGHT_TYPE](#LIGHT_TYPE) | [type_flags](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=type_flags) | 
 bool | [enabled](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=enabled) | 
 int | [layer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=layer) | 
 
@@ -2261,6 +2262,7 @@ Derived from [Screen](#Screen)
 Type | Name | Description
 ---- | ---- | -----------
 int | [buttons](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=buttons) | 
+int | [time_till_death_screen](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=time_till_death_screen) | Delay after player death to open the death screen
 
 ### ScreenLogo
 
@@ -2879,8 +2881,9 @@ int | [speechbubble_owner](https://github.com/spelunky-fyi/overlunky/search?l=Lu
 [LevelGenSystem](#LevelGenSystem) | [level_gen](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=level_gen) | Entrance and exit coordinates, shop types and all themes
 int | [correct_ushabti](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=correct_ushabti) | See `get_correct_ushabti`. == anim_frame - (2 * floor(anim_frame/12))
 [Items](#Items) | [items](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=items) | Has the current player count, player inventories and character selections
-int | [camera_layer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=camera_layer) | The currently drawn layer, can't be changed
+int | [camera_layer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=camera_layer) | 
 int | [layer_transition_timer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=layer_transition_timer) | 
+int | [transition_to_layer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=transition_to_layer) | 
 [ScreenTeamSelect](#ScreenTeamSelect) | [screen_team_select](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=screen_team_select) | 
 [ScreenCharacterSelect](#ScreenCharacterSelect) | [screen_character_select](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=screen_character_select) | 
 [ScreenTransition](#ScreenTransition) | [screen_transition](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=screen_transition) | 

src/game_api/entities_chars.cpp

@@ -68,7 +68,7 @@ uint8_t Player::kapala_blood_amount()
 void Player::set_jetpack_fuel(uint8_t fuel)
 {
     static auto jetpackID = to_id("ENT_TYPE_ITEM_JETPACK");
-    for (auto item : items.entities())
+    for (auto item : items.entities()) // TODO: should probably change to powerups right?
     {
         if (item->type->id == jetpackID)
         {

src/game_api/entities_chars.hpp

@@ -7,9 +7,10 @@
 #include <string>     // for u16string, allocator
 #include <vector>     // for vector
 
-#include "aliases.hpp" // for ENT_TYPE
-#include "color.hpp"   // for Color
-#include "movable.hpp" // for Movable
+#include "aliases.hpp"               // for ENT_TYPE
+#include "color.hpp"                 // for Color
+#include "containers/custom_map.hpp" //
+#include "movable.hpp"               // for Movable
 
 struct Illumination;
 struct PlayerInputs;
@@ -60,7 +61,7 @@ class Ai
 class PowerupCapable : public Movable
 {
   public:
-    std::map<ENT_TYPE, Entity*> powerups; // type id -> entity
+    custom_map<ENT_TYPE, Entity*> powerups; // type id -> entity
 
     /// Removes a currently applied powerup. Specify `ENT_TYPE.ITEM_POWERUP_xxx`, not `ENT_TYPE.ITEM_PICKUP_xxx`! Removing the Eggplant crown does not seem to undo the throwing of eggplants, the other powerups seem to work.
     void remove_powerup(ENT_TYPE powerup_type);

src/game_api/entities_floors.cpp

@@ -801,7 +801,7 @@ void Door::unlock(bool unlock)
             {
                 if (!main_door->door_blocker)
                 {
-                    main_door->door_blocker = state.layer_local(layer)->spawn_entity_over(door_bg_large, this, 0, 2.0);
+                    main_door->door_blocker = state.layer(layer)->spawn_entity_over(door_bg_large, this, 0, 2.0);
                     main_door->door_blocker->animation_frame = 1;
                 }
             }

src/game_api/entity_lookup.cpp

@@ -102,7 +102,7 @@ void foreach_mask(uint32_t mask, Layer* l, FunT&& fun)
 
 std::vector<uint32_t> get_entities_by(std::vector<ENT_TYPE> entity_types, uint32_t mask, LAYER layer)
 {
-    auto state = State::get();
+    auto state = State::get().ptr();
     std::vector<uint32_t> found;
     const std::vector<ENT_TYPE> proper_types = get_proper_types(std::move(entity_types));
 
@@ -124,37 +124,39 @@ std::vector<uint32_t> get_entities_by(std::vector<ENT_TYPE> entity_types, uint32
 
     if (layer == LAYER::BOTH)
     {
+        auto layer_front = state->layers[0];
+        auto layer_back = state->layers[1];
         if (proper_types.empty() || proper_types[0] == 0)
         {
             if (mask == 0) // all entities
             {
                 // this exception for small improvments with calling reserve once
-                found.reserve(found.size() + (size_t)state.layer(0)->all_entities.size + (size_t)state.layer(1)->all_entities.size);
-                found.insert(found.end(), state.layer(0)->all_entities.uids().begin(), state.layer(0)->all_entities.uids().end());
-                found.insert(found.end(), state.layer(1)->all_entities.uids().begin(), state.layer(1)->all_entities.uids().end());
+                found.reserve(found.size() + (size_t)layer_front->all_entities.size + (size_t)layer_back->all_entities.size);
+                found.insert(found.end(), layer_front->all_entities.uids().begin(), layer_front->all_entities.uids().end());
+                found.insert(found.end(), layer_back->all_entities.uids().begin(), layer_back->all_entities.uids().end());
             }
             else // all types
             {
-                foreach_mask(mask, state.layer(0), insert_all_uids);
-                foreach_mask(mask, state.layer(1), insert_all_uids);
+                foreach_mask(mask, layer_front, insert_all_uids);
+                foreach_mask(mask, layer_back, insert_all_uids);
             }
         }
         else
         {
-            foreach_mask(mask, state.layer(0), push_matching_types);
-            foreach_mask(mask, state.layer(1), push_matching_types);
+            foreach_mask(mask, layer_front, push_matching_types);
+            foreach_mask(mask, layer_back, push_matching_types);
         }
     }
     else
     {
         uint8_t correct_layer = enum_to_layer(layer);
         if (proper_types.empty() || proper_types[0] == 0) // all types
         {
-            foreach_mask(mask, state.layer(correct_layer), insert_all_uids);
+            foreach_mask(mask, state->layers[correct_layer], insert_all_uids);
         }
         else
         {
-            foreach_mask(mask, state.layer(correct_layer), push_matching_types);
+            foreach_mask(mask, state->layers[correct_layer], push_matching_types);
         }
     }
     return found;
@@ -167,6 +169,7 @@ std::vector<uint32_t> get_entities_by(ENT_TYPE entity_type, uint32_t mask, LAYER
 
 std::vector<uint32_t> get_entities_at(std::vector<ENT_TYPE> entity_types, uint32_t mask, float x, float y, LAYER layer, float radius)
 {
+    // TODO: use entitie regions?
     auto state = State::get();
     std::vector<uint32_t> found;
     const std::vector<ENT_TYPE> proper_types = get_proper_types(std::move(entity_types));
@@ -175,7 +178,7 @@ std::vector<uint32_t> get_entities_at(std::vector<ENT_TYPE> entity_types, uint32
         for (auto& item : entities.entities())
         {
             auto [ix, iy] = item->position();
-            float distance = sqrt(pow(x - ix, 2.0f) + pow(y - iy, 2.0f));
+            float distance = std::sqrt(std::pow(x - ix, 2.0f) + std::pow(y - iy, 2.0f));
             if (distance < radius && entity_type_check(proper_types, item->type->id))
             {
                 found.push_back(item->uid);
@@ -201,6 +204,7 @@ std::vector<uint32_t> get_entities_at(ENT_TYPE entity_type, uint32_t mask, float
 
 std::vector<uint32_t> get_entities_overlapping_hitbox(std::vector<ENT_TYPE> entity_types, uint32_t mask, AABB hitbox, LAYER layer)
 {
+    // TODO: use entitie regions?
     auto state = State::get();
     std::vector<uint32_t> result;
     const std::vector<ENT_TYPE> proper_types = get_proper_types(std::move(entity_types));