Merge pull request #1 from ajjr1996/feature/third-nilfgaardian-war-bo…

…okmark Feature/third nilfgaardian war bookmark
dworschak · Jul 20, 2017 · 8b81c15 · 8b81c15
2 parents 682e3dc + d88e83d
commit 8b81c15
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 11 deletions.
diff --git a/MOD/Witcher/common/dynasties/20000_nilfgaardian_dynasties.txt b/MOD/Witcher/common/dynasties/20000_nilfgaardian_dynasties.txt
@@ -383,3 +383,10 @@
 	}
 	used_for_random = no
 }
+
+
+20032 = {
+	name = "var Moehoen"
+	culture = "nilfgaardian"
+	used_for_random = no
+}
diff --git a/MOD/Witcher/common/traits/W_special_traits.txt b/MOD/Witcher/common/traits/W_special_traits.txt
@@ -96,6 +96,7 @@ strong_emperor = {
 	ai_ambition = 10
 	ai_rationality = 10
 	ai_honor = 10
+
 	vassal_opinion = 10
 	health = 0.10
 }

diff --git a/MOD/Witcher/history/characters/000002_redanian_radovid.txt b/MOD/Witcher/history/characters/000002_redanian_radovid.txt
@@ -359,6 +359,11 @@
 	1268.1.1={ 
 		add_spouse=24995 #Adda of Temeria
 		give_nickname=nick_the_stern
-	} 
+	}
+	1275.1.1={
+		raise_levies={ 
+			location=44 #Oxenfurt
+		}
+	}
 	1318.7.22={ death=yes } 
 } 
diff --git a/MOD/Witcher/history/characters/020000_temerian.txt b/MOD/Witcher/history/characters/020000_temerian.txt
@@ -34,11 +34,13 @@
 ## 23700 - 23799	Beyer von Orgibet (151)		/ Orgibet	
 ## 23800 - 23899	Greiffenclau (152)			/ Grandrif
 ## 23900 - 23999	Ficquelmont (153)			/ Bavent
-## 24000 - 24800 	Dezmoden (Foltest's dynasty)
+## 24000 - 24800 	Dezmoden (1) (Foltest's dynasty)
 ############################################
 ## 24800 - 24999 	UNSPECIFIED
 ############################################
 
+
+## 22100 - 22199	von Twickel (160)			/ Puymory
 22100={
 	name = Ortlib
 	dynasty = 160

diff --git a/MOD/Witcher/history/characters/100000_nilfgaardian.txt b/MOD/Witcher/history/characters/100000_nilfgaardian.txt
@@ -33,7 +33,8 @@
 ## 101400 - 101449		var Airgech dynasty	20028	/ Patrician
 ## 101450 - 101499		Ailtlethan dynasty	20029	/ Patrician
 ## 101500 - 101549		var Donnchada dynasty	20030	/ Patrician
-## 101550 - 101699		de Perponcher dynasty			20031
+## 101550 - 101599		de Perponcher dynasty	20031
+## 101600 - 101649		var Moehoen dynasty		20032
 ############################################
 
 ## 100000 - 100499		var Emreis dynasty	20000	Nilfgaard
@@ -128,7 +129,7 @@
 		}
 	} 
 	1264.1.1={ 
-		add_spouse=109500
+		add_spouse=109500 # 'False' Ciri
 	} 
 	1265.6.3={ 
 		effect = {
@@ -147,7 +148,14 @@
 	}
 	1274.1.2={ 
 		effect={clr_character_flag=aok_emhyr}
-	} 
+	}
+	1275.1.1={
+		raise_levies={ 
+			location=512 #Findetann
+			force_mult = 0.7 # Tweak balance
+		}
+		# Note: if possible to split levies, should also be besieging Ard Carraigh (97) and Ban Gle�n (95)
+	}
 	1290.1.1={ death=yes } 
 } 
 100007={
@@ -3982,7 +3990,7 @@
 	1209.11.27={ death=yes } 
 } 
 100571={ 
-	name=Menno
+	name=Menno # Menno Coehoorn
 	dynasty=20011
 	dna=fnidbleofmm
 	culture=nilfgaardian religion=solar
@@ -3997,10 +4005,10 @@
 		effect={ 
 			give_job_title=job_marshal
 		} 
-	} 
+	}
 	1268.2.17={ 
 		death={ 
-			death_reason=death_battle
+			death_reason=death_battle # Battle of Brenna
 		} 
 	} 
 } 
@@ -11374,11 +11382,28 @@
 } 
 ## 101500 - 101549		var Donnchada dynasty	20030	/ Patrician
 
