Merge remote-tracking branch 'origin/develop' into develop

Wolferos · Mar 24, 2020 · e9438d0 · e9438d0
2 parents 0340984 + 30929f5
commit e9438d0
Show file tree

Hide file tree

Showing 80 changed files with 8,434 additions and 11,932 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 **Project Lead:** Wolferos
 
-**Current Version:** 0.9.2
+**Current Version:** 0.9.2a
 
 **Compatible with:** Hearts of Iron IV "Husky" (with or without Paid DLC)
 

diff --git a/mod/TheGreatWar.mod b/mod/TheGreatWar.mod
@@ -1,5 +1,5 @@
 name="Hearts of Iron IV: The Great War"
-path="/home/romain/.local/share/Paradox Interactive/Hearts of Iron IV/mod/thegreatwar"
+path="mod/thegreatwar"
 replace_path="history/states"
 tags={
 	"National Focuses"
@@ -14,6 +14,6 @@ tags={
 	"Technologies"
 }
 picture="tgw_picture.png"
-version="0.9.1"
+version="0.9.2a"
 supported_version="1.9.*"
 remote_file_id="699709023"
diff --git a/mod/thegreatwar/common/countries/Brittany.txt b/mod/thegreatwar/common/countries/Brittany.txt
@@ -0,0 +1,6 @@
+
+
+graphical_culture = western_european_gfx
+graphical_culture_2d = western_european_2d
+
+color = rgb { 118 99 151 }
diff --git a/mod/thegreatwar/common/countries/Corsica.txt b/mod/thegreatwar/common/countries/Corsica.txt
@@ -0,0 +1,6 @@
+
+
+graphical_culture = western_european_gfx
+graphical_culture_2d = western_european_2d
+
+color = rgb { 106 178 46 }
diff --git a/mod/thegreatwar/common/countries/Occitania.txt b/mod/thegreatwar/common/countries/Occitania.txt
@@ -0,0 +1,6 @@
+
+
+graphical_culture = western_european_gfx
+graphical_culture_2d = western_european_2d
+
+color = rgb { 105 240 240 }
diff --git a/mod/thegreatwar/common/country_tags/00_countries.txt b/mod/thegreatwar/common/country_tags/00_countries.txt
@@ -235,4 +235,7 @@ SAX = "countries/Saxony.txt"
 SHL = "countries/Schleswig-Holstein.txt"
 SOL = "countries/Solomon Islands.txt"
 TAH = "countries/Tahiti.txt"
-WUR = "countries/Wurtemberg.txt"
+WUR = "countries/Wurtemberg.txt"
+BRI = "countries/Brittany.txt"
+OCC = "countries/Occitania.txt"
+COR = "countries/Corsica.txt"
diff --git a/mod/thegreatwar/common/defines/00_defines.lua b/mod/thegreatwar/common/defines/00_defines.lua
@@ -1737,6 +1737,14 @@ NAI = {
 	MINIMUM_FUEL_DAYS_TO_ACCEPT_LEND_LEASE = 10, -- AI will accept to lend lease fuel only if they have more fuel than this number multiply by their max daily consumption. Note that for a GiE asking to its host, we divide this number by 2.
 
 	POLITICAL_IDEA_MIN_SCORE = 0.1,				-- Only replace or add an idea if score is above this score.
+
+
+	-- for positive values of following defines, ai weights will take over of hardcoded ai scoring system
+	MIN_AI_SCORE_TO_MOBILIZATION_LAW_OVERRIDE_HARD_CODED_SCORE = 0.0,
+	MIN_AI_SCORE_TO_ECONOMY_LAW_OVERRIDE_HARD_CODED_SCORE = 0.0,
+	MIN_AI_SCORE_TO_TRADE_LAW_OVERRIDE_HARD_CODED_SCORE = 1000.0,
+	MIN_AI_SCORE_TO_ALL_LAWS_OVERRIDE_HARD_CODED_SCORE = 0.0,
+
 	AT_WAR_THREAT_FACTOR = 2.0,					-- How much increase in threat does AI feel for being in war against osmeone
 	NEIGHBOUR_WAR_THREAT_FACTOR = 1.10, 		-- How much increase in threat does AI feel against neighbours who are at war
 	POTENTIAL_ALLY_JOIN_WAR_FACTOR = 100, 		-- How much increase in threat does AI feel against neighbours who are allied against one of our enemies
@@ -2444,6 +2452,7 @@ NOperatives = {
 	AGENCY_AI_BASE_NUM_FACTORIES = 25.0,				-- Used by AI to pace the upgrades. Formula : if( AGENCY_AI_BASE_NUM_FACTORIES <= num_civ_factories - num_upgrades * AGENCY_AI_PER_UPGRADE_FACTORIES )
 	AGENCY_AI_PER_UPGRADE_FACTORIES = 6.0,			-- Used by AI to pace the upgrades. Formula : if( AGENCY_AI_BASE_NUM_FACTORIES <= num_civ_factories - num_upgrades * AGENCY_AI_PER_UPGRADE_FACTORIES )
 	AGENCY_UPGRADE_PER_OPERATIVE_SLOT = 5,			-- Number of upgrade needed to unlock an additional operative slot
+	MAX_OPERATIVE_SLOT_FROM_AGENCY_UPGRADES = 1,	-- max operative slots gained from upgrades
 	AGENCY_OPERATIVE_RECRUITMENT_TIME = 30,			-- Number of days to wait to have operative to recruit when an operative slot first becomes available
 	BECOME_SPYMASTER_PP_COST = 50,					-- Number of political power used to become Spy Master
 	BECOME_SPYMASTER_MIN_UPGRADES = 3,				-- Number of agency upgrades you need before becoming Spy Master
@@ -2493,6 +2502,16 @@ NOperatives = {
 		0.1, -- DiplomaticPressure
 		3.0, -- Propaganda
 	},
+
+	-- used for calculating how many operatives will a spy master gain from its faction members
+	-- first number in every now is number of operatives gained
+	-- second number is total factory needed (mil and civ) for giving previous ratio
+	OPERATIVE_SLOTS_FROM_FACTION_MEMBERS_FOR_SPY_MASTER = {
+		0.0, 	0.0, -- 0 operative for [0, 10)
+		0.25,  	10.0, -- 0.25 operative for [10, 50)
+		0.5, 	50.0, -- 0.5 operative for >= 50
+	},
+
 	INTEL_NETWORK_STATE_MODIFIER_STRENGTH_THRESHOLD = 10,			-- Minimum amount of strength required in a state for the intel network related modifiers to start being applied
 
 	INTEL_NETWORK_MIN_DEFAULT_FOR_SHOWING = 25,              -- default min level for networks used to filter operation requirements if not overriden

diff --git a/mod/thegreatwar/descriptor.mod b/mod/thegreatwar/descriptor.mod
@@ -1,5 +1,4 @@
 name="Hearts of Iron IV: The Great War"
-path="/home/romain/.local/share/Paradox Interactive/Hearts of Iron IV/mod/thegreatwar"
 replace_path="history/states"
 tags={
 	"National Focuses"
@@ -14,6 +13,7 @@ tags={
 	"Technologies"
 }
 picture="tgw_picture.png"
-version="0.9.1"
+version="0.9.2a"
 supported_version="1.9.*"
+path="/home/romain/.local/share/Paradox Interactive/Hearts of Iron IV/mod/thegreatwar"
 remote_file_id="699709023"
diff --git a/mod/thegreatwar/gfx/flags/BRI.tga b/mod/thegreatwar/gfx/flags/BRI.tga
diff --git a/mod/thegreatwar/gfx/flags/BRI_communism.tga b/mod/thegreatwar/gfx/flags/BRI_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/BRI_fascism.tga b/mod/thegreatwar/gfx/flags/BRI_fascism.tga
diff --git a/mod/thegreatwar/gfx/flags/BRI_neutrality.tga b/mod/thegreatwar/gfx/flags/BRI_neutrality.tga
diff --git a/mod/thegreatwar/gfx/flags/COR.tga b/mod/thegreatwar/gfx/flags/COR.tga
diff --git a/mod/thegreatwar/gfx/flags/COR_communism.tga b/mod/thegreatwar/gfx/flags/COR_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/COR_democratic.tga b/mod/thegreatwar/gfx/flags/COR_democratic.tga
diff --git a/mod/thegreatwar/gfx/flags/COR_fascism.tga b/mod/thegreatwar/gfx/flags/COR_fascism.tga
diff --git a/mod/thegreatwar/gfx/flags/OCC.tga b/mod/thegreatwar/gfx/flags/OCC.tga
diff --git a/mod/thegreatwar/gfx/flags/OCC_communism.tga b/mod/thegreatwar/gfx/flags/OCC_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/OCC_fascism.tga b/mod/thegreatwar/gfx/flags/OCC_fascism.tga
diff --git a/mod/thegreatwar/gfx/flags/OCC_neutrality.tga b/mod/thegreatwar/gfx/flags/OCC_neutrality.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/BRI.tga b/mod/thegreatwar/gfx/flags/medium/BRI.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/BRI_communism.tga b/mod/thegreatwar/gfx/flags/medium/BRI_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/BRI_fascism.tga b/mod/thegreatwar/gfx/flags/medium/BRI_fascism.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/BRI_neutrality.tga b/mod/thegreatwar/gfx/flags/medium/BRI_neutrality.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/COR.tga b/mod/thegreatwar/gfx/flags/medium/COR.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/COR_communism.tga b/mod/thegreatwar/gfx/flags/medium/COR_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/COR_democratic.tga b/mod/thegreatwar/gfx/flags/medium/COR_democratic.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/COR_fascism.tga b/mod/thegreatwar/gfx/flags/medium/COR_fascism.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/OCC.tga b/mod/thegreatwar/gfx/flags/medium/OCC.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/OCC_communism.tga b/mod/thegreatwar/gfx/flags/medium/OCC_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/OCC_neutrality.tga b/mod/thegreatwar/gfx/flags/medium/OCC_neutrality.tga
diff --git a/mod/thegreatwar/gfx/flags/medium/OMA_communism.tga b/mod/thegreatwar/gfx/flags/medium/OMA_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/small/BRI.tga b/mod/thegreatwar/gfx/flags/small/BRI.tga
diff --git a/mod/thegreatwar/gfx/flags/small/BRI_communism.tga b/mod/thegreatwar/gfx/flags/small/BRI_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/small/BRI_fascism.tga b/mod/thegreatwar/gfx/flags/small/BRI_fascism.tga
diff --git a/mod/thegreatwar/gfx/flags/small/BRI_neutrality.tga b/mod/thegreatwar/gfx/flags/small/BRI_neutrality.tga
diff --git a/mod/thegreatwar/gfx/flags/small/COR.tga b/mod/thegreatwar/gfx/flags/small/COR.tga
diff --git a/mod/thegreatwar/gfx/flags/small/COR_communism.tga b/mod/thegreatwar/gfx/flags/small/COR_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/small/COR_democratic.tga b/mod/thegreatwar/gfx/flags/small/COR_democratic.tga
diff --git a/mod/thegreatwar/gfx/flags/small/COR_fascism.tga b/mod/thegreatwar/gfx/flags/small/COR_fascism.tga
diff --git a/mod/thegreatwar/gfx/flags/small/OCC.tga b/mod/thegreatwar/gfx/flags/small/OCC.tga
diff --git a/mod/thegreatwar/gfx/flags/small/OCC_communism.tga b/mod/thegreatwar/gfx/flags/small/OCC_communism.tga
diff --git a/mod/thegreatwar/gfx/flags/small/OCC_neutrality.tga b/mod/thegreatwar/gfx/flags/small/OCC_neutrality.tga
diff --git a/mod/thegreatwar/gfx/interface/logo_game.dds b/mod/thegreatwar/gfx/interface/logo_game.dds
diff --git a/mod/thegreatwar/history/countries/BRI - Brittany.txt b/mod/thegreatwar/history/countries/BRI - Brittany.txt
@@ -0,0 +1 @@
+capital = 14
diff --git a/mod/thegreatwar/history/countries/COR - Corsica.txt b/mod/thegreatwar/history/countries/COR - Corsica.txt
@@ -0,0 +1 @@
+capital = 1
diff --git a/mod/thegreatwar/history/countries/OCC - Occitania.txt b/mod/thegreatwar/history/countries/OCC - Occitania.txt
@@ -0,0 +1 @@
+capital = 31
diff --git a/mod/thegreatwar/localisation/loading_tips_l_french.yml b/mod/thegreatwar/localisation/loading_tips_l_french.yml
@@ -37,7 +37,6 @@
  LOADING_TIP_35:0 "Allez, fils de pute, voulez-vous vivre pour toujours ?\n- Daniel Daly"
  LOADING_TIP_36:0 "Cette guerre, comme la prochaine guerre, est une guerre pour mettre fin à la guerre.\n- David Lloyd George, 1916"
  LOADING_TIP_37:0 "A onze heures du matin vient la fin de la guerre la plus cruelle et la plus terrible qui ait jamais frappé l'humanité. J'espère que nous pouvons dire qu'ainsi, ce matin fatidique, a pris fin toutes les guerres. - David Lloyd George, 11 novembre 1918"
- LOADING_TIP_37:0 "A onze heures du matin vient la fin de la guerre la plus cruelle et la plus terrible qui ait jamais frappé l'humanité. J'espère que nous pouvons dire qu'ainsi, ce matin fatidique, toutes les guerres ont pris fin. - David Lloyd George, 11 novembre 1918"
  LOADING_TIP_38:0 "Dans les champs de Flandre, les coquelicots soufflent entre les croix, rangée par rangée.\n- John McCrae, 1915"
  LOADING_TIP_39:0 "Dieu protège l'Angleterre\n- Ernst Lissauer"
  LOADING_TIP_40:0 "Quoi que tu fasses, tu perds beaucoup d'hommes.\n- Charles Mangin"

diff --git a/mod/thegreatwar/localisation/replace/ww1_additional_l_french.yml b/mod/thegreatwar/localisation/replace/ww1_additional_l_french.yml
diff --git a/mod/thegreatwar/localisation/replace/ww1_aircraft_ww2_l_french.yml b/mod/thegreatwar/localisation/replace/ww1_aircraft_ww2_l_french.yml
diff --git a/mod/thegreatwar/localisation/replace/ww1_cosmetic_tags_l_french.yml b/mod/thegreatwar/localisation/replace/ww1_cosmetic_tags_l_french.yml
@@ -1,29 +1,32 @@
-l_french:
-
- GER_MIL_fascism:0 "Reich allemand"
- GER_MIL_fascism_DEF:0 "Le Reich allemand"
- GER_MIL_fascism_ADJ:0 "allemande"
-
- AUH_EMP_neutrality:0 "Empire d'Autriche"
- AUH_EMP_neutrality_DEF:0 "L'Empire d'Autriche"
- AUH_EMP_neutrality_ADJ:0 "autrichienne"
-
- AUH_EMP_fascism:0 "Empire d'Autriche"
- AUH_EMP_fascism_DEF:0 "L'Empire d'Autriche"
- AUH_EMP_fascism_ADJ:0 "autrichienne"
-
- SER_YUG_democratic:0 "Yougoslavie"
- SER_YUG_democratic_DEF:0 "La Yougoslavie"
- SER_YUG_democratic_ADJ:0 "yougoslave"
-
- SER_YUG_neutrality:0 "Yougoslavie"
- SER_YUG_neutrality_DEF:0 "La Yougoslavie"
- SER_YUG_neutrality_ADJ:0 "yougoslave"
-
- SER_YUG_fascism:0 "Yougoslavie"
- SER_YUG_fascism_DEF:0 "La Yougoslavie"
- SER_YUG_fascism_ADJ:0 "yougoslave"
-
- SER_YUG_communism:0 "Yougoslavie"
- SER_YUG_communism_DEF:0 "La Yougoslavie"
- SER_YUG_communism_ADJ:0 "yougoslave"
+l_french:
+
+ GER_MIL_fascism:0 "Reich allemand"
+ GER_MIL_fascism_DEF:0 "Le Reich allemand"
+ GER_MIL_fascism_ADJ:0 "allemande"
+
+ AUH_EMP_neutrality:0 "Empire d'Autriche"
+ AUH_EMP_neutrality_DEF:0 "L'Empire d'Autriche"
+ AUH_EMP_neutrality_ADJ:0 "autrichienne"
+
+ AUH_EMP_fascism:0 "Empire d'Autriche"
+ AUH_EMP_fascism_DEF:0 "L'Empire d'Autriche"
+ AUH_EMP_fascism_ADJ:0 "autrichienne"
+
+ SER_YUG_democratic:0 "Yougoslavie"
+ SER_YUG_democratic_DEF:0 "La Yougoslavie"
+ SER_YUG_democratic_ADJ:0 "yougoslave"
+
+ SER_YUG_neutrality:0 "Yougoslavie"
+ SER_YUG_neutrality_DEF:0 "La Yougoslavie"
+ SER_YUG_neutrality_ADJ:0 "yougoslave"
+
+ UBD_neutrality:0 "Duché Uni Balte"
+ UBD_neutrality_DEF:0 "Duché Uni Balte"
+ UBD_neutrality_ADJ:0 "Balte"
+ SER_YUG_fascism:0 "Yougoslavie"
+ SER_YUG_fascism_DEF:0 "La Yougoslavie"
+ SER_YUG_fascism_ADJ:0 "yougoslave"
+
+ SER_YUG_communism:0 "Yougoslavie"
+ SER_YUG_communism_DEF:0 "La Yougoslavie"
+ SER_YUG_communism_ADJ:0 "yougoslave"