Merge branch 'dev', version bump RC4

escalonn · Aug 16, 2015 · 84de8fd · 84de8fd
2 parents ee7ee5c + 789e3c5
commit 84de8fd
Show file tree

Hide file tree

Showing 31 changed files with 6,396 additions and 5,853 deletions.
diff --git a/SED2/common/landed_titles/Shia.txt b/SED2/common/landed_titles/Shia.txt
@@ -1,4 +1,4 @@
-k_shiite = {
+k_shiite = { # Shia
 	color = { 60 190 60 }
 	color2 = { 220 220 0 }
 	capital = 719 # Mecca
@@ -8,15 +8,20 @@ k_shiite = {
 	# Controls a religion
 	controls_religion = shiite
 	assimilate = no
+	caliphate = yes
+	coat_of_arms = {
+		data = { 0 0 0 9 1 7 7 }
+		religion = shiite
+	}
 	allow = {
-		OR = {
+		or = {
 			trait = mirza
 			trait = sayyid
 			piety = 1000
 		}
-		NOT = { has_global_flag = shia_caliphate_revolt_ongoing }
-		OR = {
-			AND = {
+		not = { has_global_flag = shia_caliphate_revolt_ongoing }
+		or = {
+			and = {
 				trait = sayyid
 				piety = 1000
 			}
@@ -25,15 +30,15 @@ k_shiite = {
 				hidden_tooltip = {
 					719 = { # Mecca
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
 						}
 					}
 					718 = { # Medina
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
@@ -46,23 +51,23 @@ k_shiite = {
 				hidden_tooltip = {
 					774 = { # Jerusalem
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
 						}
 					}
 					728 = { # Damascus
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
 						}
 					}
 					693 = { # Baghdad
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
@@ -72,13 +77,8 @@ k_shiite = {
 			}
 		}
 	}
-	caliphate = yes
-	coat_of_arms = {
-		data = { 0 0 0 9 1 7 7 }
-		religion = shiite
-	}
 	title = CALIPH
 	title_female = CALIPHA
 	foa = CALIPH_FOA
 	short_name = yes
-}
+} # end k_shiite
diff --git a/SED2/common/landed_titles/Sunni.txt b/SED2/common/landed_titles/Sunni.txt
@@ -1,4 +1,4 @@
-d_sunni = {
+d_sunni = { # The Sunni Caliphate
 	color = { 40 160 40 }
 	color2 = { 220 220 0 }
 	capital = 719 # Mecca
@@ -7,14 +7,19 @@ d_sunni = {
 	religion = sunni
 	# Controls a religion
 	controls_religion = sunni
+	caliphate = yes
+	coat_of_arms = {
+		data = { 0 0 0 3 0 2 2 }
+		religion = sunni
+	}
 	allow = {
-		OR = {
+		or = {
 			trait = mirza
 			trait = sayyid
 			piety = 1000
 		}
-		OR = {
-			AND = {
+		or = {
+			and = {
 				trait = sayyid
 				piety = 1000
 			}
@@ -23,15 +28,15 @@ d_sunni = {
 				hidden_tooltip = {
 					719 = { # Mecca
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
 						}
 					}
 					718 = { # Medina
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
@@ -44,23 +49,23 @@ d_sunni = {
 				hidden_tooltip = {
 					774 = { # Jerusalem
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
 						}
 					}
 					728 = { # Damascus
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
 						}
 					}
 					693 = { # Baghdad
 						owner = {
-							OR = {
+							or = {
 								is_liege_or_above = ROOT
 								character = ROOT
 							}
@@ -70,13 +75,8 @@ d_sunni = {
 			}
 		}
 	}
-	caliphate = yes
-	coat_of_arms = {
-		data = { 0 0 0 3 0 2 2 }
-		religion = sunni
-	}
 	title = CALIPH
 	title_female = CALIPHA
 	foa = CALIPH_FOA
 	short_name = yes
-}
+} # end d_sunni