Merge pull request #1654 from EaW-Team/FixesAfter1.9

README.md

@@ -1,3 +1,11 @@
 Equestria at War mod repository
 
 This item is not authorized for posting on Steam, except under the Steam account named "Equestria At War Team" (https://steamcommunity.com/id/Equestria_At_War).
+
+</a>
+<a href="https://github.com/EaW-Team/equestria_dev/issues">
+<img alt="Issues" src="https://img.shields.io/github/issues/EaW-Team/equestria_dev?color=0088ff" />
+</a>
+<a href="https://github.com/EaW-Team/equestria_dev/pulls">
+<img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/EaW-Team/equestria_dev?color=0088ff" />
+

changelog.txt

@@ -1,4 +1,58 @@
-🦅 “Two Eagles” 1.9.0.1 🦅
+🦅 “Two Eagles” 1.9.0.2 🦅
+✢ Added some more flavour events for Wingbardy.
+✢ Added a general for Skyfall.
+✢ Added a news event picture for Longsword civil war.
+✢ Added unique responses to the capitulation event depending on what country was capitulated.
+✢ Added several new victory points in Stalliongrad.
+✢ Added an event for lunarist New Mareland where the country can be renamed to Thestralia.
+✢ Equestria now has claims on all Stalliongrad states, and can core them through integration occupation law.
+✢ Reworked values for weather in land regions.
+✢ "Finish the fight" focus for Wingbardy will now bypass if Falcoria doesn't exist.
+✢ Fixed Wingbardy's National Health Bureau national spirit.
+✢ A Wingbardy event should no longer be incorrectly triggered by a focus.
+✢ Various improvements to Griffonian Empire's AI especially on historical. Most importantly, they will delay wars until they have cored all of Herzland.
+✢ Changed some national spirits in communist Wingbardy into leader traits.
+✢ "Rebuilt Aquila" state modifier's icon should now appear properly.
+✢ Fascist Francistria's power struggle should end if Wingbardy no longer exist or isn't fascist.
+✢ Griffonian Republic and Aquileia now instantly declare war on all Herzland nations instead of just getting wargoals.
+✢ AI Wingbardy should be less suicidal.
+✢ Changed the text for Barrad event where the country becomes harmonic, to clarify it's a dead end.
+✢ Wingbardy's New Mareland protectorate has slightly adjusted borders and same color as Wingbardy.
+✢ Supremacy Tarrin can no longer join factions.
+✢ Fixed Flowena's Aquileian puppet color not appearing sometimes.
+✢ Tarrin now goes harmonic on historical.
+✢ Greatly reduced chance of countries accepting annexation ultimatums from Talouse.
+✢ Fixed Wingbardy's communist uprising decisions not being available when they should be.
+✢ Francistria no longer has a decision to ally a non-existent Griffonian Empire.
+✢ More GFX dehumanization.
+✢ Player Tarrin now gets fewer divisions.
+✢ AI Aquileia is less likely to attack Tarrin if they are in a faction.
+✢ Fixed April Fools' Dread League getting too high discounts for armor and artillery.
+✢ Supremacy and communist Talouse can no longer form Karthinia, and supremacy Talouse cannot form Griffonian Empire.
+✢ Fixed broken trait for a Talouse air chief.
+✢ Fixed event for annexation of New Mareland speaking about Wingbardy even if Talouse is annexing it.
+✢ Francis IX now gets an updated description in the "Allies, Not Subjects" path.
+✢ Both operations and non-LaR decisions for Wingbardy's investigation should no longer be available at the same time.
+✢ Sanity checks for Daybreaker spawning.
+✢ Added race-specific unknown leader portraits and icons.
+✢ Adjusted traits for various starting generals, so they don't have Adaptable or Improvisation Expert without their prerequisite traits.
+✢ Fixed Othmar not having a description when he became country leader.
+✢ Events where Grover VI dies now kill him properly.
+✢ Talouse gets less infra damage from sabotage decisions.
+✢ Fixed various issues with event triggers for Aquileia.
+✢ Fixed harmonic Wingbardy's united against disharmony decision being spammable.
+✢ Fixed Wingbardy's head of intelligence advisor.
+✢ Various tweaks to Riverland country AIs, mostly to make them less suicidal.
+✢ Fixed integration decisions not appearing for monarchist Wingbardy.
+✢ Added a sanity check for Falcor's focus about allying Wingbardy.
+✢ Tweaked triggers for Barrad's assassination missions.
+✢ Made fascist Francistria more sensible about when it can attack Wingbardy.
+✢ Added a new Olenian admiral.
+✢ Fixed an edge case of Twilight being in Crystal Empire & ELF at the same time.
+✢ Miscellaneous bugfixes and improvements.
+✢ Miscellaneous localisation fixes.
+
+🦅 “Two Eagles” 1.9.0.1 🦅
 ✢ Various improvements to Griffonian Empire's AI.
 ✢ Added a new general for Angriver.
 ✢ Aquileian puppet Asterion now has the correct race.

common/ai_focuses/GRI.txt

@@ -20,10 +20,10 @@
 		GRI_ROU_uni
 		GRI_monasteries
 		GRI_farms
-		GRI_end_TRD
-		GRI_loyal_officer_core
-		GRI_prepare_for_war
-		GRI_empire_rising
+		# GRI_end_TRD
+		# GRI_loyal_officer_core
+		# GRI_prepare_for_war
+		# GRI_empire_rising
 		# GRI_strike_north
 		# GRI_core_the_north
 		# GRI_strike_west

common/ai_peace/1_communist.txt

@@ -179,27 +179,27 @@ communist_peace = {
 			}
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			is_riverlands_country = yes
 			FROM = { original_tag = BAR }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			tag = GRW
 			FROM = { original_tag = BOI }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = WNG
 			FROM = { original_tag = FAL }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = FAL
 			FROM = { original_tag = WNG }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = BAK
 			OR = {
 				has_government = fascism

common/ai_peace/1_democratic.txt

@@ -191,30 +191,30 @@ democratic_peace = {
 			}
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			is_riverlands_country = yes
 			FROM = { original_tag = BAR }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			tag = SIC
 			has_war_together_with = MIT
 			FROM = {
 				tag = CYA
 			}
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = WNG
 			FROM = { original_tag = FAL }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = FAL
 			FROM = { original_tag = WNG }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = BAK
 			OR = {
 				has_government = fascism

common/ai_peace/1_fascist.txt

@@ -203,25 +203,25 @@ fascist_peace = {
 			}
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			is_riverlands_country = yes
 			FROM = { original_tag = BAR }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			tag = SIC
 			has_war_together_with = MIT
 			FROM = {
 				tag = CYA
 			}
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = WNG
 			FROM = { original_tag = FAL }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = BAK
 			OR = {
 				has_government = fascism
@@ -238,7 +238,7 @@ fascist_peace = {
 			}
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = FAL
 			FROM = { original_tag = WNG }
 		}

common/ai_peace/z_default.txt

@@ -154,30 +154,30 @@ default_peace = {
 			}
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			is_riverlands_country = yes
 			FROM = { original_tag = BAR }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			tag = SIC
 			has_war_together_with = MIT
 			FROM = {
 				tag = CYA
 			}
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = WNG
 			FROM = { original_tag = FAL }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = FAL
 			FROM = { original_tag = WNG }
 		}
 		modifier = {
-			factor = 0
+			factor = 0.1
 			original_tag = BAK
 			OR = {
 				has_government = fascism

common/ai_strategy/EQS.txt

@@ -535,7 +535,7 @@ dont_guarantee_griffons = {
 	allowed = {
 		is_griffon_continent_country = no
 	}
-	targets = { MIT LUS SRS VED FAT MNC STW BRZ FEA GRI HLQ LNS KAT ANG YAL ROU PYT HEL AET TRD FEZ JEB JES JRR JER JFT VIN POM FLO AVI ERI EYR BOI BAN LAK FAL ARA FRN TAL WNG SIC CYA FIR WAT GRW FBK RCT LCT WIT BAR NIM BAK FRE DEP DMT BRF GRY GRU ZES OLV DED EWI NCH HLR FAW NTR LSC LSM HAU D01 D02 D03 D04 D05 D06 D07 D08 D09 D10 D11 D12 D13 D14 D15 D16 D17 D18 D19 D20 D21 D22 D23 D24 D25 D26 D27 D28 D29 D30 D31 D32 D33 D34 D35 D36 D37 D38 D39 D40 D41 D42 D43 D44 D45 D46 D47 D48 D49 D50 }
+	targets = { MIT LUS SRS VED FAT MNC STW BRZ FEA GRI HLQ LNS KAT ANG YAL ROU PYT HEL AET TRD FEZ JEB JES JRR JER JFT VIN POM FLO AVI ERI EYR BOI BAN LAK FAL ARA FRN TAL WNG SIC CYA FIR WAT GRW FBK RCT LCT WIT BAR NIM BAK FRE DEP DMT BRF GRY GRU ZES OLV DED EWI NCH HLR FAW NTR LSC LSM HAU JHZ JNG JGF JKR JOS JAS JEV D01 D02 D03 D04 D05 D06 D07 D08 D09 D10 D11 D12 D13 D14 D15 D16 D17 D18 D19 D20 D21 D22 D23 D24 D25 D26 D27 D28 D29 D30 D31 D32 D33 D34 D35 D36 D37 D38 D39 D40 D41 D42 D43 D44 D45 D46 D47 D48 D49 D50 }
 	enable = {
 		NOT = { is_in_faction_with = ROOT }
 		NOT = { is_subject_of = ROOT }

common/ai_strategy/GENERIC.txt

@@ -81,7 +81,7 @@ EQS_ignore_griffons = { # Reverse strategy
 		is_griffon_continent_country = no
 		NOT = { original_tag = EQC }
 	}
-	targets = { MIT LUS SRS VED FAT MNC STW BRZ FEA GRI HLQ LNS KAT ANG YAL ROU PYT HEL AET TRD FEZ JEB JES JRR JER JFT VIN POM FLO AVI ERI EYR BOI BAN LAK FAL ARA FRN TAL WNG SIC CYA FIR WAT GRW FBK RCT LCT WIT BAR NIM BAK FRE DEP DMT BRF GRY GRU ZES OLV DED EWI NCH HLR FAW NTR LSC LSM HAU D01 D02 D03 D04 D05 D06 D07 D08 D09 D10 D11 D12 D13 D14 D15 D16 D17 D18 D19 D20 D21 D22 D23 D24 D25 D26 D27 D28 D29 D30 D31 D32 D33 D34 D35 D36 D37 D38 D39 D40 D41 D42 D43 D44 D45 D46 D47 D48 D49 D50 }
+	targets = { MIT LUS SRS VED FAT MNC STW BRZ FEA GRI HLQ LNS KAT ANG YAL ROU PYT HEL AET TRD FEZ JEB JES JRR JER JFT VIN POM FLO AVI ERI EYR BOI BAN LAK FAL ARA FRN TAL WNG SIC CYA FIR WAT GRW FBK RCT LCT WIT BAR NIM BAK FRE DEP DMT BRF GRY GRU ZES OLV DED EWI NCH HLR FAW NTR LSC LSM HAU JHZ JNG JGF JKR JOS JAS JEV D01 D02 D03 D04 D05 D06 D07 D08 D09 D10 D11 D12 D13 D14 D15 D16 D17 D18 D19 D20 D21 D22 D23 D24 D25 D26 D27 D28 D29 D30 D31 D32 D33 D34 D35 D36 D37 D38 D39 D40 D41 D42 D43 D44 D45 D46 D47 D48 D49 D50 }
 	enable = {
 		is_capital_on_griffon_continent = yes
 		is_on_griffon_continent = yes

common/ai_strategy/JER.txt

@@ -216,9 +216,7 @@ JER_influence_PP_spending = {
 		has_global_flag = JER_revolution_begun
 		NOT = { has_global_flag = JER_revolution_ended }
 	}
-	abort = {
-		has_global_flag = JER_revolution_ended
-	}
+	abort_when_not_enabled = yes
 	ai_strategy = {
 		type = pp_spend_amount
 		id = decision

common/ai_strategy/NIM.txt

@@ -102,7 +102,7 @@ pegasi_protect_fed = {
 	ai_strategy = {
 		type = force_defend_ally_borders
 		id = "NIM"
-		value = 50
+		value = 100
 	}
 	ai_strategy = {
 		type = protect