great naval change yippie

Proxysseia · Jun 1, 2024 · 1824c1d · 1824c1d
1 parent 72ad291
commit 1824c1d
Show file tree

Hide file tree

Showing 21 changed files with 1,707 additions and 2,112 deletions.
diff --git a/common/buildings.txt b/common/buildings.txt
@@ -701,7 +701,7 @@ naval_base = {
 	province = yes
 	one_per_state = yes
 	colonial_range = 50
-	local_ship_build = -0.05
+	#local_ship_build = -0.05
 }
 
 railroad = {   

diff --git a/common/defines.lua b/common/defines.lua
@@ -149,7 +149,7 @@ military = {
 	LEADER_MAX_RANDOM_PRESTIGE = 0.05, -- max percent of prestige, when randomizing stats for leaders.
 	LEADER_AGE_DEATH_FACTOR = 4, -- higher value means leaders live longer
 	LEADER_PRESTIGE_TO_MORALE_FACTOR = 0.8, -- f.ex. 100% of prestige = +10% morale
-	LEADER_PRESTIGE_TO_MAX_ORG_FACTOR = 0.7, -- f.ex. 100% of prestige = +10 max org
+	LEADER_PRESTIGE_TO_MAX_ORG_FACTOR = 0.5, -- f.ex. 100% of prestige = +10 max org
 	LEADER_TRANSFER_PENALTY_ON_COUNTRY_PRESTIGE = 0.00, -- country prestige penalty on unassign leader (f.ex if leader has 100% prestige, the country loose 4% of its prestige)
 	LEADER_PRESTIGE_LAND_GAIN = 0.3, -- extra speed gain on prestige for land combat
 	LEADER_PRESTIGE_NAVAL_GAIN = 0.3, -- extra speed gain on prestige for naval combat

diff --git a/common/event_modifiers.txt b/common/event_modifiers.txt
@@ -2780,4 +2780,9 @@ china_no_reform = {
 wng_1836_setup = {
 	research_points_modifier = 0.01
 	icon = 17
+}
+
+debug_navy_xp = {
+	naval_unit_start_experience = 5
+	icon = 4
 }
diff --git a/history/provinces/france/418 - Caen.txt b/history/provinces/france/418 - Caen.txt
@@ -3,4 +3,4 @@ controller = FRA
 add_core = FRA
 trade_goods = cattle
 life_rating = 35
-naval_base = 2
+naval_base = 1
diff --git a/history/provinces/france/420 - Brest.txt b/history/provinces/france/420 - Brest.txt
@@ -4,4 +4,4 @@ add_core = FRA
 add_core = BRT
 trade_goods = grain
 life_rating = 40
-naval_base = 2
+naval_base =1
diff --git a/history/provinces/france/439 - Bourges.txt b/history/provinces/france/439 - Bourges.txt
@@ -3,3 +3,4 @@ controller = FRA
 add_core = FRA
 trade_goods = timber
 life_rating = 35
+naval_base = 1
diff --git a/history/provinces/france/446 - Chateauroux.txt b/history/provinces/france/446 - Chateauroux.txt
@@ -3,3 +3,4 @@ controller = FRA
 add_core = FRA
 trade_goods = grain
 life_rating = 35
+naval_base = 1
diff --git a/interface/buildunit.gui b/interface/buildunit.gui
@@ -648,12 +648,12 @@ guiTypes = {
 		}
 		guiButtonType = {
 			name = "unit_folder_7"
-			position = { x= 134 y =31}
+			position = { x= 171 y =31}
 			quadTextureSprite ="GFX_unit_folder_navy_3_steam_transport"
 		}
 		guiButtonType = {
 			name = "unit_folder_8"
-			position = { x= 171 y =31}
+			position = { x= 134 y =31}
 			quadTextureSprite ="GFX_unit_folder_navy_4_commerce_raider"
 		}
 		guiButtonType = {

diff --git a/inventions/PUIR_military_industry.txt b/inventions/PUIR_military_industry.txt
@@ -3,66 +3,65 @@
 #all adapted from POD mod
 #Last Updated May 16, 2014
 ###############################################################
-basic_ship_building_R&D = {
-	limit = { iron_steamers = 1 }
-	news = no
-	chance = {
-		base = 5
-	}
-	effect = {
-		factory_goods_output = {
-			clipper_convoy = 0.04
-		}
-		factory_goods_output = {
-			steamer_convoy = 0.02
-		}
-	}	
-}
+# basic_ship_building_R&D = {
+# 	limit = { iron_steamers = 1 }
+# 	news = no
+# 	chance = {
+# 		base = 5
+# 	}
+# 	effect = {
+# 		factory_goods_output = {
+# 			clipper_convoy = 0.04
+# 		}
+# 		factory_goods_output = {
+# 			steamer_convoy = 0.02
+# 		}
+# 	}	
+# }
 
-improved_ship_building_R&D = {
-	limit = { steel_steamers = 1 }
-	news = no
-	chance = {
-		base = 5
-	}
-	effect = {
-		factory_goods_output = {
-			steamer_convoy = 0.02
-		}
-		factory_goods_output = {
-			clipper_convoy = 0.02
-		}
-	}	
-}
+# improved_ship_building_R&D = {
+# 	limit = { steel_steamers = 1 }
+# 	news = no
+# 	chance = {
+# 		base = 5
+# 	}
+# 	effect = {
+# 		factory_goods_output = {
+# 			steamer_convoy = 0.02
+# 		}
+# 		factory_goods_output = {
+# 			clipper_convoy = 0.02
+# 		}
+# 	}	
+# }
+# late_colonial_ships = {
+# 	limit = { steam_turbine_ships = 1 }
+# 	news = no
+# 	chance = {
+# 		base = 5
+# 	}
+# 	effect = {
+# 		factory_goods_output = {
+# 			steamer_convoy = 0.02
+# 		}
+# 		factory_goods_output = {
+# 			clipper_convoy = 0.02
+# 		}
+# 	}			
+# }
 
-late_colonial_ships = {
-	limit = { steam_turbine_ships = 1 }
-	news = no
-	chance = {
-		base = 5
-	}
-	effect = {
-		factory_goods_output = {
-			steamer_convoy = 0.02
-		}
-		factory_goods_output = {
-			clipper_convoy = 0.02
-		}
-	}			
-}
-
-early_modern_oil_ship = {
-	limit = { oil_driven_ships = 1 }
-	news = no
-	chance = {
-		base = 5
-	}
-	effect = {
-		factory_goods_output = {
-			steamer_convoy = 0.02
-		}
-	}	
-}
+# early_modern_oil_ship = {
+# 	limit = { oil_driven_ships = 1 }
+# 	news = no
+# 	chance = {
+# 		base = 5
+# 	}
+# 	effect = {
+# 		factory_goods_output = {
+# 			steamer_convoy = 0.02
+# 		}
+# 	}	
+# }
 
 ship_artillery_making = {
 	limit = { naval_statistics = 1 }
@@ -72,7 +71,12 @@ ship_artillery_making = {
 	}
 	effect = {
 		factory_goods_output = {
-			artillery = 0.02
+			artillery = 0.05
+			canned_food = 0.05
+			steamer_convoy = 0.10
+		}
+		army_base = {
+			supply_consumption = 0.05
 		}
 	}
 }
@@ -85,7 +89,11 @@ ship_cannon_building = {
 	}
 	effect = {
 		factory_goods_output = {
-			artillery = 0.02
+			artillery = 0.05
+			canned_food = 0.05
+		}
+		army_base = {
+			supply_consumption = 0.05
 		}
 	}
 }
@@ -98,7 +106,11 @@ late_colonial_armaments_industry = {
 	}
 	effect = {
 		factory_goods_output = {
-			artillery = 0.02
+			artillery = 0.05
+			canned_food = 0.05
+		}
+		army_base = {
+			supply_consumption = 0.05
 		}
 	}
 }
@@ -111,7 +123,11 @@ modern_armaments_industry = {
 	}
 	effect = {
 		factory_goods_output = {
-			artillery = 0.02
+			artillery = 0.05
+			canned_food = 0.05
+		}
+		army_base = {
+			supply_consumption = 0.05
 		}
 	}
 }