Merge pull request #85 from Helliaca/dev

Dev

.gitignore

@@ -0,0 +1 @@
+.vscode/*

common/ideas/gondor.txt

@@ -2,6 +2,28 @@ ideas = {
 
 	country = {
 
+		GON_restored_monarchy = {
+
+			allowed = {
+				always = no
+			}
+
+			allowed_civil_war = {
+				always = yes
+			}
+
+			removal_cost = -1
+
+			picture = anti_soviet_pact
+
+			modifier = {
+				stability_factor = 0.1
+				army_morale_factor = 0.03
+				army_defence_factor = 0.1
+				army_attack_factor = 0.1
+			}
+		}
+
 		GON_kingdom_without_king = {
 
 			allowed = {

common/ideas/lotr_generic.txt

@@ -33,8 +33,8 @@ ideas = {
 			removal_cost = -1
 
 			modifier = {
-				civilian_factory_use = 2
+				civilian_factory_use = 3
 			}
 		}
 	}
-}
+}

common/ideas/others.txt

@@ -51,9 +51,9 @@ ideas = {
 			modifier = {
 				belligerent_drift = 0.05
 				political_power_factor = 0.15
-				army_attack_factor = 0.25
-				army_defence_factor = 0.25
+				army_attack_factor = 0.20
+				army_defence_factor = 0.20
 			}
 		}
 	}
-}
+}

common/national_focus/gondor.txt

@@ -378,6 +378,15 @@ continuous_focus_position = { x = 50 y = 2000 }
 			has_global_flag = fs_fellowship_departed
 			has_completed_focus = restorethekingdom
 		}
+		bypass = {
+			OR = {
+				hidden_trigger = {
+					ring_aragorn_is_dead = yes	
+				}
+				has_global_flag = fs_ring_destroyed
+				has_global_flag = fs_ring_seized
+			}
+		}
  		x =5
  		y =3
  		mutually_exclusive = { }
@@ -652,13 +661,20 @@ continuous_focus_position = { x = 50 y = 2000 }
  		x =6
  		y =5
  		mutually_exclusive = { }
+		dynamic = yes
  		prerequisite = { focus = invitearagornintominastirith}
  		cost = 10
   	available_if_capitulated = yes
 		completion_reward = {
 			remove_ideas = GON_kingdom_without_king
-			news_event = { hours = 12 id = news.366 }
-			create_country_leader = { name = "King Aragorn" picture = "Portrait_Gondor_Aragorn.dds" expire = "3080.1.1" ideology = protective traits = { patriot_king GON_isildur_heir } }
+			if = {
+				limit = { NOT = { ring_aragorn_is_dead = yes } }
+				news_event = { hours = 12 id = news.366 }
+				create_country_leader = { name = "King Aragorn" picture = "Portrait_Gondor_Aragorn.dds" expire = "3080.1.1" ideology = protective traits = { patriot_king GON_isildur_heir } }
+			}
+			else = {
+				add_ideas = GON_restored_monarchy
+			}
 		}
  }
 

common/scripted_effects/ring_scripted_effects.txt

@@ -817,8 +817,15 @@ ring_execute_weathertop_encounter = {
 	add_to_array = { global.fs_eventlog = token:fs_event_weathertop_encounter }
 	ring_trim_eventlog = yes
 
-	# Nazgul attack once:
-	ring_interception_combat_hp_attack_fs = yes
+	# Nazgul get a chance to attack once:
+	random_list = {
+		1 = {
+			ring_interception_combat_hp_attack_fs = yes
+		}
+		1 = {
+
+		}
+	}
 
 	# Aragorn gets to attack 3-4 times
     SHI = { FS_aragorn = { set_temp_variable = { temp_attacker = THIS } } }
@@ -1222,4 +1229,4 @@ ring_execute_fellowship_newspaper_event = {
 		}
 		news_event = { id = news.1222 }
 	}
-}
+}

events/Mordor.txt

@@ -1008,6 +1008,8 @@ country_event = {
 
 		custom_effect_tooltip = recall_nazgul_from_shire_tooltip
 		clr_global_flag = fs_nazgul_sent_to_shire
+		add_political_power = -150
+		add_timed_idea = { idea = minor_expense days = 60 }
 	}
 }
 
@@ -1051,6 +1053,8 @@ country_event = {
 		}
 		custom_effect_tooltip = recall_nazgul_from_shire_tooltip
 		clr_global_flag = fs_nazgul_sent_to_shire
+		add_political_power = -200
+		add_timed_idea = { idea = minor_expense days = 90 }
 	}
 }
 
@@ -1071,6 +1075,8 @@ country_event = {
 
 		custom_effect_tooltip = recall_nazgul_from_shire_tooltip
 		clr_global_flag = fs_nazgul_sent_to_shire
+		add_political_power = -250
+		add_timed_idea = { idea = minor_expense days = 100 }
 	}
 }
 
@@ -1362,4 +1368,4 @@ country_event = {
 			add_opinion_modifier = { target = PREV modifier = medium_decrease }
 		}
 	}
-}
+}

localisation/english/gondor_l_english.yml

@@ -253,5 +253,6 @@ GON_trade_agremeent:0 "Angmar trade agremeent"
 GON_orthanc_payment:0 "Payment for Orthanc"
 GON_faramir_doctrine:0 "Faramir doctrine"
 GON_isildur_heir:0 "Isildur heir"
+GON_restored_monarchy:0 "Restored Monarchy"
 gondor_research_name:0 "Gondor Alliance Research Sharing Group"
 gondor_research_desc:0 "Reduced research time for technologies researched by other faction members."