Merge branch 'master' into New-Mareland

Author: featherus

changelog.TXT

@@ -1,37 +1,43 @@
 🌼 “Poppy” 1.1 🌼
-❈ New focus trees for countries:
-	✢ New Mareland
+❈ New focus trees, events and flavour for countries:
+	✢ New Mareland - Including Solar Empire, Nightmare Moon and other paths.
 	✢ Sunstriker Clan
 	✢ Flowena
 	✢ Romau
 	✢ Crystal Province (Solar Empire Puppet)
+❈ Fixes and additions:
+✢ New portraits
+✢ New national spirit, focus and designer icons
+✢ Expanded Maar path for Greifwald.
+✢ Expansion of Prywhen's Isolationist path.
 ✢ Griffonian Empire can reclaim Nova Griffonia
 ✢ Equestrian Continent Manpower raised by 30% in all states.
-✢ Infantry Supression has been raised to 2 for Infantry, Magical Infantry and Griffon Knights. 2.2 for Pegasisi and 3 for Changeling Jagers.
-✢ Military Police Support Companies gain +1 Supression and 0.1 Supression Factor for every level researched.
-✢ Motorized and Mechanized Infantry manpower requirement lowered from 1200 to 1050
-✢ Custom Division Names for Trade Federation, Romau, Nova Griffonia and Feathesia 
-✢ News Events for Aquiliean Revolution
-✢ Griffonian Republic can no longer annex Equestria diplomatically
-✢ Griffonian Republic can actually switch to Harmony
-✢ President-Marshal Kemerskai is the prettiest bird in the world.
-✢ Expansion of Prywhen's Isolationist path
+✢ Manpower Rebalance in New Mareland, Wingbardy and Aquiliea.
+✢ Infantry suppression has been raised to 2 for Infantry, Magical Infantry and Griffon Knights. 2.2 for Pegasisi and 3 for Changeling Jagers.
+✢ Military Police Support Companies gain +1 Suppression and 0.1 Suppression Factor for every level researched.
+✢ Motorized and Mechanized Infantry manpower requirement lowered from 1200 to 1050.
+✢ Custom Division Names for New Mareland, Trade Federation, Romau, Nova Griffonia and Feathesia.
+✢ News Events for Aquiliean Revolution.
+✢ Griffonian Republic can no longer annex Equestria diplomatically.
+✢ Griffonian Republic can actually switch to Harmony.
 ✢ Fixed even MORE crash to desktop errors.
 ✢ Nightmare Moon Supporters now actually gain cores on all of Equestria if they restore the Lunar Empire instead of the failed Lunar Empire getting them.
 ✢ Everyone hates Maarites again.
 ✢ Changelings can only attempt to puppet Olenia if Olenia is Neutral.
-✢ Larger countries benefit slightly more from Military Training Decisions
+✢ Improved Military Training Decisions.
 ✢ Disabled Tutorial button.
-✢ Spellchecking
+✢ A lot of Spellchecking.
 ✢ Aquiliea, Vedina and Griffonian Republic now start with minor navies.
-✢ Minor map edit in Eastern Griffonia.
-✢ Removed the fat mountain chain in Nova Griffonia.
 ✢ AI templates updated for new pure infantry meta.
 ✢ Hjortsling takes control of Olenia when they are forcibly puppeted by the Changelings.
-✢ Expanded Maar path for Greifwald
-✢ More gfx
-✢ Other miscellaneous fixes and improvements
+✢ AI rebalance.
+✢ Other miscellaneous fixes and improvements.
 
+❈ Map Changes:
+✢ Removed the fat mountain chain in Nova Griffonia.
+✢ Better coastline and a mountain in New Mareland
+✢ More forests in Griefwald
+✢ More interesting terrain in Principality of Lushi
 
 ⚔ “Knights and Flowers” 1.0.4🌼
 

common/ai_peace/1_communist.txt

@@ -32,10 +32,6 @@ communist_peace = {
 				is_eqs_civil_war_tag = yes
 			}
 		}
