Add ceil lamp

nerudaj · Jan 2, 2024 · f8ad21b · f8ad21b
1 parent f2511eb
commit f8ad21b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 4 deletions.
diff --git a/resources/graphics/editor-items.png b/resources/graphics/editor-items.png
diff --git a/resources/graphics/editor-items.png.clip b/resources/graphics/editor-items.png.clip
@@ -14,6 +14,6 @@
         "height": 112, 
         "left": 0
     }, 
-    "nframes": 38, 
+    "nframes": 39, 
     "offset": 0
 }
diff --git a/resources/graphics/sprites.png b/resources/graphics/sprites.png
diff --git a/resources/graphics/sprites.png.clip b/resources/graphics/sprites.png.clip
@@ -1,5 +1,5 @@
 {
-    "tiles_per_row": 9, 
+    "tiles_per_row": 10, 
     "frame": {
         "width": 16, 
         "height": 16
@@ -9,11 +9,11 @@
         "vertical": 0
     }, 
     "bounds": {
-        "width": 144, 
+        "width": 160, 
         "top": 0, 
         "height": 160, 
         "left": 0
     }, 
-    "nframes": 90, 
+    "nframes": 91, 
     "offset": 0
 }
diff --git a/src/lib-defines/include/LevelItemId.hpp b/src/lib-defines/include/LevelItemId.hpp
@@ -38,6 +38,7 @@ enum class LevelItemId
     Unused18,
     Pillar,
     FloorLamp,
+    CeilLamp,
     Unused19,
     Unused20,
 };

diff --git a/src/lib-game/include/core/EntityDefinitions.hpp b/src/lib-game/include/core/EntityDefinitions.hpp
@@ -248,6 +248,9 @@ const static inline auto ENTITY_PROPERTIES =
           EntityProperties { .radius = 3_px,
                              .traits = Trait::Solid,
                              .initialSpriteIndex = FloorLampA } },
+        { EntityType::CeilLamp,
+          EntityProperties { .radius = 4_px,
+                             .initialSpriteIndex = CeilLampA } },
         { EntityType::ProjectileFlare,
           EntityProperties {
               .radius = 2_px,

diff --git a/src/lib-game/include/core/Enums.hpp b/src/lib-game/include/core/Enums.hpp
@@ -27,6 +27,7 @@ enum class SpriteId : std::uint8_t
     HarpoonA,
     PillarA,
     FloorLampA,
+    CeilLampA,
     PlayerA0,
     PlayerA1,
     PlayerA2,
@@ -164,6 +165,7 @@ enum class EntityType
     StaticDecorationBegin,
     Pillar,
     FloorLamp,
+    CeilLamp,
     StaticDecorationEnd,
     Player,
 

diff --git a/src/lib-game/src/builder/LightmapBuilder.cpp b/src/lib-game/src/builder/LightmapBuilder.cpp
@@ -152,6 +152,7 @@ std::queue<LightPoint> LightmapBuilder::getItemBasedLightSources(
         switch (static_cast<LevelItemId>(thing.id))
         {
         case FloorLamp:
+        case CeilLamp:
             queue.emplace(
                 thing.x / voxelSize.x,
                 thing.y / voxelSize.y,

diff --git a/src/lib-game/src/builder/SceneBuilder.cpp b/src/lib-game/src/builder/SceneBuilder.cpp
@@ -64,6 +64,8 @@ convertLeveldItemIdToEntityType(LevelItemId id) noexcept
         return EntityType::Pillar;
     case FloorLamp:
         return EntityType::FloorLamp;
+    case CeilLamp:
+        return EntityType::CeilLamp;
     default:
         return EntityType::Error;
     }