Simplified faction membership in lead-up to civil wars

Now we simply forcibly add non-faction members and prevent anyone in the faction from leaving (done with the diplomatic_immunity effect)

Author: Whizzer

CK2Plus/common/objectives/000_CK2Plus_factions.txt

@@ -260,11 +260,6 @@ faction_court = {
 			}
 		}
 
-		additive_modifier = {
-			value = 1000
-			has_character_flag = will_join_civil_war
-		}
-
 		# Personality reasons
 		additive_modifier = {
 			value = 150
@@ -581,11 +576,6 @@ faction_prosperity = {
 			who = FROM
 		}
 
-		additive_modifier = {
-			value = 1000
-			has_character_flag = will_join_civil_war
-		}
-
 		additive_modifier = {
 			value = 300
 			is_republic = yes
@@ -952,11 +942,6 @@ faction_glory = {
 			pacifist = yes
 		}
 
-		additive_modifier = {
-			value = 1000
-			has_character_flag = will_join_civil_war
-		}
-
 		# Personality reasons
 		additive_modifier = {
 			value = 150
@@ -1314,11 +1299,6 @@ faction_tradition = {
 			who = FROM
 		}
 
-		additive_modifier = {
-			value = 1000
-			has_character_flag = will_join_civil_war
-		}
-
 		additive_modifier = {
 			value = 300
 			is_theocracy = yes
@@ -4899,18 +4879,6 @@ faction_pretender = {
 			}
 		}
 
-		# Stay if willingly joined at the outset of civil war
-		mult_modifier = {
-			factor = 100
-
-			has_character_flag = will_join_civil_war
-
-			FROM = {
-				has_character_flag = preparing_claimant_faction_war
-				has_character_flag = civil_war_faction_leader
-			}
-		}
-
 		mult_modifier = {
 			factor = 0.2
 			pacifist = yes
@@ -6130,7 +6098,6 @@ faction_pretender = {
 			factor = 0.01
 
 			trait = content
-			NOT = { has_character_flag = will_join_civil_war }
 
 			FROMFROM = {
 				OR = {
@@ -6142,16 +6109,13 @@ faction_pretender = {
 
 		mult_modifier = {
 			factor = 0.01
-
 			trait = imbecile
-			NOT = { has_character_flag = will_join_civil_war }
 		}
 
 		mult_modifier = {
 			factor = 0.1
 
 			trait = humble
-			NOT = { has_character_flag = will_join_civil_war }
 
 			FROM = {
 				supported_claimant = { character = ROOT }
@@ -6162,7 +6126,6 @@ faction_pretender = {
 			factor = 0.1
 
 			trait = content
-			NOT = { has_character_flag = will_join_civil_war }
 
 			FROM = {
 				supported_claimant = { character = ROOT }
@@ -6171,16 +6134,12 @@ faction_pretender = {
 
 		mult_modifier = {
 			factor = 0.1
-
 			trait = inbred
-			NOT = { has_character_flag = will_join_civil_war }
 		}
 
 		mult_modifier = {
 			factor = 0.1
-
 			trait = craven
-			NOT = { has_character_flag = will_join_civil_war }
 		}
 
 		mult_modifier = {
@@ -6482,17 +6441,6 @@ faction_religious = {
 			}
 		}
 
-		mult_modifier = {
-			factor = 100
-
-			has_character_flag = will_join_civil_war
-
-			FROM = {
-				has_character_flag = preparing_religious_faction_war
-				has_character_flag = civil_war_faction_leader
-			}
-		}
-
 		mult_modifier = {
 			factor = 10
 			rightful_religious_head = ROOT
@@ -6520,37 +6468,27 @@ faction_religious = {
 
 		mult_modifier = {
 			factor = 0.1
-
 			trait = humble
-			NOT = { has_character_flag = will_join_civil_war }
 		}
 
 		mult_modifier = {
 			factor = 0.1
-
 			trait = content
-			NOT = { has_character_flag = will_join_civil_war }
 		}
 
 		mult_modifier = {
 			factor = 0.1
-
 			trait = craven
-			NOT = { has_character_flag = will_join_civil_war }
 		}
 
 		mult_modifier = {
 			factor = 0.1
-
 			trait = imbecile
-			NOT = { has_character_flag = will_join_civil_war }
 		}
 
 		mult_modifier = {
 			factor = 0.1
-
 			trait = inbred
-			NOT = { has_character_flag = will_join_civil_war }
 		}
 
 		mult_modifier = {