Merge remote-tracking branch 'remotes/origin/Vic2ToHoI4'

ParadoxGameConverters · Jun 25, 2017 · 198311c · 198311c
2 parents 7899b5e + 238a94f
commit 198311c
Show file tree

Hide file tree

Showing 107 changed files with 10,177 additions and 7,409 deletions.
diff --git a/Vic2ToHoI4/CMakeLists.txt b/Vic2ToHoI4/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 2.1)
 #set(CMAKE_VERBOSE_MAKEFILE on)
 
 project(Vic2ToHoI4)
@@ -8,6 +8,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Release-Linux)
 set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Release-Linux)
 
 add_compile_options("-std=c++11")
+add_compile_options("-g")
 
 include_directories("../common_items")
 include_directories("${PROJECT_SOURCE_DIR}")
@@ -22,13 +23,17 @@ set(COMMON_SOURCES ${COMMON_SOURCES} "../common_items/Date.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../common_items/LinuxUtils.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../common_items/Log.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../common_items/Object.cpp")
-set(COMMON_SOURCES ${COMMON_SOURCES} "../common_items/ParadoxParser8859_15.cpp")
 set(COMMON_SOURCES ${COMMON_SOURCES} "../common_items/ParadoxParserUTF8.cpp")
+set(COMMON_SOURCES ${COMMON_SOURCES} "../common_items/ParadoxParser8859_15.cpp")
+set(COMMON_SOURCES ${COMMON_SOURCES} "../common_items/Encoding.cpp")
+set(COMMON_SOURCES ${COMMON_SOURCES} "../common_items/ParadoxParserGeneric.cpp")
 
 set(Boost_USE_STATIC_LIBS       OFF)
 set(Boost_USE_MULTITHREADED     OFF)
 set(Boost_USE_STATIC_RUNTIME    OFF)
 find_package(Boost)
 if(Boost_FOUND)
   add_executable(Vic2ToHoi4Converter ${MAIN_SOURCES} ${HOI4WORLD_SOURCES} ${MAPPER_SOURCES} ${VIC2WORLD_SOURCES} ${COMMON_SOURCES})
-endif()
+  add_custom_command(TARGET Vic2ToHoi4Converter POST_BUILD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND chmod u+x Copy_Files.sh)
+  add_custom_command(TARGET Vic2ToHoi4Converter POST_BUILD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ./Copy_Files.sh)
+endif()
diff --git a/Vic2ToHoI4/Copy_Files.bat b/Vic2ToHoI4/Copy_Files.bat
@@ -15,13 +15,10 @@ copy "Data_Files\governmentMapping.txt" "release\governmentMapping.txt
 copy "Data_Files\license.txt" "release\license.txt"
 copy "Data_Files\tech_mapping.txt" "release\tech_mapping.txt"
 copy "Data_Files\unit_mapping.txt" "release\unit_mapping.txt"
-copy "Data_Files\culture_map.txt" "release\culture_map.txt"
 copy "Data_Files\FAQ.txt" "release\FAQ.txt"
 copy "Data_Files\resources.txt" "release\resources.txt"
-copy "Data_Files\navalprovinces.txt" "release\navalprovinces.txt"
 copy "Data_Files\positions.txt" "release\positions.txt"
-copy "Data_Files\femaleNames.txt" "release\femaleNames.txt"
-copy "Data_Files\callsigns.txt" "release\callsigns.txt"
+copy "Data_Files\names.txt" "release\names.txt"
 copy "Data_Files\cultureGroupToGraphics.txt" "release\cultureGroupToGraphics.txt"
 
 rem **Copy flags**

