Editor: Implemented soft-limit option

Wohlstand · Wohlstand · commit a1da519d87a6 · 2026-02-11T17:02:13.000+03:00
It allows to set the minimum of required items for integrational config packs. Some packages might contain missing dummy graphics, and this case should not being a hard reason to invalidate the config pack. So, this option allows to load these packs but with disabling dummy item ranges that has missing graphics.
diff --git a/Editor/common_features/data_array.h b/Editor/common_features/data_array.h
@@ -98,6 +98,21 @@ class PGE_DataArray
         m_total_elements = 0;
     }
 
+    /*!
+     * \brief Shrink the store size to value, but don't reallocate the store itself!
+     */
+    void shrinkTo(int number)
+    {
+        if(number == 0 || m_data == nullptr)
+            return;
+
+        if(number > m_total_elements)
+            return; // It's shrink! Not expand!
+
+        m_size = number + 1;
+        m_total_elements = number;
+    }
+
     /**
      * @brief Allocate array of required size. Everything which was previously will be deleted
      * @param number Number of reuired element slots
diff --git a/Editor/data_configs/conf_wld_level.cpp b/Editor/data_configs/conf_wld_level.cpp
@@ -25,9 +25,9 @@
 
 bool DataConfig::loadWorldLevel(obj_w_level &slevel, QString section, obj_w_level *merge_with, QString iniFile, IniProcessing *setup)
 {
-    bool valid = true;
     bool internal = !setup;
     PGEString errStr;
+
     if(internal)
         setup = new IniProcessing(iniFile);
 
@@ -43,11 +43,15 @@ bool DataConfig::loadWorldLevel(obj_w_level &slevel, QString section, obj_w_leve
         addError(errStr);
         slevel.isValid = false;
     }
+
     slevel.m_itemType = ItemTypes::WLD_Level;
+
     closeSection(setup);
+
     if(internal)
         delete setup;
-    return valid;
+
+    return slevel.isValid;
 }
 
 void DataConfig::loadWorldLevels()
@@ -56,6 +60,7 @@ void DataConfig::loadWorldLevels()
 
     obj_w_level slevel;
     unsigned long levels_total = 0;
+    unsigned long soft_limit = 0;
     bool useDirectory = false;
 
     QString level_ini = getFullIniPath("wld_levels.ini");
@@ -70,13 +75,15 @@ void DataConfig::loadWorldLevels()
     if(!openSection(&setup, "levels-main"))
         return;
     {
-        levels_total        = setup.value("total", 0).toUInt();
-        defaultGrid.levels = setup.value("grid", defaultGrid.levels).toUInt();
-        marker_wlvl.path    = setup.value("path", 0).toUInt();
-        marker_wlvl.bigpath = setup.value("bigpath", 0).toUInt();
+        setup.read("total", levels_total, 0);
+        setup.read("soft-limit", soft_limit, 0);
+        setup.read("grid", defaultGrid.levels, defaultGrid.levels);
+        setup.read("path", marker_wlvl.path, 0);
+        setup.read("bigpath", marker_wlvl.bigpath, 0);
         total_data += levels_total;
         setup.read("config-dir", folderWldLevelPoints.items, "");
         setup.read("extra-settings", folderWldLevelPoints.extraSettings, folderWldLevelPoints.items);
+
         if(!folderWldLevelPoints.items.isEmpty())
         {
             folderWldLevelPoints.items = config_dir + folderWldLevelPoints.items;
@@ -127,6 +134,21 @@ void DataConfig::loadWorldLevels()
                                        slevel.setup.icon_n,
                                        slevel.icon);
         }
+        else if(soft_limit > 0 && i > soft_limit)
+        {
+            // If resource after soft-limit is invalid, consider previous is the total number:
+            --i;
+            total_data -= levels_total;
+            total_data += i;
+            levels_total = i;
+            ConfStatus::total_wlvl = signed(levels_total);
+            main_wlevels.shrinkTo(i);
+            // Remove last error
+            errorsList[ERR_GLOBAL].pop_back();
+            emit progressMax(int(i));
+            break;
+        }
+
         /***************Load image*end***************/
         slevel.setup.id = i;
         main_wlevels.storeElement(int(i), slevel, valid);
diff --git a/Editor/data_configs/conf_wld_path.cpp b/Editor/data_configs/conf_wld_path.cpp
@@ -25,7 +25,6 @@
 
 bool DataConfig::loadWorldPath(obj_w_path &spath, QString section, obj_w_path *merge_with, QString iniFile, IniProcessing *setup)
 {
-    bool valid = true;
     bool internal = !setup;
     QString errStr;
     if(internal)
@@ -43,11 +42,13 @@ bool DataConfig::loadWorldPath(obj_w_path &spath, QString section, obj_w_path *m
         addError(errStr);
         spath.isValid = false;
     }
+
     spath.m_itemType = ItemTypes::WLD_Path;
     closeSection(setup);
     if(internal)
         delete setup;
-    return valid;
+
+    return spath.isValid;
 }
 
 void DataConfig::loadWorldPaths()
