Merge remote-tracking branch 'origin/Vic2ToHoI4_Release_0.1'

ParadoxGameConverters · Dec 23, 2016 · 2982be6 · 2982be6
2 parents a80057e + 5aab43b
commit 2982be6
Show file tree

Hide file tree

Showing 19 changed files with 10,050 additions and 4,453 deletions.
diff --git a/Vic2ToHoI4/Copy_Files.bat b/Vic2ToHoI4/Copy_Files.bat
@@ -1,5 +1,6 @@
 rem **Create blankMod**
-del "Release\blankMod" /Q
+del "Release\blankMod" /Q /S /F
+rmdir "Release\blankMod" /Q /S
 xcopy "Data_Files\blankMod" "release\blankmod" /Y /E /I
 
 rem **Copy data files**

diff --git a/Vic2ToHoI4/Data_Files/ReadMe.txt b/Vic2ToHoI4/Data_Files/ReadMe.txt
@@ -59,5 +59,7 @@ Mattymooz		- Data Files
 Yellowone1		- Art
 KaeI				- Art
 
+Special thanks to LukyLucaz, who allowed us to incoroporate Increased Resources into the converter.
+
 
  - AND ALL THE OTHERS WHO GAVE THEIR INPUT ON THE FORUM -
diff --git a/Vic2ToHoI4/Data_Files/Resources.txt b/Vic2ToHoI4/Data_Files/Resources.txt
diff --git a/Vic2ToHoI4/Data_Files/blankMod/output/common/defines/00_defines.lua b/Vic2ToHoI4/Data_Files/blankMod/output/common/defines/00_defines.lua
diff --git a/Vic2ToHoI4/Data_Files/blankMod/output/common/defines/00_graphics.lua b/Vic2ToHoI4/Data_Files/blankMod/output/common/defines/00_graphics.lua
diff --git a/Vic2ToHoI4/Data_Files/configuration.txt b/Vic2ToHoI4/Data_Files/configuration.txt
@@ -17,10 +17,10 @@ configuration =
 	# hardcoded: Use the one hardcoded into the latest converter version
 	# automatic: Attempt to automatically detect the installed HoI4 version
 	# manualEntry: Manually enter the HoI4 version
-	HoI4VersionMethod = "automatic"
+	HoI4VersionMethod = "manualEntry"
 
 	# HoI4Version: If manually entering the HoI4 version, set this to the desired version
-	HoI4Version = "1.2.1"
+	HoI4Version = "1.3.1"
 
 	# Manpower factor: a multiplier applied to manpower conversion
 	manpower_factor = "1.0"

diff --git a/Vic2ToHoI4/Source/Configuration.cpp b/Vic2ToHoI4/Source/Configuration.cpp
@@ -148,5 +148,8 @@ HOI4Version Configuration::getAutomaticHoI4Version()
 		}
 	}
 
+	LOG(LogLevel::Error) << "Could not automatically set HoI4 version. Run HoI4 and convert again, or use a different version setting.";
+	exit(-1);
+
 	return HOI4Version();
 }
diff --git a/Vic2ToHoI4/Source/HOI4World/HoI4Country.cpp b/Vic2ToHoI4/Source/HOI4World/HoI4Country.cpp
@@ -828,7 +828,6 @@ void HoI4Country::initFromV2Country(const V2World& _srcWorld, const V2Country* _
 	if (isThisStateOwnedByUs(state))
 	{
 		state->setAsCapitalState();
-		state->addAirBase(10);
 	}
 
 	// major nation

diff --git a/Vic2ToHoI4/Source/HOI4World/HoI4Focus.cpp b/Vic2ToHoI4/Source/HOI4World/HoI4Focus.cpp
@@ -27,6 +27,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
 
 HoI4Focus::HoI4Focus()
 {
+	availableIfCapitulated = false;
 }
 
 
@@ -71,6 +72,15 @@ HoI4Focus::HoI4Focus(Object* obj)
 	yPos = stoi(obj->getLeaf("y"));
 	cost = stoi(obj->getLeaf("cost"));
 
+	auto availableIfcapitulatedObjs = obj->getValue("available_if_capitulated");
+	if (
+			(availableIfcapitulatedObjs.size() > 0) &&
+			(availableIfcapitulatedObjs[0]->getLeaf() == "yes")
+		)
+	{
+		availableIfCapitulated = true;
+	}
+
 	auto availableObjs = obj->getValue("available");
 	if (availableObjs.size() > 0)
 	{
@@ -183,6 +193,10 @@ ostream& operator << (ostream& output, HoI4Focus& focus)
 	output << "		x = " << focus.xPos << "\n";
 	output << "		y = " << focus.yPos << "\n";
 	output << "		cost = " << focus.cost << "\n";
+	if (focus.availableIfCapitulated)
+	{
+		output << "		available_if_capitulated = yes\n";
+	}
 	if (focus.available != "")
 	{
 		output << "		available = {\n";

diff --git a/Vic2ToHoI4/Source/HOI4World/HoI4Focus.h b/Vic2ToHoI4/Source/HOI4World/HoI4Focus.h
@@ -52,6 +52,7 @@ class HoI4Focus
 		int xPos;
 		int yPos;
 		int cost;
+		bool availableIfCapitulated;
 		string available;
 		string cancelIfInvalid;
 		string continueIfInvalid;