From 206961478579c9d09b01574dea507ff1145012fc Mon Sep 17 00:00:00 2001
From: JonStryker <JonStryker@fd05d7c5-4d59-407a-8206-26c8fdebe439>
Date: Sun, 28 Dec 2014 21:40:14 +0000
Subject: [PATCH] more cb fixes

---
 MOD/Witcher/common/cb_types/W_cb_types.txt | 101 ++++++++++++++++-----
 1 file changed, 76 insertions(+), 25 deletions(-)

diff --git a/MOD/Witcher/common/cb_types/W_cb_types.txt b/MOD/Witcher/common/cb_types/W_cb_types.txt
index d8e9bef5b..b413c3943 100644
--- a/MOD/Witcher/common/cb_types/W_cb_types.txt
+++ b/MOD/Witcher/common/cb_types/W_cb_types.txt
@@ -1062,7 +1062,9 @@ lower_crown_levy_law = {
 	major_revolt = yes
 	
 	can_use = {
-		ROOT = { vassal_of = FROM }
+		ROOT = {
+			vassal_of = FROM
+		}
 	}
 	
 	can_use_title = {
@@ -1078,35 +1080,42 @@ lower_crown_levy_law = {
 	}
 	
 	is_valid = {
-		ROOT = {
-			OR = {
-				liege = {
-					character = PREV # either independent
-				}
-				liege = { 
-					FROM = { 
-						is_liege_or_above = PREV # or have shared liege
-					}
+		FROM = {
+			in_revolt = no
+			liege_before_war = {
+				in_revolt = no
+				liege_before_war = {
+					in_revolt = no
 				}
 			}
 		}
 	}
-	
+
 	on_success = {
-		ROOT = { opinion = { modifier = opinion_lowered_crown_levy who = FROM months = 12 } }
+		ROOT = {
+			opinion = {
+				modifier = opinion_lowered_crown_levy
+				who = FROM
+				months = 12
+			}
+		}
 		any_attacker = {
 			limit = { character = ROOT }
 			participation_scaled_prestige = 100
-			hidden_tooltip = { disband_event_forces = faction_revolters }
+			hidden_tooltip = {
+				disband_event_forces = faction_revolters
+			}
 		}
 		any_attacker = {
 			limit = { NOT = { character = ROOT } }
 			hidden_tooltip = { participation_scaled_prestige = 100 }
-			hidden_tooltip = { disband_event_forces = faction_revolters }
+			hidden_tooltip = {
+				disband_event_forces = faction_revolters
+			}
 		}
 		FROM = { hidden_tooltip = { disband_event_forces = faction_loyalists } }
 	}
-	
+
 	on_success_title = {
 		if = {
 			limit = { has_law = crown_levy_2 }
@@ -1117,9 +1126,12 @@ lower_crown_levy_law = {
 			add_law_w_cooldown = crown_levy_2
 		}
 	}
-	
+
 	on_fail = {
-		ROOT = { prestige = -100 }
+		ROOT = {
+			prestige = -100
+		}
+		
 		any_defender = {
 			limit = { character = FROM }
 			participation_scaled_prestige = 50
@@ -1128,20 +1140,26 @@ lower_crown_levy_law = {
 			limit = { NOT = { character = FROM } }
 			hidden_tooltip = { participation_scaled_prestige = 50 }
 		}
+		
 		hidden_tooltip = {
 			any_attacker = {
 				disband_event_forces = faction_revolters
-				add_character_modifier = { name = faction_lower_crown_levy_ultimatum_timer hidden = yes duration = 3650 }
+				add_character_modifier = {
+					name = faction_lower_crown_levy_ultimatum_timer
+					hidden = yes
+					duration = 3650
+				}
 			}
 		}
 		FROM = { hidden_tooltip = { disband_event_forces = faction_loyalists } }
 	}
-	
+
 	on_reverse_demand = {
-		ROOT = { 
+		ROOT = {
 			prestige = -200
 			prisoner = FROM
 		}
+		
 		any_defender = {
 			limit = { character = FROM }
 			participation_scaled_prestige = 100
@@ -1150,21 +1168,52 @@ lower_crown_levy_law = {
 			limit = { NOT = { character = FROM } }
 			hidden_tooltip = { participation_scaled_prestige = 100 }
 		}
+		
 		hidden_tooltip = {
 			any_attacker = {
 				limit = { liege = { character = FROM } }
 				prisoner = FROM
 				disband_event_forces = faction_revolters
-				add_character_modifier = { name = faction_lower_crown_levy_ultimatum_timer hidden = yes duration = 3650 }
+				add_character_modifier = {
+					name = faction_lower_crown_levy_ultimatum_timer
+					hidden = yes
+					duration = 3650
+				}
 			}
 		}
 		FROM = { hidden_tooltip = { disband_event_forces = faction_loyalists } }
 	}
+
+	attacker_ai_victory_worth = {
+		factor = -1 # always accept
+	}
 	
-	attacker_ai_victory_worth = { factor = -1 } # always accept
-	attacker_ai_defeat_worth = { factor = 100 }
-	defender_ai_victory_worth = { factor = -1 } # always accept
-	defender_ai_defeat_worth = { factor = 100 }
+	attacker_ai_defeat_worth = {
+		factor = 100
+	}
+
+	defender_ai_victory_worth = {
+		factor = -1 # always accept
+	}
+	
+	defender_ai_defeat_worth = {
+		factor = 100
+	}
+	
+	is_valid = {
+		ROOT = {
+			OR = {
+				liege = {
+					character = PREV # either independent
+				}
+				liege = { 
+					FROM = { 
+						is_liege_or_above = PREV # or have shared liege
+					}
+				}
+			}
+		}
+	}
 }
 
 lower_crown_obligation_law = {
@@ -1279,6 +1328,7 @@ lower_crown_obligation_law = {
 			prestige = -200
 			prisoner = FROM
 		}
+		
 		any_defender = {
 			limit = { character = FROM }
 			participation_scaled_prestige = 100
@@ -1287,6 +1337,7 @@ lower_crown_obligation_law = {
 			limit = { NOT = { character = FROM } }
 			hidden_tooltip = { participation_scaled_prestige = 100 }
 		}
+		
 		hidden_tooltip = {
 			any_attacker = {
 				limit = { liege = { character = FROM } }