Merge pull request #36259 from Qrox/exclude-dda

Exclude dda in unit test mod list to fix CI build errors

build-scripts/get_all_mods.py

@@ -14,6 +14,6 @@
     mod_info = json.load(open(info))
     mods.extend(e["ident"] for e in mod_info if e["type"] == "MOD_INFO")
 
-mods_to_keep = [mod for mod in mods if mod not in blacklist]
+mods_to_keep = [mod for mod in mods if mod not in blacklist and mod != "dda"]
 
 print(','.join(mods_to_keep))

data/mods/Magiclysm/worldgen/regional_overlay.json

@@ -4,6 +4,6 @@
     "//id": "magiclysm_buildings_overlay",
     "regions": [ "all" ],
     "city": { "shops": { "magic_shop": 100, "used_bookstore": 225 }, "basements": { "magic_basement": 50 } },
-    "field_coverage": { "other": { "f_glow_boulder": 0.3333 } }
+    "field_coverage": { "other": { "f_boulder_large": 0.6667, "f_glow_boulder": 0.3333 } }
   }
 ]

src/regional_settings.cpp

@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <map>
+#include <sstream>
 #include <string>
 #include <utility>
 
@@ -760,10 +761,24 @@ void groundcover_extra::finalize()   // FIXME: return bool for failure
     }
 
     if( wtotal > 1000000 ) {
-        debugmsg( "plant coverage total exceeds 100%%" );
+        std::stringstream ss;
+        for( auto it = percent_str.begin(); it != percent_str.end(); ++it ) {
+            if( it != percent_str.begin() ) {
+                ss << '+';
+            }
+            ss << it->second;
+        }
+        debugmsg( "plant coverage total (%s=%de-4) exceeds 100%%", ss.str(), wtotal );
     }
     if( btotal > 1000000 ) {
-        debugmsg( "boosted plant coverage total exceeds 100%%" );
+        std::stringstream ss;
+        for( auto it = boosted_percent_str.begin(); it != boosted_percent_str.end(); ++it ) {
+            if( it != boosted_percent_str.begin() ) {
+                ss << '+';
+            }
+            ss << it->second;
+        }
+        debugmsg( "boosted plant coverage total (%s=%de-4) exceeds 100%%", ss.str(), btotal );
     }
 
     tf_id.furn = f_null;