battle: add flag clean up and minor fix

CleanSlate/common/cb_types/adventurer_cbs.txt

@@ -799,6 +799,8 @@ manifest_destiny_invasion = {
 
 			if = {
 				limit = {
+					uses_decadence = yes
+
 					NOT = {
 						any_liege = {
 							dynasty = PREV

CleanSlate/common/cb_types/china_cbs.txt

@@ -609,7 +609,7 @@ offmap_submission = {
 			if = {
 				limit = { has_character_flag = is_rebel_general }
 
-				end_war = invalid
+				PREV = { end_war = invalid }
 
 				any_courtier = {
 					death = { death_reason = death_went_back_to_china }

CleanSlate/common/cb_types/other_cbs.txt

@@ -1187,7 +1187,7 @@ unjust_conquest = {
 					text = custom_opinion_hit_tooltip_enemy
 
 					any_realm_lord = {
-						limit = { is_landed = yes }
+						limit = { religion = defender }
 
 						opinion = {
 							name = opinion_declared_unjust_conquest

CleanSlate/common/cb_types/religious_cbs.txt

@@ -2315,6 +2315,19 @@ religious = {
 						FROM = { religion = taoist }
 					}
 
+					# Muslims fight amongst themselves
+					trigger_else_if = {
+						limit = { religion_group = muslim }
+						NOR = {
+							religion = FROM
+							FROM = { # Not fighting religious enemies
+								any_current_enemy = {
+									NOT = { religion_group = muslim }
+								}
+							}
+						}
+					}
+
 					# Can holy war known demon worshippers in he same religion group
 					trigger_if = {
 						limit = { FROM = { has_character_modifier = known_satanist } }
@@ -2323,21 +2336,6 @@ religious = {
 				}
 			}
 
-			# Requirements for Muslims
-			trigger_else_if = {
-				limit = { religion_group = muslim }
-
-				NOT = { religion = FROM }
-
-				FROM = {
-					NOT = { # Not fighting religious enemies
-						any_current_enemy = {
-							NOT = { religion_group = muslim }
-						}
-					}
-				}
-			}
-
 			top_liege = {
 				religion_group = ROOT
 
@@ -2467,6 +2465,12 @@ religious = {
 						FROM = { religion = taoist }
 					}
 
+					# Muslims fight amongst themselves
+					trigger_else_if = {
+						limit = { religion_group = muslim }
+						NOT = { religion = FROM }
+					}
+
 					# Can holy war known demon worshippers in the same religion group
 					AND = {
 						FROM = { has_character_modifier = known_satanist }
@@ -2475,12 +2479,6 @@ religious = {
 				}
 			}
 
-			# Requirements for Muslims
-			trigger_else_if = {
-				limit = { religion_group = muslim }
-				NOT = { religion = FROM }
-			}
-
 			top_liege = {
 				trigger_if = {
 					limit = { religion = FROM }

CleanSlate/common/cb_types/republic_cbs.txt

@@ -489,9 +489,9 @@ embargo_cb = {
 						}
 					}
 				}
-			}
 
-			prestige = -100
+				prestige = -100
+			}
 		}
 
 		any_attacker = { # attacking merchant republics pay dearly for not winning
@@ -502,7 +502,7 @@ embargo_cb = {
 				NOT = { character = attacker }
 			}
 
-			prestige = -1000
+			prestige = -100
 		}
 
 		defender = {

CleanSlate/common/cb_types/vassal_liege_cbs.txt

@@ -506,10 +506,7 @@ overthrow_ruler = {
 
 		# Defender
 		FROM = {
-			any_demesne_title = {
-				NOT = { lower_tier_than = ROOT }
-				temporary = no
-			}
+			higher_real_tier_than = ROOT
 		}
 	}