From bf19b73978604e1a073fa267fbeca61103dbb983 Mon Sep 17 00:00:00 2001 From: Qrox Date: Thu, 19 Dec 2019 13:16:53 +0800 Subject: [PATCH 1/2] Exclude dda in unit test mod list --- build-scripts/get_all_mods.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-scripts/get_all_mods.py b/build-scripts/get_all_mods.py index 27f0e8cd55784..85ae466df2301 100755 --- a/build-scripts/get_all_mods.py +++ b/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)) From 9cb02980d69f6aa740d1340ae90e15ad68863e9b Mon Sep 17 00:00:00 2001 From: Qrox Date: Thu, 19 Dec 2019 19:43:46 +0800 Subject: [PATCH 2/2] Fix field coverage error --- .../Magiclysm/worldgen/regional_overlay.json | 2 +- src/regional_settings.cpp | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/data/mods/Magiclysm/worldgen/regional_overlay.json b/data/mods/Magiclysm/worldgen/regional_overlay.json index ca57b13045260..867da6b6052af 100644 --- a/data/mods/Magiclysm/worldgen/regional_overlay.json +++ b/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 } } } ] diff --git a/src/regional_settings.cpp b/src/regional_settings.cpp index 24a72990e289e..0b90d3c203ea5 100644 --- a/src/regional_settings.cpp +++ b/src/regional_settings.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include @@ -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;