Fix various crashes (#568)

* Don't die while importing armies to dead countries.

* Handle capital state of -1.

* Handle a couple of cases of 'dead' blocks in databases.

* Keep but don't convert dead countries.

* trait -> traits

* Restore country importing.

* Update test

* Let rakaly differenciate ironman, text, and compressed saves.

* No-op some unneeded unit mappings.

* Actually handle plain-text saves properly.

data/configurables/character_traits.txt

@@ -138,7 +138,7 @@ army = { # Generals & Field Marshals
 		logistics = 2
 	}
 	pillager = {
-		trait = { commando }
+		traits = { commando }
 		attack = 1
 		logistics = 1
 	}

data/configurables/unit_mappings.txt

@@ -63,6 +63,8 @@ combat_unit_type_light_tanks = {
 
 pm_no_organization = {}
 pm_general_training = {}
+pm_training_streamlining = {}
+pm_advanced_tactics_training = {}
 
 ## Pre-1.5 conversions
 

src/hoi4_world/countries/hoi4_countries_converter.cpp

@@ -87,8 +87,13 @@ std::map<std::string, Country> ConvertCountries(const vic3::World source_world,
    ConvoyDistributor convoys = BuildConvoyDistributor("configurables/convoy_config.txt");
    convoys.CalculateStateWeights(source_world);
 
-   for (const auto& [country_number, source_country]: source_world.GetCountries())
+   for (const auto& source_country: source_world.GetCountries() | std::views::values)
    {
+      if (source_country.IsDead())
+      {
+         continue;
+      }
+
       std::optional<Country> new_country = ConvertCountry(source_world,
           source_country,
           source_localizations,

src/vic3_world/countries/vic3_country.h

@@ -36,6 +36,7 @@ struct CountryOptions
 {
    int number = 0;
    std::string tag;
+   bool is_dead;
    std::optional<std::string> dynamic_name;
    std::optional<std::string> dynamic_adjective;
    commonItems::Color color;
@@ -76,6 +77,7 @@ class Country
    explicit Country(CountryOptions options):
        number_(options.number),
        tag_(std::move(options.tag)),
+       is_dead_(options.is_dead),
        dynamic_name_(std::move(options.dynamic_name)),
        dynamic_adjective_(std::move(options.dynamic_adjective)),
        color_(options.color),
@@ -102,6 +104,7 @@ class Country
 
    [[nodiscard]] int GetNumber() const { return number_; }
    [[nodiscard]] const std::string& GetTag() const { return tag_; }
+   [[nodiscard]] bool IsDead() const { return is_dead_; }
    [[nodiscard]] const std::optional<std::string>& GetDynamicName() const { return dynamic_name_; }
    [[nodiscard]] const std::optional<std::string>& GetDynamicAdjective() const { return dynamic_adjective_; }
    [[nodiscard]] const commonItems::Color& GetColor() const { return color_; }
@@ -152,6 +155,7 @@ class Country
   private:
    int number_ = 0;
    std::string tag_;
+   bool is_dead_;
    std::optional<std::string> dynamic_name_;
    std::optional<std::string> dynamic_adjective_;
    commonItems::Color color_;

src/vic3_world/countries/vic3_country_importer.cpp

@@ -55,7 +55,15 @@ vic3::CountryImporter::CountryImporter()
       options_.color = commonItems::Color::Factory{}.getColor(input_stream);
    });
    country_parser_.registerKeyword("capital", [this](std::istream& input_stream) {
-      options_.capital_state = commonItems::getInt(input_stream);
+      const int64_t temp_number = commonItems::getLlong(input_stream);
+      if (temp_number == 4294967295)
+      {
+         options_.capital_state = -1;
+      }
+      else
+      {
+         options_.capital_state = static_cast<int>(temp_number);
+      }
    });
    country_parser_.registerKeyword("country_type", [this](std::istream& input_stream) {
       options_.country_type = commonItems::getString(input_stream);
@@ -83,7 +91,7 @@ vic3::CountryImporter::CountryImporter()
    });
 
    country_parser_.registerKeyword("dead", [this](std::istream& input_stream) {
-      is_dead_ = commonItems::getString(input_stream) == "yes";
+      options_.is_dead = commonItems::getString(input_stream) == "yes";
    });
 
    /// ---- counters parser ----
@@ -107,13 +115,7 @@ std::optional<vic3::Country> vic3::CountryImporter::ImportCountry(const int numb
     const std::map<std::string, commonItems::Color>& color_definitions)
 {
    options_ = {};
-   is_dead_ = false;
-
    country_parser_.parseStream(input_stream);
-   if (is_dead_)
-   {
-      return std::nullopt;
-   }
 
    if (options_.color == commonItems::Color())
    {

src/vic3_world/countries/vic3_country_importer.h

@@ -28,8 +28,6 @@ class CountryImporter
    commonItems::parser counters_parser_;
 
    CountryOptions options_;
-
-   bool is_dead_ = false;  // Country marked as invalid data by game, but not yet cleaned up
 };
 
 }  // namespace vic3

src/vic3_world/countries/vic3_country_importer_tests.cpp

@@ -27,6 +27,7 @@ TEST(Vic3WorldCountriesCountryImporter, DefaultsAreDefaulted)
 
    EXPECT_TRUE(country.has_value());
    EXPECT_TRUE(country.value_or(Country({})).GetTag().empty());
+   EXPECT_FALSE(country.value_or(Country({})).IsDead());
    EXPECT_FALSE(country.value_or(Country({})).GetDynamicName());
    EXPECT_FALSE(country.value_or(Country({})).GetDynamicAdjective());
    EXPECT_EQ(country.value_or(Country({})).GetColor(), commonItems::Color(std::array{0, 0, 0}));
@@ -170,7 +171,7 @@ TEST(Vic3WorldCountriesCountryImporter, IgIdsCanBeAdded)
 }
 
 
-TEST(Vic3WorldCountriesCountryImporter, DeadCountriesAreSkipped)
+TEST(Vic3WorldCountriesCountryImporter, DeadCountriesAreImported)
 {
    std::stringstream input;
    input << "={\n";
@@ -180,7 +181,8 @@ TEST(Vic3WorldCountriesCountryImporter, DeadCountriesAreSkipped)
    input << "}";
    const auto country = CountryImporter{}.ImportCountry(0, input, {});
 
-   EXPECT_FALSE(country.has_value());
+   EXPECT_TRUE(country.has_value());
+   EXPECT_TRUE(country.value_or(Country({})).IsDead());
 }
 
 TEST(Vic3WorldCountriesCountryImporter, CountersSectionParsed)

src/vic3_world/institutions/institutions_importer.cpp

@@ -41,7 +41,9 @@ void InstitutionsImporter::operator()(std::istream& input_stream)
       this->current_institution_ = {};
    };
 
-   DatabaseParser(elementParser).parseStream(input_stream);
+   DatabaseParser database_parser(elementParser);
+   database_parser.registerKeyword("dead", commonItems::ignoreItem);
+   database_parser.parseStream(input_stream);
 }
 
 }  // namespace vic3