diff --git a/Vic2ToHoI4/Copy_Files.sh b/Vic2ToHoI4/Copy_Files.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# **Create blankMod**
+rm -r "Release-Linux/blankMod"
+cp -r "Data_Files/blankMod" "Release-Linux/blankMod"
+
+# **Copy data files**
+cp "Data_Files/configuration.txt" "Release-Linux/configuration.txt"
+cp "Data_Files/configuration.txt" "Release-Linux/configuration-example.txt"
+cp "Data_Files/ReadMe.txt" "Release-Linux/ReadMe.txt"
+cp "Data_Files/merge_nations.txt" "Release-Linux/merge_nations.txt"
+cp "Data_Files/province_mappings.txt" "Release-Linux/province_mappings.txt"
+cp "Data_Files/HPM_province_mappings.txt" "Release-Linux/HPM_province_mappings.txt"
+cp "Data_Files/country_mappings.txt" "Release-Linux/country_mappings.txt"
+cp "Data_Files/governmentMapping.txt" "Release-Linux/governmentMapping.txt"
+cp "Data_Files/license.txt" "Release-Linux/license.txt"
+cp "Data_Files/tech_mapping.txt" "Release-Linux/tech_mapping.txt"
+cp "Data_Files/unit_mapping.txt" "Release-Linux/unit_mapping.txt"
+cp "Data_Files/FAQ.txt" "Release-Linux/FAQ.txt"
+cp "Data_Files/Resources.txt" "Release-Linux/resources.txt"
+cp "Data_Files/positions.txt" "Release-Linux/positions.txt"
+cp "Data_Files/names.txt" "Release-Linux/names.txt"
+cp "Data_Files/cultureGroupToGraphics.txt" "Release-Linux/cultureGroupToGraphics.txt"
+
+# **Copy flags**
+rm -r "Release-Linux/flags"
+cp -r "Data_Files/flags" "Release-Linux/flags"
+
+# **Create changelog**
+#rm Release-Linux/changelog.txt
+#git log --oneline --decorate >> Release-Linux/makelog.txt
+#(for /f "rmims=" %%i in (Release-Linux/makelog.txt) do @echo %%i)>Release-Linux/changelog.txt
+#rm Release-Linux/makelog.txt
diff --git a/Vic2ToHoI4/Data_Files/ReadMe.txt b/Vic2ToHoI4/Data_Files/ReadMe.txt
@@ -46,6 +46,7 @@ Idhrendur		- Project Lead, Programming, Analysis
 thatsgerman		- Programming, Analysis
 jepaan			- Programming
 Hamiller78		- Programming
+barryvm			- Programming
 Italianajt		- Analysis, Data Files, QA
 Ordinary_Kraut	- Analysis, Data Files
 DasGuntLord01	- Analysis
@@ -64,4 +65,4 @@ Ostheim			- 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 -
+ - AND ALL THE OTHERS WHO GAVE THEIR INPUT ON THE FORUM -
diff --git a/Vic2ToHoI4/Data_Files/Vic2toHoI4DefaultConfiguration.xml b/Vic2ToHoI4/Data_Files/Vic2toHoI4DefaultConfiguration.xml
@@ -23,8 +23,8 @@
 						<entryOptions>
 							<entryOption>
 								<name>hardcoded</name>
-								<friendlyName>Hard Coded (1.3.3)</friendlyName>
-								<description>Use the HoI4 version hard coded into the converter (1.3.3)</description>
+								<friendlyName>Hard Coded (1.4.0)</friendlyName>
+								<description>Use the HoI4 version hard coded into the converter (1.4.0)</description>
 								<isDefault>true</isDefault>
 							</entryOption>
 							<entryOption>
@@ -84,6 +84,25 @@
 						<minValue>0.01</minValue>
 						<maxValue>100.0</maxValue>
 					</preference>
+					<preference>
+						<name>drop_minor_ideologies</name>
+						<friendlyName>Drop Minor Ideologies</friendlyName>
+						<description>Convert only major ideologies.</description>
+						<entryOptions>
+							<entryOption>
+								<name>true</name>
+								<friendlyName>Yes</friendlyName>
+								<description>Keep only major ideologies.</description>
+								<isDefault>true</isDefault>
+							</entryOption>
+							<entryOption>
+							<name>false</name>
+								<friendlyName>No</friendlyName>
+								<description>Keep all ideologies.</description>
+								<isDefault>false</isDefault>
+							</entryOption>
+						</entryOptions>
+					</preference>
 				</preferences>
 			</category>
 		</categories>

diff --git a/Vic2ToHoI4/Data_Files/blankMod/output/common/ai_strategy/CHI.txt b/Vic2ToHoI4/Data_Files/blankMod/output/common/ai_strategy/CHI.txt
diff --git a/Vic2ToHoI4/Data_Files/blankMod/output/common/ai_strategy/FRA.txt b/Vic2ToHoI4/Data_Files/blankMod/output/common/ai_strategy/FRA.txt