Merge pull request #126 from HoI4-LOTRMod-Team/helliaca-dev

Helliaca dev
HoI4-LOTRMod-Team · Feb 19, 2024 · 4a6152e · 4a6152e
2 parents df357f4 + 4f72cb0
commit 4a6152e
Show file tree

Hide file tree

Showing 40 changed files with 316 additions and 64 deletions.
diff --git a/common/on_actions/00_lotr_delete_eagles_on_actions.txt b/common/on_actions/00_lotr_delete_eagles_on_actions.txt
@@ -1,17 +1,28 @@
 on_actions = {
 
+
+
 	# We don't want eagles/fellbeasts to be gainable through capitulation. So we drain the stockpile when a country capitulates.
 	on_capitulation_immediate = {
 		effect = {
 			ROOT = {
 
-				set_temp_variable = { eagle_stockpile = var:num_equipment@archetype_generic_airframe }
-				multiply_temp_variable = { eagle_stockpile = -1 }
-
-				add_equipment_to_stockpile = {
-					type = archetype_generic_airframe
-					amount = eagle_stockpile
-					producer = ROOT
+				if = {
+					limit = {
+						OR = {
+							has_tech = eagle_domestication
+							has_tech = eagle_domestication_men
+							has_tech = fellbeast_domestication
+						}
+					}
+					set_temp_variable = { eagle_stockpile = var:num_equipment@archetype_generic_airframe }
+					multiply_temp_variable = { eagle_stockpile = -1 }
+
+					add_equipment_to_stockpile = {
+						type = archetype_generic_airframe
+						amount = eagle_stockpile
+						producer = ROOT
+					}
 				}
 			}
 		}

diff --git a/common/script_enums.txt b/common/script_enums.txt
@@ -532,6 +532,7 @@ script_enum_equipment_bonus_type = {
 
 	siege_trebuchet_equipment_0
 	trebuchet_equipment
+	trebuchet_equipment_0
 
 	caravel
 	carrack

diff --git a/common/technologies/machines.txt b/common/technologies/machines.txt
@@ -930,7 +930,7 @@ technologies = {
 		}
 
 		enable_equipments = {
-			trebuchet_equipment
+			trebuchet_equipment_0
 		}
 
 		enable_subunits = {

diff --git a/common/units/air.txt b/common/units/air.txt
@@ -203,4 +203,29 @@ sub_units = {
 		need = { guided_missile_equipment = 1 }
 		land_air_wing_size = 100
 	}
+
+
+	# ANTI-CRASHING MEASURES
+	# If you're wondering why this is here: If a country *somehow* gets their hands on vanilla fighters and gets capitulated, the game crashes.
+	# These units are meant to prevent that from happening. Can probably delete this later down the line
+
+	backup_fighter = {
+		sprite = light_plane
+		priority = 1
+		active = yes
+		type = fighter
+		need = { small_plane_airframe = 1 }
+		categories = { category_fighter }
+		land_air_wing_size = 100
+	}
+
+	backup_strat_bomber = {
+		sprite = heavy_plane
+		priority = 5
+		active = yes
+		type = strategic_bomber
+		need = { large_plane_airframe = 1 }
+		categories = { category_strat_bomber }
+		land_air_wing_size = 100
+	}
 }
diff --git a/common/units/equipment/00_cav_archer_cavalry.txt b/common/units/equipment/00_cav_archer_cavalry.txt
@@ -150,7 +150,7 @@ equipments = {
 
 		#Defensive Abilities
 		defense = 4
-		breakthrough = 2
+		breakthrough = 4
 		hardness = 0.5
 		armor_value = 5
 
@@ -217,7 +217,7 @@ equipments = {
 		reliability = 0.9
 		#Defensive Abilities
 		defense = 5
-		breakthrough = 2.5
+		breakthrough = 5
 		armor_value = 10
 
 		#Offensive Abilities
@@ -257,7 +257,7 @@ equipments = {
 		reliability = 0.9
 		#Defensive Abilities
 		defense = 7
-		breakthrough = 3.5
+		breakthrough = 6
 		armor_value = 25
 
 		#Offensive Abilities

diff --git a/common/units/equipment/00_cav_heavy_cavalry.txt b/common/units/equipment/00_cav_heavy_cavalry.txt
@@ -165,7 +165,7 @@ equipments = {
 		#Defensive Abilities
 		defense = 4
 		breakthrough = 15
-		armor_value = 45
+		armor_value = 55
 		hardness = 0.7
 
 		#Offensive Abilities
@@ -234,7 +234,7 @@ equipments = {
 		#Defensive Abilities
 		defense = 8
 		breakthrough = 39
-		armor_value = 60
+		armor_value = 75
 		hardness = 0.8
 
 		build_cost_ic = 4
@@ -246,7 +246,7 @@ equipments = {
 		}
 
 		default_modules = {
-			rider_armor_slot = leather_armor_module
+			rider_armor_slot = heavy_plate_armor_module
 			rider_armament_slot = lance_armament_2_module
 			horse_breed_slot = rouncey_breed_module
 			horse_harness_slot = reinforced_war_saddle_module
@@ -272,7 +272,7 @@ equipments = {
 		#Defensive Abilities
 		defense = 10
 		breakthrough = 51
-		armor_value = 70
+		armor_value = 90
 		hardness = 0.85
 
 		build_cost_ic = 5
@@ -284,7 +284,7 @@ equipments = {
 		}
 
 		default_modules = {
-			rider_armor_slot = leather_armor_module
+			rider_armor_slot = heavy_plate_armor_module
 			rider_armament_slot = lance_armament_3_module
 			horse_breed_slot = rouncey_breed_module
 			horse_harness_slot = reinforced_war_saddle_module

diff --git a/common/units/equipment/00_cav_light_cavalry.txt b/common/units/equipment/00_cav_light_cavalry.txt
@@ -149,7 +149,7 @@ equipments = {
 		defense = 2
 		breakthrough = 5
 		armor_value = 5
-		hardness = 0.3
+		hardness = 0.2
 		ap_attack = 1
 
 		build_cost_ic = 0
@@ -197,7 +197,7 @@ equipments = {
 		defense = 2
 		breakthrough = 11
 		armor_value = 10
-		hardness = 0.4
+		hardness = 0.3
 		ap_attack = 1
 
 		build_cost_ic = 0
@@ -249,7 +249,7 @@ equipments = {
 		defense = 3
 		breakthrough = 21
 		armor_value = 15
-		hardness = 0.5
+		hardness = 0.4
 		ap_attack = 2
 
 		build_cost_ic = 1
@@ -287,7 +287,7 @@ equipments = {
 		defense = 4
 		breakthrough = 31
 		armor_value = 30
-		hardness = 0.6
+		hardness = 0.5
 		ap_attack = 3
 
 		build_cost_ic = 2

diff --git a/common/units/equipment/00_eag_bomber_eagle.txt b/common/units/equipment/00_eag_bomber_eagle.txt
@@ -44,7 +44,7 @@ equipments = {
 			tungsten = 4
 			rubber = 2
 		}
-		naval_strike_attack = 8
+		naval_strike_attack = 80
 		naval_strike_targetting = 6
 		surface_detection = 30
 		sub_detection = 7.5
@@ -189,7 +189,7 @@ equipments = {
 			tungsten = 4
 			rubber = 2
 		}
-		naval_strike_attack = 8
+		naval_strike_attack = 80
 		naval_strike_targetting = 6
 		surface_detection = 30
 		sub_detection = 7.5
@@ -250,7 +250,7 @@ equipments = {
 			tungsten = 3
 			rubber = 1
 		}
-		naval_strike_attack = 8
+		naval_strike_attack = 80
 		naval_strike_targetting = 6
 		surface_detection = 30 # For airwing of 100 planes (Destroyer I: 20 surface detection)
 		sub_detection = 7.5 # For airwing of 100 planes (Destroyer I: 5 sub detection )

diff --git a/common/units/equipment/00_fellb_bomber_fellbeast.txt b/common/units/equipment/00_fellb_bomber_fellbeast.txt
@@ -44,7 +44,7 @@ equipments = {
 			tungsten = 4
 			rubber = 2
 		}
-		naval_strike_attack = 8
+		naval_strike_attack = 80
 		naval_strike_targetting = 6
 		surface_detection = 30
 		sub_detection = 7.5
@@ -189,7 +189,7 @@ equipments = {
 			tungsten = 4
 			rubber = 2
 		}
-		naval_strike_attack = 8
+		naval_strike_attack = 80
 		naval_strike_targetting = 6
 		surface_detection = 30
 		sub_detection = 7.5
@@ -250,7 +250,7 @@ equipments = {
 			tungsten = 3
 			rubber = 1
 		}
-		naval_strike_attack = 8
+		naval_strike_attack = 80
 		naval_strike_targetting = 6
 		surface_detection = 30 # For airwing of 100 planes (Destroyer I: 20 surface detection)
 		sub_detection = 7.5 # For airwing of 100 planes (Destroyer I: 5 sub detection )

diff --git a/common/units/equipment/00_mach_catapult.txt b/common/units/equipment/00_mach_catapult.txt
@@ -200,11 +200,7 @@ equipments = {
 
 		is_archetype = yes
 		picture = archetype_artillery_equipment
-		type = {
-			artillery
-			infantry #adding infantry type
-			#motorized #Removing motorized type
-		}
+		type = armor
 		group_by = archetype
 
 		interface_category = interface_category_land
@@ -221,7 +217,7 @@ equipments = {
 		armor_value = 0
 
 		#Offensive Abilities
-		soft_attack = 75
+		soft_attack = 150
 		hard_attack = 4
 		ap_attack = 8
 		air_attack = 0
@@ -235,4 +231,12 @@ equipments = {
 			chromium = 5
 		}
 	}
+
+	trebuchet_equipment_0 = {
+		year = 1934
+
+		archetype = trebuchet_equipment
+		priority = 50
+		visual_level = 0
+	}
 }
diff --git a/common/units/equipment/modules/00_cav_horse_barding_modules.txt b/common/units/equipment/modules/00_cav_horse_barding_modules.txt
@@ -29,7 +29,7 @@ equipment_modules = {
 			build_cost_ic = 0.5
 		}
 		multiply_stats = {
-			hardness = -0.15
+
 		}
 	}
 
@@ -44,7 +44,7 @@ equipment_modules = {
 			build_cost_ic = 1
 		}
 		multiply_stats = {
-			hardness = -0.1
+			hardness = 0.05
 		}
 		build_cost_resources = {
 			rubber = 1
@@ -62,7 +62,7 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			maximum_speed = -0.15
-			hardness = 0.1
+			hardness = 0.15
 			build_cost_ic = 0.2
 		}
 		build_cost_resources = {
@@ -81,7 +81,7 @@ equipment_modules = {
 			build_cost_ic = 1
 		}
 		multiply_stats = {
-			hardness = 0.05
+			hardness = 0.1
 			build_cost_ic = 0.2
 		}
 		build_cost_resources = {
@@ -104,7 +104,7 @@ equipment_modules = {
 		dismantle_cost_ic = 1
 		multiply_stats = {
 			armor_value = 0.8
-			hardness = 0.25
+			hardness = 0.3
 			build_cost_ic = 0.5
 		}
 		build_cost_resources = {
@@ -124,7 +124,7 @@ equipment_modules = {
 			reliability = 0.15
 		}
 		multiply_stats = {
-			hardness = -0.1
+			hardness = 0.05
 			breakthrough = 0.05
 			armor_value = 0.1
 		}
@@ -146,7 +146,7 @@ equipment_modules = {
 		multiply_stats = {
 			build_cost_ic = 0.1
 			maximum_speed = -0.1
-			hardness = 0.1
+			hardness = 0.25
 			breakthrough = 0.15
 			armor_value = 0.25
 		}
@@ -168,7 +168,7 @@ equipment_modules = {
 		}
 		multiply_stats = {
 			build_cost_ic = 0.15
-			hardness = 0.05
+			hardness = 0.2
 			breakthrough = 0.12
 			armor_value = 0.15
 		}
@@ -194,7 +194,7 @@ equipment_modules = {
 		multiply_stats = {
 			build_cost_ic = 0.5
 			armor_value = 0.8
-			hardness = 0.25
+			hardness = 0.3
 			breakthrough = 0.15
 		}
 		build_cost_resources = {

diff --git a/common/units/equipment/modules/00_mach_storey_modules.txt b/common/units/equipment/modules/00_mach_storey_modules.txt
@@ -89,7 +89,7 @@ equipment_modules = {
 
 		add_stats = {
 			build_cost_ic = 3
-			anti_air_attack = 10
+			air_attack = 15
 			armor_value =10
 		}
 		manpower = 15

diff --git a/common/units/equipment/railway_gun.txt b/common/units/equipment/railway_gun.txt
@@ -30,7 +30,7 @@ equipments = {
 		visual_level = 0
 		active = no
 
-		build_cost_ic = 800.0
+		build_cost_ic = 1200.0
 		resources = {
 			steel = 4
 			tungsten = 2
@@ -46,7 +46,7 @@ equipments = {
 		visual_level = 0
 		active = no
 
-		build_cost_ic = 800.0
+		build_cost_ic = 1200.0
 		resources = {
 			steel = 4
 			tungsten = 2

diff --git a/...nks/modules/EMI_lance_armament_module.dds → ...odules/EMI_cavalry_rider_weapon_heavy.dds b/...nks/modules/EMI_lance_armament_module.dds → ...odules/EMI_cavalry_rider_weapon_heavy.dds
diff --git a/...s/modules/EMI_cutlass_armament_module.dds → ...odules/EMI_cavalry_rider_weapon_light.dds b/...s/modules/EMI_cutlass_armament_module.dds → ...odules/EMI_cavalry_rider_weapon_light.dds
diff --git a/gfx/interface/topbar/background.dds b/gfx/interface/topbar/background.dds
diff --git a/history/countries/DGU - Dol Guldur.txt b/history/countries/DGU - Dol Guldur.txt
@@ -18,9 +18,6 @@ set_technology = {
 	gw_artillery = 1
 	basic_cav = 1
 	horse_drawn_infantry = 1
-	early_fighter = 1
-	fighter1 = 1
-	early_bomber = 1
 	transport = 1
 	mass_assault = 1
 	fleet_in_being = 1
-Original file line number
+Diff line change
@@ Expand Up / @@ -532,6 +532,7 @@ script_enum_equipment_bonus_type = { @@
     	siege_trebuchet_equipment_0
     	trebuchet_equipment
+    	trebuchet_equipment_0
     	caravel
     	carrack
@@ Expand Down @@