Add a new variant of Stone Liths object (#9335)

Author: ihhub

files/data/resurrection.h2d

@@ -5101,13 +5101,25 @@ namespace
             auto & images = _icnVsSprite[id];
             if ( images.size() == 218 ) {
                 // Add 2 extra river deltas. Each delta has 7 parts.
-                images.resize( 218 + 14 );
+                // Add a new Stone Liths with 3 more images.
+                images.resize( 218 + 14 + 3 );
 
                 for ( size_t i = 0; i < 14; ++i ) {
                     images[218 + i].resize( images[i].height(), images[i].width() );
                     fheroes2::Transpose( images[i], images[218 + i] );
                     images[218 + i].setPosition( images[i].y(), images[i].x() );
                 }
+
+                fheroes2::Sprite temp;
+                fheroes2::h2d::readImage( "circular_stone_liths_center.image", temp );
+
+                images[232].resize( 32, 32 );
+                images[232].reset();
+                Copy( temp, 0, 0, images[232], 0, 0, temp.width(), temp.height() );
+                Copy( images[116], 0, temp.height(), images[232], 0, temp.height(), images[116].width(), images[116].height() - temp.height() );
+
+                fheroes2::h2d::readImage( "circular_stone_liths_left.image", images[233] );
+                fheroes2::h2d::readImage( "circular_stone_liths_top.image", images[234] );
             }
 
             return true;

src/fheroes2/agg/agg_image.cpp

@@ -72,7 +72,7 @@ namespace
     constexpr uint16_t minimumSupportedVersion{ 2 };
 
     // Change the version when there is a need to expand map format functionality.
-    constexpr uint16_t currentSupportedVersion{ 6 };
+    constexpr uint16_t currentSupportedVersion{ 7 };
 
     void convertFromV2ToV3( Maps::Map_Format::MapFormat & map )
     {
@@ -178,6 +178,24 @@ namespace
         }
     }
 
+    void convertFromV6ToV7( Maps::Map_Format::MapFormat & map )
+    {
+        static_assert( minimumSupportedVersion <= 6, "Remove this function." );
+
+        if ( map.version > 6 ) {
+            return;
+        }
+
+        for ( Maps::Map_Format::TileInfo & tileInfo : map.tiles ) {
+            for ( Maps::Map_Format::TileObjectInfo & objInfo : tileInfo.objects ) {
+                if ( objInfo.group == Maps::ObjectGroup::ADVENTURE_MISCELLANEOUS && objInfo.index >= 38 ) {
+                    // Shift the objects in the Adventure Miscellaneous group by 1 position "down" to add new Stone Liths object.
+                    objInfo.index += 1;
+                }
+            }
+        }
+    }
+
     bool saveToStream( OStreamBase & stream, const Maps::Map_Format::BaseMapFormat & map )
     {
         stream << currentSupportedVersion << map.isCampaign << map.difficulty << map.availablePlayerColors << map.humanPlayerColors << map.computerPlayerColors
@@ -275,6 +293,7 @@ namespace
         convertFromV3ToV4( map );
         convertFromV4ToV5( map );
         convertFromV5ToV6( map );
+        convertFromV6ToV7( map );
 
         return !stream.fail();
     }

src/fheroes2/maps/map_format_info.cpp

@@ -4426,6 +4426,18 @@ namespace
             objects.emplace_back( std::move( object ) );
         }
 
+        // A new variant (Resurrection expansion) of Stone Liths.
+        {
+            Maps::ObjectInfo object{ MP2::OBJ_STONE_LITHS };
+            object.groundLevelParts.emplace_back( MP2::OBJ_ICN_TYPE_OBJNMUL2, 232U, fheroes2::Point{ 0, 0 }, MP2::OBJ_STONE_LITHS, Maps::OBJECT_LAYER );
+
+            object.groundLevelParts.emplace_back( MP2::OBJ_ICN_TYPE_OBJNMUL2, 233U, fheroes2::Point{ -1, 0 }, MP2::OBJ_NONE, Maps::SHADOW_LAYER );
+
+            object.topLevelParts.emplace_back( MP2::OBJ_ICN_TYPE_OBJNMUL2, 234U, fheroes2::Point{ 0, -1 }, MP2::OBJ_NON_ACTION_STONE_LITHS );
+
+            objects.emplace_back( std::move( object ) );
+        }
+
         // Event, generic terrain.
         {
             Maps::ObjectInfo object{ MP2::OBJ_EVENT };