Fix float value being read as integer (#220) #patch

* Update Fronter

* Fix float value being read as integer

* Minor ReSharper tweaks

* Update commonItems

Author: IhateTrains

Fronter

@@ -12,7 +12,7 @@
 #include "ConverterVersion.h"
 #include <filesystem>
 #include <ranges>
-#include <math.h>
+#include <cmath>
 
 
 

ImperatorToCK3/Source/CK3/CK3World.cpp

@@ -18,6 +18,14 @@ Imperator::Characters::Characters(std::istream& theStream, const std::shared_ptr
 }
 
 
+Imperator::Characters& Imperator::Characters::operator=(const Characters& other) {
+	if (this != &other) {
+		this->characters = other.characters;
+	}
+	return *this;
+}
+
+
 void Imperator::Characters::registerKeys() {
 	registerRegex(commonItems::integerRegex, [this](const std::string& charID, std::istream& theStream) {
 		std::shared_ptr<Character> newCharacter = characterFactory.getCharacter(theStream, charID, genes);

ImperatorToCK3/Source/Imperator/Characters/Characters.cpp

@@ -16,7 +16,7 @@ class Characters: commonItems::parser {
 	Characters() = default;
 	Characters(std::istream& theStream, const std::shared_ptr<GenesDB>& genesDB);
 
-	Characters& operator= (const Characters& obj) { this->characters = obj.characters; return *this; }
+	Characters& operator=(const Characters& other);
 
 	[[nodiscard]] const auto& getCharacters() const { return characters; }
 

ImperatorToCK3/Source/Imperator/Characters/Characters.h

@@ -44,7 +44,7 @@ class Province {
 	std::string religion;
 	std::pair<unsigned long long, std::shared_ptr<Country>> ownerCountry{ 0, nullptr };
 	unsigned long long controller = 0;
-	unsigned int civilizationValue = 0;
+	double civilizationValue = 0;
 	ProvinceRank provinceRank = ProvinceRank::settlement;
 	bool fort = false;
 	bool holySite = false;

ImperatorToCK3/Source/Imperator/Provinces/Province.h

@@ -27,8 +27,7 @@ Imperator::Province::Factory::Factory() {
 		province->pops.emplace(commonItems::getULlong(theStream), nullptr);
 	});
 	registerKeyword("civilization_value", [this](std::istream& theStream) {
-		const auto valStr = commonItems::getString(theStream);
-		province->civilizationValue = commonItems::stringToInteger<unsigned int>(valStr);
+		province->civilizationValue = commonItems::getDouble(theStream);
 	});
 	registerKeyword("province_rank", [this](std::istream& theStream) {
 		const auto provinceRankStr = commonItems::getString(theStream);

ImperatorToCK3/Source/Imperator/Provinces/ProvinceFactory.cpp

@@ -11,9 +11,8 @@
 
 
 void logGameVersions(const std::string& imperatorPath, const std::string& ck3Path) {
-	nlohmann::json impLauncherSettings, ck3LauncherSettings;
-
 	try {
+		nlohmann::json impLauncherSettings;
 		std::ifstream impSettingsFile(imperatorPath + "/launcher/launcher-settings.json");
 		impSettingsFile >> impLauncherSettings;
 		impSettingsFile.close();
@@ -24,6 +23,7 @@ void logGameVersions(const std::string& imperatorPath, const std::string& ck3Pat
 	}
 
 	try {
+		nlohmann::json ck3LauncherSettings;
 		std::ifstream ck3SettingsFile(ck3Path + "/launcher/launcher-settings.json");
 		ck3SettingsFile >> ck3LauncherSettings;
 		ck3SettingsFile.close();

ImperatorToCK3/Source/ImperatorToCK3Converter.cpp

@@ -124,7 +124,7 @@ std::optional<mappers::LocBlock> mappers::LocalizationMapper::getLocBlockForKey(
 }
 
 
-void mappers::LocBlock::modifyForEveryLanguage(const LocBlock& otherLocBlock, std::function<void(std::string&, const std::string&)> modifyingFunction) {
+void mappers::LocBlock::modifyForEveryLanguage(const LocBlock& otherLocBlock, const std::function<void(std::string&, const std::string&)>& modifyingFunction) {
 	modifyingFunction(english, otherLocBlock.english);
 	modifyingFunction(french, otherLocBlock.french);
 	modifyingFunction(german, otherLocBlock.german);

ImperatorToCK3/Source/Mappers/LocalizationMapper/LocalizationMapper.cpp

@@ -21,7 +21,7 @@ typedef struct LocBlock {
 	std::string russian;
 	std::string simp_chinese;
 	std::string spanish;
-	void modifyForEveryLanguage(const LocBlock& otherLocBlock, std::function<void(std::string&, const std::string&)> modifyingFunction);
+	void modifyForEveryLanguage(const LocBlock& otherLocBlock, const std::function<void(std::string&, const std::string&)>& modifyingFunction);
 } LocBlock;
 
 class LocalizationMapper {

ImperatorToCK3/Source/Mappers/LocalizationMapper/LocalizationMapper.h

@@ -32,10 +32,12 @@ void mappers::ReligionMapper::registerKeys() {
 void mappers::ReligionMapper::loadRegionMappers(std::shared_ptr<ImperatorRegionMapper> impRegionMapper, std::shared_ptr<CK3RegionMapper> _ck3RegionMapper) {
 	const auto imperatorRegionMapper = std::move(impRegionMapper);
 	const auto ck3RegionMapper = std::move(_ck3RegionMapper);
-	if (!imperatorRegionMapper)
+	if (!imperatorRegionMapper) {
 		throw std::runtime_error("Religion Mapper: Imperator Region Mapper is unloaded!");
-	if (!ck3RegionMapper)
+	}
+	if (!ck3RegionMapper) {
 		throw std::runtime_error("Religion Mapper: CK3 Region Mapper is unloaded!");
+	}
 	for (auto& mapping : religionMappings) {
 		mapping.insertImperatorRegionMapper(imperatorRegionMapper);
 		mapping.insertCK3RegionMapper(ck3RegionMapper);
@@ -46,8 +48,9 @@ void mappers::ReligionMapper::loadRegionMappers(std::shared_ptr<ImperatorRegionM
 std::optional<std::string> mappers::ReligionMapper::match(const std::string& impReligion, const unsigned long long ck3ProvinceID, const unsigned long long impProvinceID) const {
 	for (const auto& religionMapping : religionMappings) {
 		const auto& possibleMatch = religionMapping.match(impReligion, ck3ProvinceID, impProvinceID);
-		if (possibleMatch)
+		if (possibleMatch) {
 			return *possibleMatch;
+		}
 	}
 	return std::nullopt;
 }