Merge pull request #114 from SnowletTV/dev

Dev

.gitignore

@@ -1,3 +1 @@
-
-common/missions/01_antigonid_mission_01_vision.txt
 *.bak

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "hoi4ModUtilities.modFile": "c:\\Users\\snowl\\Documents\\Paradox Interactive\\Imperator\\mod\\invictus\\descriptor.mod"
+}

common/ai_budget/00_default.txt

@@ -47,7 +47,15 @@ base_budget = {
 	savings = {
 		#Let savings go from unchanged (value of 1) to 0 if near death in a war.
 		weight = {
-			base = 0
+			base = 0.6
+			modifier = {
+				trigger = {
+					war = yes
+				}
+				add = {
+					value = -0.6
+				}
+			}
 		}
 	}
 
@@ -148,7 +156,7 @@ base_budget = {
 	gold = {
 		#Save more gold than other stuff.
 		savings = {
-			weight = 0
+			weight = 0.25
 		}
 	}
 
@@ -183,7 +191,7 @@ base_budget = {
 		weight = {
 			base = 1.25
 			modifier = {
-				add = 15
+				add = 20
 				trigger = {
 					war = no
 					has_civil_war = no

common/character_interactions/adopt_to_family.txt

@@ -8,7 +8,6 @@
 
 	potential_trigger = {
 		hidden:scope:actor = {
-			NOT = { has_variable = regency_government }
 			OR = {
 				is_monarchy = yes
 				is_tribal = yes

common/character_interactions/befriend.txt

@@ -21,9 +21,6 @@
 				this = scope:actor.current_ruler
 			}
 			NOT = { is_friend = scope:actor.current_ruler }
-			NOT = {
-				has_character_modifier = commander_king
-			}
 		}
 	}
 

common/character_interactions/bit_assign_commander.txt

@@ -10,6 +10,7 @@
 
 	potential_trigger = {
 		scope:actor = {
+			is_ai = no
 			tag = BIT
 			has_variable = bithynia_commanders_allowed
 			NOT = {

common/character_interactions/create_mercenary.txt

@@ -21,7 +21,10 @@
 			}
 		}
 		hidden:scope:actor = {
-			is_monarchy = yes
+			OR = {
+				is_monarchy = yes
+				has_variable = celtic_mercenary_allowance
+			}
 		}
 	}
 
@@ -44,9 +47,6 @@
 			NOT = {
 				has_character_modifier = disloyal_successor_cmod
 			}
-			NOT = {
-				has_character_modifier = commander_king
-			}
 			custom_tooltip = {
 				text = "no_other_mercs_here"
 				location = {
@@ -96,6 +96,17 @@
 				move_country = c:MER
 			}
 		}
+		if = {
+			limit = {
+				scope:actor = {
+					has_variable = celtic_mercenary_allowance
+				}
+			}
+			set_variable = {
+				name = celtic_mercenary_created
+				value = 1
+			}
+		}
 		custom_tooltip = create_mercenary_may_return_some_day_tt
 
 	}

common/character_interactions/grant_stipends.txt

@@ -14,7 +14,6 @@
 			is_ruler = no
 			NOT = { employer = { tag = REB } }
 			NOT = { employer = { tag = BAR } }
-			NOT = { has_character_modifier = commander_king }
 		}
 	}
 

common/character_interactions/imprison.txt

@@ -11,9 +11,6 @@
 			employer = scope:actor
 			NOT = { employer = { tag = REB } }
 			NOT = { employer = { tag = BAR } }
-			NOT = {
-				has_character_modifier = commander_king
-			}
 			is_alive = yes
 			is_mercenary = no
 			prisoner = no

common/character_interactions/smear_character.txt

@@ -30,9 +30,6 @@
 		scope:target = {
 			is_adult = yes
 			popularity > 5
-			NOT = {
-				has_character_modifier = commander_king
-			}
 			NAND = {
 				employer = {
 					is_monarchy = yes

common/character_interactions/sogdian_emporium.txt

@@ -0,0 +1,120 @@
+sogdian_emporium = {
+
+	on_other_nation = no
+	on_own_nation = yes
+
+	sound = "event:/SFX/UI/Character/Unique/sfx_ui_character_arrange_marriage"
+
+	message = no
+
+	potential_trigger = {
+		scope:actor = {
+			is_ai = no
+			tag = SOG
+			has_variable = sogdian_emporium_allowed
+		}
+		hidden:scope:target = {
+			is_alive = yes
+			is_ruler = yes
+			employer = scope:actor
+			NOT = { employer = { tag = REB } }
+			NOT = { employer = { tag = BAR } }
+		}
+	}
+	allowed_trigger = {
+		scope:actor = {
+			trigger_if = {
+				limit = {
+					NOT = { has_variable = no_more_cooldown_on_cities }
+				}
+				trigger_if = {
+					limit = { has_variable = recently_established_city }
+					custom_tooltip = {
+						text = recently_established_tt
+						NOT = { has_variable = recently_established_city }
+					}
+				}
+				can_pay_price = establish_sogdian_emporium_price
+			}
+			trigger_else = {
+				limit = {
+					has_variable = no_more_cooldown_on_cities
+				}
+				trigger_if ={
+					limit = { has_variable = recently_established_city }
+					custom_tooltip = {
+						text = recently_established_tt_2
+						NOT = { has_variable = recently_established_city }
+					}
+				}
+				can_pay_price = new_establish_sogdian_emporium_price
+			}
+		}
+	}
+
+	#for any province in the scope:actor country
+	province_actor_trigger = {
+		#has_province_rank = settlement
+		NOT = {
+			food_trade_good_trigger = yes
+		}
+		NOT = {
+			has_province_modifier = founding_city_in_progress
+		}
+		NOT = {
+			has_province_modifier = urban_development_in_progress
+		}
+		NOT = {
+			THIS.AREA = {
+				any_area_province = {
+					 has_province_modifier = sogdian_emporium_mod
+				}
+			}
+		}
+	}
+
+	effect = {
+		scope:actor = {
+			trigger_event = {
+				id = sogdian_emporium.1
+				days = 365
+			}
+			#Set an on_action that will maybe fire a few events
+			if = {
+				limit = {
+					NOT = { has_variable = no_more_cooldown_on_cities }
+				}
+				pay_price = establish_sogdian_emporium_price
+				set_variable = {
+					name = recently_established_city
+					days = 3650
+				}
+			}
+			else_if = {
+				limit = {
+					has_variable = no_more_cooldown_on_cities
+				}
+				pay_price = new_establish_sogdian_emporium_price
+				set_variable = {
+					name = recently_established_city
+					days = 365
+				}
+			}
+			if = {
+				limit = {
+					exists = scope:recipient
+				}
+				scope:recipient = {
+					add_permanent_province_modifier = {
+						name = sogdian_emporium
+						mode = add
+				 	}
+		            add_province_modifier = {
+		                name = founding_sogdian_emporium_in_progress	
+		                duration = 365
+		            }
+				}
+			}
+		}
+	}
+}

common/coat_of_arms/coat_of_arms/01_invictus_countries.txt

@@ -827,46 +827,3 @@ SHUNGA_FLAG = {
 		color2 = "offwhite"
 	}
 }
-SATAVAHANA_FLAG = {
-	pattern = "pattern_solid.tga"
-	color1 = "indus_color"
-	color2 = "achaemenid_mauve"
-
-	colored_emblem = {
-		texture = "ce_elephant_02.dds"
-		color1 = "red_nougat"
-		color2 = "pitch_black"
-		instance = { 
-		scale = { -0.9 0.9 }
-		}
-	}
-		colored_emblem = {
-		texture = "ce_border_stars_01.dds"
-		color1 = "pitch_black"
-		color2 = "offwhite"
-		instance = { 
-		rotation = 90
-		}
-	}
-		colored_emblem = {
-		texture = "ce_border_stars_01.dds"
-		color1 = "pitch_black"
-		color2 = "offwhite"
-		instance = { 
-		rotation = 270
-		}
-	}
-		colored_emblem = {
-		texture = "ce_border_stars_01.dds"
-		color1 = "pitch_black"
-		color2 = "offwhite"
-		instance = { 
-		rotation = 180
-		}
-	}
-		colored_emblem = {
-		texture = "ce_border_stars_01.dds"
-		color1 = "pitch_black"
-		color2 = "offwhite"
-	}
-}