-## 101550 - 101699		Chaos dynasty			20031
+## 101550 - 101599		Chaos dynasty			20031
 101550={ 
 	name=Khorne
 	dynasty=20031
 	culture=nilfgaardian religion=solar
 	1250.1.3={ birth=yes } 
 	1320.3.2={ death=yes } 
 } 
+
+## 101600 - 101649		var Moehoen dynasty		20032
+
+101600={
+	name=Havart
+	dynasty=20032
+	culture=nilfgaardian religion=solar
+	add_trait=canon add_trait=human_race add_trait=skilled_tactician
+	1235.1.1={ birth=yes }
+	1268.2.18={
+		employer=100006
+		effect={ 
+			give_job_title=job_marshal
+		}
+	}
+	1300.1.1={ death=yes }
+}
diff --git a/MOD/Witcher/history/titles/c_prage.txt b/MOD/Witcher/history/titles/c_prage.txt
@@ -6,3 +6,7 @@
 800.1.1={
 	liege=d_tretogor
 }
+
+1263.1.1={
+	holder=9	#Radowid V
+}
diff --git a/MOD/Witcher/history/titles/c_rhederbrug.txt b/MOD/Witcher/history/titles/c_rhederbrug.txt
@@ -6,3 +6,7 @@
 800.1.1={
 	liege=d_tretogor
 }
+
+1263.1.1={
+	holder=9	#Radowid V
+}
diff --git a/MOD/Witcher/history/titles/k_cintra.txt b/MOD/Witcher/history/titles/k_cintra.txt
@@ -31,9 +31,11 @@
 	holder=105498
 }
 1262.7.12={
-	holder=100571
+	holder=100571 # Menno Coehoorn
 	liege=e_nilfgaard
+	vice_royalty = yes
 }
 1267.7.15={
 	holder=109500
+	vice_royalty = no
 }
diff --git a/MOD/Witcher/history/titles/k_temeria.txt b/MOD/Witcher/history/titles/k_temeria.txt
@@ -22,6 +22,7 @@
 1247.1.1={ holder=24999 }
 1274.5.12 = { holder = 0 }
 1274.11.15 = {
-	holder = 100006				#Emhyr
+	holder = 101600 #Havart var Moehoen
 	liege = e_nilfgaard
+	vice_royalty = yes
 }
diff --git a/MOD/Witcher/localisation/WikipediaLinks.csv b/MOD/Witcher/localisation/WikipediaLinks.csv
@@ -139,6 +139,8 @@ W_L_97607;http://witcher.wikia.com/wiki/Hedwig_of_Malleore;;;;;;;;;;;;;x
 W_L_100005;http://witcher.wikia.com/wiki/Fergus_var_Emreis;;;;;;;;;;;;;x
 W_L_100006;http://witcher.wikia.com/wiki/Emhyr_var_Emreis;;;;;;;;;;;;;x
 W_L_100007;http://witcher.wikia.com/wiki/Ciri;;;;;;;;;;;;;x
+W_L_100571;http://witcher.wikia.com/wiki/Menno_Coehoorn;;;;;;;;;;;;;x
+W_L_101600;http://witcher.wikia.com/wiki/Havart_var_Moehoen;;;;;;;;;;;;;x
 W_L_109500;http://witcher.wikia.com/wiki/False_Ciri;;;;;;;;;;;;;x
 W_L_120004;http://witcher.wikia.com/wiki/Clarissa_of_Toussaint;;;;;;;;;;;;;x
 W_L_;;;;;;;;;;;;;;x
diff --git a/MOD/Witcher/localisation/y_nobletitles.csv b/MOD/Witcher/localisation/y_nobletitles.csv
@@ -99,6 +99,10 @@ city_count_nazairian;Provost;Provost;Provost;;Provost;;;;;;;;;x
 city_barony_of_nazairian;Tithing of;Tithing of;Tithing of;;Tithing of;;;;;;;;;x
 city_county_of_nazairian;Burgh;Burgh;Burgh;;Burgh;;;;;;;;;x
 county_of_nazairian;Shire of;Shire of;Shire of;;Shire of;;;;;;;;;x
+# Nilfgaardian culture
+job_marshal_nilfgaardian;Field Marshal;;;;;;;;;;;;;x
+vice_royalty_king_nilfgaardian;Governor;;;;;;;;;;;;;x
+vice_royalty_kingdom_of_nilfgaardian;Province of;;;;;;;;;;;;;x
 # Generic religion
 temple_baron;Priest;;;;;;;;;;;;;x
 temple_baron_female;Priestess;;;;;;;;;;;;;x
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,7 @@ @@
 .1.1={
     	liege=d_tretogor
     }
+.1.1={
+    	holder=9	#Radowid V
+    }