-		modifier = {
-			factor = 3
-			has_annex_war_goal = FROM
-		}
 		modifier = {
 			factor = 0.1
 			OR = {
@@ -79,6 +75,10 @@ communist_peace = {
 	# ROOT = Taker, FROM = Giver
 	puppet = {
 		factor = 800
+		modifier = {
+			factor = 0
+			has_annex_war_goal = FROM
+		}
 		modifier = {
 			factor = 0
 			is_griffon_continent_griffon_country = yes

common/ai_peace/1_democratic.txt

@@ -33,11 +33,6 @@ democratic_peace = {
 			}
 		}
 
-		modifier = {
-			factor = 2
-			has_annex_war_goal = FROM
-		}
-
 		modifier = { #
 			factor = 0.1
 			OR = {
@@ -79,6 +74,12 @@ democratic_peace = {
 				tag = GRI
 			}
 		}
+		modifier = {
+			factor = 0
+			tag = FAT
+			has_completed_focus = FAT_the_griffons_tutelage
+			FROM = { tag = GRI }
+		}
 	}
 
 	liberate = {
@@ -102,7 +103,7 @@ democratic_peace = {
 	puppet = {
 		factor = 800 #200
 		modifier = {
-			factor = 0.5
+			factor = 0
 			has_annex_war_goal = FROM
 		}
 		modifier = {

common/ai_peace/1_fascist.txt

@@ -61,10 +61,6 @@ fascist_peace = {
 				is_eqs_civil_war_tag = yes
 			}
 		}
-		modifier = {
-			factor = 1.5
-			has_annex_war_goal = FROM
-		}
 		modifier = {
 			factor = 0
 			NOT = {
@@ -109,7 +105,7 @@ fascist_peace = {
 	puppet = {
 		factor = 100 #150
 		modifier = {
-			factor = 0.5
+			factor = 0
 			has_annex_war_goal = FROM
 		}
 		modifier = {

common/ai_peace/z_default.txt

@@ -32,10 +32,6 @@ default_peace = {
 				is_eqs_civil_war_tag = yes
 			}
 		}
-		modifier = {
-			factor = 1.5
-			has_annex_war_goal = FROM
-		}
 		modifier = {
 			factor = 0.1
 			OR = {
@@ -64,6 +60,12 @@ default_peace = {
 			factor = 0
 			is_subject = yes
 		}
+		modifier = {
+			factor = 0
+			tag = FAT
+			has_completed_focus = FAT_the_griffons_tutelage
+			FROM = { tag = GRI }
+		}
 	}
 
 	# ROOT = Taker, FROM = Liberated
@@ -75,7 +77,7 @@ default_peace = {
 	puppet = {
 		factor = 600 #200
 		modifier = {
-			factor = 0.5
+			factor = 0
 			has_annex_war_goal = FROM
 		}
 		modifier = {

common/bookmarks/the_gathering_storm.txt

@@ -110,34 +110,63 @@ bookmarks = {
 
 
 		# minors from DLC ####
-		"YAK"={
+		"EQC"={
 			minor = yes
-			history = "YAK_GATHERING_STORM_DESC"
-			ideology = neutrality
+			history = "EQC_GATHERING_STORM_DESC"
+			ideology = democratic
 			ideas = {
-				agrarian_society
+				EQC_great_depression_1
+				EQC_griffon_minorities1
+				equestrian_overlord
 			}
 			focuses = {
-				YAK_insult
-				YAK_jakistan_by_force
-				YAK_reform_society
+				EQC_royal_visit
+				EQC_the_election
+				EQC_nmac_spirit
 			}
 		}
-		"GFF"={
+		"MNC"={
 			minor = yes
-			history = "GFF_GATHERING_STORM_DESC"
+			history = "MNC_GATHERING_STORM_DESC"
+			ideology = fascism
+			ideas = {
+				MNC_banditry
+				MNC_economy
+			}
+			focuses = {
+				MNC_resist_democratic
+				MNC_maar_beckons
+				MNC_back_to_raiding
+			}
+		}
+		"YAK"={
+			minor = yes
+			history = "YAK_GATHERING_STORM_DESC"
 			ideology = neutrality
 			ideas = {
-				GFF_bandits
-				GFF_cannibals
-				GFF_commies
+				agrarian_society
 			}
 			focuses = {
-				GFF_got_funds
-				GFF_virgil_power
-				GFF_red_takover
+				YAK_insult
+				YAK_jakistan_by_force
+				YAK_reform_society
 			}
 		}
+		#"GFF"={
+		#	minor = yes
+		#	history = "GFF_GATHERING_STORM_DESC"
+		#	ideology = neutrality
+		#	ideas = {
+		#		GFF_bandits
+		#		GFF_cannibals
+		#		GFF_commies
+		#	}
+		#	focuses = {
+		#		GFF_got_funds
+		#		GFF_virgil_power
+		#		GFF_red_takover
+		#	}
+		#}
 		"AET"={
 			minor = yes
 			history = "AET_GATHERING_STORM_DESC"
@@ -210,22 +239,7 @@ bookmarks = {
 				GRW_victory_in_civil_war
 				GRW_aquire_modern_rifle
 			}
-		}
-		"EQC"={
-			minor = yes
-			history = "EQC_GATHERING_STORM_DESC"
-			ideology = democratic
-			ideas = {
-				EQC_great_depression_1
-				EQC_griffon_minorities1
-				equestrian_overlord
-			}
-			focuses = {
-				EQC_royal_visit
-				EQC_the_election
-				EQC_nmac_spirit
-			}
-		}
+		}		
 		effect = {
 			randomize_weather = 22345 # <- Obligatory in every bookmark !
 			#123 = { rain_light = yes }

common/country_leader/00_traits.txt

@@ -2619,14 +2619,22 @@ leader_traits = {
 	}
 	## AHAHAHAHAHAH ###
 
-	uniform_designer = { # Ground units get 9 more Morale
-		army_morale_factor = 0.07
+	rarity_the_designer = { # Ground units get 7 more Morale
+		army_morale_factor = 0.05
 		winter_attrition_factor = -0.1
 		heat_attrition_factor = -0.05
 		ai_will_do = {
 			factor = 2
 		}
 	}
+	uniform_designer = {
+		army_morale_factor = 0.025
+		winter_attrition_factor = -0.05
+		heat_attrition_factor = -0.035
+		ai_will_do = {
+			factor = 2
+		}
+	}
 	inspiration_leader = { # Ground units get 9 more Morale
 		industrial_capacity_factory = 0.05
 		local_resources_factor = 0.05

common/decisions/AET_decisions.txt

@@ -37,7 +37,7 @@ changeling_friends_category = {
 AET_maarite_sacrifice_category = {
 	AET_raise_dead = {
 
-		icon = maar
+		icon = bird_skull
 
 		visible = {
 			original_tag = AET
@@ -71,7 +71,7 @@ AET_maarite_sacrifice_category = {
 
 	AET_hellfire_forge_guns = {
 
-		icon = generic_form_nation
+		icon = bird_skull
 
 		visible = {
 			original_tag = AET
@@ -105,7 +105,7 @@ AET_maarite_sacrifice_category = {
 
 	AET_maarite_blessing = {
 
-		icon = generic_form_nation
+		icon = bird_skull
 
 		visible = {
 			original_tag = AET
@@ -158,7 +158,7 @@ AET_maarite_sacrifice_category = {
 
 	AET_maarite_blessing_of_war = {
 
-		icon = generic_form_nation
+		icon = bird_skull
 
 		visible = {
 			original_tag = AET
@@ -198,7 +198,7 @@ AET_maarite_sacrifice_category = {
 
 	AET_maarite_blessing_of_production = {
 
-		icon = generic_form_nation
+		icon = bird_skull
 
 		visible = {
 			original_tag = AET

common/decisions/DED_decisions.txt

@@ -2436,3 +2436,47 @@ DED_border_wars = {
 		}
 	}
 }
+
+operations = {
+	world_conquest_remove_DED = {
+		icon = border_war
+		cost = 100
+		ai_will_do = {
+			factor = 150
+		}
+		fire_only_once = yes
+		
+		war_with_on_remove = DED
+
+		allowed = {
+			is_ai = no
+			NOT = { tag = DED }
+		}
+
+		target_trigger = {
+			FROM = { tag = DED }
+		}
+
+		visible = {
+			country_exists = DED
+			all_other_country = {
+				OR = {
+					tag = DED
+					exists = no
+					is_subject_of = ROOT
+					is_in_faction_with = ROOT
+				}
+			}
+		}
+		days_remove = 70
+		
+		
+		remove_effect = {
+			log = "[GetDateText] [Root.GetName]: decision world_conquest_remove_DED"
+			declare_war_on = {
+				type = annex_everything
+				target = DED
+			}
+		}
+	}
+}