@@ -56,6 +57,7 @@ void DataConfig::loadWorldPaths()
 
     obj_w_path sPath;
     unsigned long path_total = 0;
+    unsigned long soft_limit = 0;
     bool useDirectory = false;
 
     QString scene_ini = getFullIniPath("wld_paths.ini");
@@ -72,6 +74,7 @@ void DataConfig::loadWorldPaths()
         return;
     {
         path_total = setup.value("total", 0).toUInt();
+        setup.read("soft-limit", soft_limit, 0);
         defaultGrid.paths = setup.value("grid", defaultGrid.paths).toUInt();
         total_data += path_total;
         setup.read("config-dir", folderWldPaths.items, "");
@@ -107,6 +110,7 @@ void DataConfig::loadWorldPaths()
             valid = loadWorldPath(sPath, "path", nullptr, QString("%1/path-%2.ini").arg(folderWldPaths.items).arg(i));
         else
             valid = loadWorldPath(sPath, QString("path-%1").arg(i), 0, "", &setup);
+
         /***************Load image*******************/
         if(valid)
         {
@@ -126,6 +130,21 @@ void DataConfig::loadWorldPaths()
                                        sPath.icon);
         }
         /***************Load image*end***************/
+        else if(soft_limit > 0 && i > soft_limit)
+        {
+            // If resource after soft-limit is invalid, consider previous is the total number:
+            --i;
+            total_data -= path_total;
+            total_data += i;
+            path_total = i;
+            ConfStatus::total_wpath = signed(path_total);
+            main_wpaths.shrinkTo(i);
+            // Remove last error
+            errorsList[ERR_GLOBAL].pop_back();
+            emit progressMax(int(i));
+            break;
+        }
+
         sPath.setup.id = i;
         main_wpaths.storeElement(int(i), sPath, valid);
 
diff --git a/Editor/data_configs/conf_wld_scene.cpp b/Editor/data_configs/conf_wld_scene.cpp
@@ -25,7 +25,6 @@
 
 bool DataConfig::loadWorldScene(obj_w_scenery &sScene, QString section, obj_w_scenery *merge_with, QString iniFile, IniProcessing *setup)
 {
-    bool valid = true;
     bool internal = !setup;
     QString errStr;
     if(internal)
@@ -43,11 +42,13 @@ bool DataConfig::loadWorldScene(obj_w_scenery &sScene, QString section, obj_w_sc
         addError(errStr);
         sScene.isValid = false;
     }
+
     sScene.m_itemType = ItemTypes::WLD_Scenery;
     closeSection(setup);
     if(internal)
         delete setup;
-    return valid;
+
+    return sScene.isValid;
 }
 
 
@@ -57,6 +58,7 @@ void DataConfig::loadWorldScene()
 
     obj_w_scenery sScene;
     unsigned long scenery_total = 0;
+    unsigned long soft_limit = 0;
     bool useDirectory = false;
 
     QString scene_ini = getFullIniPath("wld_scenery.ini");
@@ -72,6 +74,7 @@ void DataConfig::loadWorldScene()
         return;
     {
         setup.read("total", scenery_total, 0);
+        setup.read("soft-limit", soft_limit, 0);
         setup.read("grid", defaultGrid.scenery, defaultGrid.scenery);
         total_data += scenery_total;
         setup.read("config-dir", folderWldScenery.items, "");
@@ -107,6 +110,7 @@ void DataConfig::loadWorldScene()
             valid = loadWorldScene(sScene, "scenery", nullptr, QString("%1/scenery-%2.ini").arg(folderWldScenery.items).arg(i));
         else
             valid = loadWorldScene(sScene, QString("scenery-%1").arg(i), 0, "", &setup);
+
         /***************Load image*******************/
         if(valid)
         {
@@ -126,6 +130,21 @@ void DataConfig::loadWorldScene()
                                        sScene.icon);
         }
         /***************Load image*end***************/
+        else if(soft_limit > 0 && i > soft_limit)
+        {
+            // If resource after soft-limit is invalid, consider previous is the total number:
+            --i;
+            total_data -= scenery_total;
+            total_data += i;
+            scenery_total = i;
+            ConfStatus::total_wscene = signed(scenery_total);
+            main_wscene.shrinkTo(i);
+            // Remove last error
+            errorsList[ERR_GLOBAL].pop_back();
+            emit progressMax(int(i));
+            break;
+        }
+
         sScene.setup.id = i;
         main_wscene.storeElement(int(i), sScene, valid);
 
