Merge branch 'dev' of https://github.com/Helliaca/HoI4-LotrMod into dev

HoI4-LOTRMod-Team · Jun 21, 2024 · 2f3778a · 2f3778a
2 parents db4b4b8 + b9d0e05
commit 2f3778a
Show file tree

Hide file tree

Showing 115 changed files with 761 additions and 317 deletions.
diff --git a/additional_credits.txt b/additional_credits.txt
@@ -13,11 +13,11 @@ Dark-Realm of Gondor flag by LordBojangles (https://www.deviantart.com/lordbojan
 
 Most generic portraits are generated using Midjourney (midjourney.com)
 
-People who helped with the focus tree icons and flags:
+People who helped with the focus tree icons, national spirits and flags:
 - Arnadex (discord name)
 - Walther (discord name)
 - Soviet_Cyber (discord name)
-
+- yeoudal (discord name)
 
 Bag End artwork (loading screen) by Tummi (Vladimir Stana) (https://www.artstation.com/artwork/lVrbez)
 Lothlorien artwork (loading screens) by Tummi (Vladimir Stana) (https://www.artstation.com/artwork/0nJZbY)

diff --git a/common/characters/ANG.txt b/common/characters/ANG.txt
@@ -264,15 +264,40 @@ characters={
 		}
 	}
 
+	#Nazguls
+
 	ANG_Witch_king = {
 		name="Witch King"
 		portraits={
 			army={
 				large="GFX_portrait_mordor_witch"
 				small="GFX_idea_portrait_mordor_witch"
 			}
-			civilian={
-				large="GFX_portrait_mordor_witch"
+		}
+		field_marshal={
+			traits = { offensive_doctrine }
+			skill=3
+			attack_skill=4
+			defense_skill=4
+			planning_skill=3
+			logistics_skill=4
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Witch_king
+			slot = chief_advisor 
+			cost = 150
+			traits = { lord_of_the_nazgul }
+			available = {
+				always = yes
+			}
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
 			}
 		}
 	}
@@ -285,6 +310,29 @@ characters={
 				small="GFX_idea_portrait_mordor_khamul"
 			}
 		}
+		corps_commander={
+			traits = { desert_fox swamp_fox }
+			skill=4
+			attack_skill = 3
+			defense_skill = 4
+			planning_skill = 2
+			logistics_skill = 3
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Khamul
+			slot = political_advisor 
+			cost = 150
+			traits = { shadow_of_the_east }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Uvantha = {
@@ -295,6 +343,30 @@ characters={
 				small="GFX_idea_portrait_mordor_uvantha"
 			}
 		}
+		advisor={
+			idea_token = ANG_Uvantha
+			slot = political_advisor
+			traits  = {
+				prince_of_terror
+			}
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		corps_commander={
+			traits = { hill_fighter }
+			skill = 3
+			attack_skill = 2
+			defense_skill = 2
+			planning_skill = 4
+			logistics_skill = 3
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Hoarmurath = {
@@ -305,6 +377,30 @@ characters={
 				small="GFX_idea_portrait_mordor_hoarmurath"
 			}
 		}
+		advisor={
+			idea_token = ANG_Hoarmurath
+			slot = political_advisor
+			traits  = {
+				ideological_crusader
+			}
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		corps_commander={
+			traits = { ranger panzer_leader }
+			skill = 3
+			attack_skill = 2
+			defense_skill = 2
+			planning_skill = 1
+			logistics_skill = 3
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Dwar = {
@@ -315,6 +411,34 @@ characters={
 				small="GFX_idea_portrait_mordor_dwar"
 			}
 		}
+		advisor={
+			idea_token = ANG_Dwar
+			slot = army_chief
+			cost = 150
+			traits = {
+				experienced_general
+			}
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+			ai_will_do = {
+				factor = 1
+			}
+		}
+		corps_commander={
+			traits = { trait_engineer }
+			skill = 3
+			attack_skill = 1
+			defense_skill = 2
+			planning_skill = 3
+			logistics_skill = 2
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Adunaphel = {
@@ -325,6 +449,29 @@ characters={
 				small="GFX_idea_portrait_mordor_adunaphel"
 			}
 		}
+		corps_commander={
+			traits = { winter_specialist }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 3
+			planning_skill = 3
+			logistics_skill = 2
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Adunaphel
+			slot = army_chief 
+			cost = 150
+			traits = { army_chief_entrenchment_1 }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Akhorahil = {
@@ -335,6 +482,29 @@ characters={
 				small="GFX_idea_portrait_mordor_akhorahil"
 			}
 		}
+		corps_commander={
+			traits = { naval_invader }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 2
+			planning_skill = 3
+			logistics_skill = 3
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Akhorahil
+			slot = army_chief 
+			cost = 150
+			traits = { army_chief_maneuver_1 }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Ji_Indur = {
@@ -345,6 +515,29 @@ characters={
 				small="GFX_idea_portrait_mordor_indur"
 			}
 		}
+		corps_commander={
+			traits = { jungle_rat }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 1
+			planning_skill = 2
+			logistics_skill = 4
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Ji_Indur
+			slot = army_chief 
+			cost = 150
+			traits = { army_chief_planning_1 }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 
 	ANG_Ren = {
@@ -355,5 +548,28 @@ characters={
 				small="GFX_idea_portrait_mordor_ren"
 			}
 		}
+		corps_commander={
+			traits = { bearer_of_artillery }
+			skill = 2
+			attack_skill = 1
+			defense_skill = 2
+			planning_skill = 4
+			logistics_skill = 2
+			legacy_id=-1
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
+		advisor = {
+			idea_token = ANG_Ren
+			slot = high_command
+			cost = 150
+			traits = { ring_catcher }
+			visible = {
+				has_completed_focus = ANG_recall_the_nazguls
+				NOT = { has_global_flag = fs_ring_destroyed }
+			}
+		}
 	}
 }
diff --git a/common/country_leader/00_traits.txt b/common/country_leader/00_traits.txt
@@ -4537,7 +4537,7 @@ leader_traits = {
 	}
 
 	telephone_company = {
-		random= No
+		random= no
 		land_reinforce_rate = 0.02
 		coordination_bonus = 0.04
 		ai_will_do = {

diff --git a/common/decisions/Old_alliances_decisions.txt b/common/decisions/Old_alliances_decisions.txt
@@ -17,7 +17,7 @@ BEACON_category = {
 
         available = {
             has_defensive_war = yes
-
+            has_war_with = MOR
             if = {
                 limit = {
                     tag = GON

diff --git a/common/decisions/_debug_decisions.txt b/common/decisions/_debug_decisions.txt
@@ -95,6 +95,18 @@ debug_decisions = {
 		}
 	}
 
+	ring_destroyed = {
+		available = {
+			is_ai = no
+			is_debug = yes
+		}
+		fire_only_once = no
+		cost = 0
+		complete_effect = {
+			ring_destroy_ring = yes
+		}
+	}
+
 	testeroo = {
 		icon = generic_research
 
@@ -219,10 +231,7 @@ debug_decisions = {
 		cost = 0
 
 		complete_effect = {
-			create_wargoal = {
-				type = annex_everything
-				target = MOR
-			}
+			create_wargoal = { type = annex_everything target = GON }
 		}
 	}
 

diff --git a/common/decisions/ring_decisions.txt b/common/decisions/ring_decisions.txt
@@ -610,7 +610,22 @@ ring_corruption_decisions_generic = {
 
 			ring_remove_ring = yes
 
-			MOR = { country_event = fs.106 }
+			if = {
+				limit = {
+					MOR = {
+						has_government = belligerent
+					}
+				}
+				MOR = { country_event = fs.106 }
+			} else_if = {
+				limit = {
+					ANG = {
+						has_government = belligerent
+						has_country_flag = ANG_sauron_returned
+					}
+				}
+				ANG = { country_event = fs.108 }
+			}
 		}
 	}
 

diff --git a/common/defines/00_lotr_defines.lua b/common/defines/00_lotr_defines.lua
@@ -45,3 +45,6 @@ NDefines.NProduction.MAX_CIV_FACTORIES_PER_LINE = 12
 NDefines.NDiplomacy.TENSION_NO_CB_WAR = 15							-- Amount of tension generated by a no-CB wargoal : base value 15
 NDefines.NDiplomacy.TENSION_CB_WAR = 10								-- Amount of tension generated by a war with a CB : base value 7
 NDefines.NDiplomacy.TENSION_TIME_SCALE_START_DATE = "3018.1.1.12"	-- Starting at this date, the tension values will be scaled down (will be equal to 1 before that)
+
+-- Better supply from motorization
+NDefines.NSupply.SUPPLY_HUB_FULL_MOTORIZATION_BONUS = 3.0