Merge branch 'pre0.5.3' into develop

README.md

@@ -7,9 +7,9 @@
 
 **Project Lead:** Wolferos 
 
-**Current Version:** 0.5.2
+**Current Version:** 0.5.3
 
-**Compatible with:** Hearts of Iron IV 1.5.2 "Cornflakes"(with or without Paid DLC) 
+**Compatible with:** Hearts of Iron IV "Cornflakes" (with or without Paid DLC) 
 
 **Supported Languages:**
 - English

mod/thegreatwar/common/buildings/00_buildings.txt

@@ -15,24 +15,26 @@ buildings = {
 
 	arms_factory = {
 		show_on_map = 6
-		base_cost = 4000
-		base_cost_conversion = 2400
+		base_cost = 7200
+		base_cost_conversion = 4000
 		military_production = 1
 		icon_frame = 2
 		max_level = 20
 		shares_slots = yes
 		value = 8
+		infrastructure_construction_effect = yes
 	}
 
 	industrial_complex = {
 		show_on_map = 6
-		base_cost = 7200
-		base_cost_conversion = 6000
+		base_cost = 10800
+		base_cost_conversion = 9000
 		general_production = 1
 		icon_frame = 1
 		max_level = 20
 		shares_slots = yes
 		value = 5
+		infrastructure_construction_effect = yes
 	}
 
 	air_base = {
@@ -42,6 +44,7 @@ buildings = {
 		air_base = yes
 		max_level = 10
 		value = 1
+		damage_factor = 0.5
 	}
 
 	naval_base = {
@@ -60,10 +63,10 @@ buildings = {
 	bunker = {
 		show_on_map = 1
 		has_destroyed_mesh = yes
-		base_cost = 2500
+		base_cost = 800
+		per_level_extra_cost = 800
 		provincial = yes
 		disabled_in_dmz = yes
-		per_level_extra_cost = 500
 		icon_frame = 7
 		land_fort = 1
 		max_level = 10
@@ -73,10 +76,10 @@ buildings = {
 	trench = {
 		show_on_map = 1
 		has_destroyed_mesh = no
-		base_cost = 2000
+		base_cost = 600
+		per_level_extra_cost = 600
 		provincial = yes
 		disabled_in_dmz = yes
-		per_level_extra_cost = 250
 		icon_frame = 14
 		land_fort = 1
 		max_level = 10
@@ -86,10 +89,10 @@ buildings = {
 	coastal_bunker = {
 		show_on_map = 1
 		has_destroyed_mesh = yes
-		base_cost = 2500
+		base_cost = 800
+		per_level_extra_cost = 800
 		provincial = yes
 		disabled_in_dmz = yes
-		per_level_extra_cost = 500
 		only_costal = yes
 		icon_frame = 8
 		naval_fort = 1
@@ -100,14 +103,15 @@ buildings = {
 	dockyard = {
 		show_on_map = 1
 		show_on_map_meshes = 3
-		base_cost = 3250
+		base_cost = 6400
 		only_costal = yes
 		naval_production = 1
 		icon_frame = 4
 		only_costal = yes
 		max_level = 20
 		shares_slots = yes
 		value = 5
+		infrastructure_construction_effect = yes
 	}
 
 
@@ -125,15 +129,15 @@ buildings = {
 
 	synthetic_refinery = {
 		show_on_map = 1
-		base_cost = 8750
+		base_cost = 13000
 		icon_frame = 10
-		local_resources_oil = 5 # May use local_resources_ + any resource name
+		local_resources_oil = 2 # May use local_resources_ + any resource name
 		local_resources_rubber = 2 # May use local_resources_ + any resource name
 		refinery = yes
-		#max_level = 0 # max: 5
-		max_level = 4 # This is the max unlock level
+		max_level = 3 # This is the max unlock level
 		shares_slots = yes
 		value = 5
+		infrastructure_construction_effect = yes
 	}
 
 	radar_station = {
@@ -149,23 +153,25 @@ buildings = {
 
 	rocket_site = {
 		show_on_map = 1
-		base_cost = 3250
+		base_cost = 6400
 		icon_frame = 12
 		rocket_production = 5
 		rocket_launch_capacity = 1
-		max_level = 0
+		max_level = 5
 		shares_slots = yes
 		value = 1
+		infrastructure_construction_effect = yes
 	}
 
 	nuclear_reactor = {
 		show_on_map = 1
-		base_cost = 15000
+		base_cost = 30000
 		icon_frame = 13
 		nuclear_reactor = yes
 		nuclear_production_factor = 1
-		max_level = 0 # This is the max unlock level
+		max_level = 1 # This is the max unlock level
 		shares_slots = yes
 		value = 10
+		infrastructure_construction_effect = yes
 	}
 }

mod/thegreatwar/common/defines/00_defines.lua

@@ -249,6 +249,7 @@ NCountry = {
 	CIVIL_WAR_INVOLVEMENT_MIN_TENSION = 0.5,		-- base value of world tension to involve other sides to the civil war
 	UNCAPITULATE_LEVEL = 0.1,                       -- if we reclaim this much and our capital we reset capitulate status
 	BASE_SURRENDER_LIMIT = 0.8,						-- Base level of occupation required for country surrender
+	MIN_SURRENDER_LIMIT = 0.1,						-- Minimum non-forced surrender limit. valid 0-1
 	BASE_MOBILIZATION_SPEED = 0.01,				-- Base speed of manpower mobilization  #in 1/1000 of 1 %
 	BOMBING_WAR_SUPPORT_SCALE = -0.00003, 			-- Scaling of health damaged by bombers to war support impact
 	MAX_BOMBING_WAR_SUPPORT_IMPACT = 0.3,			-- Max impact of bombing on the war support
@@ -324,7 +325,7 @@ NTechnology = {
 NPolitics = {
 	BASE_LEADER_TRAITS = 3,				-- Base amount of leader traits.
 	MAX_RANDOM_LEADERS = 1,				-- Maximum amount random leader to have per party.
-	BASE_POLITICAL_POWER_INCREASE = 2,	-- Weekly increase of PP.	#HOI4TGW ::: BASE_POLITICAL_POWER_INCREASE = 2,
+	BASE_POLITICAL_POWER_INCREASE = 2,	-- Weekly increase of PP.
 	ARMY_LEADER_COST = 5,					-- cost for recruiting new leaders, 'this value' * number_of_existing_leaders_of_type
 	NAVY_LEADER_COST = 5,					-- cost for recruiting new leaders, 'this value' * number_of_existing_leaders_of_type
 	GOAL_COST_FACTOR = 1.0,				-- Multiplayer for cost of political goals
@@ -446,7 +447,7 @@ NMilitary = {
 	RIVER_SMALL_START_INDEX = 0,                   -- color indices for rivers
 	RIVER_SMALL_STOP_INDEX = 6,
 	RIVER_LARGE_STOP_INDEX = 11,
-	BASE_FORT_PENALTY = -0.10, 					   -- fort penalty		#HOI4TGW ::: BASE_FORT_PENALTY = -0.15,
+	BASE_FORT_PENALTY = -0.07, 					   -- fort penalty		#HOI4TGW ::: BASE_FORT_PENALTY = -0.15,
 	BASE_STACKING_PENALTY = -0.1,                  -- multiple direction attack penalty
 	MULTIPLE_COMBATS_PENALTY = -0.5,               -- defender penalty if attacked from multiple directions
 	DIG_IN_FACTOR = 0.02,						   -- bonus factor for each dug-in level
@@ -1410,13 +1411,13 @@ NAI = {
 	NAVAL_SHIP_AIR_IMPORTANCE = 2.0,					-- Naval ship air importance
 	NAVAL_SHIP_IN_PORT_AIR_IMPORTANCE = 6.0,			-- Naval ship in the port air importance
 	NAVAL_COMBAT_AIR_IMPORTANCE = 12.0,					-- Naval combat air importance
-	NAVAL_TRANSFER_AIR_IMPORTANCE = 25.0,				-- Naval transfer air importance
+	NAVAL_TRANSFER_AIR_IMPORTANCE = 0.0,				-- Naval transfer air importance
 	NAVAL_COMBAT_TRANSFER_AIR_IMPORTANCE = 50.0,		-- Naval combat involving enemy land units
 	NAVAL_IMPORTANCE_SCALE = 1.0,						-- Naval total importance scale (every naval score get's multiplied by it)
 
 	NAVAL_FIGHTERS_PER_PLANE = 1.1,						-- Amounts of air superiority planes requested per enemy plane
-	NAVAL_STRIKE_PLANES_PER_ARMY = 15,					-- Amount of planes requested per enemy army
-	NAVAL_STRIKE_PLANES_PER_SHIP = 5,					-- Amount of bombers requested per enemy ship
+	NAVAL_STRIKE_PLANES_PER_ARMY = 0,					-- Amount of planes requested per enemy army
+	NAVAL_STRIKE_PLANES_PER_SHIP = 20,					-- Amount of bombers requested per enemy ship
 	PORT_STRIKE_PLANES_PER_SHIP = 10,					-- Amount of bombers request per enemy ship in the port
 	NAVAL_MIN_EXCORT_WINGS = 0,							-- Min amount of airwings requested to excort operations
 	DEMOCRATIC_AI_FACTION_KICKING_PLAYER_THREAT_DIFFERENCE = 6.0, -- World threat generation difference needed to kick a player from a democratic faction
@@ -1430,11 +1431,15 @@ NAI = {
 	LAND_DEFENSE_INFRA_IMPORTANCE_FACTOR = 0.5,			-- Factor of infrastructure influence on strategic importance ( 0.0 - 1.0 )
 	LAND_DEFENSE_IMPORTANCE_SCALE = 1.5,				-- Lend defence total importance scale (every land defence score get's multiplied by it)
 
-	LAND_DEFENSE_MIN_FACTORIES_FOR_AIR_IMPORTANCE = 6,	-- If amount of factories is less importance of factories won't apply
+	NUM_HOURS_SINCE_LAST_COMBAT_TO_SUPPORT_UNITS_VIA_AIR = 72,			-- units will be considered in combat if they are just out of their last combat for air supporting
 
-	LAND_DEFENSE_FIGHERS_PER_PLANE = 1.1,				-- Amount of air superiority planes requested per enemy plane
-	LAND_DEFENSE_INTERSEPTORS_PER_BOMBERS = 0.2,		-- Amount of air interceptor planes requested per enemy plane
+	LAND_DEFENSE_MIN_FACTORIES_FOR_AIR_IMPORTANCE = 6,	-- If amount of factories is less importance of factories won't apply
 
+	LAND_DEFENSE_FIGHERS_PER_PLANE = 1.0,				-- Amount of air superiority planes requested per enemy plane
+	LAND_DEFENSE_INTERSEPTORS_PER_BOMBERS = 2.0,		-- Amount of air interceptor planes requested per enemy bomber
+	LAND_DEFENSE_INTERSEPTORS_PER_PLANE = 1.0,				-- Amount of air interceptor planes requested per enemy plane (non bomber)
+
+
 	LAND_COMBAT_AIR_SUPERIORITY_IMPORTANCE = 0.20,		-- Strategic importance of air superiority ( amount of enemy planes in area )
 	LAND_COMBAT_OUR_ARMIES_AIR_IMPORTANCE = 12,			-- Strategic importance of our armies
 	LAND_COMBAT_OUR_COMBATS_AIR_IMPORTANCE = 55,		-- Strategic importance of our armies in the combats
@@ -1448,11 +1453,14 @@ NAI = {
 	LAND_COMBAT_FIGHTERS_PER_PLANE = 1.1,				-- Amount of air superiority planes requested per enemy plane
 	LAND_COMBAT_CAS_WINGS_PER_ENEMY_ARMY_LIMIT = 4,		-- Limit of CAS wings requested by enemy armies
 	LAND_COMBAT_CAS_PER_ENEMY_ARMY = 20,				-- Amount of CAS planes requested per enemy army
-	LAND_COMBAT_CAS_PER_COMBAT = 200,					-- Amount of CAS requested per combat	
+	LAND_COMBAT_CAS_PER_COMBAT = 150,					-- Amount of CAS requested per combat	
 	LAND_COMBAT_BOMBERS_PER_LAND_FORT_LEVEL = 15,		-- Amount of bomber planes requested per enemy land fort level
 	LAND_COMBAT_BOMBERS_PER_COASTAL_FORT_LEVEL = 10,	-- Amount of bomber planes requested per enemy coastal fort level
 	LAND_COMBAT_MIN_EXCORT_WINGS = 2,					-- Min amount of airwings requested to excort operations
 
+	LAND_COMBAT_INTERCEPT_PER_PLANE = 0.4,				-- Amount of interception planes requested per enemy plane
+
+
 	STR_BOMB_AIR_SUPERIORITY_IMPORTANCE = 0.10,			-- Strategic importance of air superiority ( amount of enemy planes in area )
 	STR_BOMB_CIVIL_FACTORY_IMPORTANCE = 50,				-- Strategic importance of enemy civil factories
 	STR_BOMB_MILITARY_FACTORY_IMPORTANCE = 70,			-- Strategic importance of enemy military factories

mod/thegreatwar/common/technologies/air_techs.txt

@@ -43,7 +43,6 @@ technologies = {
 		}
 	}
 
-	# KiS a Fake Fighter so we can use the second icon for the variant, this tech is never used in the game
 	ww1_fakefighter1 = {	
 		research_cost = 1	
 		categories = {			light_air			light_fighter			air_equipment		}