diff --git a/Editor/data_configs/conf_wld_tile.cpp b/Editor/data_configs/conf_wld_tile.cpp
@@ -25,7 +25,6 @@
 
 bool DataConfig::loadWorldTerrain(obj_w_tile &stile, QString section, obj_w_tile *merge_with, QString iniFile, IniProcessing *setup)
 {
-    bool valid = true;
     bool internal = !setup;
     QString errStr;
     if(internal)
@@ -43,11 +42,13 @@ bool DataConfig::loadWorldTerrain(obj_w_tile &stile, QString section, obj_w_tile
         addError(errStr);
         stile.isValid = false;
     }
+
     stile.m_itemType = ItemTypes::WLD_Tile;
     closeSection(setup);
     if(internal)
         delete setup;
-    return valid;
+
+    return stile.isValid;
 }
 
 void DataConfig::loadWorldTiles()
@@ -56,6 +57,7 @@ void DataConfig::loadWorldTiles()
 
     obj_w_tile stile;
     unsigned long tiles_total = 0;
+    unsigned long soft_limit = 0;
     bool useDirectory = false;
 
     QString tile_ini = getFullIniPath("wld_tiles.ini");
@@ -71,6 +73,7 @@ void DataConfig::loadWorldTiles()
         return;
     {
         setup.read("total", tiles_total, 0);
+        setup.read("soft-limit", soft_limit, 0);
         setup.read("grid", defaultGrid.terrain, defaultGrid.terrain);
         total_data += tiles_total;
         setup.read("config-dir", folderWldTerrain.items, "");
@@ -125,6 +128,21 @@ void DataConfig::loadWorldTiles()
                                        stile.icon);
         }
         /***************Load image*end***************/
+        else if(soft_limit > 0 && i > soft_limit)
+        {
+            // If resource after soft-limit is invalid, consider previous is the total number:
+            --i;
+            total_data -= tiles_total;
+            total_data += i;
+            tiles_total = i;
+            ConfStatus::total_wtile = signed(tiles_total);
+            main_wtiles.shrinkTo(i);
+            // Remove last error
+            errorsList[ERR_GLOBAL].pop_back();
+            emit progressMax(int(i));
+            break;
+        }
+
         stile.setup.id = i;
         main_wtiles.storeElement(int(i), stile, valid);
 
diff --git a/Editor/data_configs/obj_bgo.cpp b/Editor/data_configs/obj_bgo.cpp
@@ -51,7 +51,6 @@ void obj_bgo::copyTo(obj_bgo &bgo)
  */
 bool DataConfig::loadLevelBGO(obj_bgo &sbgo, QString section, obj_bgo *merge_with, QString iniFile, IniProcessing *setup)
 {
-    bool valid = true;
     bool internal = !setup;
     QString errStr;
     if(internal)
@@ -73,7 +72,8 @@ bool DataConfig::loadLevelBGO(obj_bgo &sbgo, QString section, obj_bgo *merge_wit
     closeSection(setup);
     if(internal)
         delete setup;
-    return valid;
+
+    return sbgo.isValid;
 }
 
 
@@ -83,6 +83,7 @@ void DataConfig::loadLevelBGO()
 
     obj_bgo sbgo;
     unsigned long bgo_total = 0;
+    unsigned long soft_limit = 0;
     bool useDirectory = false;
 
     QString bgo_ini = getFullIniPath("lvl_bgo.ini");
@@ -98,6 +99,7 @@ void DataConfig::loadLevelBGO()
         return;
     {
         setup.read("total", bgo_total, 0);
+        setup.read("soft-limit", soft_limit, 0);
         setup.read("grid",  defaultGrid.bgo, defaultGrid.bgo);
         total_data += bgo_total;
         setup.read("config-dir", folderLvlBgo.items, "");
@@ -155,6 +157,21 @@ void DataConfig::loadLevelBGO()
                                        sbgo.icon);
         }
         /***************Load image*end***************/
+        else if(soft_limit > 0 && i > soft_limit)
+        {
+            // If resource after soft-limit is invalid, consider previous is the total number:
+            --i;
+            total_data -= bgo_total;
+            total_data += i;
+            bgo_total = i;
+            ConfStatus::total_bgo = signed(bgo_total);
+            main_bgo.shrinkTo(i);
+            // Remove last error
+            errorsList[ERR_GLOBAL].pop_back();
+            emit progressMax(int(i));
+            break;
+        }
+
         sbgo.setup.id = i;
         main_bgo.storeElement(static_cast<int>(i), sbgo, valid);
 
diff --git a/Editor/data_configs/obj_block.cpp b/Editor/data_configs/obj_block.cpp
diff --git a/Editor/data_configs/obj_npc.cpp b/Editor/data_configs/obj_npc.cpp
diff --git a/changelog.editor.txt b/changelog.editor.txt