src/vic3_world/laws/laws_importer.cpp

@@ -69,7 +69,9 @@ std::map<int, std::set<std::string>> vic3::ImportLaws(std::istream& input_stream
       }
    };
 
-   DatabaseParser(law_parser_function).parseStream(input_stream);
+   DatabaseParser database_parser(law_parser_function);
+   database_parser.registerKeyword("dead", commonItems::ignoreItem);
+   database_parser.parseStream(input_stream);
 
    LOG(LogLevel::Info) << fmt::format("\tImported {} active laws.", active_laws);
    LOG(LogLevel::Info) << fmt::format("\tImported {} inactive laws.", inactive_laws);

src/vic3_world/world/vic3_world_importer.cpp

@@ -95,22 +95,19 @@ std::vector<Mod> GetModsFromSave(const std::vector<std::string>& mod_names)
 
 std::istringstream MeltSave(const rakaly::GameFile& save, const std::string& save_string)
 {
-   std::string melted_save_string;
-   if (save.is_binary())
+   const auto melt = save.melt();
+   if (melt.has_unknown_tokens())
    {
-      const auto melt = save.melt();
-      if (melt.has_unknown_tokens())
-      {
-         throw std::runtime_error("Unable to melt ironman save");
-      }
-
-      melt.writeData(melted_save_string);
+      throw std::runtime_error("Unable to melt ironman save");
    }
-   else
+
+   std::string melted_save_string;
+   melt.writeData(melted_save_string);
+
+   if (melted_save_string.empty())
    {
-      melted_save_string = save_string;
+      return std::istringstream{save_string};
    }
-
    return std::istringstream{melted_save_string};
 }
 
@@ -258,6 +255,7 @@ void AssignMilitaryFormationsToCountries(const std::map<int, vic3::MilitaryForma
       if (country == countries.end())
       {
          Log(LogLevel::Warning) << fmt::format("Could not find country {} to assign army formations.", country_number);
+         continue;
       }
       country->second.SetArmyFormations(army_formations);
    }
@@ -267,6 +265,7 @@ void AssignMilitaryFormationsToCountries(const std::map<int, vic3::MilitaryForma
       if (country == countries.end())
       {
          Log(LogLevel::Warning) << fmt::format("Could not find country {} to assign navy formations.", country_number);
+         continue;
       }
       country->second.SetNavyFormations(navy_formations);
    }