Merge pull request #107 from icendoan/sbmunch-patch-46

Change Grants and make take core possible when over infamy
icendoan · Mar 12, 2021 · a48244f · a48244f
2 parents 53325db + e7d6c61
commit a48244f
Show file tree

Hide file tree

Showing 3 changed files with 265 additions and 98 deletions.
diff --git a/icen_PUIR/common/cb_types.txt b/icen_PUIR/common/cb_types.txt
@@ -400,7 +400,7 @@ acquire_core_state = {
 	good_relation_militancy_factor = 1
 
 	can_use = {
-		this = { NOT = { badboy = 1 } }
+		#this = { NOT = { badboy = 1 } }
 		NOT = { is_our_vassal = THIS }
 		number_of_states = 2 # annex if you want their last state
 		any_owned_province = {
@@ -451,7 +451,7 @@ annex_core_country = {
 	good_relation_militancy_factor = 1
 
 	can_use = {
-		this = { NOT = { badboy = 1 } }
+		#this = { NOT = { badboy = 1 } }
 		NOT = { is_our_vassal = THIS }
 		any_owned_province = {
 			is_core = THIS

diff --git a/icen_PUIR/events/grants 1.txt b/icen_PUIR/events/grants 1.txt
@@ -30,7 +30,7 @@ country_event = {
 				ai = no
 
 				money = 10000
-				NOT = { money = 1000000 }
+				NOT = { money = 500000 }
 
 			}
 
@@ -46,14 +46,14 @@ country_event = {
 
 				ai = no
 
-				money = 1000000
-				NOT = { money = 10000000 }
+				money = 500000
+				NOT = { money = 2000000 }
 
 			}
 
-			country_event = {id = 100011 days = 0}
+			country_event = {id = 100002 days = 0}
 
-		}	
+		}		
 
 		any_country = {
 
@@ -63,11 +63,28 @@ country_event = {
 
 				ai = no
 
-				money = 10000000
+				money = 2000000
+				NOT = { money = 6000000 }
 
 			}
 
-			country_event = {id = 100012 days = 0}
+			country_event = {id = 100003 days = 0}
+
+		}
+
+		any_country = {
+
+			limit = {
+
+				has_country_flag = will_give_grants
+
+				ai = no
+
+				money = 6000000
+
+			}
+
+			country_event = {id = 100004 days = 0}
 
 		}	
 
@@ -80,7 +97,7 @@ country_event = {
 
 country_event = {
 
-id = 100002
+id = 100005
 
 	title = "$FROMCOUNTRY$ Grants Aid"
 
@@ -95,9 +112,9 @@ id = 100002
 
 		ai_chance = {factor = 100} 
 
-		FROM = { country_event = {id = 100013 days = 0}}	
+		FROM = { country_event = {id = 100010 days = 0}}	
 
-		FROM = { country_event = {id = 100003 days = 0}}
+		FROM = { country_event = {id = 100011 days = 0}}
 
 	}
 
@@ -106,7 +123,7 @@ id = 100002
 
 country_event = {
 
-	id = 100004
+	id = 100006
 
 	title = "$FROMCOUNTRY$ Grants Aid"
 
@@ -122,9 +139,9 @@ country_event = {
 
 FROM = {
 
-		country_event = {id = 100003 days = 0}
+		country_event = {id = 100011 days = 0}
 
-		country_event = {id = 100005 days = 0}
+		country_event = {id = 100012 days = 0}
 
 		}
 
@@ -135,7 +152,7 @@ FROM = {
 
 country_event = {
 
-	id = 100006
+	id = 100007
 
 	title = "$FROMCOUNTRY$ Grants Aid"
 
@@ -151,21 +168,47 @@ country_event = {
 	ai_chance = {factor = 100}
 
 		FROM = {
-			country_event = {id = 100005 days = 0}
+			country_event = {id = 100012 days = 0}
 
 
-			country_event = {id = 100007 days = 0}
+			country_event = {id = 100013 days = 0}
 
 		}
 
 	}
 
+}
+
+country_event = {
+
+	id = 100008
+
+	title = "$FROMCOUNTRY$ Grants Aid"
+
+	is_triggered_only = yes
+	desc = "$FROMCOUNTRY$ has decided to give us aid on the order of millions of pounds."
+
+	allow_multiple_instances = yes
+
+	option = {
+
+			name = "Great!"
+	ai_chance = {factor = 100}
+
+			FROM = {
+			country_event = {id = 100012 days = 0}
+
+			country_event = {id = 100014 days = 0}
+
+		}
+
+	}
+
 }
-
 
 country_event = {
 
-	id = 100008
+	id = 100009
 
 	title = "$FROMCOUNTRY$ Grants Aid"
 
@@ -180,9 +223,9 @@ country_event = {
 	ai_chance = {factor = 100}
 
 			FROM = {
-			country_event = {id = 100007 days = 0}
+			country_event = {id = 100013 days = 0}
 
-			country_event = {id = 100009 days = 0}
+			country_event = {id = 100015 days = 0}
 
 		}