Merge pull request #385 from Mr-Auto/color.in.entitydb

Color in entitydb
spelunky-fyi · Jul 11, 2024 · 9916af9 · 9916af9
2 parents 767ce21 + 441714b
commit 9916af9
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua
diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md
@@ -470,10 +470,7 @@ float | [acceleration](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=
 float | [max_speed](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=max_speed) | 
 float | [sprint_factor](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=sprint_factor) | 
 float | [jump](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=jump) | 
-float | [glow_red](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=glow_red) | 
-float | [glow_green](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=glow_green) | 
-float | [glow_blue](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=glow_blue) | 
-float | [glow_alpha](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=glow_alpha) | 
+[Color](#Color) | [default_color](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=default_color) | 
 int | [damage](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=damage) | 
 int | [life](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=life) | 
 int | [sacrifice_value](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=sacrifice_value) | Favor for sacrificing alive. Halved when dead (health == 0).

diff --git a/src/game_api/entities_chars.hpp b/src/game_api/entities_chars.hpp
@@ -55,7 +55,18 @@ class Ai
     int8_t unknown24;
     int8_t unknown25;
     int32_t unknown26;
-    // Map unknown27;
+    std::map<size_t, size_t> unknown27;
+
+    size_t unknown28; // probably vector?
+    size_t unknown29;
+    size_t unknown30;
+
+    std::vector<uintptr_t> unknown31;      // pointers to the Ai targets in state
+    std::map<uint32_t, uint8_t> unknown32; // dunno what any of this is, keeps changing rapidly
+
+    size_t unknown33;
+    uintptr_t unknown34; // pointer to map/set ?
+    std::map<size_t, size_t> unknown35;
 };
 
 class PowerupCapable : public Movable

diff --git a/src/game_api/entity_db.hpp b/src/game_api/entity_db.hpp
@@ -58,7 +58,7 @@ struct EntityDB
     };
     /// MASK, will only call collision2 when colliding with entities that match this mask.
     int32_t collision2_mask;
-    /// MASK used for collision with floors.
+    /// MASK used for collision with floors, walls etc.
     int32_t collision_mask;
     int32_t field_44;
     int32_t default_flags;
@@ -77,9 +77,13 @@ struct EntityDB
         Color default_color;
         struct
         {
+            /// NoDoc
             float glow_red;
+            /// NoDoc
             float glow_green;
+            /// NoDoc
             float glow_blue;
+            /// NoDoc
             float glow_alpha;
         };
     };

diff --git a/src/game_api/layer.hpp b/src/game_api/layer.hpp
@@ -153,6 +153,7 @@ struct Layer
 
     EntityList unknown_entities2;
     std::array<EntityList, 53> entities_by_draw_depth;
+    EntityList unknown_entities2a;
     EntityList unknown_entities3;        // debris, explosions, laserbeams etc. ?
     EntityList unknown_entities4;        // explosions, laserbeams, BG_LEVEL_*_SOOT ? only for short time while there are spawned?
     std::vector<Entity*> unknown_vector; // add_to_layer uses this

diff --git a/src/game_api/savedata.hpp b/src/game_api/savedata.hpp
@@ -67,7 +67,8 @@ struct ConstellationLine
 
 struct Constellation
 {
-    uint32_t star_count;
+    uint8_t star_count;
+    uint8_t unknown[3]; // possibly something?
     std::array<ConstellationStar, 45> stars;
     float scale;
     uint8_t line_count;

diff --git a/src/game_api/script/usertypes/entity_lua.cpp b/src/game_api/script/usertypes/entity_lua.cpp
@@ -90,6 +90,7 @@ void register_usertypes(sol::state& lua)
     entitydb_type["max_speed"] = &EntityDB::max_speed;
     entitydb_type["sprint_factor"] = &EntityDB::sprint_factor;
     entitydb_type["jump"] = &EntityDB::jump;
+    entitydb_type["default_color"] = &EntityDB::default_color;
     entitydb_type["glow_red"] = &EntityDB::glow_red;
     entitydb_type["glow_green"] = &EntityDB::glow_green;
     entitydb_type["glow_blue"] = &EntityDB::glow_blue;

diff --git a/src/game_api/state_structs.hpp b/src/game_api/state_structs.hpp
@@ -717,8 +717,12 @@ struct LiquidPhysicsEngine
     std::list<size_t> unk1; // seams to be empty, or have one element 0?
     uint32_t resize_value;  // used to resive the arrays?
     uint32_t unk3b;         // padding probably
-    std::list<int32_t> liquid_ids;
-    std::list<int32_t> unknown44;                        // all of them are -1
+
+    // this is actually a pre C++11 version of std::list, which is different from current one!
+    std::pair<size_t, size_t> liquid_ids; // std::list<int32_t>
+    // this is actually a pre C++11 version of std::list, which is different from current one!
+    std::pair<size_t, size_t> unknown44; // std::list<int32_t> all of them are -1
+
     std::list<int32_t>::const_iterator* list_liquid_ids; // list of all iterators of liquid_ids?
     int32_t unknown45a;                                  // size related for the array above
     int32_t unknown45b;                                  // padding